diff options
author | Theodore Ts'o <tytso@mit.edu> | 2017-08-22 10:37:10 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2017-08-22 10:37:10 -0400 |
commit | 3f557ac7c7708ea2a637dba1099dd011d026be5d (patch) | |
tree | afb4baaf680f55db76d9807e6ab536b11015e8ce /debian | |
parent | 9e54816b22afcfb5ac597506e8210b42eeac5553 (diff) |
debian: remove support libuuid/libblkid packages
Remove support for util-linux prior to 2.16, when e2fsprogs provided
its own copy of libuuid and libblkid. This is only needed for Debian
distributions prior to Wheezy, which is no longer supported.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'debian')
-rw-r--r-- | debian/control.in | 156 | ||||
-rw-r--r-- | debian/e2fsprogs.shlibs.local (renamed from debian/e2fsprogs.shlibs.local.in) | 4 | ||||
-rwxr-xr-x | debian/rules | 101 |
3 files changed, 5 insertions, 256 deletions
diff --git a/debian/control.in b/debian/control.in index 3609d702..f7ed6aa2 100644 --- a/debian/control.in +++ b/debian/control.in @@ -1,13 +1,11 @@ define(MULTIARCH_HEADERS,ifdef(`DO_MULTIARCH', Multi-Arch: same Pre-Depends: ${misc:Pre-Depends},REMOVE_ME))dnl -define(UTIL_LINUX_NG_DEFINES, -ifdef(`UTIL_LINUX_NG', ``libblkid-dev (>= 2.16), uuid-dev (>= 2.16),''))dnl Source: e2fsprogs Section: admin Priority: required Maintainer: Theodore Y. Ts'o <tytso@mit.edu> -Build-Depends: gettext, texinfo, pkg-config, libfuse-dev [linux-any kfreebsd-any], libattr1-dev, debhelper (>= 9.0), UTIL_LINUX_NG_DEFINES m4 +Build-Depends: gettext, texinfo, pkg-config, libfuse-dev [linux-any kfreebsd-any], libattr1-dev, debhelper (>= 9.0), libblkid-dev, uuid-dev, m4 Standards-Version: 4.0.0 Homepage: http://e2fsprogs.sourceforge.net @@ -104,116 +102,6 @@ Description: command-line interface parsing library - headers and static librari It was originally inspired by the Multics SubSystem library. . This package contains the development environment for the ss library. -ifdef(`UTIL_LINUX_NG',,`` -Package: libuuid1 -Section: libs -Depends: passwd, ${shlibs:Depends}, ${misc:Depends} -Recommends: uuid-runtime -Replaces: e2fsprogs (<< 1.34-1) -Architecture: any -MULTIARCH_HEADERS -Description: Universally Unique ID library - The libuuid library generates and parses 128-bit universally unique - ids (UUIDs). A UUID is an identifier that is unique across both - space and time, with respect to the space of all UUIDs. A UUID can - be used for multiple purposes, from tagging objects with an extremely - short lifetime, to reliably identifying very persistent objects - across a network. - . - See RFC 4122 for more information. - -Package: uuid-runtime -Section: libs -Priority: optional -Depends: passwd, libuuid1 (>> 1.40.3-1), ${shlibs:Depends}, ${misc:Depends} -Replaces: e2fsprogs (<= 1.40.3-1ubuntu1) -Architecture: any -Description: runtime components for the Universally Unique ID library - The libuuid library generates and parses 128-bit universally unique - ids (UUIDs). A UUID is an identifier that is unique across both - space and time, with respect to the space of all UUIDs. A UUID can - be used for multiple purposes, from tagging objects with an extremely - short lifetime, to reliably identifying very persistent objects - across a network. - . - See RFC 4122 for more information. - . - This package contains the uuidgen program and the uuidd daemon. - . - The uuidd daemon is used to generate UUIDs, especially time-based - UUID’s, in a secure and guaranteed-unique fashion, even in the face - of large numbers of threads trying to grab UUID’s running on - different CPU’s. It is used by libuuid as well as the uuidgen - program. - -ifdef(`UDEB_PKGS',`` -Package: libuuid1-udeb -Package-Type: udeb -Section: debian-installer -Priority: optional -Depends: ${shlibs:Depends} -Architecture: any -Description: stripped down universally unique id library, for debian-installer - libuuid generates and parses 128-bit universally unique ids (UUIDs). - See RFC 4122 for more information. - . - This is a minimal package for debian-installer. -'')dnl - -Package: uuid-dev -Section: libdevel -Priority: extra -Depends: libc6-dev | libc-dev, libuuid1 (= ${mainBinary}), ${misc:Depends} -Replaces: e2fslibs-dev (<< 1.15) -Architecture: any -Description: universally unique id library - headers and static libraries - libuuid generates and parses 128-bit universally unique ids (UUIDs). - See RFC 4122 for more information. - . - This package contains the development environment for the uuid library. - -Package: libblkid1 -Section: libs -Depends: ${shlibs:Depends}, ${misc:Depends} -Architecture: any -Description: block device id library - The blkid library which allows system programs like fsck and - mount to quickly and easily find block devices by filesystem UUID and - LABEL. This allows system administrators to avoid specifying - filesystems by hard-coded device names, but via a logical naming - system instead. - -ifdef(`UDEB_PKGS',`` -Package: libblkid1-udeb -Package-Type: udeb -Section: debian-installer -Priority: optional -Depends: ${shlibs:Depends}, ${misc:Depends} -Architecture: any -Description: stripped down block device id library, for debian-installer - The blkid library which allows system programs like fsck and - mount to quickly and easily find block devices by filesystem UUID and - LABEL. This allows system administrators to avoid specifiying - filesystems by hard-coded device names, but via a logical naming - system instead. - . - This is a minimal package for debian-installer. -'')dnl - -Package: libblkid-dev -Section: libdevel -Priority: extra -Depends: libc6-dev | libc-dev, libblkid1 (= ${binary:Version}), ${misc:Depends} -Architecture: any -Description: block device id library - headers and static libraries - The blkid library which allows system programs like fsck and - mount to quickly and easily find block devices by filesystem UUID and - LABEL. This allows system administrators to avoid specifiying - filesystems by hard-coded device names, but via a logical naming - system instead. - . - This package contains the development environment for the blkid library. -'')dnl ifdef(`UDEB_PKGS',`` Package: e2fsprogs-udeb @@ -265,11 +153,7 @@ Description: ext2/ext3/ext4 file system libraries - headers and static libraries Package: e2fsprogs Essential: yes -ifdef(`UTIL_LINUX_NG', -``Pre-Depends: ${shlibs:Depends}, ${misc:Depends}, util-linux (>= 2.15~rc1-1) -'', -``Pre-Depends: ${shlibs:Depends}, ${misc:Depends} -'')dnl +Pre-Depends: ${shlibs:Depends}, ${misc:Depends}, libblkid1, libuuid1 Multi-Arch: foreign Suggests: gpart, parted, fuse2fs, e2fsck-static, e2fsprogs-l10n Architecture: any @@ -292,20 +176,7 @@ Description: debugging information for e2fsprogs and its libraries, contained in the e2fsprogs and e2fsck-static packages. The debug information is used for execution tracing and core dump analysis. -'') -ifdef(`USE_DBGSYM',,ifdef(`UTIL_LINUX_NG',,`` -Package: uuid-runtime-dbg -Section: debug -Priority: extra -Depends: uuid-runtime (= ${binary:Version}), ${misc:Depends} -Architecture: any -Description: debugging information for uuid-runtime - This package includes the debug information useful for debugging the - uuid runtime programs, contained in the uuid-runtime package. - The debugging information is used for execution tracing and core - dump analysis. -''))dnl -ifdef(`USE_DBGSYM',,`` + Package: e2fslibs-dbg Section: debug Priority: extra @@ -336,24 +207,3 @@ Description: debugging information for libss2 ss library, contained in the libss2 package. The debug information is used for execution tracing and core dump analysis. '')dnl -ifdef(`USE_DBGSYM',,ifdef(`UTIL_LINUX_NG',,`` -Package: libblkid1-dbg -Section: debug -Priority: extra -Depends: libblkid1 (= ${binary:Version}), ${misc:Depends} -Architecture: any -Description: debugging information for libblkid1 - This package includes the debug information useful for debugging the - blkid library, contained in the libblkid1 package. The debug - information is used for execution tracing and core dump analysis. - -Package: libuuid1-dbg -Section: debug -Priority: extra -Depends: libuuid1 (= ${binary:Version}), ${misc:Depends} -Architecture: any -Description: debugging information for libuuid1 - This package includes the debug information useful for debugging the - UUID library, contained in the libuuid1 package. The debug - information is used for execution tracing and core dump analysis. -''))dnl diff --git a/debian/e2fsprogs.shlibs.local.in b/debian/e2fsprogs.shlibs.local index 1f7db5d8..5390fd8c 100644 --- a/debian/e2fsprogs.shlibs.local.in +++ b/debian/e2fsprogs.shlibs.local @@ -1,8 +1,4 @@ libcom_err 2 libcomerr2 (>= 1.42~WIP-2011-10-05-1) libss 2 libss2 (>= 1.34-1) -ifdef(`UTIL_LINUX_NG',, -``libuuid 1 libuuid1 (>= 1.34-1) -libblkid 1 libblkid1 (>= 1.34-1) -'')dnl libext2fs 2 e2fslibs (= ${binary:Version}) libe2p 2 e2fslibs (= ${binary:Version}) diff --git a/debian/rules b/debian/rules index dc4d2380..7354a508 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,6 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null # Allow distro-specific behaviour DISTRO :=$(shell sed -ne '/DISTRIB_ID/s/.*=//p' /etc/lsb-release 2>/dev/null || echo Debian) -UTIL_LINUX_NG ?= yes ifeq ($(DEB_BUILD_GNU_SYSTEM), gnu) SKIP_FUSE2FS=yes @@ -52,14 +51,6 @@ COMERR_SOVERSION ?= $(shell grep ELF_SO_VERSION lib/et/Makefile.in | cut '-d ' - SS_VERSION ?= $(shell grep ELF_VERSION lib/ss/Makefile.in | cut '-d ' -f3) SS_SOVERSION ?= $(shell grep ELF_SO_VERSION lib/ss/Makefile.in | cut '-d ' -f3) -ifneq ($(UTIL_LINUX_NG),yes) -UUID_VERSION ?= $(shell grep ELF_VERSION lib/uuid/Makefile.in | cut '-d ' -f3) -UUID_SOVERSION ?= $(shell grep ELF_SO_VERSION lib/uuid/Makefile.in | cut '-d ' -f3) - -BLKID_VERSION ?= $(shell grep ELF_VERSION lib/blkid/Makefile.in | cut '-d ' -f3) -BLKID_SOVERSION ?= $(shell grep ELF_SO_VERSION lib/blkid/Makefile.in | cut '-d ' -f3) -endif - EXT2FS_SOVERSION ?= $(shell grep ELF_SO_VERSION lib/ext2fs/Makefile.in | cut '-d ' -f3) E2P_SOVERSION ?= $(shell grep ELF_SO_VERSION lib/e2p/Makefile.in | cut '-d ' -f3) @@ -69,26 +60,12 @@ topdir ?= $(shell pwd) debdir ?= ${topdir}/debian tmpdir ?= ${debdir}/tmp udebdir ?= ${debdir}/e2fsprogs-udeb -ifneq ($(UTIL_LINUX_NG),yes) -blkidudebdir ?= ${debdir}/libblkid1-udeb -uuidudebdir ?= ${debdir}/libuuid1-udeb -endif libcomerrdir ?= ${debdir}/libcomerr${COMERR_SOVERSION} comerrdevdir ?= ${debdir}/comerr-dev libcomerrdbgdir ?= ${debdir}/libcomerr2-dbg libssdir ?= ${debdir}/libss${SS_SOVERSION} ssdevdir ?= ${debdir}/ss-dev libssdbgdir ?= ${debdir}/libss2-dbg -ifneq ($(UTIL_LINUX_NG),yes) -libblkiddir ?= ${debdir}/libblkid${BLKID_SOVERSION} -libblkiddevdir ?= ${debdir}/libblkid-dev -libblkiddbgdir ?= ${debdir}/libblkid1-dbg -libuuiddir ?= ${debdir}/libuuid${UUID_SOVERSION} -uuiddevdir ?= ${debdir}/uuid-dev -libuuiddbgdir ?= ${debdir}/libuuid1-dbg -uuidruntimedir ?= ${debdir}/uuid-runtime -uuidruntimedbgdir ?= ${debdir}/uuid-runtime-dbg -endif libext2dir ?= ${debdir}/e2fslibs libext2devdir ?= ${debdir}/e2fslibs-dev libext2dbgdir ?= ${debdir}/e2fslibs-dbg @@ -103,14 +80,6 @@ mandir ?= ${tmpdir}${MANDIR} UDEB_NAME ?= $(package)-udeb_$(MAIN_VERSION)_$(DEB_HOST_ARCH).udeb UDEB_PRIORITY ?= $(shell grep '^Package: e2fsprogs-udeb' debian/control.in -A 10 | grep ^Priority: | cut -d ' ' -f 2) -ifneq ($(UTIL_LINUX_NG),yes) -BLKID_UDEB_NAME ?= libblkid1-udeb_$(MAIN_VERSION)_$(DEB_HOST_ARCH).udeb -BLKID_UDEB_PRIORITY ?= $(shell grep '^Package: libblkid1-udeb' debian/control.in -A 10 | grep ^Priority: | cut -d ' ' -f 2) - -UUID_UDEB_NAME ?= libuuid1-udeb_$(MAIN_VERSION)_$(DEB_HOST_ARCH).udeb -UUID_UDEB_PRIORITY ?= $(shell grep '^Package: libuuid1-udeb' debian/control.in -A 10 | grep ^Priority: | cut -d ' ' -f 2) -endif - STAMPSDIR ?= debian/stampdir CFGSTDSTAMP ?= ${STAMPSDIR}/configure-std-stamp CFGBFSTAMP ?= ${STAMPSDIR}/configure-bf-stamp @@ -126,9 +95,6 @@ INSTALL_PROGRAM ?= $(INSTALL) -p -o root -g root -m 0755 ifneq (,$(findstring update-symbols,$(DEB_BUILD_OPTIONS))) SYMBOL_LIBS := e2fslibs libcomerr2 libss2 -ifneq ($(UTIL_LINUX_NG),yes) -SYMBOL_LIBS += libblkid1 libuuid1 -endif endif DEFAULT_CFLAGS ?= -g -O2 @@ -171,13 +137,8 @@ endif BF_CFLAGS = -Os -fomit-frame-pointer -ifeq ($(UTIL_LINUX_NG),yes) UTIL_CONF_FLAGS ?= --disable-fsck --disable-libblkid \ --disable-libuuid --disable-uuidd -else -UTIL_CONF_FLAGS ?= --enable-fsck --enable-libblkid \ - --enable-libuuid --enable-uuidd -endif ifneq ($(SKIP_FUSE2FS),) UTIL_CONF_FLAGS += --disable-fuse2fs @@ -215,13 +176,6 @@ DBG_PACKAGES += -pe2fsprogs-dbg -pe2fslibs-dbg -plibcomerr2-dbg -plibss2-dbg M4_ARGS+=-UUSE_DBGSYM endif -ifeq ($(UTIL_LINUX_NG),yes) -M4_ARGS+=-DUTIL_LINUX_NG -else -DBG_PACKAGES += -puuid-runtime-dbg -plibuuid1-dbg -plibblkid1-dbg -M4_ARGS+=-UUTIL_LINUX_NG -endif - ifneq ($(strip $(DEB_HOST_MULTIARCH)),) M4_ARGS+=-DDO_MULTIARCH else @@ -251,7 +205,7 @@ FILES_FIXUP= libcomerr2.files comerr-dev.files libss2.files ss-dev.files \ libuuid1.files uuid-dev.files libblkid1.files libblkid-dev.files \ e2fslibs.files e2fslibs-dev.files -debian-files: debian/control debian/e2fsprogs.shlibs.local +debian-files: debian/control ifeq ($(strip $(DEB_HOST_MULTIARCH)),) for i in $(FILES_FIXUP); do \ sed -e 's;lib/\*/;lib/;' debian/$$i.in > debian/$$i; \ @@ -261,14 +215,11 @@ else endif mrproper: clean - rm debian/control debian/e2fsprogs.shlibs.local + rm debian/control debian/control: debian/control.in debian/rules m4 $(M4_ARGS) < debian/control.in | grep -v ^REMOVE_ME$$ > $@ -debian/e2fsprogs.shlibs.local: debian/e2fsprogs.shlibs.local.in - m4 $(M4_ARGS) < debian/e2fsprogs.shlibs.local.in > $@ - ${CFGSTDSTAMP}: dh_testdir if which dh_update_autotools_config > /dev/null 2>&1 ; then \ @@ -439,14 +390,6 @@ install-udeb: build ln -sf mke2fs mkfs.ext2 ; ln -sf mke2fs mkfs.ext3 ; \ ln -sf mke2fs mkfs.ext4) -ifneq ($(UTIL_LINUX_NG),yes) - mkdir -p ${blkidudebdir}/lib - mv ${udebdir}/lib/libblkid.* ${blkidudebdir}/lib - - mkdir -p ${uuidudebdir}/lib - mv ${udebdir}/lib/libuuid.* ${uuidudebdir}/lib -endif - binary-indep: # no arch-independant debs. @@ -459,12 +402,6 @@ binary-arch: install $(INSTALL_UDEB) # symlinks to prepare dh_installdocs run -ifneq ($(UTIL_LINUX_NG),yes) - mkdir -p ${debdir}/libblkid${BLKID_SOVERSION}/usr/share/doc/libblkid${BLKID_SOVERSION} - mkdir -p ${debdir}/libblkid-dev/usr/share/doc - ln -sf libblkid${BLKID_SOVERSION} ${debdir}/libblkid-dev/usr/share/doc/libblkid-dev -endif - mkdir -p ${debdir}/libss${SS_SOVERSION}/usr/share/doc/libss${SS_SOVERSION} mkdir -p ${debdir}/ss-dev/usr/share/doc ln -sf libss${SS_SOVERSION} ${debdir}/ss-dev/usr/share/doc/ss-dev @@ -473,21 +410,10 @@ endif mkdir -p ${debdir}/comerr-dev/usr/share/doc ln -sf libcomerr${COMERR_SOVERSION} ${debdir}/comerr-dev/usr/share/doc/comerr-dev -ifneq ($(UTIL_LINUX_NG),yes) - mkdir -p ${debdir}/libuuid${UUID_SOVERSION}/usr/share/doc/libuuid${UUID_SOVERSION} - mkdir -p ${debdir}/uuid-dev/usr/share/doc -# ln -sf libuuid${UUID_SOVERSION} ${debdir}/uuid-dev/usr/share/doc/uuid-dev -endif - mkdir -p ${debdir}/e2fslibs/usr/share/doc/e2fslibs mkdir -p ${debdir}/e2fslibs-dev/usr/share/doc ln -sf e2fslibs ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs-dev -ifneq ($(UTIL_LINUX_NG),yes) - $(INSTALL) -p -m 0644 debian/libblkid.copyright \ - ${debdir}/libblkid${BLKID_SOVERSION}/usr/share/doc/libblkid${BLKID_SOVERSION}/copyright -endif - dh_installdocs -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb # HTML docs @@ -525,10 +451,6 @@ endif dh_strip $(call dh_strip_args,e2fslibs) dh_strip $(call dh_strip_args,libss${SS_SOVERSION}) dh_strip $(call dh_strip_args,libcomerr${COMERR_SOVERSION}) -ifneq ($(UTIL_LINUX_NG),yes) - dh_strip $(call dh_strip_args,libblkid${BLKID_SOVERSION}) - dh_strip $(call dh_strip_args,libuuid${UUID_SOVERSION}) -endif dh_strip # dpkg symbol handling @@ -544,13 +466,6 @@ endif dh_compress dh_makeshlibs --add-udeb=e2fsprogs-udeb -ifeq ($(SKIP_UDEB),) -ifneq ($(UTIL_LINUX_NG),yes) - echo "udeb: libblkid 1 libblkid1-udeb" >> \ - debian/libblkid1/DEBIAN/shlibs - echo "udeb: libuuid 1 libuuid1-udeb" >> debian/libuuid1/DEBIAN/shlibs -endif -endif dh_installdeb dh_shlibdeps -l${stdbuilddir}/lib @@ -571,24 +486,12 @@ endif -u '-v${COMERR_VERSION}-${MAIN_VERSION} -VmainBinary=${MAIN_VERSION}' DH_OPTIONS= dh_gencontrol -pss-dev \ -u '-v${SS_VERSION}-${MAIN_VERSION} -VmainBinary=${MAIN_VERSION}' -ifneq ($(UTIL_LINUX_NG),yes) - DH_OPTIONS= dh_gencontrol -puuid-dev \ - -u '-v${UUID_VERSION}-${MAIN_VERSION} -VmainBinary=${MAIN_VERSION}' -endif ifeq ($(SKIP_UDEB),) dh_gencontrol -pe2fsprogs-udeb -- -fdebian/files~ -ifneq ($(UTIL_LINUX_NG),yes) - dh_gencontrol -plibblkid1-udeb -- -fdebian/files~ - dh_gencontrol -plibuuid1-udeb -- -fdebian/files~ -endif endif ifeq ($(SKIP_UDEB),) dpkg-distaddfile $(UDEB_NAME) debian-installer $(UDEB_PRIORITY) -ifneq ($(UTIL_LINUX_NG),yes) - dpkg-distaddfile $(BLKID_UDEB_NAME) debian-installer $(BLKID_UDEB_PRIORITY) - dpkg-distaddfile $(UUID_UDEB_NAME) debian-installer $(UUID_UDEB_PRIORITY) -endif endif dh_md5sums dh_builddeb |