X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/41811345b79f7f918a569ab57434de85ba478cb3..1f2800f5f5534f4d76defa4deefbfff92f2ea944:/openwrt/package/util-linux/Makefile

diff --git a/openwrt/package/util-linux/Makefile b/openwrt/package/util-linux/Makefile
index 30a4398ae..6e8f5abd7 100644
--- a/openwrt/package/util-linux/Makefile
+++ b/openwrt/package/util-linux/Makefile
@@ -1,3 +1,5 @@
+# $Id$
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fdisk
@@ -17,8 +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" \
@@ -30,19 +34,33 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 $(PKG_BUILD_DIR)/.built:
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR)/fdisk \
+	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		OPT="$(TARGET_CFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
+		INSTALLSUID="install -m 4755" \
 		all install
 	touch $@
 
 $(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) $(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)
+
 mostlyclean:
 	-$(MAKE) -C $(PKG_BUILD_DIR) clean
 	rm -f $(PKG_BUILD_DIR)/.built