diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:06:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:06:29 +0200 |
| commit | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (patch) | |
| tree | 7ad8952e59f53a23bcba0ee92086cd8adb96799c /mk | |
| parent | 8c3ac66ed98ec86d0917078b4aab0e3e6df16cd3 (diff) | |
| parent | ca760844fcd08190b692a674ff387fe15c39a497 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 14 | ||||
| -rw-r--r-- | mk/modules.mk | 1 | ||||
| -rw-r--r-- | mk/package.mk | 2 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 2 |
4 files changed, 16 insertions, 3 deletions
diff --git a/mk/build.mk b/mk/build.mk index a8ba19c72..53f0ff5bf 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -18,6 +18,8 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \ ADK_PACKAGE_GRUB=n \ ADK_PACKAGE_AUFS2_UTIL=n \ ADK_PACKAGE_BASE_FILES=y \ + ADK_PACKAGE_GCC=n \ + ADK_PACKAGE_MGETTY=n \ ADK_COMPILE_HEIMDAL=n \ ADK_PACKAGE_HEIMDAL_PKINIT=n \ ADK_PACKAGE_HEIMDAL_SERVER=n \ @@ -425,6 +427,18 @@ bulk: ) 2>&1 | tee $(TOPDIR)/bin/$${target}_$$libc/$$target-$$libc-$$fs.log; \ done <${TOPDIR}/target/bulk.lst +bulktoolchain: + while read target libc; do \ + mkdir -p $(TOPDIR)/bin/$${target}_$$libc; \ + ( \ + echo === building $$target $$libc on $$(date); \ + $(GMAKE) prereq && \ + $(GMAKE) TARGET=$$target LIBC=$$libc defconfig; \ + $(GMAKE) VERBOSE=1 all; \ + rm .config; \ + ) 2>&1 | tee $(TOPDIR)/bin/$${target}_$$libc/$$target-$$libc.log; \ + done <${TOPDIR}/target/bulktool.lst + bulkall: while read target libc fs; do \ mkdir -p $(TOPDIR)/bin/$${target}_$$libc; \ diff --git a/mk/modules.mk b/mk/modules.mk index 4747a4e16..ab33f6863 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -778,7 +778,6 @@ $(eval $(call KMOD_template,CRYPTO_FCRYPT,crypto-fcrypt,\ ,11)) $(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\ - $(MODULES_DIR)/kernel/lib/zlib_inflate/zlib_inflate \ $(MODULES_DIR)/kernel/lib/zlib_deflate/zlib_deflate \ $(MODULES_DIR)/kernel/crypto/deflate \ ,10)) diff --git a/mk/package.mk b/mk/package.mk index f397974d8..6c58d4d4e 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -216,7 +216,7 @@ endif -exec echo 'WARNING: $${IPKG_$(1)} installs files in /lib -' \ ' fix this!' >&2 \; -quit 2>/dev/null; fi; \ find usr ! -type d 2>/dev/null | \ - grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' | \ + grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' | \ tee '$${STAGING_PARENT}/pkg/$(1)' | \ cpio -padlmu '$${STAGING_DIR}' @cd '$${STAGING_DIR}'; grep 'usr/lib/.*\.la$$$$' \ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index d78cc5876..466a4c398 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -164,7 +164,7 @@ endif -exec echo 'WARNING: ${PKG_NAME} installs files in /lib -' \ ' fix this!' >&2 \; -quit 2>/dev/null; fi;\ find usr ! -type d 2>/dev/null | \ - grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' | \ + grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' | \ tee '${STAGING_PARENT}/pkg/${PKG_NAME}' | \ cpio -padlmu '${STAGING_DIR}' @cd '${STAGING_DIR}'; grep 'usr/lib/.*\.la$$' \ |