From patchwork Sun Mar 17 11:08:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 228291 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 561A22C00B4 for ; Sun, 17 Mar 2013 22:09:28 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id BE5C0A0097; Sun, 17 Mar 2013 11:09:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0pQ-DlFd8+LJ; Sun, 17 Mar 2013 11:09:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 2F3F7A0051; Sun, 17 Mar 2013 11:09:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 135FD8F74B for ; Sun, 17 Mar 2013 11:09:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5EFDF86891 for ; Sun, 17 Mar 2013 11:09:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id opr4A5PIFCtF for ; Sun, 17 Mar 2013 11:09:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f180.google.com (mail-we0-f180.google.com [74.125.82.180]) by whitealder.osuosl.org (Postfix) with ESMTPS id 9DF0982327 for ; Sun, 17 Mar 2013 11:09:18 +0000 (UTC) Received: by mail-we0-f180.google.com with SMTP id k14so3998496wer.25 for ; Sun, 17 Mar 2013 04:09:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:subject:date:message-id:x-mailer; bh=CPrXKpBBnktjfp0KKQqvNoh+MdiXHHFjUvHZdwwEzdI=; b=BtwLtD3tt3ofV6fD5zpR3FNDKikpo2ZB+t6yyY2IHvR/rYkzNw80VIk6PA9ly7h/qu BVeHnE8lRj8H9PwO+ChENnJJB7Gnrev4YMTti7qkgyfcuTFzRAQyxGw7TdCIu47Kem0w TG9VJO1pGkwFcxz4N5Uy0AF+uEtFbSe/koQSQtG0wKpNFyKSRINnIzNQePx00k6OTFZt 9eZmVDgq76iXzy/kQngQsx6Dh7u3uYKTYbtWn6G5fgN6n9oU1o7EPiZTaOrkQc5Hi+Aa Vu00Euzk96OfQP7Mrpi9O6WOq6+XQC6lsBYt2iZxZkVIRQXQ68V3391+JanCLNw5iNED c7Tw== X-Received: by 10.180.86.1 with SMTP id l1mr11160817wiz.32.1363518556720; Sun, 17 Mar 2013 04:09:16 -0700 (PDT) Received: from localhost.localdomain (host-84-13-110-38.opaltelecom.net. [84.13.110.38]) by mx.google.com with ESMTPS id t7sm7573958wij.2.2013.03.17.04.09.14 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 17 Mar 2013 04:09:15 -0700 (PDT) From: spdawson@gmail.com To: buildroot@busybox.net Date: Sun, 17 Mar 2013 11:08:09 +0000 Message-Id: <1363518489-1065-1-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.7.10.4 Subject: [Buildroot] [PATCH v2] rework patch model X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: Simon Dawson At the Buildroot Developers Meeting (4-5 February 2013, in Brussels) a change to the patch logic was discussed. See http://elinux.org/Buildroot:DeveloperDaysFOSDEM2013 for details. In summary: * For patches stored in the package directory, if package/// does exist, apply package///*.patch, otherwise, apply package//*.patch * For patches stored in the global patches directory, if $(GLOBAL_PATCH_DIR)/// does exist, apply $(GLOBAL_PATCH_DIR)///*.patch, otherwise, apply $(GLOBAL_PATCH_DIR)//*.patch This patch adds the new BR2_GLOBAL_PATCH_DIR configuration item, and reworks the generic package infrastructure to implement the new patch logic. Signed-off-by: Simon Dawson --- v2: Add documentation, as suggested by Baruch Siach Config.in | 15 +++++++++++++++ docs/manual/customize-packages.txt | 23 +++++++++++++++++++++++ docs/manual/customize.txt | 2 ++ package/pkg-generic.mk | 16 ++++++++-------- 4 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 docs/manual/customize-packages.txt diff --git a/Config.in b/Config.in index a2c305f..03c4a3e 100644 --- a/Config.in +++ b/Config.in @@ -437,6 +437,21 @@ config BR2_PACKAGE_OVERRIDE_FILE as the source directory for a particular package. See the Buildroot documentation for more details on this feature. +config BR2_GLOBAL_PATCH_DIR + string "global patch directory" + help + You may specify a directory containing global package patches. + For a specific version of a specific package , patches + are applied as follows. + + First, the default Buildroot patch set for the package is applied. + + If the directory $(BR2_GLOBAL_PATCH_DIR)// exists, then + all *.patch files in the directory will be applied. + + Otherwise, if the directory $(BR2_GLOBAL_PATCH_DIR)/ exists, then + all *.patch files in the directory will be applied. + endmenu source "toolchain/Config.in" diff --git a/docs/manual/customize-packages.txt b/docs/manual/customize-packages.txt new file mode 100644 index 0000000..9e158c7 --- /dev/null +++ b/docs/manual/customize-packages.txt @@ -0,0 +1,23 @@ +// -*- mode:doc -*- ; + +[[packages-custom]] +Customizing packages +~~~~~~~~~~~~~~~~~~~~ + +It is sometimes useful to apply 'extra' patches to packages - over and +above those provided in Buildroot. This might be used to support custom +features in a project, for example, or when working on a new architecture. + +The +BR2_GLOBAL_PATCH_DIR+ configuration file option can be +used to specify a directory containing global package patches. + +For a specific version of a specific package , patches +are applied as follows. + +First, the default Buildroot patch set for the package is applied. + +If the directory $(BR2_GLOBAL_PATCH_DIR)// exists, then +all *.patch files in the directory will be applied. + +Otherwise, if the directory $(BR2_GLOBAL_PATCH_DIR)/ exists, then +all *.patch files in the directory will be applied. diff --git a/docs/manual/customize.txt b/docs/manual/customize.txt index 3b1a5a7..0456ef1 100644 --- a/docs/manual/customize.txt +++ b/docs/manual/customize.txt @@ -15,3 +15,5 @@ include::customize-kernel-config.txt[] include::customize-toolchain.txt[] include::customize-store.txt[] + +include::customize-packages.txt[] diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 57b0fd0..db0b025 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -82,21 +82,21 @@ endif # find the package directory (typically package/) and the # prefix of the patches $(BUILD_DIR)/%/.stamp_patched: NAMEVER = $(RAWNAME)-$($(PKG)_VERSION) +$(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS = $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(call qstrip,$(BR2_GLOBAL_PATCH_DIR))/$(RAWNAME) $(BUILD_DIR)/%/.stamp_patched: @$(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$(RAWNAME)") $(foreach hook,$($(PKG)_PRE_PATCH_HOOKS),$(call $(hook))$(sep)) $(foreach p,$($(PKG)_PATCH),support/scripts/apply-patches.sh $(@D) $(DL_DIR) $(p)$(sep)) $(Q)( \ - if test -d $($(PKG)_DIR_PREFIX)/$(RAWNAME); then \ - if test "$(wildcard $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER)*.patch*)"; then \ - support/scripts/apply-patches.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(NAMEVER)\*.patch $(NAMEVER)\*.patch.$(ARCH) || exit 1; \ - else \ - support/scripts/apply-patches.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(RAWNAME)\*.patch $(RAWNAME)\*.patch.$(ARCH) || exit 1; \ - if test -d $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER); then \ - support/scripts/apply-patches.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER) \*.patch \*.patch.$(ARCH) || exit 1; \ + for D in $(PATCH_BASE_DIRS); do \ + if test -d $${D}; then \ + if test -d $${D}/$($(PKG)_VERSION); then \ + support/scripts/apply-patches.sh $(@D) $${D}/$($(PKG)_VERSION) \*.patch \*.patch.$(ARCH) || exit 1; \ + else \ + support/scripts/apply-patches.sh $(@D) $${D} \*.patch \*.patch.$(ARCH) || exit 1; \ fi; \ fi; \ - fi; \ + done; \ ) $(foreach hook,$($(PKG)_POST_PATCH_HOOKS),$(call $(hook))$(sep)) $(Q)touch $@