Hi,
Theodore Tso, le Mon 13 Aug 2007 20:39:38 -0400, a écrit :
> What is DEB_HOST_GNU_TYPE_SYSTEM set to on the hurd? Is it "hurd"
> (caps significant)?
DEB_HOST_GNU_CPU=i486
DEB_HOST_GNU_SYSTEM=gnu
DEB_HOST_GNU_TYPE=i486-gnu
> I'm on a plane at the moment heading over the pond en route to
> Stockholm, so I can't check but iirc there isn't a GNU/hurd system
> available for DD's to login to.
There isn't yet indeed (we are waiting for Lufthansa machines)
> If there isn't such a system, it will be a lot better if you send me
> patches, as opposed to me just guessing whether a set of patches will
> cause to build without bugs on the Hurd.
Ok. Patch attached.
> No, the right thing to do is to just do an #ifdef in online.c to check
> to see if the ioctl's are defined.
Ok.
> Resize2fs is still useful on
> non-Linux systems since it also handles off-line resizing.
Yes I know :)
Samuel
Signed-off-by: Samuel Thibault <[EMAIL PROTECTED]>
diff -urp e2fsprogs-1.40.2/debian/control e2fsprogs-1.40.2-mine/debian/control
--- e2fsprogs-1.40.2/debian/control 2007-07-09 01:59:59.000000000 +0000
+++ e2fsprogs-1.40.2-mine/debian/control 2007-08-14 04:32:59.000000000
+0000
@@ -2,7 +2,7 @@ Source: e2fsprogs
Section: admin
Priority: required
Maintainer: Theodore Y. Ts'o <[EMAIL PROTECTED]>
-Build-Depends: texi2html (>= 1.76), gettext, texinfo, dc, libsepol1-dev,
libdevmapper-dev, libselinux1-dev, debhelper (>= 4)
+Build-Depends: texi2html (>= 1.76), gettext, texinfo, dc, libsepol1-dev
[!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libdevmapper-dev [!hurd-i386
!kfreebsd-i386 !kfreebsd-amd64], libselinux1-dev [!hurd-i386 !kfreebsd-i386
!kfreebsd-amd64], debhelper (>= 4)
Standards-Version: 3.7.2
Package: e2fsck-static
diff -urp e2fsprogs-1.40.2/debian/rules e2fsprogs-1.40.2-mine/debian/rules
--- e2fsprogs-1.40.2/debian/rules 2007-07-09 01:59:59.000000000 +0000
+++ e2fsprogs-1.40.2-mine/debian/rules 2007-08-14 04:32:58.000000000 +0000
@@ -14,6 +14,7 @@ export LC_ALL=C
# from having to guess our platform (since we know it already)
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_HOST_OS ?= $(shell dpkg-architecture -qDEB_HOST_OS)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -82,6 +83,10 @@ else
CCOPTS += -D__NO_STRING_INLINES
endif
+ifeq (${DEB_HOST_ARCH_OS},linux)
+DEVMAPPER = --enable-blkid-devmapper
+endif
+
BF_CCOPTS = -Os -fomit-frame-pointer
COMMON_CONF_FLAGS = \
@@ -89,7 +94,7 @@ COMMON_CONF_FLAGS = \
--infodir=/usr/share/info --enable-fsck
STD_CONF_FLAGS = --with-ccopts="${CCOPTS}" --enable-compression \
- --enable-blkid-devmapper
+ ${DEVMAPPER}
BF_CONF_FLAGS = --with-ccopts="${CCOPTS} ${BF_CCOPTS}" \
--disable-nls --disable-swapfs --disable-imager \
diff -urp e2fsprogs-1.40.2/resize/online.c e2fsprogs-1.40.2-mine/resize/online.c
--- e2fsprogs-1.40.2/resize/online.c 2007-06-30 12:58:35.000000000 +0000
+++ e2fsprogs-1.40.2-mine/resize/online.c 2007-08-14 04:45:16.000000000
+0000
@@ -21,6 +21,7 @@ extern char *program_name;
errcode_t online_resize_fs(ext2_filsys fs, const char *mtpt,
blk_t *new_size, int flags EXT2FS_ATTR((unused)))
{
+#ifdef __linux__
struct ext2_new_group_input input;
struct ext2_super_block *sb = fs->super;
unsigned long new_desc_blocks;
@@ -158,4 +159,9 @@ errcode_t online_resize_fs(ext2_filsys f
close(fd);
return 0;
+#else
+ printf(_("Filesystem at %s is mounted on %s, and on-line resizing is"
+ "not supported on this system.\n"), fs->device_name, mtpt);
+ exit(1);
+#endif
}
