From bc6ae3bd97162e25aff366acabbf80f096ccd8b7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 2 Mar 2014 10:35:12 +0100 Subject: goodbye eglibc, see my blog http://blog.waldemar-brodkorb.de/ --- mk/build.mk | 14 +++++++------- mk/package.mk | 5 ++--- mk/pkg-bottom.mk | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index c0f05556f..2d4523e75 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -104,7 +104,7 @@ POSTCONFIG= -@\ fi; \ done; \ if [ "$$(grep ^ADK_RUNTIME_TIMEZONE .config|md5sum)" != "$$(grep ^ADK_RUNTIME_TIMEZONE .config.old|md5sum)" ];then \ - touch .rebuild.eglibc .rebuild.uclibc .rebuild.glibc;\ + touch .rebuild.musl .rebuild.uclibc .rebuild.glibc;\ rebuild=1;\ fi; \ if [ "$$(grep ^ADK_RUNTIME_SSH_PUBKEY .config|md5sum)" != "$$(grep ^ADK_RUNTIME_SSH_PUBKEY .config.old|md5sum)" ];then \ @@ -533,7 +533,7 @@ endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) # build all target architecture and libc combinations (toolchain only) bulktoolchain: - for libc in glibc eglibc uclibc musl;do \ + for libc in glibc uclibc musl;do \ while read arch; do \ mkdir -p $(TOPDIR)/firmware/toolchain_$${arch}_$$libc; \ ( \ @@ -552,7 +552,7 @@ bulktoolchain: done test-framework: - for libc in uclibc eglibc glibc musl;do \ + for libc in uclibc glibc musl;do \ mkdir -p $(TOPDIR)/firmware/$(SYSTEM)_$(ARCH)_$$libc; \ ( \ for arch in arm mips mipsel x86 x86_64;do \ @@ -568,7 +568,7 @@ test-framework: if [ -f .exit ];then rm .exit;exit 1;fi release: - for libc in uclibc eglibc glibc musl;do \ + for libc in uclibc glibc musl;do \ mkdir -p $(TOPDIR)/firmware/$(SYSTEM)_$(ARCH)_$$libc; \ ( \ echo === building $$libc on $$(date); \ @@ -583,7 +583,7 @@ release: # build all target architecture, target systems and libc combinations bulk: - for libc in uclibc eglibc glibc musl;do \ + for libc in uclibc glibc musl;do \ while read arch; do \ systems=$$(./scripts/getsystems $$arch|grep -v toolchain); \ for system in $$systems;do \ @@ -603,7 +603,7 @@ bulk: done bulkall: - for libc in uclibc eglibc glibc musl;do \ + for libc in uclibc glibc musl;do \ while read arch; do \ systems=$$(./scripts/getsystems $$arch| grep -v toolchain); \ for system in $$systems;do \ @@ -623,7 +623,7 @@ bulkall: done bulkallmod: - for libc in uclibc eglibc glibc musl;do \ + for libc in uclibc glibc musl;do \ while read arch; do \ systems=$$(./scripts/getsystems $$arch| grep -v toolchain); \ for system in $$systems;do \ diff --git a/mk/package.mk b/mk/package.mk index 264cd06e0..ef7b3c095 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -112,7 +112,7 @@ build-all-pkgs: ${_IPKGS_COOKIE} # noscripts -> do not install scripts to $(STAGING_TARGET_DIR)/scripts # (needed for example for autoconf/automake) # noremove -> do not remove files from $(STAGING_TARGET_DIR)/target while -# cleaning (needed for toolchain packages like glibc/eglibc) +# cleaning (needed for toolchain packages like glibc) # dev -> create a development subpackage with headers and pkg-config files # should be package format independent and modular in the future define PKG_template @@ -242,7 +242,7 @@ endif 'ramdisk location:' >&2; \ echo "$$$$x" | sed 's/^/- /' >&2; \ fi; \ - if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "eglibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" ];then \ + if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" ];then \ find lib \( -name lib\*.so\* -o -name lib\*.a \) \ -exec echo 'WARNING: $${IPKG_$(1)} installs files in /lib -' \ ' fix this!' >&2 \; -quit 2>/dev/null; fi; \ @@ -300,7 +300,6 @@ $$(INFO_$(1)_DBG): $$(IPKG_$(1)_DBG) $(PKG_INSTALL) $$(IPKG_$(1)_DBG) ifneq ($(1),UCLIBC) -ifneq ($(1),EGLIBC) ifneq ($(1),GLIBC) ifneq ($(1),MUSL) $$(INFO_$(1)_DEV): $$(IPKG_$(1)_DEV) diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 3988a676f..66feea33c 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -184,7 +184,7 @@ ifneq (,$(filter dev,${PKG_OPTS})) done endif @-cd ${WRKINST}; \ - if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "eglibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" -a "${PKG_NAME}" != "pam" ];then \ + if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" -a "${PKG_NAME}" != "pam" ];then \ find lib \( -name lib\*.so\* -o -name lib\*.a \) \ -exec echo 'WARNING: ${PKG_NAME} installs files in /lib -' \ ' fix this!' >&2 \; -quit 2>/dev/null; fi;\ -- cgit v1.2.3 From d3e2b44c15131e120e99c15dc405e264a42bd4cd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 2 Mar 2014 11:20:33 +0100 Subject: fix extra endif.. --- mk/package.mk | 1 - package/Makefile | 1 - 2 files changed, 2 deletions(-) (limited to 'mk') diff --git a/mk/package.mk b/mk/package.mk index ef7b3c095..d5d48c1e1 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -307,7 +307,6 @@ $$(INFO_$(1)_DEV): $$(IPKG_$(1)_DEV) endif endif endif -endif endef diff --git a/package/Makefile b/package/Makefile index eeac0e1a4..eb49efd6a 100644 --- a/package/Makefile +++ b/package/Makefile @@ -29,7 +29,6 @@ endif package-$(ADK_PACKAGE_UCLIBCXX) += uclibc++ endif endif -endif include $(TOPDIR)/package/Depends.mk -- cgit v1.2.3 From 9e32d91c27e484f868d263cb757c56df50ebdb66 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 2 Mar 2014 15:10:20 +0100 Subject: some fixes for test-framework target --- mk/build.mk | 11 +++++++++-- target/packages/pkg-available/test | 8 ++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 target/packages/pkg-available/test (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 2d4523e75..37f27b12b 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -389,6 +389,12 @@ endif |sed -e "s#^config \(.*\)#\1=y#" \ >> $(TOPDIR)/.defconfig; \ fi + @if [ ! -z "$(COLLECTION)" ];then \ + grep -h "^config" target/packages/pkg-available/* \ + |grep -i "$(COLLECTION)" \ + |sed -e "s#^config \(.*\)#\1=y#" \ + >> $(TOPDIR)/.defconfig; \ + fi @if [ ! -z "$(PKG)" ];then \ grep "^config" target/config/Config.in \ |grep -i "$(PKG)" \ @@ -556,9 +562,10 @@ test-framework: mkdir -p $(TOPDIR)/firmware/$(SYSTEM)_$(ARCH)_$$libc; \ ( \ for arch in arm mips mipsel x86 x86_64;do \ - echo === building qemu-$$arch for $$libc on $$(date); \ + tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#"); \ + echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \ $(GMAKE) prereq && \ - $(GMAKE) ARCH=$$arch SYSTEM=qemu-$$arch LIBC=$$libc FS=archive defconfig; \ + $(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch LIBC=$$libc FS=archive COLLECTION=test defconfig; \ $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \ rm .config; \ done; \ diff --git a/target/packages/pkg-available/test b/target/packages/pkg-available/test new file mode 100644 index 000000000..8af24a816 --- /dev/null +++ b/target/packages/pkg-available/test @@ -0,0 +1,8 @@ +config ADK_PKG_TEST + bool "Compile a ADK test framework system" + default n + select ADK_PACKAGE_STRACE + select ADK_PACKAGE_SOCAT + help + Package collection used to build adk-test-framework root + filesystem. -- cgit v1.2.3