more package submenus

[openwrt.git] / package / util-linux / Makefile

diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 810a093..602d1d5 100644 (file)
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -21,62 +21,78 @@ include $(INCLUDE_DIR)/package.mk
 define Package/util-linux/Default
   SECTION:=utils
   CATEGORY:=Utilities
 define Package/util-linux/Default
   SECTION:=utils
   CATEGORY:=Utilities

+  DEPENDS:=@!TARGET_etrax

   URL:=http://www.kernel.org/pub/linux/utils/util-linux/
 endef
 
 define Package/fdisk
   URL:=http://www.kernel.org/pub/linux/utils/util-linux/
 endef
 
 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:=\
-       This package contains a utility for managing disk partition tables.
-  URL:=http://www.kernel.org/pub/linux/utils/util-linux/
+  SUBMENU=disc
+endef
+
+define Package/fdisk/description
+ This package contains a utility for managing disk partition tables.

 endef
 
 define Package/cfdisk
 endef
 
 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
-  DESCRIPTION:=\
-       This package contains a utility for managing disk partition tables.
-  URL:=http://www.kernel.org/pub/linux/utils/util-linux/
+  DEPENDS:= +libncurses
+  SUBMENU:=disc
+endef
+
+define Package/cfdisk/description
+ This package contains a utility for managing disk partition tables.

 endef
 
 define Package/losetup
 endef
 
 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:=\
-       This package contains a utility for managing loopback devices.
+endef
+
+define Package/losetup/description
+ This package contains a utility for managing loopback devices.

 endef
 
 define Package/swap-utils
 endef
 
 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:=\
-       This package contains a collection of tools for managing swap space: \\\
-       - mkswap\\\
-       - swapon\\\
-       - swapoff
+  SUBMENU:=disc
+endef
+
+define Package/swap-utils/description
+ This package contains a collection of tools for managing swap space: 
+ - mkswap
+ - swapon
+ - swapoff

 endef
 
 define Package/hwclock
 endef
 
 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:=\
-        This package contains a utility for managing the hardware clock

 endef
 
 endef
 

-TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib
+define Package/hwclock/description
+ This package contains a utility for managing the hardware clock.
+endef
+
+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)" \
                INSTALLSUID="install -m 4755" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                OPT="$(TARGET_CFLAGS)" \
                INSTALLSUID="install -m 4755" \
                DESTDIR="$(PKG_INSTALL_DIR)" \

-               all install \
-       )
+               all install

 endef
 
 define Package/Template
 endef
 
 define Package/Template