resolve merge conflict

3 files changed, 19 insertions, 14 deletions

diff --git a/mk/build.mk b/mk/build.mk
index c0f05556f..37f27b12b 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 \
@@ -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)" \
@@ -533,7 +539,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,13 +558,14 @@ 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 \
-				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; \
@@ -568,7 +575,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 +590,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 +610,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 +630,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..d5d48c1e1 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)
@@ -308,7 +307,6 @@ $$(INFO_$(1)_DEV): $$(IPKG_$(1)_DEV)
 endif
 endif
 endif
-endif
 
 endef
 
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;\