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 +++++++++++----------- packages/busybox/busybox.mk | 6 +- packages/graphics/directfb/directfb.mk | 12 ++-- packages/graphics/fontconfig/fontconfig.mk | 2 +- packages/graphics/freefont/freefont.mk | 14 ++-- packages/graphics/gtk/gtk.mk | 2 +- packages/graphics/imlib2/imlib2.mk | 8 +-- packages/graphics/pango/pango.mk | 2 +- packages/misc/ncurses/ncurses.mk | 4 +- packages/misc/tslib/tslib.mk | 2 +- .../lua-modules/cgilua/cgilua.mk | 8 +-- .../lua-modules/luafilesystem/luafilesystem.mk | 8 +-- .../scripting-languages/lua-modules/rings/rings.mk | 12 ++-- packages/scripting-languages/lua/lua.mk | 12 ++-- packages/scripting-languages/perl/perl.mk | 10 +-- packages/security/openssl/openssl.mk | 6 +- packages/system/dbus/dbus.mk | 4 +- packages/system/upstart/upstart.mk | 14 ++-- packages/x11/libx11/libx11.mk | 8 +-- packages/x11/xf86inputevdev/xf86inputevdev.mk | 2 +- packages/x11/xf86videofbdev/xf86videofbdev.mk | 2 +- packages/x11/xkeyboardconfig/xkeyboardconfig.mk | 6 +- packages/x11/xserver/xserver.mk | 2 +- 24 files changed, 113 insertions(+), 113 deletions(-) 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 diff --git a/packages/busybox/busybox.mk b/packages/busybox/busybox.mk index 949a4ae..34f3f64 100644 --- a/packages/busybox/busybox.mk +++ b/packages/busybox/busybox.mk @@ -34,7 +34,7 @@ BB_BUILD_DIR := $(PACKAGES_BUILD)/busybox-$(BB_VERSION) BB_NODESTDIR := y BB_MAKE_ENV = CFLAGS="$(TARGET_CFLAGS) -pipe -fno-strict-aliasing" BB_MAKE_OPTS = CROSS_COMPILE="$(CCACHE_BIN) $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-" -BB_MAKE_OPTS += CONFIG_PREFIX=$(ROOTFS) +BB_MAKE_OPTS += CONFIG_PREFIX=$(embtk_rootfs) bb_install: $(call embtk_makeinstall_pkg,bb) @@ -43,14 +43,14 @@ define embtk_beforeinstall_bb $(embtk_configure_bb) $(Q)$(MAKE) -C $(BB_BUILD_DIR) \ CROSS_COMPILE="$(CCACHE_BIN) $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-" \ - CONFIG_PREFIX=$(ROOTFS) oldconfig + CONFIG_PREFIX=$(embtk_rootfs) oldconfig endef define embtk_postinstall_bb $(Q)CFLAGS="$(TARGET_CFLAGS) -pipe -fno-strict-aliasing" \ $(MAKE) -C $(BB_BUILD_DIR) \ CROSS_COMPILE="$(CCACHE_BIN) $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-" \ - CONFIG_PREFIX=$(ROOTFS) install + CONFIG_PREFIX=$(embtk_rootfs) install endef define embtk_configure_bb diff --git a/packages/graphics/directfb/directfb.mk b/packages/graphics/directfb/directfb.mk index 4d82b9c..0cfb78f 100644 --- a/packages/graphics/directfb/directfb.mk +++ b/packages/graphics/directfb/directfb.mk @@ -102,12 +102,12 @@ DIRECTFB_DEPS += $(if $(CONFIG_EMBTK_DIRECTFB_INPUT_TSLIB),tslib_install) define embtk_postinstall_directfb $(Q)test -e $(DIRECTFB_BUILD_DIR)/.patchlibtool || \ $(MAKE) $(DIRECTFB_BUILD_DIR)/.patchlibtool - $(Q)mkdir -p $(ROOTFS) - $(Q)mkdir -p $(ROOTFS)/etc - $(Q)-cp $(DIRECTFB_BUILD_DIR)/fb.modes $(ROOTFS)/etc - $(Q)mkdir -p $(ROOTFS)/usr - $(Q)mkdir -p $(ROOTFS)/usr/$(LIBDIR) - $(Q)-cp -R $(embtk_sysroot)/usr/lib/directfb-*-* $(ROOTFS)/usr/$(LIBDIR) + $(Q)mkdir -p $(embtk_rootfs) + $(Q)mkdir -p $(embtk_rootfs)/etc + $(Q)-cp $(DIRECTFB_BUILD_DIR)/fb.modes $(embtk_rootfs)/etc + $(Q)mkdir -p $(embtk_rootfs)/usr + $(Q)mkdir -p $(embtk_rootfs)/usr/$(LIBDIR) + $(Q)-cp -R $(embtk_sysroot)/usr/lib/directfb-*-* $(embtk_rootfs)/usr/$(LIBDIR) endef $(DIRECTFB_BUILD_DIR)/.patchlibtool: diff --git a/packages/graphics/fontconfig/fontconfig.mk b/packages/graphics/fontconfig/fontconfig.mk index 5ee81a6..4a79742 100644 --- a/packages/graphics/fontconfig/fontconfig.mk +++ b/packages/graphics/fontconfig/fontconfig.mk @@ -66,5 +66,5 @@ FONTCONFIG_MAKE_OPTS += FREETYPE_LIBS="$(FREETYPE_LIBS-y)" FONTCONFIG_DEPS := libxml2_install freetype_install define embtk_postinstall_fontconfig - $(Q)-cp -R $(embtk_sysroot)/usr/etc/fonts $(ROOTFS)/etc/ + $(Q)-cp -R $(embtk_sysroot)/usr/etc/fonts $(embtk_rootfs)/etc/ endef diff --git a/packages/graphics/freefont/freefont.mk b/packages/graphics/freefont/freefont.mk index 87557cd..30e3583 100644 --- a/packages/graphics/freefont/freefont.mk +++ b/packages/graphics/freefont/freefont.mk @@ -39,14 +39,14 @@ freefont_ttf_install: $(FREEFONT_TTF_BUILD_DIR)/.installed $(FREEFONT_TTF_BUILD_DIR)/.installed: $(FREEFONT_TTF_DEPS) $(call embtk_pinfo,"Installing freefont-$(FREEFONT_TTF_VERSION) in your root filesystem...") - $(Q)mkdir -p $(ROOTFS) - $(Q)mkdir -p $(ROOTFS)/usr - $(Q)mkdir -p $(ROOTFS)/usr/share - $(Q)mkdir -p $(ROOTFS)/usr/share/fonts - $(Q)mkdir -p $(ROOTFS)/usr/share/fonts/truetype - $(Q)mkdir -p $(ROOTFS)/usr/share/fonts/truetype/freefont + $(Q)mkdir -p $(embtk_rootfs) + $(Q)mkdir -p $(embtk_rootfs)/usr + $(Q)mkdir -p $(embtk_rootfs)/usr/share + $(Q)mkdir -p $(embtk_rootfs)/usr/share/fonts + $(Q)mkdir -p $(embtk_rootfs)/usr/share/fonts/truetype + $(Q)mkdir -p $(embtk_rootfs)/usr/share/fonts/truetype/freefont $(Q)cp $(FREEFONT_TTF_BUILD_DIR)/*.ttf \ - $(ROOTFS)/usr/share/fonts/truetype/freefont/ + $(embtk_rootfs)/usr/share/fonts/truetype/freefont/ $(FREEFONT_TTF_BUILD_DIR)/.decompressed: $(call embtk_decompress_pkg,freefont_ttf) diff --git a/packages/graphics/gtk/gtk.mk b/packages/graphics/gtk/gtk.mk index dd8bff3..74da271 100644 --- a/packages/graphics/gtk/gtk.mk +++ b/packages/graphics/gtk/gtk.mk @@ -59,7 +59,7 @@ GTK_CONFIGURE_OPTS += LIBPNG=-lpng define embtk_postinstall_gtk $(Q)test -e $(GTK_BUILD_DIR)/.patchlibtool || \ $(MAKE) $(GTK_BUILD_DIR)/.patchlibtool - $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/gtk-* $(ROOTFS)/usr/$(LIBDIR)/ + $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/gtk-* $(embtk_rootfs)/usr/$(LIBDIR)/ endef $(GTK_BUILD_DIR)/.patchlibtool: diff --git a/packages/graphics/imlib2/imlib2.mk b/packages/graphics/imlib2/imlib2.mk index 1503bec..2bb3b44 100644 --- a/packages/graphics/imlib2/imlib2.mk +++ b/packages/graphics/imlib2/imlib2.mk @@ -42,8 +42,8 @@ IMLIB2_PKGCONFIGS = imlib2.pc IMLIB2_DEPS := libpng_install freetype_install libjpeg_install define embtk_postinstall_imlib2 - $(Q)mkdir -p $(ROOTFS)/usr/$(LIBDIR) - $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/imlib2 $(ROOTFS)/usr/$(LIBDIR) - $(Q)-mkdir -p $(ROOTFS)/usr/share - $(Q)-cp -R $(embtk_sysroot)/usr/share/imlib2 $(ROOTFS)/usr/share + $(Q)mkdir -p $(embtk_rootfs)/usr/$(LIBDIR) + $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/imlib2 $(embtk_rootfs)/usr/$(LIBDIR) + $(Q)-mkdir -p $(embtk_rootfs)/usr/share + $(Q)-cp -R $(embtk_sysroot)/usr/share/imlib2 $(embtk_rootfs)/usr/share endef diff --git a/packages/graphics/pango/pango.mk b/packages/graphics/pango/pango.mk index e1300f6..51b5a9a 100644 --- a/packages/graphics/pango/pango.mk +++ b/packages/graphics/pango/pango.mk @@ -51,7 +51,7 @@ PANGO_DEPS := glib_install fontconfig_install $(PANGO_DEPS-y) \ define embtk_postinstall_pango $(Q)test -e $(PANGO_BUILD_DIR)/.patchlibtool || \ $(MAKE) $(PANGO_BUILD_DIR)/.patchlibtool - $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/pango $(ROOTFS)/usr/$(LIBDIR)/ + $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/pango $(embtk_rootfs)/usr/$(LIBDIR)/ endef $(PANGO_BUILD_DIR)/.patchlibtool: diff --git a/packages/misc/ncurses/ncurses.mk b/packages/misc/ncurses/ncurses.mk index b941095..e6e4a54 100644 --- a/packages/misc/ncurses/ncurses.mk +++ b/packages/misc/ncurses/ncurses.mk @@ -50,6 +50,6 @@ NCURSES_CONFIGURE_OPTS := --disable-rpath --without-cxx-binding \ --program-prefix="" define embtk_postinstall_ncurses - $(Q)mkdir -p $(ROOTFS)/usr/share - $(Q)-cp -R $(embtk_sysroot)/usr/share/tabset $(ROOTFS)/usr/share/ + $(Q)mkdir -p $(embtk_rootfs)/usr/share + $(Q)-cp -R $(embtk_sysroot)/usr/share/tabset $(embtk_rootfs)/usr/share/ endef diff --git a/packages/misc/tslib/tslib.mk b/packages/misc/tslib/tslib.mk index 4ee0aaf..6b43057 100644 --- a/packages/misc/tslib/tslib.mk +++ b/packages/misc/tslib/tslib.mk @@ -40,5 +40,5 @@ TSLIB_PKGCONFIGS = tslib*.pc TSLIB_DEPS = define embtk_postinstall_tslib - $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/ts $(ROOTFS)/usr/$(LIBDIR)/ + $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/ts $(embtk_rootfs)/usr/$(LIBDIR)/ endef diff --git a/packages/scripting-languages/lua-modules/cgilua/cgilua.mk b/packages/scripting-languages/lua-modules/cgilua/cgilua.mk index 5ebf879..70393c4 100644 --- a/packages/scripting-languages/lua-modules/cgilua/cgilua.mk +++ b/packages/scripting-languages/lua-modules/cgilua/cgilua.mk @@ -40,8 +40,8 @@ cgilua_install: $(call embtk_makeinstall_pkg,cgilua) define embtk_postinstall_cgilua - $(Q)mkdir -p $(ROOTFS) - $(Q)mkdir -p $(ROOTFS)/usr - $(Q)mkdir -p $(ROOTFS)/usr/share - $(Q)cp -R $(embtk_sysroot)/usr/share/lua $(ROOTFS)/usr/share/ + $(Q)mkdir -p $(embtk_rootfs) + $(Q)mkdir -p $(embtk_rootfs)/usr + $(Q)mkdir -p $(embtk_rootfs)/usr/share + $(Q)cp -R $(embtk_sysroot)/usr/share/lua $(embtk_rootfs)/usr/share/ endef diff --git a/packages/scripting-languages/lua-modules/luafilesystem/luafilesystem.mk b/packages/scripting-languages/lua-modules/luafilesystem/luafilesystem.mk index e9cacde..c8caa29 100644 --- a/packages/scripting-languages/lua-modules/luafilesystem/luafilesystem.mk +++ b/packages/scripting-languages/lua-modules/luafilesystem/luafilesystem.mk @@ -43,8 +43,8 @@ luafilesystem_install: $(call embtk_makeinstall_pkg,luafilesystem) define embtk_postinstall_luafilesystem - $(Q)mkdir -p $(ROOTFS) - $(Q)mkdir -p $(ROOTFS)/usr - $(Q)mkdir -p $(ROOTFS)/usr/$(LIBDIR) - $(Q)cp -R $(embtk_sysroot)/usr/$(LIBDIR)/lua $(ROOTFS)/usr/$(LIBDIR)/ + $(Q)mkdir -p $(embtk_rootfs) + $(Q)mkdir -p $(embtk_rootfs)/usr + $(Q)mkdir -p $(embtk_rootfs)/usr/$(LIBDIR) + $(Q)cp -R $(embtk_sysroot)/usr/$(LIBDIR)/lua $(embtk_rootfs)/usr/$(LIBDIR)/ endef diff --git a/packages/scripting-languages/lua-modules/rings/rings.mk b/packages/scripting-languages/lua-modules/rings/rings.mk index 05ba548..cbb1170 100644 --- a/packages/scripting-languages/lua-modules/rings/rings.mk +++ b/packages/scripting-languages/lua-modules/rings/rings.mk @@ -43,10 +43,10 @@ rings_install: $(call embtk_makeinstall_pkg,rings) define embtk_postinstall_rings - $(Q)mkdir -p $(ROOTFS) - $(Q)mkdir -p $(ROOTFS)/usr - $(Q)mkdir -p $(ROOTFS)/usr/$(LIBDIR) - $(Q)mkdir -p $(ROOTFS)/usr/share - $(Q)cp -R $(embtk_sysroot)/usr/$(LIBDIR)/lua $(ROOTFS)/usr/$(LIBDIR)/ - $(Q)cp -R $(embtk_sysroot)/usr/share/lua $(ROOTFS)/usr/share/ + $(Q)mkdir -p $(embtk_rootfs) + $(Q)mkdir -p $(embtk_rootfs)/usr + $(Q)mkdir -p $(embtk_rootfs)/usr/$(LIBDIR) + $(Q)mkdir -p $(embtk_rootfs)/usr/share + $(Q)cp -R $(embtk_sysroot)/usr/$(LIBDIR)/lua $(embtk_rootfs)/usr/$(LIBDIR)/ + $(Q)cp -R $(embtk_sysroot)/usr/share/lua $(embtk_rootfs)/usr/share/ endef diff --git a/packages/scripting-languages/lua/lua.mk b/packages/scripting-languages/lua/lua.mk index 9e9bb6d..5d1fcf2 100644 --- a/packages/scripting-languages/lua/lua.mk +++ b/packages/scripting-languages/lua/lua.mk @@ -55,10 +55,10 @@ define embtk_beforeinstall_lua endef define embtk_postinstall_lua - $(Q)mkdir -p $(ROOTFS) - $(Q)mkdir -p $(ROOTFS)/usr - $(Q)mkdir -p $(ROOTFS)/usr/$(LIBDIR) - $(Q)mkdir -p $(ROOTFS)/usr/share - $(Q)cp -R $(embtk_sysroot)/usr/$(LIBDIR)/lua $(ROOTFS)/usr/$(LIBDIR)/ - $(Q)cp -R $(embtk_sysroot)/usr/share/lua $(ROOTFS)/usr/share/ + $(Q)mkdir -p $(embtk_rootfs) + $(Q)mkdir -p $(embtk_rootfs)/usr + $(Q)mkdir -p $(embtk_rootfs)/usr/$(LIBDIR) + $(Q)mkdir -p $(embtk_rootfs)/usr/share + $(Q)cp -R $(embtk_sysroot)/usr/$(LIBDIR)/lua $(embtk_rootfs)/usr/$(LIBDIR)/ + $(Q)cp -R $(embtk_sysroot)/usr/share/lua $(embtk_rootfs)/usr/share/ endef diff --git a/packages/scripting-languages/perl/perl.mk b/packages/scripting-languages/perl/perl.mk index 10d4173..8c49b34 100644 --- a/packages/scripting-languages/perl/perl.mk +++ b/packages/scripting-languages/perl/perl.mk @@ -49,11 +49,11 @@ $(MICROPERL_BUILD_DIR)/.installed: download_microperl \ microperl-$(PERL_VERSION) in your root filesystem...") $(Q)$(MAKE) -C $(MICROPERL_BUILD_DIR) -f Makefile.micro \ OPTIMIZE="$(TARGET_CFLAGS)" CC=$(TARGETCC_CACHED) - $(Q)mkdir -p $(ROOTFS) - $(Q)mkdir -p $(ROOTFS)/usr - $(Q)mkdir -p $(ROOTFS)/usr/bin - $(Q)cp $(MICROPERL_BUILD_DIR)/microperl $(ROOTFS)/usr/bin - $(Q)cd $(ROOTFS)/usr/bin; ln -sf microperl perl + $(Q)mkdir -p $(embtk_rootfs) + $(Q)mkdir -p $(embtk_rootfs)/usr + $(Q)mkdir -p $(embtk_rootfs)/usr/bin + $(Q)cp $(MICROPERL_BUILD_DIR)/microperl $(embtk_rootfs)/usr/bin + $(Q)cd $(embtk_rootfs)/usr/bin; ln -sf microperl perl $(Q)touch $@ $(PERL_BUILD_DIR)/.decompressed: diff --git a/packages/security/openssl/openssl.mk b/packages/security/openssl/openssl.mk index 58a94c7..0e83db4 100644 --- a/packages/security/openssl/openssl.mk +++ b/packages/security/openssl/openssl.mk @@ -70,7 +70,7 @@ define embtk_postinstall_openssl $(MAKE) libtool_files_adapt; \ touch $(OPENSSL_BUILD_DIR)/.postinstalled; \ fi - $(Q)mkdir -p $(ROOTFS) - $(Q)mkdir -p $(ROOTFS)/etc - $(Q)-cp -R $(embtk_sysroot)/etc/ssl $(ROOTFS)/etc/ + $(Q)mkdir -p $(embtk_rootfs) + $(Q)mkdir -p $(embtk_rootfs)/etc + $(Q)-cp -R $(embtk_sysroot)/etc/ssl $(embtk_rootfs)/etc/ endef diff --git a/packages/system/dbus/dbus.mk b/packages/system/dbus/dbus.mk index 92ec7f5..23c1033 100644 --- a/packages/system/dbus/dbus.mk +++ b/packages/system/dbus/dbus.mk @@ -44,6 +44,6 @@ DBUS_CONFIGURE_OPTS := --enable-abstract-sockets --with-xml=libxml \ $(if $(CONFIG_EMBTK_HAVE_LIBX11),--with-x,--without-x) define embtk_postinstall_dbus - $(Q)-mkdir -p $(ROOTFS)/usr/libexec - $(Q)-cp -R $(embtk_sysroot)/usr/libexec/dbus* $(ROOTFS)/usr/libexec/ + $(Q)-mkdir -p $(embtk_rootfs)/usr/libexec + $(Q)-cp -R $(embtk_sysroot)/usr/libexec/dbus* $(embtk_rootfs)/usr/libexec/ endef diff --git a/packages/system/upstart/upstart.mk b/packages/system/upstart/upstart.mk index 086329d..226c3da 100644 --- a/packages/system/upstart/upstart.mk +++ b/packages/system/upstart/upstart.mk @@ -46,8 +46,8 @@ $(UPSTART_BUILD_DIR)/.installed: $(UPSTART_DEPS) download_upstart \ upstart-$(UPSTART_VERSION) in your root filesystem...") $(call __embtk_kill_lt_rpath,$(UPSTART_BUILD_DIR)) $(Q)$(MAKE) -C $(UPSTART_BUILD_DIR) $(J) - $(Q)$(MAKE) -C $(UPSTART_BUILD_DIR) DESTDIR=$(ROOTFS)/ install - $(Q)-rm -rf $(ROOTFS)/share + $(Q)$(MAKE) -C $(UPSTART_BUILD_DIR) DESTDIR=$(embtk_rootfs)/ install + $(Q)-rm -rf $(embtk_rootfs)/share @touch $@ download_upstart: @@ -104,9 +104,9 @@ upstart_clean: $(Q)-rm -rf $(UPSTART_BUILD_DIR)* $(UPSTART_BUILD_DIR)/.special: - $(Q)-mkdir -p $(ROOTFS)/etc - $(Q)-mkdir -p $(ROOTFS)/etc/dbus-1 - $(Q)-mkdir -p $(ROOTFS)/etc/dbus-1/system.d + $(Q)-mkdir -p $(embtk_rootfs)/etc + $(Q)-mkdir -p $(embtk_rootfs)/etc/dbus-1 + $(Q)-mkdir -p $(embtk_rootfs)/etc/dbus-1/system.d $(Q)-cp $(embtk_sysroot)/etc/dbus-1/system.d/Upstart.conf \ - $(ROOTFS)/etc/dbus-1/system.d - $(Q)-cp -R $(embtk_sysroot)/etc/init $(ROOTFS)/etc/ + $(embtk_rootfs)/etc/dbus-1/system.d + $(Q)-cp -R $(embtk_sysroot)/etc/init $(embtk_rootfs)/etc/ diff --git a/packages/x11/libx11/libx11.mk b/packages/x11/libx11/libx11.mk index 59416c5..955c934 100644 --- a/packages/x11/libx11/libx11.mk +++ b/packages/x11/libx11/libx11.mk @@ -55,10 +55,10 @@ endef define embtk_postinstall_libx11 $(Q)test -e $(LIBX11_BUILD_DIR)/.patchlibtool || \ $(MAKE) $(LIBX11_BUILD_DIR)/.patchlibtool - $(Q)-mkdir -p $(ROOTFS)/usr/share - $(Q)-mkdir -p $(ROOTFS)/usr/share/X11 - $(Q)-cp $(embtk_sysroot)/usr/share/X11/XErrorDB $(ROOTFS)/usr/share/X11/ - $(Q)-cp $(embtk_sysroot)/usr/share/X11/XKeysymDB $(ROOTFS)/usr/share/X11/ + $(Q)-mkdir -p $(embtk_rootfs)/usr/share + $(Q)-mkdir -p $(embtk_rootfs)/usr/share/X11 + $(Q)-cp $(embtk_sysroot)/usr/share/X11/XErrorDB $(embtk_rootfs)/usr/share/X11/ + $(Q)-cp $(embtk_sysroot)/usr/share/X11/XKeysymDB $(embtk_rootfs)/usr/share/X11/ endef $(LIBX11_BUILD_DIR)/.patchlibtool: diff --git a/packages/x11/xf86inputevdev/xf86inputevdev.mk b/packages/x11/xf86inputevdev/xf86inputevdev.mk index 1ad860b..6915b36 100644 --- a/packages/x11/xf86inputevdev/xf86inputevdev.mk +++ b/packages/x11/xf86inputevdev/xf86inputevdev.mk @@ -40,5 +40,5 @@ XF86INPUTEVDEV_PKGCONFIGS = xorg-evdev.pc XF86INPUTEVDEV_DEPS = xserver_install define embtk_postinstall_xf86inputevdev - $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/ + $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/xorg $(embtk_rootfs)/usr/$(LIBDIR)/ endef diff --git a/packages/x11/xf86videofbdev/xf86videofbdev.mk b/packages/x11/xf86videofbdev/xf86videofbdev.mk index 9f5aaa7..9bcd3d5 100644 --- a/packages/x11/xf86videofbdev/xf86videofbdev.mk +++ b/packages/x11/xf86videofbdev/xf86videofbdev.mk @@ -40,5 +40,5 @@ XF86VIDEOFBDEV_PKGCONFIGS = XF86VIDEOFBDEV_DEPS = xserver_install define embtk_postinstall_xf86videofbdev - $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/ + $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/xorg $(embtk_rootfs)/usr/$(LIBDIR)/ endef diff --git a/packages/x11/xkeyboardconfig/xkeyboardconfig.mk b/packages/x11/xkeyboardconfig/xkeyboardconfig.mk index 5ff0a35..07abd12 100644 --- a/packages/x11/xkeyboardconfig/xkeyboardconfig.mk +++ b/packages/x11/xkeyboardconfig/xkeyboardconfig.mk @@ -34,7 +34,7 @@ XKEYBOARDCONFIG_BUILD_DIR := $(PACKAGES_BUILD)/xkeyboard-config-$(XKEYBOARDCONFI XKEYBOARDCONFIG_DEPS := intltool_host_install xkbcomp_install define embtk_postinstall_xkeyboardconfig - $(Q)-mkdir -p $(ROOTFS)/usr/share - $(Q)-mkdir -p $(ROOTFS)/usr/share/X11 - $(Q)-cp -R $(embtk_sysroot)/usr/share/X11/xkb $(ROOTFS)/usr/share/X11/ + $(Q)-mkdir -p $(embtk_rootfs)/usr/share + $(Q)-mkdir -p $(embtk_rootfs)/usr/share/X11 + $(Q)-cp -R $(embtk_sysroot)/usr/share/X11/xkb $(embtk_rootfs)/usr/share/X11/ endef diff --git a/packages/x11/xserver/xserver.mk b/packages/x11/xserver/xserver.mk index 67098ac..6973cbc 100644 --- a/packages/x11/xserver/xserver.mk +++ b/packages/x11/xserver/xserver.mk @@ -82,5 +82,5 @@ XSERVER_CONFIGURE_OPTS += --disable-tslib endif define embtk_postinstall_xserver - $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/ + $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/xorg $(embtk_rootfs)/usr/$(LIBDIR)/ endef -- cgit v1.2.3