From cac87aa1f4f11d7ad8e0200511703a95deccdbcd Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Thu, 4 Oct 2012 22:02:45 +0200 Subject: Build system: replace EMBTK_ROOTFS -> embtk_rootfs Signed-off-by: Abdoulaye Walsimou Gaye --- mk/buildsystem.mk | 2 +- mk/rootfs.mk | 78 +++++++++++++++++++++++++++---------------------------- 2 files changed, 40 insertions(+), 40 deletions(-) (limited to 'mk') diff --git a/mk/buildsystem.mk b/mk/buildsystem.mk index 074d6dd..7afad63 100644 --- a/mk/buildsystem.mk +++ b/mk/buildsystem.mk @@ -174,6 +174,6 @@ define __embtk_kconfig_clean endef rmallpath: - $(Q)rm -rf $(PACKAGES_BUILD)* $(ROOTFS)* $(embtk_tools)* $(embtk_toolsb)* + $(Q)rm -rf $(PACKAGES_BUILD)* $(embtk_rootfs)* $(embtk_tools)* $(embtk_toolsb)* $(Q)rm -rf $(embtk_sysroot)* $(HOSTTOOLS)* $(embtk_generated)/rootfs-* $(Q)$(if $(CONFIG_EMBTK_CACHE_PATCHES),,rm -rf $(embtk_dldir)/*.patch) diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 4409676..76ec01b 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -38,15 +38,15 @@ HOSTTOOLS_COMPONENTS-$(CONFIG_EMBTK_ROOTFS_HAVE_SQUASHFS) += squashfs_tools_inst # Files to strip if requested -__embtk_rootfs/libso = $(shell [ -d $(ROOTFS)/lib ] && find $(ROOTFS)/lib -type f -name *.so*) -__embtk_rootfs/lib32so = $(shell [ -d $(ROOTFS)/lib32 ] && find $(ROOTFS)/lib32 -type f -name *.so*) -__embtk_rootfs/usr/libso = $(shell [ -d $(ROOTFS)/usr/lib ] && find $(ROOTFS)/usr/lib -type f -name *.so*) -__embtk_rootfs/usr/lib32so = $(shell [ -d $(ROOTFS)/usr/lib32 ] && find $(ROOTFS)/usr/lib32 -type f -name *.so*) -__embtk_rootfs/usr/libexec = $(shell [ -d $(ROOTFS)/usr/libexec ] && find $(ROOTFS)/usr/libexec -type f) -__embtk_rootfs/bins = $(shell [ -d $(ROOTFS)/bin ] && find $(ROOTFS)/bin -type f) -__embtk_rootfs/sbins = $(shell [ -d $(ROOTFS)/sbin ] && find $(ROOTFS)/sbin -type f) -__embtk_rootfs/usr/bins = $(shell [ -d $(ROOTFS)/usr/bin ] && find $(ROOTFS)/usr/bin -type f) -__embtk_rootfs/usr/sbins = $(shell [ -d $(ROOTFS)/usr/sbin ] && find $(ROOTFS)/usr/sbin -type f) +__embtk_rootfs/libso = $(shell [ -d $(embtk_rootfs)/lib ] && find $(embtk_rootfs)/lib -type f -name *.so*) +__embtk_rootfs/lib32so = $(shell [ -d $(embtk_rootfs)/lib32 ] && find $(embtk_rootfs)/lib32 -type f -name *.so*) +__embtk_rootfs/usr/libso = $(shell [ -d $(embtk_rootfs)/usr/lib ] && find $(embtk_rootfs)/usr/lib -type f -name *.so*) +__embtk_rootfs/usr/lib32so = $(shell [ -d $(embtk_rootfs)/usr/lib32 ] && find $(embtk_rootfs)/usr/lib32 -type f -name *.so*) +__embtk_rootfs/usr/libexec = $(shell [ -d $(embtk_rootfs)/usr/libexec ] && find $(embtk_rootfs)/usr/libexec -type f) +__embtk_rootfs/bins = $(shell [ -d $(embtk_rootfs)/bin ] && find $(embtk_rootfs)/bin -type f) +__embtk_rootfs/sbins = $(shell [ -d $(embtk_rootfs)/sbin ] && find $(embtk_rootfs)/sbin -type f) +__embtk_rootfs/usr/bins = $(shell [ -d $(embtk_rootfs)/usr/bin ] && find $(embtk_rootfs)/usr/bin -type f) +__embtk_rootfs/usr/sbins = $(shell [ -d $(embtk_rootfs)/usr/sbin ] && find $(embtk_rootfs)/usr/sbin -type f) define __embtk_rootfs_strip_f -$(FAKEROOT_BIN) -i $(FAKEROOT_ENV_FILE) -- \ @@ -89,7 +89,7 @@ __embtk_rootfs_strip: define __embtk_rootfs_mkdevnodes $(call embtk_pinfo,"Populating devices nodes of the rootfs...") $(FAKEROOT_BIN) -s $(FAKEROOT_ENV_FILE) -- $(MAKEDEVS_BIN) \ - -d $(EMBTK_ROOT)/src/devices_table.txt $(ROOTFS) + -d $(EMBTK_ROOT)/src/devices_table.txt $(embtk_rootfs) endef define __embtk_rootfs_cleanup @@ -99,42 +99,42 @@ define __embtk_rootfs_cleanup endef define __embtk_rootfs_mkinitpath - mkdir -p $(ROOTFS) - cp -Rp $(EMBTK_ROOT)/src/target_skeleton/* $(ROOTFS) + mkdir -p $(embtk_rootfs) + cp -Rp $(EMBTK_ROOT)/src/target_skeleton/* $(embtk_rootfs) mkdir -p $(PACKAGES_BUILD) $(if $(CONFIG_EMBTK_64BITS_FS_COMPAT32), - mkdir -p $(ROOTFS)/lib32 - mkdir -p $(ROOTFS)/usr/lib32) + mkdir -p $(embtk_rootfs)/lib32 + mkdir -p $(embtk_rootfs)/usr/lib32) endef define __embtk_rootfs_fill - mkdir -p $(ROOTFS)/$(LIBDIR) - mkdir -p $(ROOTFS)/lib - mkdir -p $(ROOTFS)/usr - mkdir -p $(ROOTFS)/usr/$(LIBDIR) - mkdir -p $(ROOTFS)/usr/lib + mkdir -p $(embtk_rootfs)/$(LIBDIR) + mkdir -p $(embtk_rootfs)/lib + mkdir -p $(embtk_rootfs)/usr + mkdir -p $(embtk_rootfs)/usr/$(LIBDIR) + mkdir -p $(embtk_rootfs)/usr/lib $(if $(CONFIG_EMBTK_64BITS_FS), - cd $(ROOTFS); ln -s lib lib64 - cd $(ROOTFS)/usr; ln -s lib lib64) + cd $(embtk_rootfs); ln -s lib lib64 + cd $(embtk_rootfs)/usr; ln -s lib lib64) $(if $(CONFIG_EMBTK_64BITS_FS_COMPAT32), - cd $(ROOTFS); ln -s lib lib64 - cd $(ROOTFS)/usr; ln -s lib lib64) - -cp -d $(embtk_sysroot)/lib/*.so* $(ROOTFS)/lib/ - -cp -d $(embtk_sysroot)/usr/lib/*.so* $(ROOTFS)/usr/lib/ + cd $(embtk_rootfs); ln -s lib lib64 + cd $(embtk_rootfs)/usr; ln -s lib lib64) + -cp -d $(embtk_sysroot)/lib/*.so* $(embtk_rootfs)/lib/ + -cp -d $(embtk_sysroot)/usr/lib/*.so* $(embtk_rootfs)/usr/lib/ $(if $(CONFIG_EMBTK_64BITS_FS_COMPAT32), - -cp -d $(embtk_sysroot)/lib32/*.so* $(ROOTFS)/lib32/ - -cp -d $(embtk_sysroot)/usr/lib32/*.so* $(ROOTFS)/usr/lib32/) - -cp -R $(embtk_sysroot)/bin/* $(ROOTFS)/bin/ >/dev/null 2>/dev/null - -cp -R $(embtk_sysroot)/usr/bin/* $(ROOTFS)/usr/bin/ - -cp -R $(embtk_sysroot)/sbin/* $(ROOTFS)/sbin/ >/dev/null 2>/dev/null - -cp -R $(embtk_sysroot)/usr/sbin/* $(ROOTFS)/usr/sbin/ - -cp -R $(embtk_sysroot)/etc/* $(ROOTFS)/etc/ >/dev/null 2>/dev/null - cp -R $(embtk_sysroot)/root $(ROOTFS)/ + -cp -d $(embtk_sysroot)/lib32/*.so* $(embtk_rootfs)/lib32/ + -cp -d $(embtk_sysroot)/usr/lib32/*.so* $(embtk_rootfs)/usr/lib32/) + -cp -R $(embtk_sysroot)/bin/* $(embtk_rootfs)/bin/ >/dev/null 2>/dev/null + -cp -R $(embtk_sysroot)/usr/bin/* $(embtk_rootfs)/usr/bin/ + -cp -R $(embtk_sysroot)/sbin/* $(embtk_rootfs)/sbin/ >/dev/null 2>/dev/null + -cp -R $(embtk_sysroot)/usr/sbin/* $(embtk_rootfs)/usr/sbin/ + -cp -R $(embtk_sysroot)/etc/* $(embtk_rootfs)/etc/ >/dev/null 2>/dev/null + cp -R $(embtk_sysroot)/root $(embtk_rootfs)/ $(if $(CONFIG_EMBTK_TARGET_STRIPPED), $(call embtk_pinfo,"Stripping binaries as specified...") $(MAKE) __embtk_rootfs_strip) -$(FAKEROOT_BIN) -i $(FAKEROOT_ENV_FILE) -- \ - rm -rf `find $(ROOTFS) -type f -name *.la` + rm -rf `find $(embtk_rootfs) -type f -name *.la` endef define __embtk_rootfs_build @@ -144,14 +144,14 @@ define __embtk_rootfs_build $(MAKE) $(ROOTFS_COMPONENTS-y) $(__embtk_rootfs_mkdevnodes) $(__embtk_rootfs_fill) - $(call embtk_rootfs_mktarbz2,$(ROOTFS),$(ROOTFS_TARBZ2)) + $(call embtk_rootfs_mktarbz2,$(embtk_rootfs),$(ROOTFS_TARBZ2)) $(if $(CONFIG_EMBTK_ROOTFS_HAVE_INITRAMFS_CPIO), - $(call embtk_rootfs_mkinitramfs,$(ROOTFS),$(ROOTFS_INITRAMFS))) + $(call embtk_rootfs_mkinitramfs,$(embtk_rootfs),$(ROOTFS_INITRAMFS))) $(if $(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2), - $(call embtk_rootfs_mkjffs2,$(ROOTFS),$(ROOTFS_JFFS2))) + $(call embtk_rootfs_mkjffs2,$(embtk_rootfs),$(ROOTFS_JFFS2))) $(if $(CONFIG_EMBTK_ROOTFS_HAVE_SQUASHFS), - $(call embtk_rootfs_mksquashfs,$(ROOTFS),$(ROOTFS_SQUASHFS))) - rm -rf $(ROOTFS) + $(call embtk_rootfs_mksquashfs,$(embtk_rootfs),$(ROOTFS_SQUASHFS))) + rm -rf $(embtk_rootfs) $(call embtk_pinfo,"Selected root filesystems built successfully!") endef -- cgit v1.2.3