diff options
-rw-r--r-- | mk/build.mk | 14 | ||||
-rw-r--r-- | package/.template/Makefile (renamed from package/template/Makefile) | 0 | ||||
-rw-r--r-- | package/quagga/Makefile | 1 | ||||
-rw-r--r-- | target/bulk.lst | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/mk/build.mk b/mk/build.mk index 495077b3a..ee3867a16 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -178,10 +178,10 @@ kernelconfig: $(MAKE) -C $(BUILD_DIR)/linux/ ARCH=$(ARCH) menuconfig cp $(BUILD_DIR)/linux/.config $(TOPDIR)/target/$(ADK_TARGET)/kernel.config -# create a new package from package/template +# create a new package from package/.template newpackage: @echo "Creating new package $(PKG)" - $(CP) $(TOPDIR)/package/template $(TOPDIR)/package/$(PKG) + $(CP) $(TOPDIR)/package/.template $(TOPDIR)/package/$(PKG) pkg=$$(echo $(PKG)|tr '[:lower:]' '[:upper:]'); \ $(SED) "s#@UPKG@#$$pkg#" $(TOPDIR)/package/$(PKG)/Makefile $(SED) 's#@PKG@#$(PKG)#' $(TOPDIR)/package/$(PKG)/Makefile @@ -403,17 +403,17 @@ bulk: mkdir -p $(TOPDIR)/bulkdir/$$target-$$libc-$$fs; \ ( \ echo === building $$target $$libc $$fs on $$(date); \ - $(MAKE) prereq && \ + $(GMAKE) prereq && \ if [ "x$$p" = xy ];then \ - $(MAKE) TARGET=$$target LIBC=$$libc FS=$$fs PKG=ipkg \ + $(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs PKG=ipkg \ allmodconfig; \ else \ - $(MAKE) TARGET=$$target LIBC=$$libc FS=$$fs PKG=ipkg \ + $(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs PKG=ipkg \ defconfig; \ fi && \ - $(MAKE) VERBOSE=1 -f mk/build.mk allcopy \ + $(GMAKE) VERBOSE=1 -f mk/build.mk allcopy \ targetdir=$$target-$$libc-$$fs; \ - $(MAKE) cleantarget; \ + $(GMAKE) cleantarget; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bulkdir/$$target-$$libc-$$fs/log; \ done <${TOPDIR}/target/bulk.lst diff --git a/package/template/Makefile b/package/.template/Makefile index 66064ce81..66064ce81 100644 --- a/package/template/Makefile +++ b/package/.template/Makefile diff --git a/package/quagga/Makefile b/package/quagga/Makefile index aec761417..b5985255d 100644 --- a/package/quagga/Makefile +++ b/package/quagga/Makefile @@ -10,6 +10,7 @@ PKG_BUILDDEP+= readline ncurses PKG_MD5SUM:= 8975414c76a295f4855a417af0b5ddce PKG_DESCR:= A routing software package PKG_SECTION:= net +PKG_MULTI:= 1 PKG_URL:= http://www.quagga.net PKG_SITES:= http://www.quagga.net/download/ \ http://www.de.quagga.net/download/ \ diff --git a/target/bulk.lst b/target/bulk.lst index ab34a4697..8017bf310 100644 --- a/target/bulk.lst +++ b/target/bulk.lst @@ -1,3 +1 @@ -alix1c uclibc nfsroot y -alix1c eglibc nfsroot y alix1c glibc nfsroot y |