Control: tags -1 + patch Hi Marco
On Sun, 01 Apr 2018 18:10:28 +0200 Michael Biebl <[email protected]> wrote: > Source: kmod > Version: 25-1 > Severity: wishlist > > Late mounting of /usr is no longer supported since stretch, so it is no > longer necessary to move libs to /lib. > In preparation for a future usrmerge, I would suggest that we already > start moving libs to /usr proper. > I would also not bother setting a different libdir for the udeb build > and instead use the same paths as for the real deb for consistencies > sake. > The attached patch should do the trick (it's build tested) Eventually, the binaries should be moved as well, but this this is a more invasive change, so I skipped that for now and only moved the libraries. Regards, Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
diff -Nru kmod-25/debian/changelog kmod-25/debian/changelog --- kmod-25/debian/changelog 2018-01-21 01:02:46.000000000 +0100 +++ kmod-25/debian/changelog 2018-11-11 00:18:59.000000000 +0100 @@ -1,3 +1,10 @@ +kmod (25-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Move libraries to /usr/lib. (Closes: #894566) + + -- Michael Biebl <[email protected]> Sun, 11 Nov 2018 00:18:59 +0100 + kmod (25-1) unstable; urgency=medium * New upstream release. diff -Nru kmod-25/debian/libkmod2.files kmod-25/debian/libkmod2.files --- kmod-25/debian/libkmod2.files 2018-01-18 17:51:07.000000000 +0100 +++ kmod-25/debian/libkmod2.files 2018-11-11 00:18:34.000000000 +0100 @@ -1 +1 @@ -/lib/*/libkmod.so.* +usr/lib/*/libkmod.so.* diff -Nru kmod-25/debian/rules kmod-25/debian/rules --- kmod-25/debian/rules 2018-01-21 01:02:44.000000000 +0100 +++ kmod-25/debian/rules 2018-11-11 00:18:59.000000000 +0100 @@ -10,19 +10,20 @@ DD := $(CURDIR)/debian/libkmod-dev DKU := $(CURDIR)/debian/libkmod2-udeb -CONFFLAGS = --sysconfdir=/etc --bindir=/bin +CONFFLAGS = \ + --sysconfdir=/etc \ + --bindir=/bin \ + --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ + --with-rootlibdir=/usr/lib/$(DEB_HOST_MULTIARCH) CONFFLAGS_deb = $(CONFFLAGS) \ $(shell DEB_BUILD_MAINT_OPTIONS="hardening=+bindnow" \ dpkg-buildflags --export=configure || true) \ --enable-gtk-doc \ --with-xz \ - --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ - --with-rootlibdir=/lib/$(DEB_HOST_MULTIARCH) \ --enable-debug CONFFLAGS_udeb = $(CONFFLAGS) \ $(subst -O2,-Os -fomit-frame-pointer,$(shell DEB_BUILD_MAINT_OPTIONS="hardening=-all" \ - dpkg-buildflags --export=configure || true)) \ - --libdir=/lib --with-rootlibdir=/lib + dpkg-buildflags --export=configure || true)) ############################################################################## SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog --show-field=Date | date --file=- +%s) @@ -105,7 +106,7 @@ ifdef BUILD_UDEB cd build-udeb/ && \ $(MAKE) install-exec DESTDIR=$(DKU) - rm -r $(DKU)/lib/ + rm -r $(DKU)/usr/ egrep -i '^[a-z]' extra/aliases.conf > $(DKU)/etc/modprobe.d/aliases.conf endif
signature.asc
Description: OpenPGP digital signature
