Changeset 3675


Ignore:
Timestamp:
2006-04-20T01:56:04+02:00 (12 years ago)
Author:
nbd
Message:

more buildroot-ng bugfixes

Location:
branches/buildroot-ng/openwrt/package
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/buildroot-ng/openwrt/package/busybox/Makefile

    r3674 r3675  
    44 
    55PKG_NAME:=busybox 
     6PKG_VERSION:=1.1.2 
    67PKG_RELEASE:=1 
    78 
    8 PKG_VERSION:=1.1.2 
    99PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 
    1010PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
     
    2222DESCRIPTION:=The Swiss Army Knife of embedded Linux.  It slices, it dices, it\\\ 
    2323makes Julian Fries. 
    24 URL:=http://busybox.net 
     24URL:=http://busybox.net/ 
    2525endef 
    2626 
  • branches/buildroot-ng/openwrt/package/rules.mk

    r3674 r3675  
    2626 
    2727 
    28 define BuildPackage 
     28define Package/Default 
    2929CONFIGFILE:= 
    3030SECTION:=opt 
     
    3838TITLE:= 
    3939DESCRIPTION:= 
    40  
     40endef 
     41 
     42define BuildPackage 
     43$$(eval $$(call Package/Default)) 
    4144$$(eval $$(call Package/$(1))) 
    4245 
     
    7275 
    7376IDEPEND_$(1):=$$(strip $$(DEPENDS)) 
     77CONTROLINFO_$(1) = \ 
     78        echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control; \ 
     79        echo "Version: $$(VERSION)" >> $$(IDIR_$(1))/CONTROL/control; \ 
     80        echo "Depends: $$(IDEPEND_$(1))" >> $$(IDIR_$(1))/CONTROL/control; \ 
     81        echo "Source: $$(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control; \ 
     82        echo "Section: $$(SECTION)" >> $$(IDIR_$(1))/CONTROL/control; \ 
     83        echo "Priority: $$(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control; \ 
     84        echo "Maintainer: $$(MAINTAINER)" >> $$(IDIR_$(1))/CONTROL/control; \ 
     85        echo "Architecture: $$(PKGARCH)" >> $$(IDIR_$(1))/CONTROL/control; \ 
     86        echo "Description: $$(TITLE)" >> $$(IDIR_$(1))/CONTROL/control; \ 
     87        echo "$$(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control; 
    7488 
    7589$$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared 
    7690        mkdir -p $$(IDIR_$(1))/CONTROL 
    77         echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control 
    78         echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control 
    79         echo "Depends: $$(IDEPEND_$(1))" >> $$(IDIR_$(1))/CONTROL/control 
    80         echo "Source: $(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control 
    81         echo "Section: $(SECTION)" >> $$(IDIR_$(1))/CONTROL/control 
    82         echo "Priority: $(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control 
    83         echo "Maintainer: $(MAINTAINER)" >> $$(IDIR_$(1))/CONTROL/control 
    84         echo "Architecture: $(PKGARCH)" >> $$(IDIR_$(1))/CONTROL/control 
    85         echo "Description: $(TITLE)" >> $$(IDIR_$(1))/CONTROL/control 
    86         echo "$(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control 
     91        $$(CONTROLINFO_$(1)) 
    8792        chmod 644 $$(IDIR_$(1))/CONTROL/control 
    8893        for file in conffiles preinst postinst prerm postrm; do \ 
     
    103108DUMPINFO += \ 
    104109        echo "Package: $(1)"; \ 
    105         echo "Version: $(VERSION)"; \ 
    106         echo "Depends: $(IDEPEND_$(1))"; \ 
    107         echo "Title: $(TITLE)"; \ 
    108         echo "$(DESCRIPTION)" | sed -e 's,\\,\n,g'; \ 
     110        echo "Version: $$(VERSION)"; \ 
     111        echo "Depends: $$(IDEPEND_$(1))"; \ 
     112        echo "Title: $$(TITLE)"; \ 
     113        echo "$$(DESCRIPTION)" | sed -e 's,\\,\n,g'; \ 
    109114        echo; \ 
    110         echo "$(URL)"; \ 
     115        echo "$$(URL)"; \ 
    111116        echo "@@"; 
    112117 
Note: See TracChangeset for help on using the changeset viewer.