diff options
| author | Mirko Vogt <mirko@openwrt.org> | 2012-12-19 16:07:42 +0000 |
|---|---|---|
| committer | Mirko Vogt <mirko@openwrt.org> | 2012-12-19 16:07:42 +0000 |
| commit | 667779e4f8fa3749d0867908c4bae53b0471e961 (patch) | |
| tree | 5db59b8280f5247065587ad87b8c990556e1a135 | |
| parent | ffe33259302bcf5eb900d47bbd5272eb5fa5d8d0 (diff) | |
| download | upstream-667779e4f8fa3749d0867908c4bae53b0471e961.tar.gz upstream-667779e4f8fa3749d0867908c4bae53b0471e961.tar.bz2 upstream-667779e4f8fa3749d0867908c4bae53b0471e961.zip | |
change prefix for util-linux binaries from / to /usr
The prefix / causes executables like mount, umount, etc. to be placed
in /bin /sbin which therewith replace the busybox symlinks.
mount and umount e.g. are linked again libmount.so.
This is e.g. fatal during a sysupgrade, where /bin/mount,
/bin/umount, etc. but not libmount.so get copied into a ramdisk
which will result in non working executables within the ramdisk.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34791 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/util-linux/Makefile | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index a8aed8d65e..7deb77d0af 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -419,13 +419,13 @@ define Package/libuuid/install endef define Package/agetty/install - $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/term-utils/agetty $(1)/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/term-utils/agetty $(1)/usr/sbin/ endef define Package/blkid/install - $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/blkid $(1)/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/blkid $(1)/usr/sbin/ endef define Package/cal/install @@ -434,18 +434,18 @@ define Package/cal/install endef define Package/cfdisk/install - $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/.libs/cfdisk $(1)/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/.libs/cfdisk $(1)/usr/sbin/ endef define Package/fdisk/install - $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/.libs/fdisk $(1)/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/.libs/fdisk $(1)/usr/sbin/ endef define Package/findfs/install - $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/findfs $(1)/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/findfs $(1)/usr/sbin/ endef define Package/flock/install @@ -459,8 +459,8 @@ define Package/getopt/install endef define Package/hwclock/install - $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/hwclock/hwclock $(1)/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/hwclock/hwclock $(1)/usr/sbin/ endef define Package/logger/install @@ -474,13 +474,13 @@ define Package/look/install endef define Package/losetup/install - $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/losetup $(1)/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/losetup $(1)/usr/sbin/ endef define Package/lsblk/install - $(INSTALL_DIR) $(1)/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/lsblk $(1)/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/lsblk $(1)/usr/bin/ endef define Package/mcookie/install @@ -489,19 +489,19 @@ define Package/mcookie/install endef define Package/mount-utils/install - $(INSTALL_DIR) $(1)/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/.libs/{u,}mount $(1)/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/.libs/mountpoint $(1)/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/findmnt $(1)/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/.libs/{u,}mount $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/.libs/mountpoint $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/findmnt $(1)/usr/bin/ endef define Package/namei/install - $(INSTALL_DIR) $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/namei $(1)/usr/bin/ endef define Package/rename/install - $(INSTALL_DIR) $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/rename $(1)/usr/bin/ endef @@ -524,16 +524,16 @@ define Package/setterm/install endef define Package/sfdisk/install - $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/sfdisk $(1)/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/sfdisk $(1)/usr/sbin/ endef define Package/swap-utils/install - $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/disk-utils/.libs/mkswap $(1)/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/disk-utils/.libs/swaplabel $(1)/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/.libs/swapon $(1)/sbin/ - ln -sf swapon $(1)/sbin/swapoff + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/disk-utils/.libs/mkswap $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/disk-utils/.libs/swaplabel $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/.libs/swapon $(1)/usr/sbin/ + ln -sf swapon $(1)/usr/sbin/swapoff endef define Package/uuidd/install @@ -557,8 +557,8 @@ define Package/whereis/install endef define Package/wipefs/install - $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/wipefs $(1)/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/wipefs $(1)/usr/sbin/ endef $(eval $(call BuildPackage,libblkid)) |