diff options
| -rw-r--r-- | packages/gpe-shield/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/gpe-shield/files/uncrypt-startup-error.patch | 13 | ||||
| -rw-r--r-- | packages/gpe-shield/gpe-shield_0.9.bb | 4 | ||||
| -rwxr-xr-x | packages/initscripts/initscripts-1.0/ramdisk | 3 | ||||
| -rw-r--r-- | packages/initscripts/initscripts_1.0.bb | 2 | ||||
| -rwxr-xr-x | packages/udev/files/init | 2 | ||||
| -rw-r--r-- | packages/udev/udev-092/init | 2 | ||||
| -rw-r--r-- | packages/udev/udev-097/init | 2 | ||||
| -rw-r--r-- | packages/udev/udev-100/init | 2 | ||||
| -rw-r--r-- | packages/udev/udev_092.bb | 2 | ||||
| -rw-r--r-- | packages/udev/udev_097.bb | 2 | ||||
| -rw-r--r-- | packages/udev/udev_100.bb | 2 |
12 files changed, 26 insertions, 10 deletions
diff --git a/packages/gpe-shield/files/.mtn2git_empty b/packages/gpe-shield/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpe-shield/files/.mtn2git_empty diff --git a/packages/gpe-shield/files/uncrypt-startup-error.patch b/packages/gpe-shield/files/uncrypt-startup-error.patch new file mode 100644 index 0000000000..a67532e7cb --- /dev/null +++ b/packages/gpe-shield/files/uncrypt-startup-error.patch @@ -0,0 +1,13 @@ +diff -ur gpe-shield-0.9.org/interface.c gpe-shield-0.9/interface.c +--- gpe-shield-0.9.org/interface.c 2006-02-04 23:53:45.000000000 +0000 ++++ gpe-shield-0.9/interface.c 2007-06-18 01:50:02.000000000 +0000 +@@ -569,7 +569,8 @@ + { + if (cmd == CMD_NO_IPTABLES) + show_message(GTK_MESSAGE_WARNING, _("This system does not " \ +- "support firewalling or you"\ ++ "support firewalling (iptables " \ ++ "command is not available) or you"\ + " don't have the right to "\ + "change firewall rules, this" \ + " application will exit now.")); diff --git a/packages/gpe-shield/gpe-shield_0.9.bb b/packages/gpe-shield/gpe-shield_0.9.bb index aac8899035..124f010105 100644 --- a/packages/gpe-shield/gpe-shield_0.9.bb +++ b/packages/gpe-shield/gpe-shield_0.9.bb @@ -6,8 +6,8 @@ DEPENDS = "libgpewidget iptables virtual/kernel" RDEPENDS = "iptables" RRECOMMENDS = "kernel-module-ipt-state" -PR = "r0" +PR = "r1" inherit gpe pkgconfig - +SRC_URI += " file://uncrypt-startup-error.patch;patch=1 " diff --git a/packages/initscripts/initscripts-1.0/ramdisk b/packages/initscripts/initscripts-1.0/ramdisk index 03ac9bd05b..4dfe53cf61 100755 --- a/packages/initscripts/initscripts-1.0/ramdisk +++ b/packages/initscripts/initscripts-1.0/ramdisk @@ -22,6 +22,9 @@ else RAM_MTDBLK=/dev/mtdblock$RAM_MTD_NO fi +if grep -q $RAM_MTDBLK /etc/mtab; then echo "Device $RAM_MTDBLK already mounted"; exit 0; fi +if test ! -e $RAM_MTD; then echo >&2 "Mtdram device $RAM_MTD does not exist!"; exit 1; fi + RAM_MNTPT=/mnt/ram RAM_MTD_SIZE_HEX=`cat /proc/mtd | grep mtdram | tail -n 1 | cut -d" " -f 2` RAM_MTD_SIZE=`dc 0x$RAM_MTD_SIZE_HEX 1024 / p` diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index f979a50c27..23530b6dc8 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" DEPENDS = "makedevs" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r92" +PR = "r93" SRC_URI = "file://halt \ file://ramdisk \ diff --git a/packages/udev/files/init b/packages/udev/files/init index 8cbab188f0..456a7c070d 100755 --- a/packages/udev/files/init +++ b/packages/udev/files/init @@ -3,7 +3,7 @@ UDEVSTART=/sbin/udevstart # defaults -tmpfs_size="10M" +tmpfs_size="2M" udev_root="/dev" [ -x $UDEVSTART ] || exit 0 diff --git a/packages/udev/udev-092/init b/packages/udev/udev-092/init index 5a60d52a9a..0940b592f2 100644 --- a/packages/udev/udev-092/init +++ b/packages/udev/udev-092/init @@ -119,7 +119,7 @@ PATH="/sbin:/bin:/usr/bin" [ -x /sbin/udevd ] || exit 0 # defaults -tmpfs_size="10M" +tmpfs_size="2M" udev_root="/dev" udevd_timeout=30 diff --git a/packages/udev/udev-097/init b/packages/udev/udev-097/init index cc25c026a3..0d61d657aa 100644 --- a/packages/udev/udev-097/init +++ b/packages/udev/udev-097/init @@ -131,7 +131,7 @@ warn_if_interactive() { PATH="/sbin:/bin:/usr/bin" # defaults -tmpfs_size="10M" +tmpfs_size="2M" udev_root="/dev" if [ -e /etc/udev/udev.conf ]; then diff --git a/packages/udev/udev-100/init b/packages/udev/udev-100/init index cc25c026a3..0d61d657aa 100644 --- a/packages/udev/udev-100/init +++ b/packages/udev/udev-100/init @@ -131,7 +131,7 @@ warn_if_interactive() { PATH="/sbin:/bin:/usr/bin" # defaults -tmpfs_size="10M" +tmpfs_size="2M" udev_root="/dev" if [ -e /etc/udev/udev.conf ]; then diff --git a/packages/udev/udev_092.bb b/packages/udev/udev_092.bb index f21be9c8c5..3f1da7c3ae 100644 --- a/packages/udev/udev_092.bb +++ b/packages/udev/udev_092.bb @@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod the hotplug package and requires a kernel not older than 2.6.12." RPROVIDES_${PN} = "hotplug" -PR = "r17" +PR = "r18" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ diff --git a/packages/udev/udev_097.bb b/packages/udev/udev_097.bb index 2af5556dbd..9ed0701418 100644 --- a/packages/udev/udev_097.bb +++ b/packages/udev/udev_097.bb @@ -8,7 +8,7 @@ used to detect the type of a file system and read its metadata." DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \ needed to link programs with libvolume_id." -PR = "r7" +PR = "r8" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ diff --git a/packages/udev/udev_100.bb b/packages/udev/udev_100.bb index bef4cb7301..cebd494116 100644 --- a/packages/udev/udev_100.bb +++ b/packages/udev/udev_100.bb @@ -9,7 +9,7 @@ used to detect the type of a file system and read its metadata." DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \ needed to link programs with libvolume_id." -PR = "r6" +PR = "r7" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ |