[PATCH v3] Remove support for split-/usr installs

Always install binaries and other files under /usr, not /.  This will
break any distribution that hasn't yet merged the two, which are
vanishingly small these days.  This breaks the usecase of needing to
repair the /usr partition when there is no initramfs or livecd
available and / is the only option.

Signed-off-by: Chris Hofstaedtler <zeha@debian.org>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/configure.ac b/configure.ac
index b692b4b42f2c8109fe80674d7c8d035ed19f7249..b84234b50e0eb8cae3aac04e08fab8a1ccdec9c3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -113,27 +113,6 @@ esac
 #
 test -n "$multiarch" && enable_lib64=no
 
-#
-# Some important tools should be installed into the root partitions.
-#
-# Check whether exec_prefix=/usr: and install them to /sbin in that
-# case.  If the user chooses a different prefix assume they just want
-# a local install for testing and not a system install.
-#
-case $exec_prefix:$prefix in
-NONE:NONE | NONE:/usr | /usr:*)
-  root_sbindir='/sbin'
-  root_libdir="/${base_libdir}"
-  ;;
-*)
-  root_sbindir="${sbindir}"
-  root_libdir="${libdir}"
-  ;;
-esac
-
-AC_SUBST([root_sbindir])
-AC_SUBST([root_libdir])
-
 # Find localized files.  Don't descend into any "dot directories"
 # (like .git or .pc from quilt).  Strangely, the "-print" argument
 # to "find" is required, to avoid including such directories in the

diff --git a/debian/Makefile b/debian/Makefile
index cafe8bbb3f99ce29bf4ff38d72ba0dfa88f76426..2f9cd38c2ea6be4d476b4b8deafb8de5d4dd994c 100644 (file)
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -31,6 +31,6 @@ endif
 
 install-d-i: default
 ifeq ($(PKG_DISTRIBUTION), debian)
-       $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
-       $(INSTALL) -m 755 $(BOOT_MKFS_BIN) $(PKG_ROOT_SBIN_DIR)/mkfs.xfs
+       $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
+       $(INSTALL) -m 755 $(BOOT_MKFS_BIN) $(PKG_SBIN_DIR)/mkfs.xfs
 endif

diff --git a/debian/local/initramfs.hook b/debian/local/initramfs.hook
index 5b24eaece7a78a63a7125e077f04a57c6b1e41f5..eac7e79eaac4d3cb0106e3b2e8ddd11779fa819b 100644 (file)
--- a/debian/local/initramfs.hook
+++ b/debian/local/initramfs.hook
@@ -45,7 +45,7 @@ rootfs_type() {
 . /usr/share/initramfs-tools/hook-functions
 
 if [ "$(rootfs_type)" = "xfs" ]; then
-       copy_exec /sbin/xfs_repair
+       copy_exec /usr/sbin/xfs_repair
        copy_exec /usr/sbin/xfs_db
        copy_exec /usr/sbin/xfs_metadump
 fi

diff --git a/debian/rules b/debian/rules
index 0c1cef92d841284e4789d0cc5b4d40c7be40d0ed..0db0ed8e7543bcab117632cd3e445f2722a26966 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -105,9 +105,8 @@ binary-arch: checkroot built
        $(pkgme)  $(MAKE) dist
        install -D -m 0755 debian/local/initramfs.hook debian/xfsprogs/usr/share/initramfs-tools/hooks/xfs
        rmdir debian/xfslibs-dev/usr/share/doc/xfsprogs
-       rm -f debian/xfslibs-dev/lib/$(DEB_HOST_MULTIARCH)/libhandle.la
-       rm -f debian/xfslibs-dev/lib/$(DEB_HOST_MULTIARCH)/libhandle.a
-       rm -fr debian/xfslibs-dev/usr/lib
+       rm -f debian/xfslibs-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libhandle.la
+       rm -f debian/xfslibs-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libhandle.a
        dh_installdocs -XCHANGES
        dh_installchangelogs
        dh_strip

diff --git a/fsck/Makefile b/fsck/Makefile
index da9b6ded850ce288dcb316883337892f239dbd7d..5ca529f53e428f9620142c0dc4c2d68b70708537 100644 (file)
--- a/fsck/Makefile
+++ b/fsck/Makefile
@@ -12,6 +12,6 @@ default: $(LTCOMMAND)
 include $(BUILDRULES)
 
 install: default
-       $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
-       $(INSTALL) -m 755 xfs_fsck.sh $(PKG_ROOT_SBIN_DIR)/fsck.xfs
+       $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
+       $(INSTALL) -m 755 xfs_fsck.sh $(PKG_SBIN_DIR)/fsck.xfs
 install-dev:

diff --git a/include/builddefs.in b/include/builddefs.in
index 644ed1cb1125e0ddea061766fa8d6a81d57fcf8e..6ac36c149238f5fc09444951c477766b013309f7 100644 (file)
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -48,8 +48,6 @@ datarootdir   = @datarootdir@
 top_builddir   = @top_builddir@
 
 PKG_SBIN_DIR   = @sbindir@
-PKG_ROOT_SBIN_DIR = @root_sbindir@
-PKG_ROOT_LIB_DIR= @root_libdir@@libdirsuffix@
 PKG_LIB_DIR    = @libdir@@libdirsuffix@
 PKG_LIBEXEC_DIR        = @libexecdir@/@pkg_name@
 PKG_INC_DIR    = @includedir@/xfs

diff --git a/include/buildmacros b/include/buildmacros
index 6f34d7c528fafad30d7b0cde1cd0f2cc60e3e880..9183e5bc770fb80ac02aa1afa61620dbab416604 100644 (file)
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -50,16 +50,16 @@ LTINSTALL = $(LIBTOOL) --quiet --mode=install $(INSTALL)
 LTCOMPILE = $(LIBTOOL) --quiet --tag=CC --mode=compile $(CCF)
 
 ifeq ($(ENABLE_SHARED),yes)
-LTLDFLAGS += -rpath $(PKG_ROOT_LIB_DIR)
+LTLDFLAGS += -rpath $(PKG_LIB_DIR)
 LTLDFLAGS += -version-info $(LTVERSION)
 endif
 
 ifeq ($(ENABLE_SHARED),yes)
 INSTALL_LTLIB = \
        cd $(TOPDIR)/$(LIBNAME)/.libs; \
-       ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
-       ../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
-       ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_ROOT_LIB_DIR)
+       ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+       ../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \
+       ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR)
 endif
 
 # Libtool thinks the static and shared libs should be in the same dir, so
@@ -74,13 +74,13 @@ INSTALL_LTLIB_DEV = \
        ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
        ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
        ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
-       ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
-       ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
+       ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+       ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
        if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
-            "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \
-               ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
-               ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
-               ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
+            "x$(shell readlink -f $(PKG_LIB_DIR))" ]; then \
+               ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
+               ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
+               ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
        fi
 else
 INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)

diff --git a/mkfs/Makefile b/mkfs/Makefile
index a0c168e3815c0a591a6289eaca0911daff12d02f..a6173083e4c2d4557260826925bb7ad5e261ab81 100644 (file)
--- a/mkfs/Makefile
+++ b/mkfs/Makefile
@@ -28,8 +28,8 @@ default: depend $(LTCOMMAND) $(CFGFILES)
 include $(BUILDRULES)
 
 install: default
-       $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
-       $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
+       $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
+       $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
        $(INSTALL) -m 755 -d $(MKFS_CFG_DIR)
        $(INSTALL) -m 644 $(CFGFILES) $(MKFS_CFG_DIR)
 

diff --git a/repair/Makefile b/repair/Makefile
index 250c86cca2d3e2f628a74469405be2bb94117aa1..d948588781de1380f6bc70a19ca61ba730bd1fba 100644 (file)
--- a/repair/Makefile
+++ b/repair/Makefile
@@ -103,8 +103,8 @@ include $(BUILDRULES)
 #CFLAGS += ...
 
 install: default
-       $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
-       $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
+       $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
+       $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
 install-dev:
 
 -include .dep