DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
# find the version for the main package, from changelog file
-MAIN_VERSION = $(shell head -1 debian/changelog | cut '-d ' -f 2 | sed 's/[()]//g')
+MAIN_VERSION = $(shell head -n 1 debian/changelog | cut '-d ' -f 2 | sed 's/[()]//g')
# 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)
tmpdir=${debdir}/tmp
udebdir=${debdir}/e2fsprogs-udeb
blkidudebdir=${debdir}/libblkid1-udeb
+uuidudebdir=${debdir}/libuuid1-udeb
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}
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)
+UUID_UDEB_NAME = libuuid1-udeb_$(MAIN_VERSION)_$(DEB_HOST_ARCH).udeb
+UUID_UDEB_PRIORITY = $(shell grep '^Package: libuuid1-udeb' debian/control -A 10 | grep ^Priority: | cut -d ' ' -f 2)
+
STAMPSDIR=debian/stampdir
CFGSTDSTAMP=${STAMPSDIR}/configure-std-stamp
CFGBFSTAMP=${STAMPSDIR}/configure-bf-stamp
BUILDSTDSTAMP=${STAMPSDIR}/build-std-stamp
BUILDBFSTAMP=${STAMPSDIR}/build-bf-stamp
-CCOPTS = -O2 -fsigned-char
+CCOPTS = -g -fsigned-char
INSTALL = install
-INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
+INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 0755
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-CCOPTS += -g -O1
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CCOPTS += -O2
endif
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
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-debugfs --disable-e2initrd-helper
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
+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))
${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}
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
( 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}
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
+ rm -rf ${stdbuilddir} ${bfbuilddir} ${mipsbuilddir} ${mipsbuilddir64}
+ rm -f doc/libext2fs/*.html lib/et/com_err/*.html debian/*.substvars
dh_clean
install: cleanup install-std
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
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 -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 ; \
mkdir -p ${blkidudebdir}/lib
mv ${udebdir}/lib/libblkid.* ${blkidudebdir}/lib
+ mkdir -p ${uuidudebdir}/lib
+ mv ${udebdir}/lib/libuuid.* ${uuidudebdir}/lib
+
binary-indep:
# no arch-independant debs.
# 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/etc/mkinitrd/scripts
- install -m755 debian/e2fsprogs.mkinitrd \
- debian/e2fsprogs/etc/mkinitrd/scripts/e2fsprogs
+ mkdir -p debian/e2fsprogs/usr/share/initrd-tools/scripts
+ $(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) -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/
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
+ 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 \
+ $(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}
dh_installinfo -pcomerr-dev ${stdbuilddir}/lib/et/com_err.info
DH_OPTIONS= dh_installchangelogs -pe2fsprogs -plibuuid${UUID_SOVERSION}
DH_OPTIONS= dh_installchangelogs -pe2fsprogs -pe2fslibs
+ifneq ($(ismips),)
+ dh_strip -Xlib64ext2fs-nopic.a
+else
dh_strip
+endif
dh_compress
dh_fixperms
- dh_makeshlibs -Ne2fsprogs-udeb -Nlibblkid1-udeb
+ dh_makeshlibs -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb
dh_makeshlibs -plibcomerr${COMERR_SOVERSION} \
-V 'libcomerr2 (>= 1.33-3)'
+ 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"
-u"-Ldebian/e2fsprogs-udeb.shlibs.local"
dh_gencontrol -Ncomerr-dev -Nss-dev -Nuuid-dev \
- -Ne2fsprogs-udeb -Nlibblkid1-udeb
+ -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb
DH_OPTIONS= dh_gencontrol -pcomerr-dev \
-u '-v${COMERR_VERSION}-${MAIN_VERSION}'
DH_OPTIONS= dh_gencontrol -pss-dev \
DH_OPTIONS= dh_gencontrol -puuid-dev \
-u '-v${UUID_VERSION}-${MAIN_VERSION}'
- dh_md5sums -Ne2fsprogs-udeb -Nlibblkid1-udeb
- dh_builddeb -Ne2fsprogs-udeb -Nlibblkid1-udeb
+ dh_md5sums -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb
+ dh_builddeb -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb
# udeb stuff
dh_gencontrol -pe2fsprogs-udeb -- -fdebian/files~
dpkg-distaddfile $(BLKID_UDEB_NAME) debian-installer $(BLKID_UDEB_PRIORITY)
dh_builddeb -plibblkid1-udeb --filename=$(BLKID_UDEB_NAME)
+ dh_gencontrol -plibuuid1-udeb -- -fdebian/files~
+ dpkg-distaddfile $(UUID_UDEB_NAME) debian-installer $(UUID_UDEB_PRIORITY)
+ dh_builddeb -plibuuid1-udeb --filename=$(UUID_UDEB_NAME)
+
binary: binary-indep binary-arch
.PHONY: binary binary-arch binary-indep clean checkroot