From c244e79c9db5c3a87feb645cf64ec974bf4c63ce Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Thu, 4 Oct 2012 21:36:34 +0200 Subject: Build system: replace SYSROOT -> embtk_sysroot Signed-off-by: Abdoulaye Walsimou Gaye --- mk/binutils.mk | 2 +- mk/buildsystem.mk | 22 +++++++++++----------- mk/eglibc.mk | 16 ++++++++-------- mk/gcc.mk | 14 +++++++------- mk/linux.mk | 2 +- mk/macros.packages.mk | 42 +++++++++++++++++++++--------------------- mk/mtd-utils.mk | 6 +++--- mk/pkgconfig.mk | 4 ++-- mk/rootfs.mk | 20 ++++++++++---------- mk/toolchain.mk | 4 ++-- mk/uclibc.mk | 14 +++++++------- 11 files changed, 73 insertions(+), 73 deletions(-) (limited to 'mk') diff --git a/mk/binutils.mk b/mk/binutils.mk index 253b508..e06efa3 100644 --- a/mk/binutils.mk +++ b/mk/binutils.mk @@ -31,7 +31,7 @@ BINUTILS_PACKAGE := binutils-$(BINUTILS_VERSION).tar.bz2 BINUTILS_SRC_DIR := $(TOOLS_BUILD)/binutils-$(BINUTILS_VERSION) BINUTILS_BUILD_DIR := $(TOOLS_BUILD)/binutils-build -BINUTILS_CONFIGURE_OPTS := --with-sysroot=$(SYSROOT) --disable-werror \ +BINUTILS_CONFIGURE_OPTS := --with-sysroot=$(embtk_sysroot) --disable-werror \ --disable-nls --disable-multilib \ --target=$(STRICT_GNU_TARGET) BINUTILS_PREFIX := $(embtk_tools) diff --git a/mk/buildsystem.mk b/mk/buildsystem.mk index 550fb72..d515321 100644 --- a/mk/buildsystem.mk +++ b/mk/buildsystem.mk @@ -128,17 +128,17 @@ startbuild: $(__embtk_mk_pwarning_restartbuild),$(__embtk_mk_startbuild)) define __embtk_mk_initsysrootdirs - mkdir -p $(SYSROOT) - mkdir -p $(SYSROOT)/lib - mkdir -p $(SYSROOT)/usr - mkdir -p $(SYSROOT)/usr/etc - mkdir -p $(SYSROOT)/root - mkdir -p $(SYSROOT)/usr/lib - $(if $(CONFIG_EMBTK_32BITS_FS),,cd $(SYSROOT); \ - ln -sf lib lib64; cd $(SYSROOT)/usr;ln -sf lib lib64) + mkdir -p $(embtk_sysroot) + mkdir -p $(embtk_sysroot)/lib + mkdir -p $(embtk_sysroot)/usr + mkdir -p $(embtk_sysroot)/usr/etc + mkdir -p $(embtk_sysroot)/root + mkdir -p $(embtk_sysroot)/usr/lib + $(if $(CONFIG_EMBTK_32BITS_FS),,cd $(embtk_sysroot); \ + ln -sf lib lib64; cd $(embtk_sysroot)/usr;ln -sf lib lib64) $(if $(CONFIG_EMBTK_64BITS_FS_COMPAT32), \ - cd $(SYSROOT); ln -sf lib lib64; mkdir -p lib32; \ - cd $(SYSROOT)/usr; ln -sf lib lib64; mkdir -p lib32) + cd $(embtk_sysroot); ln -sf lib lib64; mkdir -p lib32; \ + cd $(embtk_sysroot)/usr; ln -sf lib lib64; mkdir -p lib32) endef define __embtk_mk_inittoolsdirs @@ -175,5 +175,5 @@ endef rmallpath: $(Q)rm -rf $(PACKAGES_BUILD)* $(ROOTFS)* $(embtk_tools)* $(TOOLS_BUILD)* - $(Q)rm -rf $(SYSROOT)* $(HOSTTOOLS)* $(EMBTK_GENERATED)/rootfs-* + $(Q)rm -rf $(embtk_sysroot)* $(HOSTTOOLS)* $(EMBTK_GENERATED)/rootfs-* $(Q)$(if $(CONFIG_EMBTK_CACHE_PATCHES),,rm -rf $(embtk_dldir)/*.patch) diff --git a/mk/eglibc.mk b/mk/eglibc.mk index 4b67878..832496d 100644 --- a/mk/eglibc.mk +++ b/mk/eglibc.mk @@ -107,7 +107,7 @@ define embtk_configure_eglibc AR=$(TARGETAR) \ RANLIB=$(TARGETRANLIB) \ $(CONFIG_SHELL) $(EGLIBC_SRC_DIR)/libc/configure \ - --prefix=/usr --with-headers=$(SYSROOT)/usr/include \ + --prefix=/usr --with-headers=$(embtk_sysroot)/usr/include \ --host=$(STRICT_GNU_TARGET) --build=$(HOST_BUILD) \ $(embtk_eglibc_floattype) --disable-profile --without-gd --without-cvs \ --enable-add-ons --enable-kernel="2.6.27" $(embtk_eglibc_versioning-y) \ @@ -125,7 +125,7 @@ define embtk_configure_eglibc_headers AR=$(TARGETAR) \ RANLIB=$(TARGETRANLIB) \ $(CONFIG_SHELL) $(EGLIBC_SRC_DIR)/libc/configure \ - --prefix=/usr --with-headers=$(SYSROOT)/usr/include \ + --prefix=/usr --with-headers=$(embtk_sysroot)/usr/include \ --host=$(STRICT_GNU_TARGET) --build=$(HOST_BUILD) \ $(embtk_eglibc_floattype) --disable-profile --without-gd --without-cvs \ --enable-add-ons --enable-kernel="2.6.27" $(embtk_eglibc_versioning-y) \ @@ -136,19 +136,19 @@ endef define embtk_install_eglibc PATH=$(PATH):$(embtk_tools)/bin/ $(MAKE) -C $(EGLIBC_BUILD_DIR) $(J) PATH=$(PATH):$(embtk_tools)/bin/ $(MAKE) -C $(EGLIBC_BUILD_DIR) install \ - install_root=$(SYSROOT) + install_root=$(embtk_sysroot) touch $(EGLIBC_BUILD_DIR)/.installed endef define embtk_install_eglibc_headers $(MAKE) -C $(EGLIBC_HEADERS_BUILD_DIR) install-headers \ - install_root=$(SYSROOT) install-bootstrap-headers=yes && \ + install_root=$(embtk_sysroot) install-bootstrap-headers=yes && \ $(MAKE) -C $(EGLIBC_HEADERS_BUILD_DIR) csu/subdir_lib - cp $(EGLIBC_HEADERS_BUILD_DIR)/csu/crt1.o $(SYSROOT)/usr/lib/ - cp $(EGLIBC_HEADERS_BUILD_DIR)/csu/crti.o $(SYSROOT)/usr/lib/ - cp $(EGLIBC_HEADERS_BUILD_DIR)/csu/crtn.o $(SYSROOT)/usr/lib/ + cp $(EGLIBC_HEADERS_BUILD_DIR)/csu/crt1.o $(embtk_sysroot)/usr/lib/ + cp $(EGLIBC_HEADERS_BUILD_DIR)/csu/crti.o $(embtk_sysroot)/usr/lib/ + cp $(EGLIBC_HEADERS_BUILD_DIR)/csu/crtn.o $(embtk_sysroot)/usr/lib/ $(TARGETCC) -nostdlib -nostartfiles -shared -x c /dev/null \ - -o $(SYSROOT)/usr/lib/libc.so + -o $(embtk_sysroot)/usr/lib/libc.so touch $(EGLIBC_HEADERS_BUILD_DIR)/.installed endef diff --git a/mk/gcc.mk b/mk/gcc.mk index e6a871b..45f5d99 100644 --- a/mk/gcc.mk +++ b/mk/gcc.mk @@ -75,7 +75,7 @@ GCC1_KCONFIGS_NAME := GCC GCC1_MAKE_ENV := PATH=$(PATH):$(embtk_tools)/bin GCC1_PREFIX := $(embtk_tools) -GCC1_CONFIGURE_OPTS := --with-sysroot=$(SYSROOT) \ +GCC1_CONFIGURE_OPTS := --with-sysroot=$(embtk_sysroot) \ --target=$(STRICT_GNU_TARGET) $(GCC_WITH_ABI) $(GCC_WITH_ARCH) \ $(GCC_WITH_CPU) $(GCC_WITH_FLOAT) $(GCC_WITH_FPU) $(GCC_WITH_TUNE) \ $(GCC_MULTILIB) \ @@ -103,7 +103,7 @@ GCC2_KCONFIGS_NAME := GCC GCC2_MAKE_ENV := PATH=$(PATH):$(embtk_tools)/bin GCC2_PREFIX := $(embtk_tools) -GCC2_CONFIGURE_OPTS := --with-sysroot=$(SYSROOT) \ +GCC2_CONFIGURE_OPTS := --with-sysroot=$(embtk_sysroot) \ --target=$(STRICT_GNU_TARGET) $(GCC_WITH_ABI) $(GCC_WITH_ARCH) \ $(GCC_WITH_CPU) $(GCC_WITH_FLOAT) $(GCC_WITH_FPU) $(GCC_WITH_TUNE) \ $(GCC_MULTILIB) \ @@ -130,7 +130,7 @@ GCC3_KCONFIGS_NAME := GCC GCC3_MAKE_ENV := PATH=$(PATH):$(embtk_tools)/bin GCC3_PREFIX := $(embtk_tools) -GCC3_CONFIGURE_OPTS := --with-sysroot=$(SYSROOT) \ +GCC3_CONFIGURE_OPTS := --with-sysroot=$(embtk_sysroot) \ --target=$(STRICT_GNU_TARGET) $(GCC_WITH_ABI) $(GCC_WITH_ARCH) \ $(GCC_WITH_CPU) $(GCC_WITH_FLOAT) $(GCC_WITH_FPU) $(GCC_WITH_TUNE) \ $(GCC_MULTILIB) \ @@ -152,14 +152,14 @@ endef $(GCC3_BUILD_DIR)/.gcc3_post_install: ifeq ($(CONFIG_EMBTK_32BITS_FS),y) - $(Q)-cp -d $(embtk_tools)/$(STRICT_GNU_TARGET)/lib/*.so* $(SYSROOT)/lib/ + $(Q)-cp -d $(embtk_tools)/$(STRICT_GNU_TARGET)/lib/*.so* $(embtk_sysroot)/lib/ else ifeq ($(CONFIG_EMBTK_64BITS_FS),y) - $(Q)cp -d $(embtk_tools)/$(STRICT_GNU_TARGET)/lib64/*.so* $(SYSROOT)/lib/ + $(Q)cp -d $(embtk_tools)/$(STRICT_GNU_TARGET)/lib64/*.so* $(embtk_sysroot)/lib/ else ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)cp -d $(embtk_tools)/$(STRICT_GNU_TARGET)/lib32/*.so* $(SYSROOT)/lib32/ + $(Q)cp -d $(embtk_tools)/$(STRICT_GNU_TARGET)/lib32/*.so* $(embtk_sysroot)/lib32/ endif ifeq ($(CONFIG_EMBTK_64BITS_FS)$(CONFIG_EMBTK_CLIB_UCLIBC),yy) - $(Q)cd $(SYSROOT)/lib/; ln -sf ld-uClibc.so.0 ld64-uClibc.so.0 + $(Q)cd $(embtk_sysroot)/lib/; ln -sf ld-uClibc.so.0 ld64-uClibc.so.0 endif $(Q)touch $@ diff --git a/mk/linux.mk b/mk/linux.mk index 59208f2..c002751 100644 --- a/mk/linux.mk +++ b/mk/linux.mk @@ -51,7 +51,7 @@ $(LINUX_BUILD_DIR)/.headers_installed: $(Q)PATH=$(PATH):$(embtk_tools)/bin/ $(MAKE) -C $(LINUX_BUILD_DIR) \ headers_install ARCH=$(LINUX_ARCH) \ CROSS_COMPILE=$(STRICT_GNU_TARGET)- \ - INSTALL_HDR_PATH=$(SYSROOT)/usr + INSTALL_HDR_PATH=$(embtk_sysroot)/usr $(MAKE) -C $(LINUX_BUILD_DIR) distclean $(MAKE) -C $(LINUX_BUILD_DIR) headers_install \ INSTALL_HDR_PATH=$(HOSTTOOLS)/usr diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk index 593faf6..0851979 100644 --- a/mk/macros.packages.mk +++ b/mk/macros.packages.mk @@ -64,10 +64,10 @@ endef #Macro to adapt libtool files (*.la) for cross compiling __ltlibdirold = libdir='\/usr\/$(LIBDIR)\(.*\)' -__ltlibdirnew = libdir='$(SYSROOT)\/usr\/$(LIBDIR)\1' +__ltlibdirnew = libdir='$(embtk_sysroot)\/usr\/$(LIBDIR)\1' __lt_usr/lib = $(embtk_space)\/usr\/$(LIBDIR)\/ -__lt_sysroot/usr/lib = $(embtk_space)$(SYSROOT)\/usr\/$(LIBDIR)\/ -__lt_path = $(addprefix $(SYSROOT)/usr/,$(or $(1),$(LIBDIR))) +__lt_sysroot/usr/lib = $(embtk_space)$(embtk_sysroot)\/usr\/$(LIBDIR)\/ +__lt_path = $(addprefix $(embtk_sysroot)/usr/,$(or $(1),$(LIBDIR))) define __embtk_fix_libtool_files __lt_las=`find $(__lt_path) -name *.la`; \ for la in $$__lt_las; do \ @@ -79,12 +79,12 @@ libtool_files_adapt: $(Q)$(call __embtk_fix_libtool_files) # Macro to adapt pkg-config files for cross compiling -__pkgconfig_includedir = includedir=$(SYSROOT)/usr/include -__pkgconfig_prefix = prefix=$(SYSROOT)/usr -__pkgconfig_libdir = libdir=$(SYSROOT)/usr/$(LIBDIR) +__pkgconfig_includedir = includedir=$(embtk_sysroot)/usr/include +__pkgconfig_prefix = prefix=$(embtk_sysroot)/usr +__pkgconfig_libdir = libdir=$(embtk_sysroot)/usr/$(LIBDIR) define __embtk_fix_pkgconfig_files - __conf_files0=$$(find $(SYSROOT)/usr/$(LIBDIR)/pkgconfig -name *.pc); \ - __conf_files1=$$(find $(SYSROOT)/usr/share/pkgconfig -name *.pc); \ + __conf_files0=$$(find $(embtk_sysroot)/usr/$(LIBDIR)/pkgconfig -name *.pc); \ + __conf_files1=$$(find $(embtk_sysroot)/usr/share/pkgconfig -name *.pc); \ for i in $$__conf_files0 $$__conf_files1; do \ sed -e 's;prefix=.*;$(__pkgconfig_prefix);' \ -e 's;includedir=$${prefix}/include;$(__pkgconfig_includedir);' \ @@ -284,8 +284,8 @@ define embtk_configure_pkg OBJCOPY=$(TARGETOBJCOPY) \ CFLAGS="$(TARGET_CFLAGS)" \ CXXFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \ - CPPFLAGS="-I$(SYSROOT)/usr/include" \ + LDFLAGS="-L$(embtk_sysroot)/$(LIBDIR) -L$(embtk_sysroot)/usr/$(LIBDIR)" \ + CPPFLAGS="-I$(embtk_sysroot)/usr/include" \ PKG_CONFIG="$(PKGCONFIG_BIN)" \ PKG_CONFIG_PATH="$(EMBTK_PKG_CONFIG_PATH)" \ PKG_CONFIG_LIBDIR="$(EMBTK_PKG_CONFIG_LIBDIR)" \ @@ -350,13 +350,13 @@ __embtk_single_make = $(__embtk_pkg_makeenv) $(MAKE) -C $(__embtk_pkg_builddir) __embtk_multi_make_install = $(foreach builddir,$(__embtk_pkg_makedirs), \ $(__embtk_pkg_makeenv) $(MAKE) -C $(__embtk_pkg_builddir)/$(builddir) \ $(if $(__embtk_pkg_nodestdir),, \ - DESTDIR=$(SYSROOT)$(if $(__embtk_pkg_sysrootsuffix),/$(__embtk_pkg_sysrootsuffix))) \ + DESTDIR=$(embtk_sysroot)$(if $(__embtk_pkg_sysrootsuffix),/$(__embtk_pkg_sysrootsuffix))) \ $(__embtk_pkg_makeopts) install;) __embtk_single_make_install = $(__embtk_pkg_makeenv) \ $(MAKE) -C $(__embtk_pkg_builddir) \ $(if $(__embtk_pkg_nodestdir),, \ - DESTDIR=$(SYSROOT)$(if $(__embtk_pkg_sysrootsuffix),/$(__embtk_pkg_sysrootsuffix))) \ + DESTDIR=$(embtk_sysroot)$(if $(__embtk_pkg_sysrootsuffix),/$(__embtk_pkg_sysrootsuffix))) \ $(__embtk_pkg_makeopts) install __embtk_multi_make_hostinstall = $(foreach builddir,$(__embtk_pkg_makedirs), \ @@ -658,22 +658,22 @@ endef # define __embtk_cleanup_pkg $(if $(__embtk_pkg_etc), - rm -rf $(addprefix $(SYSROOT)/etc/,$(__embtk_pkg_etc))) + rm -rf $(addprefix $(embtk_sysroot)/etc/,$(__embtk_pkg_etc))) $(if $(__embtk_pkg_bins), - rm -rf $(addprefix $(SYSROOT)/usr/bin/,$(__embtk_pkg_bins))) + rm -rf $(addprefix $(embtk_sysroot)/usr/bin/,$(__embtk_pkg_bins))) $(if $(__embtk_pkg_sbins), - rm -rf $(addprefix $(SYSROOT)/usr/sbin/,$(__embtk_pkg_sbins))) + rm -rf $(addprefix $(embtk_sysroot)/usr/sbin/,$(__embtk_pkg_sbins))) $(if $(__embtk_pkg_includes), - rm -rf $(addprefix $(SYSROOT)/usr/include/,$(__embtk_pkg_includes))) + rm -rf $(addprefix $(embtk_sysroot)/usr/include/,$(__embtk_pkg_includes))) $(if $(__embtk_pkg_libs), - rm -rf $(addprefix $(SYSROOT)/usr/$(LIBDIR)/,$(__embtk_pkg_libs))) + rm -rf $(addprefix $(embtk_sysroot)/usr/$(LIBDIR)/,$(__embtk_pkg_libs))) $(if $(__embtk_pkg_libexecs), - rm -rf $(addprefix $(SYSROOT)/usr/libexec/,$(__embtk_pkg_libexecs))) + rm -rf $(addprefix $(embtk_sysroot)/usr/libexec/,$(__embtk_pkg_libexecs))) $(if $(__embtk_pkg_pkgconfigs), - rm -rf $(addprefix $(SYSROOT)/usr/$(LIBDIR)/pkgconfig/,$(__embtk_pkg_pkgconfigs)) - rm -rf $(addprefix $(SYSROOT)/usr/share/pkgconfig/,$(__embtk_pkg_pkgconfigs))) + rm -rf $(addprefix $(embtk_sysroot)/usr/$(LIBDIR)/pkgconfig/,$(__embtk_pkg_pkgconfigs)) + rm -rf $(addprefix $(embtk_sysroot)/usr/share/pkgconfig/,$(__embtk_pkg_pkgconfigs))) $(if $(__embtk_pkg_shares), - rm -rf $(addprefix $(SYSROOT)/usr/share/,$(__embtk_pkg_shares))) + rm -rf $(addprefix $(embtk_sysroot)/usr/share/,$(__embtk_pkg_shares))) $(if $(__embtk_pkg_usegit)$(__embtk_pkg_usesvn), rm -rf $(__embtk_pkg_dotconfigured_f) rm -rf $(__embtk_pkg_dotinstalled_f), diff --git a/mk/mtd-utils.mk b/mk/mtd-utils.mk index 11ea4e6..bbda650 100644 --- a/mk/mtd-utils.mk +++ b/mk/mtd-utils.mk @@ -46,11 +46,11 @@ MTDUTILS_SBINS := bin2nand flash_eraseall flash_unlock mkfs.jffs2 nand2bin \ nftldump recv_image ubiattach ubigen ubirename MTDUTILS_DEPS := zlib_install lzo_install e2fsprogs_install -MTDUTILS_MAKE_ENV := LDFLAGS="-L$(SYSROOT)/lib -L$(SYSROOT)/usr/lib" -MTDUTILS_MAKE_ENV += CPPFLAGS="-I. -I./include -I$(SYSROOT)/usr/include" +MTDUTILS_MAKE_ENV := LDFLAGS="-L$(embtk_sysroot)/lib -L$(embtk_sysroot)/usr/lib" +MTDUTILS_MAKE_ENV += CPPFLAGS="-I. -I./include -I$(embtk_sysroot)/usr/include" MTDUTILS_MAKE_ENV += CFLAGS="$(TARGET_CFLAGS)" MTDUTILS_MAKE_ENV += BUILDDIR=$(MTDUTILS_BUILD_DIR) -MTDUTILS_MAKE_ENV += DESTDIR=$(SYSROOT) +MTDUTILS_MAKE_ENV += DESTDIR=$(embtk_sysroot) MTDUTILS_MAKE_ENV += PATH=$(PATH):$(embtk_tools)/bin CROSS=$(CROSS_COMPILE) mtdutils_install: diff --git a/mk/pkgconfig.mk b/mk/pkgconfig.mk index ae49a17..746ad6d 100644 --- a/mk/pkgconfig.mk +++ b/mk/pkgconfig.mk @@ -31,8 +31,8 @@ PKGCONFIG_BUILD_DIR := $(TOOLS_BUILD)/pkg-config-$(PKGCONFIG_VERSION) PKGCONFIG_BIN := $(HOSTTOOLS)/usr/bin/pkg-config -__EMBTK_PKG_CONFIG_PATH := $(SYSROOT)/usr/$(LIBDIR)/pkgconfig -__EMBTK_PKG_CONFIG_PATH += $(SYSROOT)/usr/share/pkgconfig +__EMBTK_PKG_CONFIG_PATH := $(embtk_sysroot)/usr/$(LIBDIR)/pkgconfig +__EMBTK_PKG_CONFIG_PATH += $(embtk_sysroot)/usr/share/pkgconfig EMBTK_PKG_CONFIG_PATH := $(subst $(embtk_space),:,$(__EMBTK_PKG_CONFIG_PATH)) EMBTK_PKG_CONFIG_LIBDIR := $(EMBTK_PKG_CONFIG_PATH) diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 1676dea..3adeddf 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -119,17 +119,17 @@ define __embtk_rootfs_fill $(if $(CONFIG_EMBTK_64BITS_FS_COMPAT32), cd $(ROOTFS); ln -s lib lib64 cd $(ROOTFS)/usr; ln -s lib lib64) - -cp -d $(SYSROOT)/lib/*.so* $(ROOTFS)/lib/ - -cp -d $(SYSROOT)/usr/lib/*.so* $(ROOTFS)/usr/lib/ + -cp -d $(embtk_sysroot)/lib/*.so* $(ROOTFS)/lib/ + -cp -d $(embtk_sysroot)/usr/lib/*.so* $(ROOTFS)/usr/lib/ $(if $(CONFIG_EMBTK_64BITS_FS_COMPAT32), - -cp -d $(SYSROOT)/lib32/*.so* $(ROOTFS)/lib32/ - -cp -d $(SYSROOT)/usr/lib32/*.so* $(ROOTFS)/usr/lib32/) - -cp -R $(SYSROOT)/bin/* $(ROOTFS)/bin/ >/dev/null 2>/dev/null - -cp -R $(SYSROOT)/usr/bin/* $(ROOTFS)/usr/bin/ - -cp -R $(SYSROOT)/sbin/* $(ROOTFS)/sbin/ >/dev/null 2>/dev/null - -cp -R $(SYSROOT)/usr/sbin/* $(ROOTFS)/usr/sbin/ - -cp -R $(SYSROOT)/etc/* $(ROOTFS)/etc/ >/dev/null 2>/dev/null - cp -R $(SYSROOT)/root $(ROOTFS)/ + -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)/ $(if $(CONFIG_EMBTK_TARGET_STRIPPED), $(call embtk_pinfo,"Stripping binaries as specified...") $(MAKE) __embtk_rootfs_strip) diff --git a/mk/toolchain.mk b/mk/toolchain.mk index de59c42..e6f4271 100644 --- a/mk/toolchain.mk +++ b/mk/toolchain.mk @@ -130,7 +130,7 @@ endef define __embtk_toolchain_compress tar -cjf $(TOOLCHAIN_PACKAGE) \ - $(notdir $(SYSROOT)) $(notdir $(embtk_tools)) && \ + $(notdir $(embtk_sysroot)) $(notdir $(embtk_tools)) && \ mv $(TOOLCHAIN_PACKAGE) $(TOOLCHAIN_DIR)/$(TOOLCHAIN_PACKAGE) endef @@ -162,7 +162,7 @@ define __embtk_toolchain_build $(foreach dep,$(patsubst %_install,%,$(TOOLCHAIN_DEPS)), $(MAKE) $(dep)_clean;) $(foreach pkg,$(__embtk_rootfs_pkgs-y),$(MAKE) $(pkg)_clean;) - rm -rf $(SYSROOT) $(embtk_tools) + rm -rf $(embtk_sysroot) $(embtk_tools) $(__embtk_toolchain_mkinitdirs) $(MAKE) $(TOOLCHAIN_PRE_DEPS-y) $(TOOLCHAIN_DEPS) touch $(TOOLCHAIN_DIR)/.installed) diff --git a/mk/uclibc.mk b/mk/uclibc.mk index be18326..911c84b 100755 --- a/mk/uclibc.mk +++ b/mk/uclibc.mk @@ -47,12 +47,12 @@ uclibc_headers_install: $(UCLIBC_BUILD_DIR)/.installed: $(call embtk_pinfo,"Build and install uClibc-$(UCLIBC_VERSION) ...") - $(Q)$(MAKE) -C $(UCLIBC_BUILD_DIR) PREFIX=$(SYSROOT)/ \ + $(Q)$(MAKE) -C $(UCLIBC_BUILD_DIR) PREFIX=$(embtk_sysroot)/ \ CROSS_COMPILER_PREFIX="$(embtk_tools)/bin/$(STRICT_GNU_TARGET)-" \ SHARED_LIB_LOADER_PREFIX="/$(LIBDIR)/" \ MULTILIB_DIR="/$(LIBDIR)/" \ RUNTIME_PREFIX="/" DEVEL_PREFIX="/usr/" \ - KERNEL_HEADERS="$(SYSROOT)/usr/include/" \ + KERNEL_HEADERS="$(embtk_sysroot)/usr/include/" \ UCLIBC_EXTRA_CFLAGS="$(EMBTK_UCLIBC_CFLAGS)" install $(Q)touch $@ @@ -63,22 +63,22 @@ $(UCLIBC_BUILD_DIR)/.headers_installed: $(Q)$(MAKE) -C $(UCLIBC_BUILD_DIR) distclean $(Q)$(embtk_configure_uclibc) $(Q)$(MAKE) -C $(UCLIBC_BUILD_DIR) silentoldconfig - $(Q)$(MAKE) -C $(UCLIBC_BUILD_DIR) PREFIX=$(SYSROOT)/ \ + $(Q)$(MAKE) -C $(UCLIBC_BUILD_DIR) PREFIX=$(embtk_sysroot)/ \ CROSS_COMPILER_PREFIX="$(embtk_tools)/bin/$(STRICT_GNU_TARGET)-" \ SHARED_LIB_LOADER_PREFIX="/$(LIBDIR)/" \ MULTILIB_DIR="/$(LIBDIR)/" \ RUNTIME_PREFIX="/" DEVEL_PREFIX="/usr/" \ - KERNEL_HEADERS="$(SYSROOT)/usr/include/" \ + KERNEL_HEADERS="$(embtk_sysroot)/usr/include/" \ UCLIBC_EXTRA_CFLAGS="$(EMBTK_UCLIBC_CFLAGS)" install_headers - $(Q)$(MAKE) -C $(UCLIBC_BUILD_DIR) PREFIX=$(SYSROOT)/ \ + $(Q)$(MAKE) -C $(UCLIBC_BUILD_DIR) PREFIX=$(embtk_sysroot)/ \ CROSS_COMPILER_PREFIX="$(embtk_tools)/bin/$(STRICT_GNU_TARGET)-" \ SHARED_LIB_LOADER_PREFIX="/$(LIBDIR)/" \ MULTILIB_DIR="/$(LIBDIR)/" \ RUNTIME_PREFIX="/" DEVEL_PREFIX="/usr/" \ - KERNEL_HEADERS="$(SYSROOT)/usr/include/" \ + KERNEL_HEADERS="$(embtk_sysroot)/usr/include/" \ UCLIBC_EXTRA_CFLAGS="$(EMBTK_UCLIBC_CFLAGS)" install_startfiles $(Q)$(TARGETCC) -nostdlib -nostartfiles -shared -x c /dev/null \ - -o $(SYSROOT)/usr/$(LIBDIR)/libc.so + -o $(embtk_sysroot)/usr/$(LIBDIR)/libc.so $(Q)touch $@ download_uclibc_headers: -- cgit v1.2.3