diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-03 14:46:58 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-03 14:46:58 +0100 |
| commit | e6d7923746537504a5e19b5c9aa050a1836048b6 (patch) | |
| tree | f76be1d9b5827397911ac56551496a1e896ff6eb /mk | |
| parent | 7d768fd32415a15d0e3c87aa4cab0b1bafda2fda (diff) | |
move package template out of pkgmaker's view
avoid pkgmaker warning. quagga is a multi package.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 14 |
1 files changed, 7 insertions, 7 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 |