[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Growing the size of e2fsprogs-udeb by ~150k



On Mon, Jul 15, 2019 at 02:41:55PM +0200, Cyril Brulebois wrote:
> Just had a look at your package (sitting in NEW so using a local build
> in an unclean development chroot). Why use .shlibs.local overrides? At
> least the udeb part seems counter-productive, as that's stripping away
> the versions, which can be important at times.
> 
> Results before/after git rm debian/e2fsprogs-udeb.shlibs.local:
> 
>     Control files of package e2fsprogs-udeb: lines which differ (wdiff format)
>     --------------------------------------------------------------------------
>     Depends: [-libblkid1-udeb,-] {+libblkid1-udeb (>= 2.31),+} libc6-udeb (>= 2.28), libuuid1-udeb {+(>= 2.31)+}
>

For e2fsprogs.shlibs.local, it's because I want to force an exact
correspondance between the version of libextfs2 and e2fsprogs, since
some of the programs, e2fsck in particular can be very sensitive to
behavioral changes, and for safety's sake I wanted to restrict it to
what I am reguarly regression testing.

For e2fsprogs-udeb.shlibs.local, it was introduced in commit
7a15db238194 ("Applied NMU patch to fix Debian bugs #203056 and
#203058") to fix a d-i issue sixteen years ago.  I'm not sure what the
true root cause which caused it to be necessary, but certainly appears
not to be necessary any more.  :-)

					- Ted

commit 7a15db238194e943150ec32c4cef8e48435f0637
Author: Theodore Ts'o <tytso@mit.edu>
Date:   Tue Jul 29 22:15:33 2003 -0400

    Applied NMU patch to fix Debian bugs #203056 and #203058

diff --git a/debian/changelog b/debian/changelog
index 6d5ecbbf..048bcd74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+e2fsprogs (1.34-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * don't call ldconfig in udebs.
+  * fix dependencies of e2fsprogs-udeb.
+
+ -- Bastian Blank <waldi@debian.org>  Tue, 29 Jul 2003 12:11:54 +0200
+
 e2fsprogs (1.34-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/e2fsprogs-udeb.shlibs.local b/debian/e2fsprogs-udeb.shlibs.local
new file mode 100644
index 00000000..2c6e6fa8
--- /dev/null
+++ b/debian/e2fsprogs-udeb.shlibs.local
@@ -0,0 +1,6 @@
+libblkid 1 libblkid1-udeb
+# force the dependency to libblkid1-udeb, even if it don't include the lib
+libcom_err 2 libblkid1-udeb
+libuuid 1 libblkid1-udeb
+libext2fs 2 libblkid1-udeb
+libe2p 2 libblkid1-udeb
diff --git a/debian/rules b/debian/rules
index 45c6167d..b3081528 100644
--- a/debian/rules
+++ b/debian/rules
@@ -329,7 +329,7 @@ binary-arch: install install-udeb
 	dh_compress
 	dh_fixperms
 
-	dh_makeshlibs
+	dh_makeshlibs -Ne2fsprogs-udeb -Nlibblkid1-udeb
 	dh_makeshlibs -plibcomerr${COMERR_SOVERSION} \
 		-V 'libcomerr2 (>= 1.33-3)'
 
@@ -337,6 +337,8 @@ binary-arch: install install-udeb
 	dh_shlibdeps -l${stdbuilddir}/lib
 	dh_shlibdeps -pe2fsprogs -l${stdbuilddir}/lib \
 		-u"-Ldebian/e2fsprogs.shlibs.local"
+	dh_shlibdeps -pe2fsprogs-udeb -l${stdbuilddir}/lib \
+		-u"-Ldebian/e2fsprogs-udeb.shlibs.local"
 
 	dh_gencontrol -Ncomerr-dev -Nss-dev -Nuuid-dev \
 		-Ne2fsprogs-udeb -Nlibblkid1-udeb


Reply to: