diff options
| author | Samuel Thibault <sthibault@debian.org> | 2010-01-11 02:06:19 +0000 |
|---|---|---|
| committer | Samuel Thibault <sthibault@debian.org> | 2010-01-11 02:06:19 +0000 |
| commit | 2dcfe47d3b2b136d50222901a4d08514942c77df (patch) | |
| tree | 6e1da1af5851292bfea33703247881b9e4462846 /debian | |
| parent | 0c22bd9ea4e21c86bb8dab190875ed8c79914b2b (diff) | |
debian/patches/MAKEDEV.patch: Make MAKEDEV bash-free.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/MAKEDEV.patch | 64 |
2 files changed, 53 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog index 17f02486..baac0aa7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,7 @@ hurd (20090404-3) UNRELEASED; urgency=low local/runsystem.gnu in /libexec, install ext2fs.static in /boot * debian/rules: Do not ship libthread_*.pic.a, as mklibs doesn't manage to keep version information. + * debian/patches/MAKEDEV.patch: Make MAKEDEV bash-free. [ Guillem Jover ] * Update make-new-tarball.sh to exclude git instead of CVS paths. diff --git a/debian/patches/MAKEDEV.patch b/debian/patches/MAKEDEV.patch index 5f701874..8f130d0c 100644 --- a/debian/patches/MAKEDEV.patch +++ b/debian/patches/MAKEDEV.patch @@ -1,20 +1,60 @@ -commit 4d2e9c98b5b886d80fb7396aef89ca50b0d5fcfe +commit 62e4f1a11b4598daa4a22fe3b868fde3c6fa818e Author: Samuel Thibault <samuel.thibault@ens-lyon.org> -Date: Sun Sep 27 23:33:29 2009 +0200 +Date: Mon Jan 11 03:03:08 2010 +0100 - Use #!/bin/bash instead of #!/bin/sh + Make MAKEDEV bash-free - The script makes big use of bashisms. + * sutils/MAKEDEV.sh (cmd, st, lose, mkdev): Remove function, add + (). + (mkdev): Use ${I#???} instead of ${I:3}. --- - sutils/MAKEDEV.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + MAKEDEV.sh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) +diff --git a/sutils/MAKEDEV.sh b/sutils/MAKEDEV.sh +index 260e93b..4277b05 100644 --- a/sutils/MAKEDEV.sh +++ b/sutils/MAKEDEV.sh -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - # - # Make standard devices - # +@@ -51,12 +51,12 @@ case "$#" in 0) + exit 1;; + esac + +-function cmd { ++cmd() { + eval $ECHO "$@" + eval $EXEC "$@" + } + +-function st { ++st() { + local NODE="$1" + local OWNER="$2" + local PERM="$3" +@@ -68,7 +68,7 @@ function st { + fi + } + +-function lose { ++lose() { + local line + for line; do + echo 1>&2 "$0: $line" +@@ -76,7 +76,7 @@ function lose { + exit 1 + } + +-function mkdev { ++mkdev() { + local I + for I; do + case $I in +@@ -120,7 +120,7 @@ function mkdev { + # ptys + [pt]ty[pqrstuvwxyzPQRS]?) + # Make one pty, both the master and slave halves. +- local id="${I:3}" ++ local id="${I#???}" + st pty$id root 666 /hurd/term ${DEVDIR}/pty$id \ + pty-master ${DEVDIR}/tty$id + st tty$id root 666 /hurd/term ${DEVDIR}/tty$id \ |