Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/22 00:33:40+00:00 nexus.co.uk!pb
ignore errors from modprobe during module autoload

2005/01/21 19:28:39-05:00 handhelds.org!kergoth
Add udev 050, and consolodate the common udev metadata into a .inc.

2005/01/21 19:20:29-05:00 handhelds.org!kergoth
Upgrade to sudo 1.6.8p6, as versions of Sudo prior to 1.6.8p2 are affected by
a potential security flaw that could allow a malicious user to subvert Bash
shell scripts.

BKrev: 41f1a0ebM799gMlmTP1rllhZZDpNAw

17 files changed, 10 insertions, 199 deletions

diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 36d004bfe5..4bf7aad3d9 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -148,7 +148,7 @@ update-modules || true
 
 autoload_postinst_fragment() {
 if [ x"$D" = "x" ]; then
-	modprobe %s
+	modprobe %s || true
 fi
 }
 
diff --git a/packages/sudo/sudo-1.6.7p5/configure.patch b/packages/sudo/sudo-1.6.8p6/autofoo.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/sudo/sudo-1.6.7p5/configure.patch
+++ b/packages/sudo/sudo-1.6.8p6/autofoo.patch
diff --git a/packages/sudo/sudo-1.6.7p5/nonrootinstall.patch b/packages/sudo/sudo-1.6.8p6/noexec-link.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/sudo/sudo-1.6.7p5/nonrootinstall.patch
+++ b/packages/sudo/sudo-1.6.8p6/noexec-link.patch
diff --git a/packages/sudo/sudo-1.6.7p5/nostrip.patch b/packages/sudo/sudo-1.6.8p6/nonrootinstall.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/sudo/sudo-1.6.7p5/nostrip.patch
+++ b/packages/sudo/sudo-1.6.8p6/nonrootinstall.patch
diff --git a/packages/udev/udev-042/noasmlinkage.patch b/packages/sudo/sudo-1.6.8p6/nostrip.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/udev/udev-042/noasmlinkage.patch
+++ b/packages/sudo/sudo-1.6.8p6/nostrip.patch
diff --git a/packages/udev/udev-042/tmpfs.patch b/packages/sudo/sudo.inc
index e69de29bb2..e69de29bb2 100644
--- a/packages/udev/udev-042/tmpfs.patch
+++ b/packages/sudo/sudo.inc
diff --git a/packages/sudo/sudo_1.6.7p5.bb b/packages/sudo/sudo_1.6.7p5.bb
deleted file mode 100644
index c1dfb7930d..0000000000
--- a/packages/sudo/sudo_1.6.7p5.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-SECTION = "base"
-DESCRIPTION = "Sudo (superuser do) allows a system \
-administrator to give certain users (or groups of \
-users) the ability to run some (or all) commands \
-as root while logging all commands and arguments."
-
-PR="r2"
-LICENSE = "sudo"
-SRC_URI = "ftp://ftp.sudo.ws/pub/sudo/sudo-${PV}.tar.gz \
-	   file://nonrootinstall.patch;patch=1 \
-	   file://configure.patch;patch=1 \
-           file://nostrip.patch;patch=1"
-
-inherit autotools
-
-do_configure_prepend () {
-	if [ ! -e acinclude.m4 ]; then
-		cat aclocal.m4 > acinclude.m4
-	fi
-}
diff --git a/packages/sudo/sudo_1.6.8p6.bb b/packages/sudo/sudo_1.6.8p6.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/sudo/sudo_1.6.8p6.bb
diff --git a/packages/udev/files/init b/packages/udev/files/init
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/files/init
diff --git a/packages/udev/files/noasmlinkage.patch b/packages/udev/files/noasmlinkage.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/files/noasmlinkage.patch
diff --git a/packages/udev/files/tmpfs.patch b/packages/udev/files/tmpfs.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/files/tmpfs.patch
diff --git a/packages/udev/udev-042/init b/packages/udev/udev-042/init
deleted file mode 100644
index 266628e971..0000000000
--- a/packages/udev/udev-042/init
+++ /dev/null
@@ -1,178 +0,0 @@
-#!/bin/sh -e
-
-PATH="/usr/sbin:/usr/bin:/sbin:/bin"
-
-UDEVSTART=/sbin/udevstart
-
-# default maximum size of the /dev ramfs
-ramfs_size="1M"
-
-[ -x $UDEVSTART ] || exit 0
-
-. /etc/udev/udev.conf
-
-case "$(uname -r)" in
-  2.[012345].*)
-    echo "udev requires a kernel >= 2.6, not started."
-    exit 0
-    ;;
-esac
-
-if ! grep -q '[[:space:]]ramfs$' /proc/filesystems; then
-    echo "udev requires ramfs support, not started."
-    exit 0
-fi
-
-if [ ! -e /proc/sys/kernel/hotplug ]; then
-    echo "udev requires hotplug support, not started."
-    exit 0
-fi
-
-##############################################################################
-
-# we need to unmount /dev/pts/ and remount it later over the ramfs
-unmount_devpts() {
-  if mountpoint -q /dev/pts/; then
-    umount -l /dev/pts/
-  fi
-
-  if mountpoint -q /dev/shm/; then
-    umount -l /dev/shm/
-  fi
-}
-
-# mount a ramfs over /dev, if somebody did not already do it
-mount_ramfs() {
-  if grep -E -q "^[^[:space:]]+ /dev ramfs" /proc/mounts; then
-    return 0
-  fi
-
-  # /.dev is used by /sbin/MAKEDEV to access the real /dev directory.
-  # if you don't like this, remove /.dev/.
-  [ -d /.dev ] && mount --bind /dev /.dev
-
-  echo -n "Mounting a ramfs over /dev..."
-  mount -n -o size=$ramfs_size,mode=0755 -t ramfs none /dev
-  echo "done."
-}
-
-# I hate this hack.  -- Md
-make_extra_nodes() {
- if [ -f /etc/udev/links.conf ]; then
-  grep '^[^#]' /etc/udev/links.conf | \
-  while read type name arg1; do
-    [ "$type" -a "$name" -a ! -e "/dev/$name" -a ! -L "/dev/$name" ] ||continue
-    case "$type" in
-    L)
-      ln -s $arg1 /dev/$name
-      ;;
-    D)
-      mkdir -p /dev/$name
-      ;;
-    M)
-      mknod --mode=600 /dev/$name $arg1
-      ;;
-    *)
-      echo "unparseable line ($type $name $arg1)"
-      ;;
-    esac
-  done
- fi
-}
-
-##############################################################################
-
-if [ "$udev_root" != "/dev/" ]; then
-  echo "WARNING: udev_root != /dev/"
-
-case "$1" in
-  start)
-    if [ -e "$udev_root/.udev.tdb" ]; then
-      if mountpoint -q /dev/; then
-        echo "FATAL: udev is already active on $udev_root."
-        exit 1
-      else
-        echo "WARNING: .udev.tdb already exists on the old $udev_root!"
-      fi
-    fi
-    mount -n -o size=$ramfs_size,mode=0755 -t ramfs none $udev_root
-    echo -n "Creating initial device nodes..."
-    $UDEVSTART
-    echo "done."
-    ;;
-  stop)
-    start-stop-daemon -K -x /sbin/udevd 
-    echo -n "Unmounting $udev_root..."
-    # unmounting with -l should never fail
-    if umount -l $udev_root; then
-      echo "done."
-    else
-      echo "failed."
-    fi
-    ;;
-  restart|force-reload)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}"
-    exit 1
-    ;;
-esac
-
-  exit 0
-fi # udev_root != /dev/
-
-##############################################################################
-# When modifying this script, do not forget that between the time that
-# the new /dev has been mounted and udevstart has been run there will be
-# no /dev/null. This also means that you cannot use the "&" shell command.
-
-case "$1" in
-  start)
-    if [ -e "$udev_root/.udev.tdb" ]; then
-      if mountpoint -q /dev/; then
-        echo "FATAL: udev is already active on $udev_root."
-        exit 1
-      else
-        echo "WARNING: .udev.tdb already exists on the old $udev_root!"
-      fi
-    fi
-    unmount_devpts
-    mount_ramfs
-    ACTION=add
-    echo -n "Creating initial device nodes..."
-    $UDEVSTART
-    make_extra_nodes
-    echo "done."
-#    /etc/init.d/mountvirtfs start
-    ;;
-  stop)
-    start-stop-daemon -K -x /sbin/udevd 
-    unmount_devpts
-    echo -n "Unmounting /dev..."
-    # unmounting with -l should never fail
-    if umount -l /dev; then
-      echo "done."
-      umount -l /.dev || true
-#      /etc/init.d/mountvirtfs start
-    else
-      echo "failed."
-    fi
-    ;;
-  restart|force-reload)
-    start-stop-daemon -K -x /sbin/udevd 
-    echo -n "Recreating device nodes..."
-    ACTION=add
-    $UDEVSTART
-    make_extra_nodes
-    echo "done."
-    ;;
-  *)
-    echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}"
-    exit 1
-    ;;
-esac
-
-exit 0
-
diff --git a/packages/udev/udev-050/flags.patch b/packages/udev/udev-050/flags.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/udev-050/flags.patch
diff --git a/packages/udev/udev-050/kill_logname.patch b/packages/udev/udev-050/kill_logname.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/udev-050/kill_logname.patch
diff --git a/packages/udev/udev.inc b/packages/udev/udev.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/udev.inc
diff --git a/packages/udev/udev_042.bb b/packages/udev/udev_042.bb
index e69de29bb2..af03818cfd 100644
--- a/packages/udev/udev_042.bb
+++ b/packages/udev/udev_042.bb
@@ -0,0 +1,9 @@
+PR = "r3"
+
+SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
+	   file://flags.patch;patch=1 \
+	   file://tmpfs.patch;patch=1 \
+	   file://noasmlinkage.patch;patch=1 \
+	   file://init"
+
+include udev.inc
diff --git a/packages/udev/udev_050.bb b/packages/udev/udev_050.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/udev_050.bb