more buildroot-ng bugfixes

[openwrt.git] / package / rules.mk

diff --git a/package/rules.mk b/package/rules.mk
index 1e5a761..d40d692 100644 (file)
--- a/package/rules.mk
+++ b/package/rules.mk
@@ -1,5 +1,9 @@
 # default target
+ifneq ($(DUMP),)
+all: dumpinfo
+else
 all: compile
+endif
 
 define Build/DefaultTargets
 $(PKG_BUILD_DIR)/.prepared:
@@ -16,11 +20,12 @@ $(PKG_BUILD_DIR)/.built:
        $(call Build/Compile)
        touch $$@
 
-DEFAULT_TARGETS:=1
+define Build/DefaultTargets
+endef
 endef
 
 
-define BuildPackage
+define Package/Default
 CONFIGFILE:=
 SECTION:=opt
 CATEGORY:=Extra packages
@@ -32,7 +37,10 @@ PKGARCH:=$(ARCH)
 PRIORITY:=optional
 TITLE:=
 DESCRIPTION:=
+endef
 
+define BuildPackage
+$$(eval $$(call Package/Default))
 $$(eval $$(call Package/$(1)))
 
 ifeq ($$(TITLE),)
@@ -55,29 +63,32 @@ IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk
 IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1)
 INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list
 
-ifneq ($(BR2_PACKAGE_$(1)),)
+ifneq ($(PACKAGE_$(1)),)
 compile-targets: $$(IPKG_$(1))
 endif
 ifneq ($(DEVELOPER),)
 compile-targets: $$(IPKG_$(1))
 endif
-ifeq ($(BR2_PACKAGE_$(1)),y)
+ifeq ($(PACKAGE_$(1)),y)
 install-targets: $$(INFO_$(1))
 endif
 
 IDEPEND_$(1):=$$(strip $$(DEPENDS))
+CONTROLINFO_$(1) = \
+       echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control; \
+       echo "Version: $$(VERSION)" >> $$(IDIR_$(1))/CONTROL/control; \
+       echo "Depends: $$(IDEPEND_$(1))" >> $$(IDIR_$(1))/CONTROL/control; \
+       echo "Source: $$(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control; \
+       echo "Section: $$(SECTION)" >> $$(IDIR_$(1))/CONTROL/control; \
+       echo "Priority: $$(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control; \
+       echo "Maintainer: $$(MAINTAINER)" >> $$(IDIR_$(1))/CONTROL/control; \
+       echo "Architecture: $$(PKGARCH)" >> $$(IDIR_$(1))/CONTROL/control; \
+       echo "Description: $$(TITLE)" >> $$(IDIR_$(1))/CONTROL/control; \
+       echo "$$(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control;
 
 $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared
        mkdir -p $$(IDIR_$(1))/CONTROL
-       echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
-       echo "Version: $$(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
-       echo "Depends: $$(IDEPEND_$(1))" >> $$(IDIR_$(1))/CONTROL/control
-       echo "Source: $$(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control
-       echo "Section: $$(SECTION)" >> $$(IDIR_$(1))/CONTROL/control
-       echo "Priority: $$(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control
-       echo "Maintainer: $$(MAINTAINER)" >> $$(IDIR_$(1))/CONTROL/control
-       echo "Architecture: $$(PKGARCH)" >> $$(IDIR_$(1))/CONTROL/control
-       echo "Description: $$(DESCRIPTION)" >> $$(IDIR_$(1))/CONTROL/control
+       $$(CONTROLINFO_$(1))
        chmod 644 $$(IDIR_$(1))/CONTROL/control
        for file in conffiles preinst postinst prerm postrm; do \
                [ -f ./ipkg/$(1).$$$$file ] && cp ./ipkg/$(1).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file || true; \
@@ -94,6 +105,18 @@ $(1)-clean:
        rm -f $$(IPKG_$(1))
 clean: $(1)-clean
 
+DUMPINFO += \
+       echo "Package: $(1)"; \
+       echo "Version: $$(VERSION)"; \
+       echo "Depends: $$(IDEPEND_$(1))"; \
+       echo "Title: $$(TITLE)"; \
+       echo "$$(DESCRIPTION)" | sed -e 's,\\,\n,g'; \
+       echo; \
+       echo "$$(URL)"; \
+       echo "@@";
+
+PACKAGES += $(1)
+
 ifneq ($(__DEFAULT_TARGETS),1)
 $(eval $(call Build/DefaultTargets))
 endif
@@ -141,6 +164,11 @@ define Build/Compile
 $(call Build/Compile/Default)
 endef
 
+ifneq ($(DUMP),)
+dumpinfo:
+       $(DUMPINFO)
+else
+
 source: $(DL_DIR)/$(PKG_SOURCE)
 prepare: source
        @[ -f $(PKG_BUILD_DIR)/.prepared ] || { \
@@ -181,5 +209,6 @@ clean:
        @$(CMD_TRACE) "cleaning... " 
        @$(MAKE) clean-targets $(MAKE_TRACE)
        rm -rf $(PKG_BUILD_DIR)
+endif
 
-.PHONY: all source prepare compile install clean
+.PHONY: all source prepare compile install clean dumpinfo