Changeset 4856


Ignore:
Timestamp:
2006-09-24T23:17:17+02:00 (10 years ago)
Author:
nico
Message:

fix DESCRIPTION use in menuconfig and ipkg control files

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/buildroot-ng/openwrt/include/package.mk

    r4849 r4856  
    9191endef 
    9292 
     93define BuildDescription 
     94  ifneq ($(DESCRIPTION),) 
     95    DESCRIPTION:=$(TITLE)\\ $(DESCRIPTION) 
     96  else 
     97    DESCRIPTION:=$(TITLE) 
     98  endif 
     99endef 
     100 
    93101define BuildIPKGVariable 
    94102  pkg_$(subst .,_,$(subst -,_,$(1)))_$(2) = $$(Package/$(1)/$(2)) 
     
    100108  $(eval $(call Package/Default)) 
    101109  $(eval $(call Package/$(1))) 
    102  
    103   $(foreach FIELD, TITLE CATEGORY PRIORITY VERSION, 
     110  $(eval $(call BuildDescription)) 
     111 
     112  $(foreach FIELD, TITLE CATEGORY PRIORITY SECTION VERSION, 
    104113    ifeq ($($(FIELD)),) 
    105114      $$(error Package/$(1) is missing the $(FIELD) field) 
    106115    endif 
    107116  ) 
    108  
    109   ifeq ($(PKGARCH),) 
    110     PKGARCH:=$(ARCH) 
    111   endif 
    112  
    113   ifeq ($(DESCRIPTION),) 
    114     $(eval DESCRIPTION:=$(TITLE)) 
    115   endif 
    116117 
    117118  IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk 
     
    207208        echo "Maintainer: $(MAINTAINER)" >> $$(IDIR_$(1))/CONTROL/control 
    208209        echo "Architecture: $(PKGARCH)" >> $$(IDIR_$(1))/CONTROL/control 
    209         echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control 
     210        echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g' | sed -e 's,^[[:space:]]*$$$$, .,g' >> $$(IDIR_$(1))/CONTROL/control 
    210211        chmod 644 $$(IDIR_$(1))/CONTROL/control 
    211212        (cd $$(IDIR_$(1))/CONTROL; \ 
Note: See TracChangeset for help on using the changeset viewer.