1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-10-01 11:44:11 +03:00

package/util-linux fixes:

* don't use Build/Configure/Default since it is not an autoconf based package
 * fix opt flags passed more than once
 * move DEPENDS:=@!LINUX_2_6_ETRAX in shared Package/util-linux/Default


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8498 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2007-08-26 23:33:28 +00:00
parent 49b68868da
commit c86c1f7986

View File

@ -21,13 +21,13 @@ include $(INCLUDE_DIR)/package.mk
define Package/util-linux/Default define Package/util-linux/Default
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
DEPENDS:=@!LINUX_2_6_ETRAX
URL:=http://www.kernel.org/pub/linux/utils/util-linux/ URL:=http://www.kernel.org/pub/linux/utils/util-linux/
endef endef
define Package/fdisk define Package/fdisk
$(call Package/util-linux/Default) $(call Package/util-linux/Default)
TITLE:=Partition table manipulation utility TITLE:=Partition table manipulation utility
DEPENDS:=@!LINUX_2_6_ETRAX
DESCRIPTION:=\ DESCRIPTION:=\
This package contains a utility for managing disk partition tables. This package contains a utility for managing disk partition tables.
URL:=http://www.kernel.org/pub/linux/utils/util-linux/ URL:=http://www.kernel.org/pub/linux/utils/util-linux/
@ -36,7 +36,7 @@ endef
define Package/cfdisk define Package/cfdisk
$(call Package/util-linux/Default) $(call Package/util-linux/Default)
TITLE:=Partition table manipulation utility TITLE:=Partition table manipulation utility
DEPENDS:=+libncurses @!LINUX_2_6_ETRAX DEPENDS+= +libncurses
DESCRIPTION:=\ DESCRIPTION:=\
This package contains a utility for managing disk partition tables. This package contains a utility for managing disk partition tables.
URL:=http://www.kernel.org/pub/linux/utils/util-linux/ URL:=http://www.kernel.org/pub/linux/utils/util-linux/
@ -45,7 +45,6 @@ endef
define Package/losetup define Package/losetup
$(call Package/util-linux/Default) $(call Package/util-linux/Default)
TITLE:=Loopback devices setup and control utility TITLE:=Loopback devices setup and control utility
DEPENDS:=@!LINUX_2_6_ETRAX
DESCRIPTION:=\ DESCRIPTION:=\
This package contains a utility for managing loopback devices. This package contains a utility for managing loopback devices.
endef endef
@ -53,7 +52,6 @@ endef
define Package/swap-utils define Package/swap-utils
$(call Package/util-linux/Default) $(call Package/util-linux/Default)
TITLE:=Swap space management utilities TITLE:=Swap space management utilities
DEPENDS:=@!LINUX_2_6_ETRAX
DESCRIPTION:=\ DESCRIPTION:=\
This package contains a collection of tools for managing swap space: \\\ This package contains a collection of tools for managing swap space: \\\
- mkswap\\\ - mkswap\\\
@ -64,19 +62,26 @@ endef
define Package/hwclock define Package/hwclock
$(call Package/util-linux/Default) $(call Package/util-linux/Default)
TITLE:=Utilities for managing the hardware clock TITLE:=Utilities for managing the hardware clock
DEPENDS:=@!LINUX_2_6_ETRAX
DESCRIPTION:=\ DESCRIPTION:=\
This package contains a utility for managing the hardware clock This package contains a utility for managing the hardware clock
endef endef
TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib define Build/Configure
# this is NOT GNU configure!
( cd $(PKG_BUILD_DIR); \
CC="$(TARGET_CC)" \
CFLAGS="$(TARGET_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
./configure \
);
endef
define Build/Compile define Build/Compile
$(call Build/Compile/Default, \ $(MAKE) -C $(PKG_BUILD_DIR) \
OPT="$(TARGET_CFLAGS)" \ OPT="$(TARGET_CFLAGS)" \
INSTALLSUID="install -m 4755" \ INSTALLSUID="install -m 4755" \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
all install \ all install
)
endef endef
define Package/Template define Package/Template