X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=debian%2Frules;h=df9ca5036fa88c9c2824545f97eac44bf87953a4;hb=5e05541ad0df4506eec324d98262c25d2e4e0d8d;hp=157421c3ff94923b53d8cc677db5dc14de7fdd3c;hpb=b9f409255eec6ccaa7d297bcbf5e2a6478a02735;p=tools%2Fe2fsprogs.git diff --git a/debian/rules b/debian/rules index 157421c..df9ca50 100644 --- a/debian/rules +++ b/debian/rules @@ -10,8 +10,6 @@ # be paranoid export LC_ALL=C -export DH_COMPAT=3 - DEB_BUILD_ARCH := $(shell dpkg --print-architecture) DEB_BUILD_GNU_TYPE := $(shell ./config.guess) ifndef DEB_HOST_ARCH @@ -21,7 +19,7 @@ DEB_HOST_GNU_CPU := $(patsubst hurd-%,%,$(DEB_HOST_ARCH)) ifeq ($(filter-out hurd-%,${DEB_HOST_ARCH}),) DEB_HOST_GNU_SYSTEM := gnu else -# FIXME: we won't always have only Hurd and Linux +# FIXME: we won't have always just Hurd and Linux DEB_HOST_GNU_SYSTEM := linux endif DEB_HOST_GNU_TYPE := ${DEB_HOST_GNU_CPU}-${DEB_HOST_GNU_SYSTEM} @@ -29,13 +27,18 @@ DEB_HOST_GNU_TYPE := ${DEB_HOST_GNU_CPU}-${DEB_HOST_GNU_SYSTEM} # find the version for the main package, from changelog file MAIN_VERSION = $(shell head -1 debian/changelog | cut '-d ' -f 2 | sed 's/[()]//g') -# find versions for libraries going into their own packages, from their Makefile.in's +# find versions for libraries going into their own packages, from their Makefile.in's, +# and sonames for all libs COMERR_VERSION = $(shell grep ELF_VERSION lib/et/Makefile.in | cut '-d ' -f3) -COMERR_MAJOR = $(word 1,$(subst ., ,${COMERR_VERSION})) +COMERR_SOVERSION = $(shell grep ELF_SO_VERSION lib/et/Makefile.in | cut '-d ' -f3) SS_VERSION = $(shell grep ELF_VERSION lib/ss/Makefile.in | cut '-d ' -f3) -SS_MAJOR = $(word 1,$(subst ., ,${SS_VERSION})) +SS_SOVERSION = $(shell grep ELF_SO_VERSION lib/ss/Makefile.in | cut '-d ' -f3) UUID_VERSION = $(shell grep ELF_VERSION lib/uuid/Makefile.in | cut '-d ' -f3) -# UUID_MAJOR = $(word 1,$(subst ., ,${UUID_VERSION})) +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) +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) package=e2fsprogs @@ -43,13 +46,22 @@ topdir=$(shell pwd) debdir=${topdir}/debian tmpdir=${debdir}/tmp bfdir=${debdir}/e2fsprogs-bf +udebdir=${debdir}/e2fsprogs-udeb +blkidudebdir=${debdir}/libblkid1-udeb maindir=${debdir}/e2fsprogs stdbuilddir=${debdir}/BUILD-STD bfbuilddir=${debdir}/BUILD-BF +mipsbuilddir=${debdir}/BUILD-MIPS # docdir=${maindir}/usr/share/doc/${package} MANDIR=/usr/share/man mandir=${tmpdir}${MANDIR} +UDEB_NAME = $(package)-udeb_$(MAIN_VERSION)_$(DEB_HOST_ARCH).udeb +UDEB_PRIORITY = $(shell grep '^Package: e2fsprogs-udeb' debian/control -A 10 | grep ^Priority: | cut -d ' ' -f 2) + +BLKID_UDEB_NAME = libblkid1-udeb_$(MAIN_VERSION)_$(DEB_HOST_ARCH).udeb +BLKID_UDEB_PRIORITY = $(shell grep '^Package: libblkid1-udeb' debian/control -A 10 | grep ^Priority: | cut -d ' ' -f 2) + SUBPACKAGES_DIRS = tmp e2fslibs-dev comerr-dev ss-dev STAMPSDIR=debian/stampdir @@ -78,13 +90,12 @@ else CCOPTS += -D__NO_STRING_INLINES endif -# Try -Os BF_CCOPTS = -Os -fomit-frame-pointer COMMON_CONF_FLAGS = \ --enable-elf-shlibs --enable-dynamic-e2fsck \ --enable-nls \ - --mandir=${MANDIR} --infodir=/usr/share/info + --infodir=/usr/share/info STD_CONF_FLAGS = --with-ccopts="${CCOPTS}" --enable-compression @@ -92,18 +103,39 @@ BF_CONF_FLAGS = --with-ccopts="${CCOPTS} ${BF_CCOPTS}" \ --disable-swapfs --disable-imager \ --disable-resizer --disable-debugfs +MIPS_NOPIC_CONF_FLAGS = --with-ccopts="${CCOPTS}" \ + --disable-nls \ + --disable-swapfs --disable-imager \ + --disable-resizer # --disable-debugfs +# we can't use those flags at configure time +MIPS_CFLAGS= -G 0 -fno-pic -mno-abicalls + +ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) +ifneq (,$(findstring $(DEB_BUILD_ARCH),mips mipsel)) +ismips=ismips +endif +endif + ${CFGSTDSTAMP}: dh_testdir mkdir -p ${stdbuilddir} ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) - cd ${stdbuilddir} && CFLAGS="${CFLAGS}" \ + cd ${stdbuilddir} && \ ${topdir}/configure ${COMMON_CONF_FLAGS} ${STD_CONF_FLAGS} else - cd ${stdbuilddir} && CFLAGS="${CFLAGS}" CC="${DEB_HOST_GNU_TYPE}-gcc" \ + cd ${stdbuilddir} && CC="${DEB_HOST_GNU_TYPE}-gcc" \ ${topdir}/configure ${COMMON_CONF_FLAGS} ${STD_CONF_FLAGS} \ --build=$(DEB_BUILD_GNU_TYPE) $(DEB_HOST_GNU_TYPE) endif + + # specially-built MIPS lib + if [ ismips = "${ismips}" ]; then \ + mkdir -p ${mipsbuilddir} ; \ + cd ${mipsbuilddir} && \ + ${topdir}/configure ${MIPS_NOPIC_CONF_FLAGS} ; \ + fi + mkdir -p ${STAMPSDIR} touch ${CFGSTDSTAMP} @@ -113,10 +145,10 @@ ${CFGBFSTAMP}: mkdir -p ${bfbuilddir} ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) - cd ${bfbuilddir} && CFLAGS="${CFLAGS}" \ + cd ${bfbuilddir} && \ ${topdir}/configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS} else - cd ${bfbuilddir} && CFLAGS="${CFLAGS}" CC="${DEB_HOST_GNU_TYPE}-gcc" \ + cd ${bfbuilddir} && CC="${DEB_HOST_GNU_TYPE}-gcc" \ ${topdir}/configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS} \ --build=$(DEB_BUILD_GNU_TYPE) $(DEB_HOST_GNU_TYPE) endif @@ -129,10 +161,20 @@ build-std: ${BUILDSTDSTAMP} ${BUILDSTDSTAMP}: ${CFGSTDSTAMP} dh_testdir make -C ${stdbuilddir} all + ( cd ${stdbuilddir}/doc && \ texi2html -split_chapter ${topdir}/doc/libext2fs.texinfo ) ( cd ${stdbuilddir}/lib/et && make com_err.info && \ texi2html -split_chapter -expandinfo ${topdir}/lib/et/com_err.texinfo ) + + # specially-built MIPS lib + if [ ismips = "${ismips}" ]; then \ + make -C ${mipsbuilddir}/util ; \ + make -C ${mipsbuilddir} libs \ + CFLAGS="${CCOPTS} ${MIPS_CFLAGS}" \ + LIB_SUBDIRS="lib/et lib/ext2fs" ; \ + fi + touch ${BUILDSTDSTAMP} build-bf: ${BUILDBFSTAMP} @@ -146,7 +188,7 @@ clean: rm -rf ${STAMPSDIR} -make -C ${stdbuilddir} -i distclean -make -C ${bfbuilddir} -i distclean - rm -rf ${stdbuilddir} ${bfbuilddir} + rm -rf ${stdbuilddir} ${bfbuilddir} ${mipsbuilddir} rm -f doc/libext2fs_*.html lib/et/com_err_*.html debian/*.substvars dh_clean @@ -172,13 +214,24 @@ install-std: build # static libs and .h files make -C ${stdbuilddir} install-libs DESTDIR=${tmpdir} LDCONFIG=true + # remove FSIM for now. + -rm ${tmpdir}/lib/evms/libe2fsim.*.so + # statically-linked fsck ${INSTALL_PROGRAM} ${stdbuilddir}/e2fsck/e2fsck.static ${tmpdir}/sbin ln -s e2fsck.8.gz ${mandir}/man8/e2fsck.static.8.gz + ln -s et/com_err.h ${tmpdir}/usr/include + dh_movefiles test -z `find ${tmpdir} -type f` + # specially-built MIPS lib + if [ ismips = "${ismips}" ]; then \ + cp ${mipsbuilddir}/lib/libext2fs.a \ + ${debdir}/e2fslibs-dev/usr/lib/libext2fs-nopic.a ; \ + fi + install-bf: DH_OPTIONS= install-bf: build dh_testdir @@ -192,25 +245,44 @@ install-bf: build cd ${bfdir}/sbin && rm -f e2label cd ${bfdir}/usr/bin && rm -f uuidgen + # remove FSIM for now. + rm ${bfdir}/lib/evms/libe2fsim.*.so + +install-udeb: install-bf + dh_testdir + dh_testroot + dh_installdirs + + cp -a ${bfdir}/lib ${udebdir}/ + mkdir -p ${udebdir}/sbin + cp -a ${bfdir}/sbin/mke2fs ${udebdir}/sbin/ + ln -s mke2fs ${udebdir}/sbin/mkfs.ext2 + ln -s mke2fs ${udebdir}/sbin/mkfs.ext3 + cp -a ${bfdir}/sbin/e2fsck ${udebdir}/sbin/ + ln -s e2fsck ${udebdir}/sbin/fsck.ext2 + ln -s e2fsck ${udebdir}/sbin/fsck.ext3 + mkdir -p ${blkidudebdir}/lib + mv ${udebdir}/lib/libblkid.* ${blkidudebdir}/lib binary-indep: # no arch-independant debs. binary-arch: DH_OPTIONS= -a -binary-arch: install +binary-arch: install install-udeb dh_testdir dh_testroot - # remove obsolete maint-scripts provided by 1.26 upstream - cd debian && rm -f comerr-dev.postinst e2fslibs-dev.postinst \ - e2fsprogs.postinst e2fsprogs.shlibs - # lintian overrides for i in $$(cd debian && echo *.lintian-overrides); do \ pkg=$${i%.lintian-overrides} ;\ install -m644 -D -p debian/$$i ${debdir}/$${pkg}/usr/share/lintian/overrides/$${pkg} ;\ done + # mkinitrd script + mkdir -p debian/e2fsprogs/etc/mkinitrd/scripts + install -m755 debian/e2fsprogs.mkinitrd \ + debian/e2fsprogs/etc/mkinitrd/scripts/e2fsprogs + # symlinks to prepare dh_installdocs run mkdir -p ${debdir}/e2fsck-static/usr/share/doc/ ln -sf e2fsprogs ${debdir}/e2fsck-static/usr/share/doc/e2fsck-static @@ -222,24 +294,33 @@ binary-arch: install ln -sf e2fsprogs ${debdir}/uuid-dev/usr/share/doc/uuid-dev # comerr and ss have their own copyright notices - mkdir -p ${maindir}/usr/share/doc/libcomerr${COMERR_MAJOR} - mkdir -p ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_MAJOR} - ln -sf libcomerr${COMERR_MAJOR} ${debdir}/comerr-dev/usr/share/doc/comerr-dev + mkdir -p ${maindir}/usr/share/doc/libcomerr${COMERR_SOVERSION} + mkdir -p ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION} + ln -sf libcomerr${COMERR_SOVERSION} ${debdir}/comerr-dev/usr/share/doc/comerr-dev + + mkdir -p ${maindir}/usr/share/doc/libss${SS_SOVERSION} + mkdir -p ${debdir}/ss-dev/usr/share/doc/libss${SS_SOVERSION} + ln -sf libss${SS_SOVERSION} ${debdir}/ss-dev/usr/share/doc/ss-dev - mkdir -p ${maindir}/usr/share/doc/libss${SS_MAJOR} - mkdir -p ${debdir}/ss-dev/usr/share/doc/libss${SS_MAJOR} - ln -sf libss${SS_MAJOR} ${debdir}/ss-dev/usr/share/doc/ss-dev + 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 - for i in libcomerr${COMERR_MAJOR} libss${SS_MAJOR}; do \ + for i in libcomerr${COMERR_SOVERSION} libss${SS_SOVERSION}; do \ install -m 644 debian/$$i.copyright \ ${maindir}/usr/share/doc/$$i/copyright ; \ done - dh_installdocs + install -m 644 debian/libblkid.copyright \ + ${debdir}/libblkid${BLKID_SOVERSION}/usr/share/doc/libblkid${BLKID_SOVERSION}/copyright + + dh_installdocs -Ne2fsprogs-udeb -Nlibblkid1-udeb install -m 644 debian/e2fsprogs.copyright \ ${bfdir}/usr/share/doc/e2fsprogs-bf/copyright + # libblkid is under the the LGPL + # HTML docs install -d ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs-dev/html-info/ install -p ${stdbuilddir}/doc/libext2fs_*.html \ @@ -252,7 +333,7 @@ binary-arch: install install -p ${topdir}/doc/libext2fs.texinfo \ ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs-dev/libext2fs.texi install -p ${topdir}/lib/et/com_err.texinfo \ - ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_MAJOR}/com_err.texi + ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}/com_err.texi dh_installexamples @@ -261,9 +342,9 @@ binary-arch: install dh_undocumented - DH_OPTIONS= dh_installchangelogs -pe2fsprogs -pe2fsprogs-bf ChangeLog + DH_OPTIONS= dh_installchangelogs -pe2fsprogs -pe2fsprogs-bf -plibblkid${BLKID_SOVERSION} ChangeLog - for i in libcomerr${COMERR_MAJOR} libss${SS_MAJOR} ; do \ + for i in libcomerr${COMERR_SOVERSION} libss${SS_SOVERSION} ; do \ mkdir -p ${maindir}/usr/share/doc/$$i ; \ ln -s ../e2fsprogs/changelog.Debian.gz ${maindir}/usr/share/doc/$$i/ ; \ ln -s ../e2fsprogs/changelog.gz ${maindir}/usr/share/doc/$$i/ ; \ @@ -277,26 +358,52 @@ binary-arch: install echo "libcdev:Depends=${LIBC-DEV}" > debian/comerr-dev.substvars echo "libcdev:Depends=${LIBC-DEV}" > debian/ss-dev.substvars echo "libcdev:Depends=${LIBC-DEV}" > debian/uuid-dev.substvars + echo "libcdev:Depends=${LIBC-DEV}" > debian/blkid-dev.substvars echo "libcdev:Depends=${LIBC-DEV}" > debian/e2fslibs-dev.substvars # Call this mostly to get the maintainer-script snippets dh_makeshlibs -pe2fsprogs # We overwrite the shlibs by hand because of virtual packages used - cp debian/e2fsprogs.shlibs.in debian/e2fsprogs/DEBIAN/shlibs + : > debian/e2fsprogs/DEBIAN/shlibs + echo "libext2fs ${EXT2FS_SOVERSION} libext2fs${EXT2FS_SOVERSION}" \ + >> debian/e2fsprogs/DEBIAN/shlibs + echo "libe2p ${E2P_SOVERSION} libe2p${E2P_SOVERSION}" \ + >> debian/e2fsprogs/DEBIAN/shlibs + echo "libuuid ${UUID_SOVERSION} libuuid${UUID_SOVERSION}" \ + >> debian/e2fsprogs/DEBIAN/shlibs + echo "libcom_err ${COMERR_SOVERSION} libcomerr${COMERR_SOVERSION}" \ + >> debian/e2fsprogs/DEBIAN/shlibs + echo "libss ${SS_SOVERSION} libss${SS_SOVERSION}" \ + >> debian/e2fsprogs/DEBIAN/shlibs + + dh_makeshlibs -plibblkid${BLKID_SOVERSION} dh_installdeb dh_shlibdeps -l${stdbuilddir}/lib - dh_gencontrol -Ncomerr-dev -Nss-dev -Nuuid-dev + dh_gencontrol -Ncomerr-dev -Nss-dev -Nuuid-dev -Ne2fsprogs-udeb -Nlibblkid1-udeb DH_OPTIONS= dh_gencontrol -pcomerr-dev \ -u '-v${COMERR_VERSION}-${MAIN_VERSION}' DH_OPTIONS= dh_gencontrol -pss-dev \ -u '-v${SS_VERSION}-${MAIN_VERSION}' DH_OPTIONS= dh_gencontrol -puuid-dev \ -u '-v${UUID_VERSION}-${MAIN_VERSION}' - - dh_md5sums - dh_builddeb + DH_OPTIONS= dh_gencontrol -plibblkid-dev \ + -u '-v${MAIN_VERSION}' + DH_OPTIONS= dh_gencontrol -plibblkid${BLKID_SOVERSION} \ + -u '-v${MAIN_VERSION}' + + dh_md5sums -Ne2fsprogs-udeb -Nlibblkid1-udeb + dh_builddeb -Ne2fsprogs-udeb -Nlibblkid1-udeb + + # udeb stuff + dh_gencontrol -pe2fsprogs-udeb -- -fdebian/files~ + dpkg-distaddfile $(UDEB_NAME) debian-installer $(UDEB_PRIORITY) + dh_builddeb -pe2fsprogs-udeb --filename=$(UDEB_NAME) + + dh_gencontrol -plibblkid1-udeb -- -fdebian/files~ + dpkg-distaddfile $(BLKID_UDEB_NAME) debian-installer $(BLKID_UDEB_PRIORITY) + dh_builddeb -plibblkid1-udeb --filename=$(BLKID_UDEB_NAME) binary: binary-indep binary-arch