use gcc 4.0.2 and deselect ppp by default for Aruba, use gcc 3.4.5 for the other...

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

diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index d2cf96e..6e8f5ab 100644 (file)
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -19,9 +19,10 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,FDISK,fdisk,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LOSETUP,losetup,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,SWAP_UTILS,swap-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
        (cd $(PKG_BUILD_DIR); \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
@@ -43,14 +44,20 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_FDISK):
        install -d -m0755 $(IDIR_FDISK)/usr/sbin
-       cp -fpR $(PKG_INSTALL_DIR)/sbin/fdisk $(IDIR_FDISK)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/sbin/fdisk $(IDIR_FDISK)/usr/sbin/
        $(RSTRIP) $(IDIR_FDISK)
        $(IPKG_BUILD) $(IDIR_FDISK) $(PACKAGE_DIR)
 
+$(IPKG_LOSETUP):
+       install -d -m0755 $(IDIR_LOSETUP)/usr/sbin
+       $(CP) $(PKG_INSTALL_DIR)/sbin/losetup $(IDIR_LOSETUP)/usr/sbin/
+       $(RSTRIP) $(IDIR_LOSETUP)
+       $(IPKG_BUILD) $(IDIR_LOSETUP) $(PACKAGE_DIR)
+
 $(IPKG_SWAP_UTILS):
        install -d -m0755 $(IDIR_SWAP_UTILS)/usr/sbin
-       cp -fpR $(PKG_INSTALL_DIR)/sbin/mkswap $(IDIR_SWAP_UTILS)/usr/sbin/
-       cp -fpR $(PKG_INSTALL_DIR)/sbin/swap{on,off} $(IDIR_SWAP_UTILS)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/sbin/mkswap $(IDIR_SWAP_UTILS)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/sbin/swap{on,off} $(IDIR_SWAP_UTILS)/usr/sbin/
        $(RSTRIP) $(IDIR_SWAP_UTILS)
        $(IPKG_BUILD) $(IDIR_SWAP_UTILS) $(PACKAGE_DIR)