Browse Source

move package template out of pkgmaker's view

avoid pkgmaker warning. quagga is a multi package.
Waldemar Brodkorb 14 years ago
parent
commit
e6d7923746
4 changed files with 8 additions and 9 deletions
  1. 7 7
      mk/build.mk
  2. 0 0
      package/.template/Makefile
  3. 1 0
      package/quagga/Makefile
  4. 0 2
      target/bulk.lst

+ 7 - 7
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

+ 0 - 0
package/template/Makefile → package/.template/Makefile


+ 1 - 0
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/ \

+ 0 - 2
target/bulk.lst

@@ -1,3 +1 @@
-alix1c		uclibc		nfsroot		y
-alix1c		eglibc		nfsroot		y
 alix1c		glibc		nfsroot		y