qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-23 23:16:16 +02:00
Code

more buildroot-ng bugfixes

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3675 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2006-04-19 23:56:04 +00:00
parent 902fd8c8a3
commit 7243ce0e7a
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/busybox/Makefile
View File

@ -3,9 +3,9 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=busybox 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_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.busybox.net/downloads PKG_SOURCE_URL:=http://www.busybox.net/downloads
@ -21,7 +21,7 @@ CATEGORY:=Base system
TITLE:=Core utilities for embedded Linux TITLE:=Core utilities for embedded Linux
DESCRIPTION:=The Swiss Army Knife of embedded Linux. It slices, it dices, it\\\ DESCRIPTION:=The Swiss Army Knife of embedded Linux. It slices, it dices, it\\\
makes Julian Fries. makes Julian Fries.
URL:=http://busybox.net URL:=http://busybox.net/
endef endef
define Build/Configure define Build/Configure

37
package/rules.mk
View File

@ -25,7 +25,7 @@ endef
endef endef
define BuildPackage define Package/Default
CONFIGFILE:= CONFIGFILE:=
SECTION:=opt SECTION:=opt
CATEGORY:=Extra packages CATEGORY:=Extra packages
@ -37,7 +37,10 @@ PKGARCH:=$(ARCH)
PRIORITY:=optional PRIORITY:=optional
TITLE:= TITLE:=
DESCRIPTION:= DESCRIPTION:=
endef
define BuildPackage
$$(eval $$(call Package/Default))
$$(eval $$(call Package/$(1))) $$(eval $$(call Package/$(1)))
ifeq ($$(TITLE),) ifeq ($$(TITLE),)
@ -71,19 +74,21 @@ install-targets: $$(INFO_$(1))
endif endif
IDEPEND_$(1):=$$(strip $$(DEPENDS)) 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 $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared
mkdir -p $$(IDIR_$(1))/CONTROL mkdir -p $$(IDIR_$(1))/CONTROL
echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control $$(CONTROLINFO_$(1))
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
chmod 644 $$(IDIR_$(1))/CONTROL/control chmod 644 $$(IDIR_$(1))/CONTROL/control
for file in conffiles preinst postinst prerm postrm; do \ for file in conffiles preinst postinst prerm postrm; do \
[ -f ./ipkg/$(1).$$$$file ] && cp ./ipkg/$(1).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file || true; \ [ -f ./ipkg/$(1).$$$$file ] && cp ./ipkg/$(1).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file || true; \
@ -102,12 +107,12 @@ clean: $(1)-clean
DUMPINFO += \ DUMPINFO += \
echo "Package: $(1)"; \ echo "Package: $(1)"; \
echo "Version: $(VERSION)"; \ echo "Version: $$(VERSION)"; \
echo "Depends: $(IDEPEND_$(1))"; \ echo "Depends: $$(IDEPEND_$(1))"; \
echo "Title: $(TITLE)"; \ echo "Title: $$(TITLE)"; \
echo "$(DESCRIPTION)" | sed -e 's,\\,\n,g'; \ echo "$$(DESCRIPTION)" | sed -e 's,\\,\n,g'; \
echo; \ echo; \
echo "$(URL)"; \ echo "$$(URL)"; \
echo "@@"; echo "@@";
PACKAGES += $(1) PACKAGES += $(1)