projects
/
openwrt
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
88b8c4e
)
fix DESCRIPTION use in menuconfig and ipkg control files
author
Nicolas Thill
<nico@openwrt.org>
Sun, 24 Sep 2006 21:17:17 +0000
(21:17 +0000)
committer
Nicolas Thill
<nico@openwrt.org>
Sun, 24 Sep 2006 21:17:17 +0000
(21:17 +0000)
SVN-Revision: 4856
openwrt/include/package.mk
patch
|
blob
|
history
diff --git
a/openwrt/include/package.mk
b/openwrt/include/package.mk
index f7dbacc415d792756e849de0df4a4f149ae44a79..709bb4415550e2c14981eacc42027d740caf8163 100644
(file)
--- a/
openwrt/include/package.mk
+++ b/
openwrt/include/package.mk
@@
-90,6
+90,14
@@
define Package/Default
DESCRIPTION:=
endef
DESCRIPTION:=
endef
+define BuildDescription
+ ifneq ($(DESCRIPTION),)
+ DESCRIPTION:=$(TITLE)\\ $(DESCRIPTION)
+ else
+ DESCRIPTION:=$(TITLE)
+ endif
+endef
+
define BuildIPKGVariable
pkg_$(subst .,_,$(subst -,_,$(1)))_$(2) = $$(Package/$(1)/$(2))
export pkg_$(subst .,_,$(subst -,_,$(1))_$(2))
define BuildIPKGVariable
pkg_$(subst .,_,$(subst -,_,$(1)))_$(2) = $$(Package/$(1)/$(2))
export pkg_$(subst .,_,$(subst -,_,$(1))_$(2))
@@
-99,21
+107,14
@@
endef
define BuildPackage
$(eval $(call Package/Default))
$(eval $(call Package/$(1)))
define BuildPackage
$(eval $(call Package/Default))
$(eval $(call Package/$(1)))
+ $(eval $(call BuildDescription))
- $(foreach FIELD, TITLE CATEGORY PRIORITY VERSION,
+ $(foreach FIELD, TITLE CATEGORY PRIORITY
SECTION
VERSION,
ifeq ($($(FIELD)),)
$$(error Package/$(1) is missing the $(FIELD) field)
endif
)
ifeq ($($(FIELD)),)
$$(error Package/$(1) is missing the $(FIELD) field)
endif
)
- ifeq ($(PKGARCH),)
- PKGARCH:=$(ARCH)
- endif
-
- ifeq ($(DESCRIPTION),)
- $(eval DESCRIPTION:=$(TITLE))
- endif
-
IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk
IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1)
INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list
IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk
IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1)
INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list
@@
-206,7
+207,7
@@
define BuildPackage
echo "Priority: $(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control
echo "Maintainer: $(MAINTAINER)" >> $$(IDIR_$(1))/CONTROL/control
echo "Architecture: $(PKGARCH)" >> $$(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)" | sed -e 's,\\,\n
,g' >> $$(IDIR_$(1))/CONTROL/control
+ echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n
,g' | sed -e 's,^[[:space:]]*$$$$, .
,g' >> $$(IDIR_$(1))/CONTROL/control
chmod 644 $$(IDIR_$(1))/CONTROL/control
(cd $$(IDIR_$(1))/CONTROL; \
$($(1)_COMMANDS) \
chmod 644 $$(IDIR_$(1))/CONTROL/control
(cd $$(IDIR_$(1))/CONTROL; \
$($(1)_COMMANDS) \