mirror of https://github.com/vitalif/e2fsprogs
Update Debian packaging information as of 1.29+130-WIP-0930-2.
Theodore Ts'o
parent
482afc442d
commit
dd198d6885
|
|
@ -1,3 +1,34 @@
|
|||
e2fsprogs (1.29+1.30-WIP-0930-2) unstable; urgency=low
|
||||
|
||||
* Made mkinitrd script to skip commented-out lines (Closes: #163251).
|
||||
|
||||
-- Yann Dirson <dirson@debian.org> Tue, 15 Oct 2002 00:16:08 +0200
|
||||
|
||||
e2fsprogs (1.29+1.30-WIP-0930-1) unstable; urgency=low
|
||||
|
||||
* New upstream prerelease.
|
||||
* Replaced in mkinitrd script "tune2fs -j" with "tune2fs -O
|
||||
has_journal", as suggested by Theodore Ts'o (Closes: #162949).
|
||||
* Remove --disable-debugfs from mips-nopic flags (Closes: #162674).
|
||||
|
||||
-- Yann Dirson <dirson@debian.org> Thu, 3 Oct 2002 00:05:36 +0200
|
||||
|
||||
e2fsprogs (1.29-1) unstable; urgency=low
|
||||
|
||||
* New upstream release (Closes: #159423).
|
||||
* Fixed typo in chattr manpage (Philipp Matthias Hahn, Closes:
|
||||
#162297).
|
||||
* Generate udeb package for debian-installer (Martin Sjögren, Closes:
|
||||
#162212).
|
||||
* Fixed installation of mkinitrd script (don't use dh_install). Remove
|
||||
it from the wrong location where it was, in preinst. Hopefully noone
|
||||
noticed.
|
||||
* Also have old scripts/e2fsprogs.mkinitrd removed.
|
||||
* Bumped Standards-Version to 3.5.6, no change. 3.5.7 will need a bit
|
||||
of work but not tonight.
|
||||
|
||||
-- Yann Dirson <dirson@debian.org> Thu, 26 Sep 2002 01:46:25 +0200
|
||||
|
||||
e2fsprogs (1.28-5) unstable; urgency=low
|
||||
|
||||
* The "this time it will work ! (famous last words)" release.
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ Section: base
|
|||
Priority: required
|
||||
Maintainer: Yann Dirson <dirson@debian.org>
|
||||
Build-Depends: texi2html, texinfo, debhelper (>= 4)
|
||||
Standards-Version: 3.5.4
|
||||
Standards-Version: 3.5.6
|
||||
|
||||
Package: e2fsck-static
|
||||
Section: admin
|
||||
|
|
@ -75,6 +75,19 @@ Description: A stripped-down versions of e2fsprogs, for boot-floppies
|
|||
Don't attempt to install this package, it has no support for a couple of
|
||||
features you surely want. Anyway it should refuse to install.
|
||||
|
||||
Package: e2fsprogs-udeb
|
||||
Section: debian-installer
|
||||
Priority: standard
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}
|
||||
Conflicts: e2fsprogs
|
||||
Architecture: any
|
||||
Description: A stripped-down versions of e2fsprogs, for debian-installer
|
||||
This package is an e2fsprogs package built for a reduced size, so that
|
||||
it can help to save space in debian-installer.
|
||||
.
|
||||
Don't attempt to install this package, it has no support for a couple of
|
||||
features you surely want. Anyway it should refuse to install.
|
||||
|
||||
Package: e2fsprogs
|
||||
Essential: yes
|
||||
Pre-Depends: ${shlibs:Depends}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#!/bin/sh
|
||||
ext3root=`awk '{ if (($2 == "/") && ($3 == "ext3")) {print $1;}}' /etc/fstab`
|
||||
ext3root=`grep -v '^ *#' /etc/fstab | awk '{ if (($2 == "/") && ($3 == "ext3")) {print $1;}}'`
|
||||
if test -n "$ext3root" ; then
|
||||
/sbin/tune2fs -j $ext3root > /dev/null
|
||||
/sbin/tune2fs -O has_journal $ext3root > /dev/null
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -13,4 +13,11 @@ EOT
|
|||
*) exit 2 ;;
|
||||
esac
|
||||
|
||||
# Old/erroneous conffile from early post-woody sid
|
||||
if [ -d /etc/mkinitrd/scripts/e2fsprogs ]
|
||||
then
|
||||
rm -rf /etc/mkinitrd/scripts/e2fsprogs
|
||||
fi
|
||||
rm -f /etc/mkinitrd/scripts/e2fsprogs.mkinitrd
|
||||
|
||||
#DEBHELPER#
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ topdir=$(shell pwd)
|
|||
debdir=${topdir}/debian
|
||||
tmpdir=${debdir}/tmp
|
||||
bfdir=${debdir}/e2fsprogs-bf
|
||||
udebdir=${debdir}/e2fsprogs-udeb
|
||||
maindir=${debdir}/e2fsprogs
|
||||
stdbuilddir=${debdir}/BUILD-STD
|
||||
bfbuilddir=${debdir}/BUILD-BF
|
||||
|
|
@ -52,6 +53,9 @@ mipsbuilddir=${debdir}/BUILD-MIPS
|
|||
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)
|
||||
|
||||
SUBPACKAGES_DIRS = tmp e2fslibs-dev comerr-dev ss-dev
|
||||
|
||||
STAMPSDIR=debian/stampdir
|
||||
|
|
@ -96,7 +100,7 @@ BF_CONF_FLAGS = --with-ccopts="${CCOPTS} ${BF_CCOPTS}" \
|
|||
MIPS_NOPIC_CONF_FLAGS = --with-ccopts="${CCOPTS}" \
|
||||
--disable-nls \
|
||||
--disable-swapfs --disable-imager \
|
||||
--disable-resizer --disable-debugfs
|
||||
--disable-resizer # --disable-debugfs
|
||||
# we can't use those flags at configure time
|
||||
MIPS_CFLAGS= -G 0 -fno-pic -mno-abicalls
|
||||
|
||||
|
|
@ -236,12 +240,25 @@ install-bf: build
|
|||
# remove FSIM for now.
|
||||
rm ${bfdir}/lib/evms/libe2fsim.1.1.1.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
|
||||
|
||||
binary-indep:
|
||||
# no arch-independant debs.
|
||||
|
||||
binary-arch: DH_OPTIONS= -a
|
||||
binary-arch: install
|
||||
binary-arch: install install-udeb
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
|
||||
|
|
@ -256,9 +273,9 @@ binary-arch: install
|
|||
done
|
||||
|
||||
# mkinitrd script
|
||||
dh_install -p e2fsprogs debian/e2fsprogs.mkinitrd \
|
||||
/etc/mkinitrd/scripts/e2fsprogs
|
||||
chmod +x ${debdir}/e2fsprogs/etc/mkinitrd/scripts/*
|
||||
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/
|
||||
|
|
@ -284,7 +301,7 @@ binary-arch: install
|
|||
${maindir}/usr/share/doc/$$i/copyright ; \
|
||||
done
|
||||
|
||||
dh_installdocs
|
||||
dh_installdocs -Ne2fsprogs-udeb
|
||||
|
||||
install -m 644 debian/e2fsprogs.copyright \
|
||||
${bfdir}/usr/share/doc/e2fsprogs-bf/copyright
|
||||
|
|
@ -346,7 +363,7 @@ binary-arch: install
|
|||
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
|
||||
DH_OPTIONS= dh_gencontrol -pcomerr-dev \
|
||||
-u '-v${COMERR_VERSION}-${MAIN_VERSION}'
|
||||
DH_OPTIONS= dh_gencontrol -pss-dev \
|
||||
|
|
@ -354,8 +371,13 @@ binary-arch: install
|
|||
DH_OPTIONS= dh_gencontrol -puuid-dev \
|
||||
-u '-v${UUID_VERSION}-${MAIN_VERSION}'
|
||||
|
||||
dh_md5sums
|
||||
dh_builddeb
|
||||
dh_md5sums -Ne2fsprogs-udeb
|
||||
dh_builddeb -Ne2fsprogs-udeb
|
||||
|
||||
# udeb stuff
|
||||
dh_gencontrol -pe2fsprogs-udeb -- -fdebian/files~
|
||||
dpkg-distaddfile $(UDEB_NAME) debian-installer $(UDEB_PRIORITY)
|
||||
dh_builddeb -pe2fsprogs-udeb --filename=$(UDEB_NAME)
|
||||
|
||||
binary: binary-indep binary-arch
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue