Whamcloud - gitweb
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'maint' into next
[tools/e2fsprogs.git] / debian / rules
diff --git a/debian/rules b/debian/rules
old mode 100644 (file)
new mode 100755 (executable)
index db262bc..d3e2494
--- a/debian/rules
+++ b/debian/rules
@@ -44,6 +44,7 @@ maindir=${debdir}/e2fsprogs
 stdbuilddir=${debdir}/BUILD-STD
 bfbuilddir=${debdir}/BUILD-BF
 mipsbuilddir=${debdir}/BUILD-MIPS
+mipsbuilddir64=${debdir}/BUILD-MIPS-64
 # docdir=${maindir}/usr/share/doc/${package}
 MANDIR=/usr/share/man
 mandir=${tmpdir}${MANDIR}
@@ -63,10 +64,10 @@ CFGBFSTAMP=${STAMPSDIR}/configure-bf-stamp
 BUILDSTDSTAMP=${STAMPSDIR}/build-std-stamp
 BUILDBFSTAMP=${STAMPSDIR}/build-bf-stamp
 
-CCOPTS = -g -fsigned-char
+CCOPTS = -g
 
 INSTALL = install
-INSTALL_PROGRAM = $(INSTALL) -p -o root -g root  -m  755
+INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 0755
 
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 CCOPTS += -O2
@@ -84,21 +85,22 @@ endif
 BF_CCOPTS = -Os -fomit-frame-pointer
 
 COMMON_CONF_FLAGS =  \
-                --enable-elf-shlibs --enable-dynamic-e2fsck --disable-evms \
-                --infodir=/usr/share/info
+                --enable-elf-shlibs --enable-dynamic-e2fsck \
+                --infodir=/usr/share/info --enable-fsck
 
-STD_CONF_FLAGS = --with-ccopts="${CCOPTS}" --enable-compression 
+STD_CONF_FLAGS = --with-ccopts="${CCOPTS}" --enable-compression \
+               --enable-blkid-devmapper
 
 BF_CONF_FLAGS = --with-ccopts="${CCOPTS} ${BF_CCOPTS}" \
-       --disable-nls --disable-swapfs --disable-imager \
-       --disable-resizer --disable-debugfs  --disable-e2initrd-helper
+       --disable-nls --disable-imager \
+       --disable-debugfs  --disable-e2initrd-helper
 
 MIPS_NOPIC_CONF_FLAGS = --with-ccopts="${CCOPTS}" \
-       --disable-nls \
-       --disable-swapfs --disable-imager \
-        --disable-resizer # --disable-debugfs
+       --disable-nls --disable-imager --disable-resizer # --disable-debugfs
+
 # we can't use those flags at configure time
 MIPS_CFLAGS= -G 0 -fno-pic -mno-abicalls
+MIPS_CFLAGS_64= -mabi=64 -G 0 -fno-pic -mno-abicalls
 
 ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
 ifneq (,$(findstring $(DEB_BUILD_ARCH),mips mipsel))
@@ -109,22 +111,27 @@ endif
 ${CFGSTDSTAMP}:
        dh_testdir
 
+       # Make sure we don't try to rebuild the configure scripts
+       find . -name configure | xargs touch
+
        mkdir -p ${stdbuilddir}
 ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-       cd ${stdbuilddir} && \
+       cd ${stdbuilddir} && AWK=/usr/bin/awk \
                ${topdir}/configure ${COMMON_CONF_FLAGS} ${STD_CONF_FLAGS}
 else
-       cd ${stdbuilddir} && CC="${DEB_HOST_GNU_TYPE}-gcc" \
+       cd ${stdbuilddir} && AWK=/usr/bin/awk 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
+  # specially-built MIPS libs
+ifneq ($(ismips),)
+       mkdir -p ${mipsbuilddir} ${mipsbuilddir64}
+       cd ${mipsbuilddir} && AWK=/usr/bin/awk \
+               ${topdir}/configure ${MIPS_NOPIC_CONF_FLAGS}
+       cd ${mipsbuilddir64} && AWK=/usr/bin/awk \
+               ${topdir}/configure ${MIPS_NOPIC_CONF_FLAGS}
+endif
 
        mkdir -p ${STAMPSDIR}
        touch ${CFGSTDSTAMP}
@@ -135,10 +142,10 @@ ${CFGBFSTAMP}:
 
        mkdir -p ${bfbuilddir}
 ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-       cd ${bfbuilddir} && \
+       cd ${bfbuilddir} && AWK=/usr/bin/awk \
                ${topdir}/configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS}
 else
-       cd ${bfbuilddir} && CC="${DEB_HOST_GNU_TYPE}-gcc" \
+       cd ${bfbuilddir} && AWK=/usr/bin/awk CC="${DEB_HOST_GNU_TYPE}-gcc" \
                ${topdir}/configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS} \
                --build=$(DEB_BUILD_GNU_TYPE) $(DEB_HOST_GNU_TYPE)
 endif
@@ -157,13 +164,17 @@ ${BUILDSTDSTAMP}: ${CFGSTDSTAMP}
        ( 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
+  # specially-built MIPS libs
+ifneq ($(ismips),)
+       make -C ${mipsbuilddir}/util
+       make -C ${mipsbuilddir} \
+               CFLAGS="${CCOPTS} ${MIPS_CFLAGS}" \
+               LIB_SUBDIRS="lib/et lib/ext2fs" libs
+       make -C ${mipsbuilddir64}/util
+       make -C ${mipsbuilddir64} \
+               CFLAGS="${CCOPTS} ${MIPS_CFLAGS_64}" \
+               LIB_SUBDIRS="lib/et lib/ext2fs" libs
+endif
 
        touch ${BUILDSTDSTAMP}
 
@@ -178,10 +189,10 @@ ${BUILDBFSTAMP}: ${CFGBFSTAMP}
 clean:
        dh_testdir
        rm -rf ${STAMPSDIR}
-       -make -C ${stdbuilddir} -i distclean
-       -make -C ${bfbuilddir} -i distclean
-       rm -rf ${stdbuilddir} ${bfbuilddir} ${mipsbuilddir}
-       rm -f doc/libext2fs_*.html lib/et/com_err_*.html debian/*.substvars
+       [ ! -f ${stdbuilddir}/Makefile ] || make -C ${stdbuilddir} distclean
+       [ ! -f ${bfbuilddir}/Makefile ] || make -C ${bfbuilddir} distclean
+       rm -rf ${stdbuilddir} ${bfbuilddir} ${mipsbuilddir} ${mipsbuilddir64}
+       rm -f doc/libext2fs/*.html lib/et/com_err/*.html debian/*.substvars
        dh_clean
 
 install: cleanup install-std
@@ -208,18 +219,20 @@ install-std: build
 
   # statically-linked fsck
        ${INSTALL_PROGRAM} ${stdbuilddir}/e2fsck/e2fsck.static ${tmpdir}/sbin
-       ln -s e2fsck.8.gz ${mandir}/man8/e2fsck.static.8.gz
+       cp ${mandir}/man8/e2fsck.8 ${mandir}/man8/e2fsck.static.8
 
        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
+  # specially-built MIPS libs
+ifneq ($(ismips),)
+       $(INSTALL) -p -m 0644 ${mipsbuilddir}/lib/libext2fs.a \
+               ${debdir}/e2fslibs-dev/usr/lib/libext2fs-nopic.a
+       $(INSTALL) -p -m 0644 ${mipsbuilddir64}/lib/libext2fs.a \
+               ${debdir}/e2fslibs-dev/usr/lib/lib64ext2fs-nopic.a
+endif
 
 install-udeb: DH_OPTIONS=
 install-udeb: build
@@ -232,10 +245,13 @@ install-udeb: build
                INSTALL_PROGRAM="${INSTALL_PROGRAM}" LDCONFIG=true
        make -C ${bfbuilddir}/misc install DESTDIR=${udebdir} \
                INSTALL_PROGRAM="${INSTALL_PROGRAM}" LDCONFIG=true
+       make -C ${bfbuilddir}/resize install DESTDIR=${udebdir} \
+               INSTALL_PROGRAM="${INSTALL_PROGRAM}" LDCONFIG=true
 
        rm -rf ${udebdir}/usr
        find ${udebdir}/sbin -type f -a ! -name e2fsck \
-               -a ! -name mke2fs -a ! -name tune2fs -print | xargs rm
+               -a ! -name mke2fs -a ! -name tune2fs \
+               -a ! -name resize2fs -a ! -name badblocks -print | xargs rm
 
        (cd ${udebdir}/sbin; ln -s e2fsck fsck.ext2 ; \
                ln -s e2fsck fsck.ext3 ; ln -s mke2fs mkfs.ext2 ; \
@@ -258,23 +274,21 @@ binary-arch: install install-udeb
   # 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} ;\
+               $(INSTALL) -m 0644 -D -p debian/$$i ${debdir}/$${pkg}/usr/share/lintian/overrides/$${pkg} ;\
        done
 
   # mkinitrd script
        mkdir -p debian/e2fsprogs/usr/share/initrd-tools/scripts
-       install -m755 debian/initrd-tools.e2fsprogs \
+       $(INSTALL) -p -o root -g root -m 0755 debian/initrd-tools.e2fsprogs \
                debian/e2fsprogs/usr/share/initrd-tools/scripts/e2fsprogs
 
   # initrd script
        mkdir -p debian/e2fsprogs/usr/share/e2fsprogs
-       install -m755 debian/initrd.ext3-add-journal \
+       $(INSTALL) -p -o root -g root -m 0755 debian/initrd.ext3-add-journal \
                debian/e2fsprogs/usr/share/e2fsprogs/initrd.ext3-add-journal
 
 
   # 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
 
        mkdir -p ${debdir}/libblkid${BLKID_SOVERSION}/usr/share/doc/libblkid${BLKID_SOVERSION}
        mkdir -p ${debdir}/libblkid-dev/usr/share/doc
@@ -290,63 +304,75 @@ binary-arch: install install-udeb
 
        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
+#      ln -sf libuuid${UUID_SOVERSION} ${debdir}/uuid-dev/usr/share/doc/uuid-dev
 
        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
 
-       install -m 644 debian/libblkid.copyright \
+       $(INSTALL) -p -m 0644 debian/libblkid.copyright \
                ${debdir}/libblkid${BLKID_SOVERSION}/usr/share/doc/libblkid${BLKID_SOVERSION}/copyright
 
        dh_installdocs -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb
 
   # HTML docs
-       install -d ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs/html-info/
-       install -p ${stdbuilddir}/doc/libext2fs_*.html \
+       $(INSTALL) -d ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs/html-info/
+       $(INSTALL) -p -m 0644 ${stdbuilddir}/doc/libext2fs/*.html \
           ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs/html-info/
-       install -d ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}/html-info/
-       install -p ${stdbuilddir}/lib/et/com_err_*.html \
+       $(INSTALL) -d ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}/html-info/
+       $(INSTALL) -p -m 0644 ${stdbuilddir}/lib/et/com_err/*.html \
           ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}/html-info/
 
   # texinfo docs
        mkdir -p ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}
-       install -p ${topdir}/doc/libext2fs.texinfo \
+       $(INSTALL) -p -m 0644 ${topdir}/doc/libext2fs.texinfo \
           ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs/libext2fs.texi
-       install -p ${topdir}/lib/et/com_err.texinfo \
+       $(INSTALL) -p -m 0644 ${topdir}/lib/et/com_err.texinfo \
           ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}/com_err.texi
 
-       install -d ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}/examples
-       install -p -m 0644 lib/ss/ss_err.et \
+       $(INSTALL) -d ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}/examples
+       $(INSTALL) -p -m 0644 lib/ss/ss_err.et \
                ${stdbuilddir}/lib/ext2fs/ext2_err.et \
                ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}/examples
-       install -d ${debdir}/ss-dev/usr/share/doc/libss${SS_SOVERSION}/examples
-       install -p -m 0644 debugfs/debug_cmds.ct \
+       $(INSTALL) -d ${debdir}/ss-dev/usr/share/doc/libss${SS_SOVERSION}/examples
+       $(INSTALL) -p -m 0644 debugfs/debug_cmds.ct \
                ${debdir}/ss-dev/usr/share/doc/libss${SS_SOVERSION}/examples
 
-       install -d ${debdir}/uuid-dev/usr/share/doc/libuuid${UUID_SOVERSION}
-       install -p -m 0644 doc/draft-leach-uuids-guids-01.txt \
-               ${debdir}/uuid-dev/usr/share/doc/libuuid${UUID_SOVERSION}
+       $(INSTALL) -d ${debdir}/uuid-dev/usr/share/doc/libuuid${UUID_SOVERSION}
+
+       if test -f /etc/lsb-release && \
+               grep -q DISTRIB_ID=Ubuntu /etc/lsb-release; then \
+       $(INSTALL) -p -m 0644 e2fsck/e2fsck.conf.ubuntu \
+               ${debdir}/e2fsprogs/etc/e2fsck.conf; \
+       fi
 
        dh_installinfo -pcomerr-dev ${stdbuilddir}/lib/et/com_err.info
        dh_installinfo -pe2fslibs-dev ${stdbuilddir}/doc/libext2fs.info
 
-       DH_OPTIONS= dh_installchangelogs -pe2fsprogs -plibblkid${BLKID_SOVERSION}
-       DH_OPTIONS= dh_installchangelogs -pe2fsprogs -plibcomerr${COMERR_SOVERSION}
-       DH_OPTIONS= dh_installchangelogs -pe2fsprogs -plibss${SS_SOVERSION}
-       DH_OPTIONS= dh_installchangelogs -pe2fsprogs -plibuuid${UUID_SOVERSION}
-       DH_OPTIONS= dh_installchangelogs -pe2fsprogs -pe2fslibs
+       DH_OPTIONS= dh_installchangelogs -pe2fsprogs \
+               -plibblkid${BLKID_SOVERSION} -plibcomerr${COMERR_SOVERSION} \
+               -plibss${SS_SOVERSION} -plibuuid${UUID_SOVERSION} \
+               -pe2fslibs -puuid-dev -pe2fsck-static
 
+       dh_fixperms
+ifneq ($(ismips),)
+       dh_strip -Xlib64ext2fs-nopic.a
+else
        dh_strip
+endif
 
        dh_compress
-       dh_fixperms
 
        dh_makeshlibs -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb
        dh_makeshlibs -plibcomerr${COMERR_SOVERSION} \
                -V 'libcomerr2 (>= 1.33-3)'
+       dh_makeshlibs -plibblkid${BLKID_SOVERSION} -V 'libblkid1 (>= 1.39-1)'
+       echo "udeb: libblkid 1 libblkid1-udeb" >> \
+               debian/libblkid1/DEBIAN/shlibs
+       echo "udeb: libuuid 1 libuuid1-udeb" >> debian/libuuid1/DEBIAN/shlibs
 
        dh_installdeb
+       rm debian/e2fsprogs-udeb/DEBIAN/conffiles
        dh_shlibdeps -l${stdbuilddir}/lib
        dh_shlibdeps -pe2fsprogs -l${stdbuilddir}/lib \
                -u"-Ldebian/e2fsprogs.shlibs.local"
Mirror of git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git