diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 30 | ||||
| -rw-r--r-- | debian/control | 6 | ||||
| -rw-r--r-- | debian/hurd-udeb.lintian-overrides | 1 | ||||
| -rw-r--r-- | debian/hurd.hurd-console.init | 4 | ||||
| -rw-r--r-- | debian/hurd.install.in | 1 | ||||
| -rw-r--r-- | debian/hurd.lintian-overrides | 4 | ||||
| -rw-r--r-- | debian/hurd.postinst | 2 | ||||
| -rwxr-xr-x | debian/local/finish-install.d/51hurd_config-console | 18 | ||||
| -rwxr-xr-x | debian/local/runsystem | 7 | ||||
| -rw-r--r-- | debian/patches/rc.patch | 3 | ||||
| -rwxr-xr-x | debian/rules | 18 |
11 files changed, 74 insertions, 20 deletions
diff --git a/debian/changelog b/debian/changelog index a8465f09..4d115a7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,28 @@ -hurd (1:0.5.git20140206-2) UNRELEASED; urgency=medium - - * patches/mount.patch: Also ignore exec option. - - -- Samuel Thibault <sthibault@debian.org> Sat, 08 Feb 2014 21:23:02 +0100 - -hurd (1:0.5.git20140206-1) unstable; urgency=medium +hurd (1:0.5.git20140320-1) unstable; urgency=medium + * New upstream snapshot. + - patches/libports_stability.patch: Remove, merged upstream. + - patches/exec_filename_fs.patch: Refresh. + - rules: Disable bz2 support in udeb (Closes: #741420) * control: Only Replace/Conflict old login package which was potentially shipping /bin/login. * local/securetty: Remove file, let it be installed by the login package. - - -- Samuel Thibault <sthibault@debian.org> Thu, 06 Feb 2014 00:22:53 +0000 + * patches/rc.patch: Also make /etc/mtab point to /proc/mounts. + * patches/mount.patch: Also ignore exec option. + * local/runsystem: Allow to pass VGA options from d-i boot menu. + * local/finish-install.d/51hurd_config-console: Propagate VGA options to + installed system. + * hurd.hurd-console.init: Do not make hurd-console depend on $all, + and make it start before DMs. + * hurd.postinst: Decrease our runsystem priority to 5, thus switching to + sysvinit boot up, and enabling the hard work of a lot of people, thanks a + lot to everybody involved! + * hurd.lintian-overrides, hurd-udeb.lintian-overrides: Ignore lintian warning + about static translators embedding bzip2 and zlib. + * rules: force installing hurd-udeb lintian overrides to actually fix above + override. + + -- Samuel Thibault <sthibault@debian.org> Thu, 20 Mar 2014 02:24:20 +0000 hurd (1:0.5.git20140203-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 4a964a6a..8dfd7135 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: required Maintainer: GNU Hurd Maintainers <debian-hurd@lists.debian.org> Standards-Version: 3.9.5 -Build-Depends: mig (>= 1.3-2), gnumach-dev (>= 2:1.3.99.dfsg.cvs20070526), +Build-Depends: mig (>= 1.4-2), gnumach-dev (>= 2:1.3.99.dfsg.cvs20070526), libc0.3-dev (>= 2.17-94~), texinfo, libncursesw5-dev, debhelper (>= 7.0.50~), gcc-4.7, autoconf, dh-autoreconf, libparted-dev, libpciaccess-dev, libx11-dev, x11proto-core-dev, pkg-config, @@ -31,8 +31,8 @@ Breaks: gnumach (<< 2:1.3.99.dfsg.cvs20070526-1), libc0.3 (<< 2.11.2-12), netdde Suggests: hurd-doc Recommends: bf-utf-source Provides: makedev, login, console-driver-xkb -Replaces: makedev, login, random-egd, console-driver-xkb -Conflicts: makedev, login, console-driver-xkb +Replaces: makedev, login (<< 1:4.0.14-4), random-egd, console-driver-xkb +Conflicts: makedev, login (<< 1:4.0.14-4), console-driver-xkb Architecture: hurd-any Description: GNU Hurd This is the GNU Hurd package. It contains essential system software and diff --git a/debian/hurd-udeb.lintian-overrides b/debian/hurd-udeb.lintian-overrides index 7f67c429..bbcc6282 100644 --- a/debian/hurd-udeb.lintian-overrides +++ b/debian/hurd-udeb.lintian-overrides @@ -1,3 +1,4 @@ non-standard-toplevel-dir hurd/ non-standard-toplevel-dir servers/ package-contains-empty-directory servers/ +hurd-udeb udeb: embedded-library boot/ext2fs.static: zlib diff --git a/debian/hurd.hurd-console.init b/debian/hurd.hurd-console.init index 095e8cb4..c27eecd5 100644 --- a/debian/hurd.hurd-console.init +++ b/debian/hurd.hurd-console.init @@ -1,10 +1,12 @@ #! /bin/sh ### BEGIN INIT INFO # Provides: hurd-console -# Required-Start: $all +# Required-Start: $local_fs # Required-Stop: $local_fs # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 +# X-Start-Before: $x-display-manager gdm gdm3 kdm xdm ldm sdm wdm nodm lightdm +# X-Stop-After: $x-display-manager gdm gdm3 kdm xdm ldm sdm wdm nodm lightdm # Short-Description: Start userland console ### END INIT INFO diff --git a/debian/hurd.install.in b/debian/hurd.install.in index 11791cb2..1fdbb31f 100644 --- a/debian/hurd.install.in +++ b/debian/hurd.install.in @@ -1,7 +1,6 @@ ../../console/motd.UTF8 etc ../../release/servers.boot boot ../local/random-hurd.sh hurd -../local/securetty etc ../local/setup-translators usr/lib/hurd ../local/urandom-hurd.sh hurd bin/addauth diff --git a/debian/hurd.lintian-overrides b/debian/hurd.lintian-overrides index 71cf6306..eaecef4b 100644 --- a/debian/hurd.lintian-overrides +++ b/debian/hurd.lintian-overrides @@ -5,3 +5,7 @@ setuid-binary bin/ps-hurd 4755 root/root setuid-binary usr/bin/w-hurd 4755 root/root possibly-insecure-handling-of-tmp-files-in-maintainer-script postinst:76 package-contains-empty-directory servers/socket/ +embedded-library hurd/ext2fs.static: bzip2 +embedded-library hurd/ext2fs.static: zlib +embedded-library hurd/iso9660fs.static: bzip2 +embedded-library hurd/iso9660fs.static: zlib diff --git a/debian/hurd.postinst b/debian/hurd.postinst index eb079b71..c947914b 100644 --- a/debian/hurd.postinst +++ b/debian/hurd.postinst @@ -8,7 +8,7 @@ if [ "$1" = configure ] && [ "$2" ]; then --remove runsystem /libexec/runsystem.gnu fi update-alternatives --quiet \ - --install /etc/hurd/runsystem runsystem /etc/hurd/runsystem.gnu 20 \ + --install /etc/hurd/runsystem runsystem /etc/hurd/runsystem.gnu 5 \ --slave /sbin/halt halt /sbin/halt-hurd \ --slave /sbin/reboot reboot /sbin/reboot-hurd diff --git a/debian/local/finish-install.d/51hurd_config-console b/debian/local/finish-install.d/51hurd_config-console index 03cc7697..55ea3d07 100755 --- a/debian/local/finish-install.d/51hurd_config-console +++ b/debian/local/finish-install.d/51hurd_config-console @@ -1,3 +1,19 @@ #!/bin/sh -[ -f /var/run/hurd-console.pid ] || sed -i -e "s/ENABLE='true'/ENABLE='false'/" /target/etc/default/hurd-console +if [ -f /var/run/hurd-console.pid ] +then + VGA_OPTIONS="" + for i in $(cat /proc/cmdline) ; do + case "$i" in + VGA_OPTIONS=*) + VGA_OPTIONS=${i#VGA_OPTIONS=} + ;; + esac + done + if [ -n "$VGA_OPTIONS" ] + then + sed -i -e "s/DISPLAY='-d vga'/DISPLAY='-d vga $VGA_OPTIONS'/" /target/etc/default/hurd-console + fi +else + sed -i -e "s/ENABLE='true'/ENABLE='false'/" /target/etc/default/hurd-console +fi diff --git a/debian/local/runsystem b/debian/local/runsystem index a59ff716..ddb45270 100755 --- a/debian/local/runsystem +++ b/debian/local/runsystem @@ -14,7 +14,7 @@ mem=`vmstat-hurd --size -k` if [ "$mem" -lt 240000 ] then echo "You only have ${mem}KiB memory." - echo "Debian GNU/Hurd installation has not been optimized for memory usage yet, and thus currently needs at least 256MiB memory, sorry." + echo "Debian GNU/Hurd installation has not been optimized for memory usage yet, and thus currently needs at least 512MiB memory, sorry." while true do sleep 60 @@ -42,6 +42,9 @@ for i in $envvars ; do TERM=*) term=yes ;; + VGA_OPTIONS=*) + VGA_OPTIONS=${i#VGA_OPTIONS=} + ;; esac done @@ -63,7 +66,7 @@ then . /etc/default/keyboard [ -z "$XKBLAYOUT" ] || LAYOUT="--keymap $XKBLAYOUT" fi - console -d vga -g -d pc_kbd --repeat=kbd $LAYOUT -d pc_mouse --repeat=mouse -c /dev/vcs & + console -d vga -g $VGA_OPTIONS -d pc_kbd --repeat=kbd $LAYOUT -d pc_mouse --repeat=mouse -c /dev/vcs & echo $! > /var/run/hurd-console.pid wait echo diff --git a/debian/patches/rc.patch b/debian/patches/rc.patch index a4be4aa5..964662c7 100644 --- a/debian/patches/rc.patch +++ b/debian/patches/rc.patch @@ -24,7 +24,7 @@ More debianish rc scripts ;; # Filesystem modified, filesystem should be restarted # Ideally we would only restart the filesystem -@@ -85,12 +88,25 @@ if test -d /tmp; then +@@ -85,12 +88,26 @@ if test -d /tmp; then fi if test -d /var/run; then @@ -50,6 +50,7 @@ More debianish rc scripts + +# This file must exist for e2fsck to work. +ln -s /proc/mounts /var/run/mtab ++ln -sf /proc/mounts /etc/mtab #echo -n restoring pty permissions... #chmod 666 /dev/tty[pqrs]* diff --git a/debian/rules b/debian/rules index a58d2df8..361604b2 100755 --- a/debian/rules +++ b/debian/rules @@ -18,9 +18,11 @@ # 02111-1307 USA. DEB_DESTDIR = $(CURDIR)/debian/tmp +DEB_DESTDIR_UDEB = $(CURDIR)/debian/tmp-udeb CONFIGURE_ARGS = --disable-profile --enable-static-progs='ext2fs,iso9660fs' CONFIGURE_ARGS_deb = +CONFIGURE_ARGS_udeb = --without-libdaemon --without-libbz2 SUID_PROGRAMS = /bin/ids /bin/login /bin/ps-hurd /usr/bin/w-hurd DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) @@ -33,14 +35,17 @@ INSTALL_generated := $(patsubst %.in,%,$(INSTALL_in)) override_dh_auto_configure: dh_auto_configure -Bbuild-deb -- $(CONFIGURE_ARGS) $(CONFIGURE_ARGS_deb) $(shell dpkg-buildflags --export=configure) + dh_auto_configure -Bbuild-udeb -- $(CONFIGURE_ARGS) $(CONFIGURE_ARGS_udeb) $(shell dpkg-buildflags --export=configure) override_dh_auto_build: dh_auto_build -Bbuild-deb + dh_auto_build -Bbuild-udeb cd build-deb/doc && make && makeinfo --html --split=chapter ../../doc/hurd.texi $(MAKE) -C libdde-linux26 BUILDDIR=$(CURDIR)/build-deb override_dh_auto_clean: dh_auto_clean -Bbuild-deb + dh_auto_clean -Bbuild-udeb $(MAKE) -C libdde-linux26 cleanall rm -f $$(find libdde-linux26 -name \*.d) rm -fr libdde-linux26/build @@ -49,6 +54,7 @@ override_dh_auto_clean: override_dh_auto_install: dh_auto_install -Bbuild-deb --destdir= -- prefix=$(DEB_DESTDIR) libdir=$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH) sysconfdir=$(DEB_DESTDIR)/etc localstatedir=$(DEB_DESTDIR)/var XKB_BASE=$(DEB_DESTDIR)/usr/share/X11/xkb + dh_auto_install -Bbuild-udeb --destdir= -- prefix=$(DEB_DESTDIR_UDEB) libdir=$(DEB_DESTDIR_UDEB)/lib sysconfdir=$(DEB_DESTDIR_UDEB)/etc localstatedir=$(DEB_DESTDIR_UDEB)/var XKB_BASE=$(DEB_DESTDIR_UDEB)/usr/share/X11/xkb $(MAKE) -C libdde-linux26 INSTALLDIR=$(CURDIR)/debian/tmp/usr/share/libdde_linux26/build/include install # runsystem is managed by update-alternatives @@ -62,6 +68,11 @@ override_dh_auto_install: mv debian/tmp/bin/uptime debian/tmp/usr/bin/uptime-hurd mv debian/tmp/bin/vmstat debian/tmp/usr/bin/vmstat-hurd mv debian/tmp/bin/w debian/tmp/usr/bin/w-hurd + mkdir -p debian/tmp-udeb/usr/bin + mv debian/tmp-udeb/bin/ps debian/tmp-udeb/bin/ps-hurd + mv debian/tmp-udeb/bin/uptime debian/tmp-udeb/usr/bin/uptime-hurd + mv debian/tmp-udeb/bin/vmstat debian/tmp-udeb/usr/bin/vmstat-hurd + mv debian/tmp-udeb/bin/w debian/tmp-udeb/usr/bin/w-hurd # move away halt and reboot to not conflict with sysvinit # (they will be handled as alternatives) @@ -70,9 +81,13 @@ override_dh_auto_install: # remove PIC static libraries rm -f debian/tmp/lib/$(DEB_HOST_MULTIARCH)/*_pic.a + rm -f debian/tmp-udeb/lib/*_pic.a override_dh_install: $(INSTALL_generated) + dh_install $(addprefix -p,$(filter %-udeb,$(shell dh_listpackages))) --sourcedir=debian/tmp-udeb dh_install --remaining-packages --list-missing --sourcedir=debian/tmp + mkdir -p debian/hurd-udeb/usr/share/lintian/overrides + install -p -m644 debian/hurd-udeb.lintian-overrides debian/hurd-udeb/usr/share/lintian/overrides/hurd-udeb override_dh_installinit: dh_installinit -phurd --name=hurd-console @@ -90,11 +105,12 @@ override_dh_fixperms: chmod u+s $(patsubst %,$(CURDIR)/debian/hurd%,$(SUID_PROGRAMS)) override_dh_makeshlibs: - dh_makeshlibs -phurd-libs0.3 + dh_makeshlibs -phurd-libs0.3 --add-udeb=hurd-libs0.3-udeb dh_makeshlibs --remaining-packages -Xusr/lib/hurd/ override_dh_clean: dh_clean + rm -rf debian/tmp-udeb debian/%.install: debian/%.install.in cat $^ | sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' > $@ |