From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnout Vandecappelle Date: Tue, 04 Feb 2014 18:55:51 +0100 Subject: [Buildroot] [PATCH 1 of 4 v2] infra: remove variable FOO_DIR_PREFIX In-Reply-To: <6a46109dc43358a75adb.1391530913@argentina> References: <6a46109dc43358a75adb.1391530913@argentina> Message-ID: <52F129A7.4040001@mind.be> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net On 04/02/14 17:21, Thomas De Schampheleire wrote: > Variable FOO_DIR_PREFIX in inner-generic-package isn't really needed. The > contents of this variable are 'package' for normal packages, 'boot' for > bootloaders, and 'linux' for the linux kernel. > When patching a package, all you need to know is the directory where > patches can reside, which is already returned by $(pkgdir). In order to be > able to use this variable outside of inner-generic-package, we introduce a > target-specific variable PKGDIR that equals to this $(pkgdir). > > Signed-off-by: Thomas De Schampheleire Acked-by: Arnout Vandecappelle (Essensium/Mind) (untested) > > --- > package/pkg-generic.mk | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -137,7 +137,7 @@ endif > # > # For BR2_GLOBAL_PATCH_DIR, only generate if it is defined > $(BUILD_DIR)/%/.stamp_patched: NAMEVER = $(RAWNAME)-$($(PKG)_VERSION) > -$(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS = $($(PKG)_DIR_PREFIX)/$(RAWNAME) > +$(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS = $(PKGDIR) > $(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS += $(addsuffix /$(RAWNAME),$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) > $(BUILD_DIR)/%/.stamp_patched: > @$(call step_start,patch) > @@ -358,7 +358,6 @@ endif > $(2)_INSTALL_STAGING ?= NO > $(2)_INSTALL_IMAGES ?= NO > $(2)_INSTALL_TARGET ?= YES > -$(2)_DIR_PREFIX = $(4) > > # define sub-target stamps > $(2)_TARGET_INSTALL_TARGET = $$($(2)_DIR)/.stamp_target_installed > @@ -507,6 +506,7 @@ endif > $$($(2)_TARGET_RSYNC_SOURCE): PKG=$(2) > $$($(2)_TARGET_PATCH): PKG=$(2) > $$($(2)_TARGET_PATCH): RAWNAME=$(patsubst host-%,%,$(1)) > +$$($(2)_TARGET_PATCH): PKGDIR=$(call pkgdir) > $$($(2)_TARGET_EXTRACT): PKG=$(2) > $$($(2)_TARGET_SOURCE): PKG=$(2) > $$($(2)_TARGET_DIRCLEAN): PKG=$(2) > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot > > -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F