From 4bde99fa31d105d163e3d519f314af7d9537bfb3 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sun, 20 Dec 2009 19:40:26 +0059 Subject: PKG_{HOST,TARGET}_DEP* handling as wbx@ requested Signed-off-by: Thorsten Glaser --- target/target.lst | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 target/target.lst (limited to 'target') diff --git a/target/target.lst b/target/target.lst new file mode 100644 index 000000000..224ceaa01 --- /dev/null +++ b/target/target.lst @@ -0,0 +1,29 @@ +native ADK_LINUX_NATIVE +alix1c ADK_LINUX_X86_ALIX1C +alix2d ADK_LINUX_X86_ALIX2D +alix ADK_LINUX_X86_ALIX1C || ADK_LINUX_X86_ALIX2D +wrap ADK_LINUX_X86_WRAP +foxboard ADK_LINUX_CRIS_FOXBOARD +lemote ADK_LINUX_MIPS64_LEMOTE +ag241 ADK_LINUX_MIPS_AG241 +tomtom ADK_LINUX_ARM_TOMTOM +g1 ADK_LINUX_ARM_G1 +zaurus ADK_LINUX_XSCALE_ZAURUS +shuttle ADK_LINUX_X86_64_SHUTTLE +x86_64_rescue ADK_LINUX_X86_64_RESCUE +x86_rescue ADK_LINUX_X86_RESCUE +mipsel_rescue ADK_LINUX_MIPSEL_RESCUE +mips_rescue ADK_LINUX_MIPS_RESCUE +arm_qemu ADK_LINUX_ARM_QEMU +mips_qemu ADK_LINUX_MIPS_QEMU +mipsel_qemu ADK_LINUX_MIPSEL_QEMU +mips64_qemu ADK_LINUX_MIPS64_QEMU +mips64el_qemu ADK_LINUX_MIPS64EL_QEMU +cris_qemu ADK_LINUX_CRIS_QEMU +x86_qemu ADK_LINUX_X86_QEMU +x86_64_qemu ADK_LINUX_X86_64_QEMU +qemu ADK_LINUX_ARM_QEMU || ADK_LINUX_MIPS_QEMU || ADK_LINUX_MIPSEL_QEMU || ADK_LINUX_MIPS64_QEMU || ADK_LINUX_MIPS64EL_QEMU || ADK_LINUX_CRIS_QEMU || ADK_LINUX_X86_QEMU || ADK_LINUX_X86_64_QEMU +rb411 ADK_LINUX_MIPS_RB411 +rb433 ADK_LINUX_MIPS_RB433 +rb532 ADK_LINUX_MIPS_RB532 +routerboard ADK_LINUX_MIPS_RB411 || ADK_LINUX_MIPS_RB433 || ADK_LINUX_MIPS_RB532 -- cgit v1.2.3 From b11d3a635ac903eb013409aebaec4c9b91026056 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 20 Dec 2009 20:15:51 +0100 Subject: fix all TARGET/HOST dependencies expand TARGET logic for ! values --- package/asterisk/Makefile | 2 ++ package/cfgfs/Makefile | 2 ++ package/gdb/Makefile | 1 + package/linux-atm/Makefile | 5 ++--- package/mplayer/Makefile | 2 ++ package/pkgmaker | 14 ++++++++++++-- package/swconfig/Makefile | 2 ++ package/valgrind/Makefile | 2 ++ package/xf86-video-cirrus/Makefile | 2 ++ package/xf86-video-geode/Makefile | 2 ++ target/target.lst | 2 ++ 11 files changed, 31 insertions(+), 5 deletions(-) (limited to 'target') diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 87b47015e..7dd463cac 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -21,6 +21,8 @@ PKG_NOPARALLEL:= 1 PKG_URL:= http://www.asterisk.org PKG_SITES:= http://downloads.asterisk.org/pub/telephony/asterisk/releases/ +PKG_TARGET_DEPENDS:= !foxboard + PKG_DEPENDS_MAIN:= asterisk PKG_DESCR_CHAN_MGCP:= Media Gateway Control Protocol implementation PKG_DESCR_CHAN_SKINNY:= Skinny Client Control Protocol implementation diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 99ac7055a..a5f24a96f 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -13,6 +13,8 @@ PKG_TARGET_DEPENDS:= alix1c alix2d wrap foxboard ag241 rb532 WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 +CFLINE_CFGFS:= select BUSYBOX_COMM\\n\\tselect BUSYBOX_MD5SUM + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CFGFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/gdb/Makefile b/package/gdb/Makefile index 17d37ef55..139d6b54b 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -8,6 +8,7 @@ PKG_DESCR:= GNU debugger PKG_SECTION:= comp PKG_DEPENDS:= libthread-db libncurses PKG_BUILDDEP+= ncurses readline +PKG_TARGET_DEPENDS:= !foxboard include ${TOPDIR}/mk/package.mk diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile index a999be5d6..b3a8fbd48 100644 --- a/package/linux-atm/Makefile +++ b/package/linux-atm/Makefile @@ -12,15 +12,14 @@ PKG_SECTION:= libs PKG_URL:= http://linux-atm.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-atm/} +PKG_HOST_DEPENDS:= !freebsd + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz PKG_DESCR_1:= br2684ctl PKG_DEPENDS_1:= libatm PKG_SECTION_1:= net -CFLINE_LIBATM:= depends on !ADK_HOST_FREEBSD -CFLINE_BR2684CTL:= depends on !ADK_HOST_FREEBSD - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBATM,libatm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index ac0c50c92..89127b715 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -14,6 +14,8 @@ PKG_DEPENDS:= zlib libncurses libmad alsa-lib libvorbis libogg libfaad2 libpthr PKG_URL:= http://www.mplayerhq.hu PKG_SITES:= http://openadk.org/distfiles/ +PKG_TARGET_DEPENDS:= alix1c x86_qemu x86_64_qemu + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/pkgmaker b/package/pkgmaker index f8061010d..f00285192 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -57,7 +57,7 @@ for dn in */Makefile; do # PKGDFLT_*: subpackage 'default {:-n}', by subpackage option # CFLINE_*: one free-format Config.in line per subpackage option # PKGFD_*: flavour description, per package flavour option - # PKG_{HOST,TARGET}_DEPENDS: wbx@’s weird ideas + # PKG_{HOST,TARGET}_DEPENDS: add host or target dependencies eval $($GMAKE dump="PKG_NAME PKG_FLAVOURS PKG_DESCR PKG_URL PKG_CXX \ ALL_PKGOPTS \$(foreach x,\${ALL_PKGOPTS},PKGNAME_\${x} \ PKGDESC_\${x} PKGDEPS_\${x} PKGDFLT_\${x} CFLINE_\${x}) \ @@ -120,7 +120,13 @@ for dn in */Makefile; do if [[ -n $PKG_TARGET_DEPENDS ]]; then ptd='\tdepends on' sp=' ' # local sp: space (or ' || ') + if [[ $PKG_TARGET_DEPENDS = *\!* ]]; then + sp=' !' + else + sp=' ' + fi for x in $PKG_TARGET_DEPENDS; do + x=${x#!} #XXX cache this with mksh R40+ found=0 while read friendlyname sym; do @@ -133,7 +139,11 @@ for dn in */Makefile; do exit 1 fi ptd="$ptd${sp}$sym" - sp=' || ' + if [[ $PKG_TARGET_DEPENDS = *\!* ]]; then + sp=' && !' + else + sp=' || ' + fi done fi diff --git a/package/swconfig/Makefile b/package/swconfig/Makefile index 2c4586712..f9f183b10 100644 --- a/package/swconfig/Makefile +++ b/package/swconfig/Makefile @@ -10,6 +10,8 @@ PKG_BUILDDEP+= libnl PKG_DESCR:= switch configuration utility PKG_SECTION:= misc +PKG_TARGET_CONFIG:= rb433 + WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile index bb8ae3b07..bf0c1710d 100644 --- a/package/valgrind/Makefile +++ b/package/valgrind/Makefile @@ -12,6 +12,8 @@ PKG_SECTION:= utils PKG_URL:= http://valgrind.org PKG_SITES:= http://valgrind.org/downloads/ +PKG_TARGET_DEPENDS:= x86 x86_64 + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk diff --git a/package/xf86-video-cirrus/Makefile b/package/xf86-video-cirrus/Makefile index 370aac976..a86ba2730 100644 --- a/package/xf86-video-cirrus/Makefile +++ b/package/xf86-video-cirrus/Makefile @@ -13,6 +13,8 @@ PKG_SECTION:= x11 PKG_DEPENDS:= xorg-server PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/ +PKG_TARGET_DEPENDS:= x86_qemu x86_64_qemu + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XF86_VIDEO_CIRRUS,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/xf86-video-geode/Makefile b/package/xf86-video-geode/Makefile index f124fc201..b98613082 100644 --- a/package/xf86-video-geode/Makefile +++ b/package/xf86-video-geode/Makefile @@ -13,6 +13,8 @@ PKG_SECTION:= x11 PKG_DEPENDS:= xorg-server PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/ +PKG_TARGET_DEPENDS:= alix1c + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XF86_VIDEO_GEODE,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/target/target.lst b/target/target.lst index 224ceaa01..2537feef7 100644 --- a/target/target.lst +++ b/target/target.lst @@ -27,3 +27,5 @@ rb411 ADK_LINUX_MIPS_RB411 rb433 ADK_LINUX_MIPS_RB433 rb532 ADK_LINUX_MIPS_RB532 routerboard ADK_LINUX_MIPS_RB411 || ADK_LINUX_MIPS_RB433 || ADK_LINUX_MIPS_RB532 +x86 ADK_LINUX_X86_QEMU || ADK_LINUX_X86_RESCUE || ADK_LINUX_X86_ALIX1C || ADK_LINUX_X86_ALIX2D || ADK_LINUX_X86_WRAP +x86_64 ADK_LINUX_X86_64_QEMU || ADK_LINUX_X86_64_RESCUE || ADK_LINUX_X86_64_SHUTTLE -- cgit v1.2.3 From 2737423784ee8b84a7594232ec6aa2df0b400488 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 21 Dec 2009 13:01:07 +0100 Subject: add a more realistic bulk target thx to mirabilos --- .gitignore | 1 + Makefile | 3 +++ mk/build.mk | 39 +++++++++++++++++++++++++++------------ package/linux-atm/Makefile | 1 + target/bulk.lst | 3 +++ 5 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 target/bulk.lst (limited to 'target') diff --git a/.gitignore b/.gitignore index 7e9e1ef50..46c2fdb03 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ dl/ package/*/info.mk tools_build/ extra/ +bulkdir/ diff --git a/Makefile b/Makefile index 6a5609fd2..392e780e8 100644 --- a/Makefile +++ b/Makefile @@ -121,6 +121,9 @@ image_clean imageclean cleanimage: .prereq_done menuconfig: .prereq_done @${GMAKE_INV} menuconfig +defconfig: .prereq_done + @${GMAKE_INV} defconfig + allnoconfig: .prereq_done @${GMAKE_INV} _config W=-n diff --git a/mk/build.mk b/mk/build.mk index 145856d6d..98dc6592c 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -79,6 +79,9 @@ include ${TOPDIR}/mk/split-cfg.mk all: world +allcopy: all + $(CP) $(BIN_DIR) $(TOPDIR)/bulkdir/${d}/ + .NOTPARALLEL: .PHONY: all world clean cleantarget cleandir distclean image_clean @@ -200,7 +203,7 @@ distclean: @$(TRACE) distclean @$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE) rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \ - ${TOPDIR}/.cfg* + ${TOPDIR}/.cfg* $(TOPDIR)/bulkdir rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR) rm -f .config* .defconfig .tmpconfig.h all.config \ ${TOPDIR}/package/*/info.mk @@ -224,7 +227,7 @@ $(CONFIG)/conf: $(CONFIG)/mconf: @$(MAKE) -C $(CONFIG) -defconfig: +defconfig: $(CONFIG)/conf ifeq (${OStype},Linux) @echo ADK_HOST_LINUX=y > $(TOPDIR)/.defconfig endif @@ -332,20 +335,32 @@ _mconfig: ${CONFIG}/conf _mconfig2 _config _mconfig2: ${CONFIG}/conf modconfig @${CONFIG}/conf -m ${RCONFIG} >/dev/null -# build all targets and combinations -bulk: - mkdir $(TOPDIR)/bulk - $(MAKE) TARGET=alix1c LIBC=uclibc FS=nfsroot PKG=ipkg allmodconfig - $(MAKE) v - $(CP) $(BIN_DIR) $(TOPDIR)/bulk - $(MAKE) cleantarget - distclean: @$(MAKE) -C $(CONFIG) clean @rm -rf $(BUILD_DIR) $(TOOLS_BUILD_DIR) $(BIN_DIR) $(DISTDIR) \ - ${TOPDIR}/.cfg* + ${TOPDIR}/.cfg* $(TOPDIR)/bulkdir @rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_PARENT) $(TARGET_DIR) @rm -f .config* .defconfig all.config .tmpconfig.h \ ${TOPDIR}/package/*/info.mk -endif # ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) +endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) + +# build all targets and combinations +bulk: + while read target libc fs p; do \ + mkdir -p $(TOPDIR)/bulkdir/$$target-$$libc-$$fs; \ + ( \ + echo === building $$target $$libc $$fs on $$(date); \ + $(MAKE) prereq && \ + $(MAKE) TARGET=$$target LIBC=$$libc FS=$$fs PKG=ipkg \ + defconfig && \ + if [ "x$$p" = xy ];then \ + $(MAKE) TARGET=$$target LIBC=$$libc FS=$$fs PKG=ipkg \ + allmodconfig; \ + fi && \ + $(MAKE) VERBOSE=1 -f mk/build.mk allcopy \ + d=$$target-$$libc-$$fs && \ + $(MAKE) cleantarget; \ + rm .*config; \ + ) 2>&1 | tee $(TOPDIR)/bulkdir/$$target-$$libc-$$fs/log; \ + done <${TOPDIR}/target/bulk.lst diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile index 1ebd2172b..b6f06694f 100644 --- a/package/linux-atm/Makefile +++ b/package/linux-atm/Makefile @@ -11,6 +11,7 @@ PKG_DESCR:= ATM library and tools for Linux PKG_SECTION:= libs PKG_URL:= http://linux-atm.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-atm/} +PKG_NOPARALLEL:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz diff --git a/target/bulk.lst b/target/bulk.lst new file mode 100644 index 000000000..ab34a4697 --- /dev/null +++ b/target/bulk.lst @@ -0,0 +1,3 @@ +alix1c uclibc nfsroot y +alix1c eglibc nfsroot y +alix1c glibc nfsroot y -- cgit v1.2.3