diff options
| author | Jeremie Koenig <jk@jk.fr.eu.org> | 2011-01-19 23:51:41 (GMT) |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-01-19 23:51:41 (GMT) |
| commit | 28a6a9870dfc10a176a1149153bfd75958ee1758 (patch) | |
| tree | 24f4e221b32ffae0761cf6da0b2660dbd0adce1c | |
| parent | 6243d1f157a826f14b3139bb73f0228eff00097c (diff) | |
| download | debootstrap-28a6a9870dfc10a176a1149153bfd75958ee1758.zip debootstrap-28a6a9870dfc10a176a1149153bfd75958ee1758.tar.gz debootstrap-28a6a9870dfc10a176a1149153bfd75958ee1758.tar.bz2 | |
Hurd support
- Use the newer setup-translators script and firmlink
$TARGET/{dev,servers} in setup_devices_hurd;
- Don't attempt to build devices.tar.gz, which is not needed.
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | functions | 18 |
4 files changed, 20 insertions, 15 deletions
@@ -3,7 +3,12 @@ VERSION := $(shell sed 's/.*(\(.*\)).*/\1/; q' debian/changelog) MAKEDEV := /sbin/MAKEDEV +ifneq ($(shell uname),GNU) all: devices.tar.gz +else +all: +endif + clean: rm -f devices.tar.gz rm -rf dev @@ -20,7 +25,9 @@ install: chown root:root $(DESTDIR)/usr/sbin/debootstrap chmod 0755 $(DESTDIR)/usr/sbin/debootstrap +ifneq ($(shell uname),GNU) install -o root -g root -m 0644 devices.tar.gz $(DSDIR)/ +endif devices.tar.gz: rm -rf dev diff --git a/debian/changelog b/debian/changelog index bfb6e1b..c718c98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,13 @@ debootstrap (1.0.27) UNRELEASED; urgency=low * Fix bug and typo on --private-key Patch by Jonathan Klee. - -- Miguel Figueiredo <elmig@debianpt.org> Tue, 04 Jan 2011 21:16:28 +0000 + [ Jeremie Koenig ] + * Hurd support: + - Use the newer setup-translators script and firmlink + $TARGET/{dev,servers} in setup_devices_hurd; + - Don't attempt to build devices.tar.gz, which is not needed. + + -- Samuel Thibault <sthibault@debian.org> Thu, 20 Jan 2011 00:50:35 +0100 debootstrap (1.0.26) unstable; urgency=low diff --git a/debian/control b/debian/control index 1e69716..6bb9ec9 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: extra Maintainer: Debian Install System Team <debian-boot@lists.debian.org> Uploaders: Anthony Towns <ajt@debian.org>, Joey Hess <joeyh@debian.org>, Frans Pop <fjp@debian.org>, Junichi Uekawa <dancer@debian.org>, Colin Watson <cjwatson@debian.org> -Build-Depends: debhelper (>= 7.0.50), makedev (>= 2.3.1-69) +Build-Depends: debhelper (>= 7.0.50), makedev (>= 2.3.1-69) [!hurd-i386] Standards-Version: 3.9.1 Vcs-Browser: http://git.debian.org/?p=d-i/debootstrap.git Vcs-Git: git://git.debian.org/d-i/debootstrap.git @@ -978,19 +978,11 @@ setup_devices () { } setup_devices_hurd () { - mkdir -p "$TARGET/servers/socket" - /bin/settrans -cfk "$TARGET/servers/socket/1" /hurd/pflocal - /bin/settrans -cf "$TARGET/servers/socket/2" /hurd/pfinet - /bin/settrans -cfk "$TARGET/servers/exec" /hurd/exec - /bin/settrans -cf "$TARGET/servers/crash-suspend" /hurd/crash --suspend - /bin/settrans -cf "$TARGET/servers/crash-kill" /hurd/crash --kill - /bin/settrans -cf "$TARGET/servers/crash-dump-core" /hurd/crash --dump-core - /bin/settrans -cf "$TARGET/servers/password" /hurd/password - /bin/settrans -cf "$TARGET/servers/default-pager" /hurd/proxy-defpager - ln -fs crash-kill "$TARGET/servers/crash" - ln -fs 1 "$TARGET/servers/socket/local" - ln -fs 2 "$TARGET/servers/socket/inet" - (cd "$TARGET/dev"; /sbin/MAKEDEV fd std ptyp ptyq vcs tty1 tty2 tty3 tty4 tty5 tty6) + # Use the setup-translators of the hurd package, and firmlink + # $TARGET/{dev,servers} to the system ones. + in_target /usr/lib/hurd/setup-translators -k + settrans -a $TARGET/dev /hurd/firmlink /dev + settrans -a $TARGET/servers /hurd/firmlink /servers } setup_devices_fakechroot () { |