diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/hurd.postinst | 14 | ||||
| -rwxr-xr-x | debian/local/setup-translators | 2 |
4 files changed, 22 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index d4f1efa1..b8bfe3b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ hurd (20120520-1) UNRELEASED; urgency=low * New upstream snapshot, remove libpthread. * rules: Bump to gcc-4.7. + * control: Depend on netdde, recent enough (>= 0.0.20120518~) to avoid + conflicts with gnumach drivers. + * local/setup-translators: Setup netdde translator and /dev/eth*. + * debian/hurd.postinst: Migrate pfinet into using /dev/eth0. -- Samuel Thibault <sthibault@debian.org> Thu, 26 Apr 2012 19:03:16 +0000 diff --git a/debian/control b/debian/control index 4b856b21..70b048ce 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Vcs-Git: git://git.debian.org/pkg-hurd/hurd.git Package: hurd Essential: yes -Depends: ${misc:Depends}, sysv-rc, libc0.3 (>= 2.13-31~), ${shlibs:Depends} +Depends: ${misc:Depends}, sysv-rc, netdde (>= 0.0.20120518~), libc0.3 (>= 2.13-31~), ${shlibs:Depends} Breaks: gnumach (<< 2:1.3.99.dfsg.cvs20070526-1), libc0.3 (<< 2.11.2-12) Suggests: hurd-doc Recommends: bf-utf-source @@ -62,7 +62,7 @@ Priority: optional Section: debian-installer Architecture: hurd-any XC-Package-Type: udeb -Depends: ${misc:Depends} +Depends: ${misc:Depends}, netdde (>= 0.0.20120518~) Provides: hurd, ext2-modules, fat-modules, ipv6-modules, isofs-modules, loop-modules, mouse-modules, nfs-modules, socket-modules, ufs-modules Description: GNU Hurd - udeb This is the GNU Hurd udeb package. It contains essential system software and diff --git a/debian/hurd.postinst b/debian/hurd.postinst index 4a552ddf..a8a5c087 100644 --- a/debian/hurd.postinst +++ b/debian/hurd.postinst @@ -75,6 +75,20 @@ if [ "$1" = configure ] && [ "$2" ]; then ( cd /dev ; rm -f random urandom ) fi /usr/lib/hurd/setup-translators -K + + # upgrade pfinet into using DDE node + if PFINET="`showtrans /servers/socket/2`" + then + PFINET=$(echo "$PFINET" | sed 's_ eth_ /dev/eth_') + PFINET=$(echo "$PFINET" | sed 's_=eth_=/dev/eth_') + settrans -pk /servers/socket/2 $PFINET + fi + if PFINET6=`showtrans /servers/socket/26` + then + PFINET6=$(echo "$PFINET6" | sed 's_ eth_ /dev/eth_') + PFINET6=$(echo "$PFINET6" | sed 's_=eth_=/dev/eth_') + settrans -pk /servers/socket/26 $PFINET6 + fi fi update-alternatives --install /hurd/random.sh random.sh /hurd/random-hurd.sh 10 \ diff --git a/debian/local/setup-translators b/debian/local/setup-translators index 38a23129..7fbc4d87 100755 --- a/debian/local/setup-translators +++ b/debian/local/setup-translators @@ -133,6 +133,8 @@ md sdX 0123 md sdXsY 0123 123456789 md sdXs1Y 0123 0123456 md cdX 01 +md netdde +md ethX 0123 if [ "$MINIMAL" ]; then md loopX 0123 |