more buildroot-ng bugfixes

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3675 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index aa6093e..a583076 100644 (file)
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=busybox
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=busybox

+PKG_VERSION:=1.1.2

 PKG_RELEASE:=1
 
 PKG_RELEASE:=1
 

-PKG_VERSION:=1.1.2

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.busybox.net/downloads
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.busybox.net/downloads


@@ -21,7 +21,7 @@ CATEGORY:=Base system
 TITLE:=Core utilities for embedded Linux
 DESCRIPTION:=The Swiss Army Knife of embedded Linux.  It slices, it dices, it\\\
 makes Julian Fries.
 TITLE:=Core utilities for embedded Linux
 DESCRIPTION:=The Swiss Army Knife of embedded Linux.  It slices, it dices, it\\\
 makes Julian Fries.

-URL:=http://busybox.net
+URL:=http://busybox.net/

 endef
 
 define Build/Configure
 endef
 
 define Build/Configure

diff --git a/package/rules.mk b/package/rules.mk
index 9f52f17..d40d692 100644 (file)
--- a/package/rules.mk
+++ b/package/rules.mk
@@ -25,7 +25,7 @@ endef
 endef
 
 
 endef
 
 

-define BuildPackage
+define Package/Default

 CONFIGFILE:=
 SECTION:=opt
 CATEGORY:=Extra packages
 CONFIGFILE:=
 SECTION:=opt
 CATEGORY:=Extra packages


@@ -37,7 +37,10 @@ PKGARCH:=$(ARCH)
 PRIORITY:=optional
 TITLE:=
 DESCRIPTION:=
 PRIORITY:=optional
 TITLE:=
 DESCRIPTION:=

+endef

 
 

+define BuildPackage
+$$(eval $$(call Package/Default))

 $$(eval $$(call Package/$(1)))
 
 ifeq ($$(TITLE),)
 $$(eval $$(call Package/$(1)))
 
 ifeq ($$(TITLE),)


@@ -71,19 +74,21 @@ install-targets: $$(INFO_$(1))
 endif
 
 IDEPEND_$(1):=$$(strip $$(DEPENDS))
 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
 
 $$(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: $(TITLE)" >> $$(IDIR_$(1))/CONTROL/control
-       echo "$(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(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; \
        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; \


@@ -102,12 +107,12 @@ clean: $(1)-clean
 
 DUMPINFO += \
        echo "Package: $(1)"; \
 
 DUMPINFO += \
        echo "Package: $(1)"; \

-       echo "Version: $(VERSION)"; \
-       echo "Depends: $(IDEPEND_$(1))"; \
-       echo "Title: $(TITLE)"; \
-       echo "$(DESCRIPTION)" | sed -e 's,\\,\n,g'; \
+       echo "Version: $$(VERSION)"; \
+       echo "Depends: $$(IDEPEND_$(1))"; \
+       echo "Title: $$(TITLE)"; \
+       echo "$$(DESCRIPTION)" | sed -e 's,\\,\n,g'; \

        echo; \
        echo; \

-       echo "$(URL)"; \
+       echo "$$(URL)"; \

        echo "@@";
 
 PACKAGES += $(1)
        echo "@@";
 
 PACKAGES += $(1)