hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change prefix for util-linux binaries from / to /usr

Browse Source 
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.

SVN-Revision: 34791
master
Mirko Vogt 12 years ago
parent 687920ba3e
commit ec9ce7e089
1 changed files with 31 additions and 31 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 62
      package/util-linux/Makefile

62
package/util-linux/Makefile
Unescape View File

@ -419,13 +419,13 @@ define Package/libuuid/install
endef endef
define Package/agetty/install define Package/agetty/install
$(INSTALL_DIR) $(1)/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/term-utils/agetty $(1)/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/term-utils/agetty $(1)/usr/sbin/
endef endef
define Package/blkid/install define Package/blkid/install
$(INSTALL_DIR) $(1)/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/blkid $(1)/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/blkid $(1)/usr/sbin/
endef endef
define Package/cal/install define Package/cal/install
@ -434,18 +434,18 @@ define Package/cal/install
endef endef
define Package/cfdisk/install define Package/cfdisk/install
$(INSTALL_DIR) $(1)/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/.libs/cfdisk $(1)/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/.libs/cfdisk $(1)/usr/sbin/
endef endef
define Package/fdisk/install define Package/fdisk/install
$(INSTALL_DIR) $(1)/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/.libs/fdisk $(1)/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/.libs/fdisk $(1)/usr/sbin/
endef endef
define Package/findfs/install define Package/findfs/install
$(INSTALL_DIR) $(1)/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/findfs $(1)/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/findfs $(1)/usr/sbin/
endef endef
define Package/flock/install define Package/flock/install
@ -459,8 +459,8 @@ define Package/getopt/install
endef endef
define Package/hwclock/install define Package/hwclock/install
$(INSTALL_DIR) $(1)/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/hwclock/hwclock $(1)/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/hwclock/hwclock $(1)/usr/sbin/
endef endef
define Package/logger/install define Package/logger/install
@ -474,13 +474,13 @@ define Package/look/install
endef endef
define Package/losetup/install define Package/losetup/install
$(INSTALL_DIR) $(1)/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/losetup $(1)/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/losetup $(1)/usr/sbin/
endef endef
define Package/lsblk/install define Package/lsblk/install
$(INSTALL_DIR) $(1)/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/lsblk $(1)/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/lsblk $(1)/usr/bin/
endef endef
define Package/mcookie/install define Package/mcookie/install
@ -489,19 +489,19 @@ define Package/mcookie/install
endef endef
define Package/mount-utils/install define Package/mount-utils/install
$(INSTALL_DIR) $(1)/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/.libs/{u,}mount $(1)/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/.libs/{u,}mount $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/.libs/mountpoint $(1)/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/.libs/mountpoint $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/findmnt $(1)/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/findmnt $(1)/usr/bin/
endef endef
define Package/namei/install 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/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/namei $(1)/usr/bin/
endef endef
define Package/rename/install 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/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/rename $(1)/usr/bin/
endef endef
@ -524,16 +524,16 @@ define Package/setterm/install
endef endef
define Package/sfdisk/install define Package/sfdisk/install
$(INSTALL_DIR) $(1)/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/sfdisk $(1)/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/sfdisk $(1)/usr/sbin/
endef endef
define Package/swap-utils/install define Package/swap-utils/install
$(INSTALL_DIR) $(1)/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/disk-utils/.libs/mkswap $(1)/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/disk-utils/.libs/mkswap $(1)/usr/sbin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/disk-utils/.libs/swaplabel $(1)/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/disk-utils/.libs/swaplabel $(1)/usr/sbin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/.libs/swapon $(1)/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/.libs/swapon $(1)/usr/sbin/
ln -sf swapon $(1)/sbin/swapoff ln -sf swapon $(1)/usr/sbin/swapoff
endef endef
define Package/uuidd/install define Package/uuidd/install
@ -557,8 +557,8 @@ define Package/whereis/install
endef endef
define Package/wipefs/install define Package/wipefs/install
$(INSTALL_DIR) $(1)/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/wipefs $(1)/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/wipefs $(1)/usr/sbin/
endef endef
$(eval $(call BuildPackage,libblkid)) $(eval $(call BuildPackage,libblkid))

Write Preview
Loading…
Cancel
Save