summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2005-04-17 17:20:51 +0000
committerRichard Purdie <rpurdie@rpsys.net>2005-04-17 17:20:51 +0000
commit1e147b70e9a5f2a1e9b7bc76e4561b6d3e30da20 (patch)
tree909ac43e7d11a49eade16f6074bf325019686839 /packages
parent75fa5d6073ba68514a7dcaff73b687395f7c1faf (diff)
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/oe/openembedded 2005/04/17 18:20:26+01:00 rpsys.net!RP initscipts: Change levels so keymap gets loaded before checkversion so Ctrl+C works to skip it BKrev: 42629af3asoTpE6lzBjoag0ziV_ETw
Diffstat (limited to 'packages')
-rw-r--r--packages/gpe-bootsplash/gpe-bootsplash_1.14.bb4
-rw-r--r--packages/initscripts/initscripts_1.0.bb14
-rw-r--r--packages/udev/udev.inc4
3 files changed, 11 insertions, 11 deletions
diff --git a/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb b/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb
index bfb79ef33e..0e59b0bfa5 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
SECTION = "gpe"
PRIORITY = "optional"
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
SRC_URI += "file://splash-p.svg file://splash-l.svg"
SRC_URI_append_ramses = " file://ramses.patch;patch=1"
@@ -15,6 +15,6 @@ FILES_${PN} += "${datadir}/gpe"
do_install_append() {
install -m 0644 ${WORKDIR}/splash-p.svg ${D}${datadir}/gpe/splash-p.svg
install -m 0644 ${WORKDIR}/splash-l.svg ${D}${datadir}/gpe/splash-l.svg
- mv ${D}${sysconfdir}/rcS.d/S00bootsplash ${D}${sysconfdir}/rcS.d/S02bootsplash
+ mv ${D}${sysconfdir}/rcS.d/S00bootsplash ${D}${sysconfdir}/rcS.d/S03bootsplash
}
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 0ff36eba8c..6d94e15999 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
DEPENDS_openzaurus = "makedevs virtual/kernel"
RDEPENDS = "makedevs"
LICENSE = "GPL"
-PR = "r39"
+PR = "r40"
SRC_URI = "file://halt \
file://ramdisk \
@@ -90,13 +90,13 @@ do_install () {
if [ "${DISTRO}" == "openzaurus" ]; then
cat ${WORKDIR}/checkversion | sed -e "s,VERSION,${KERNEL_VERSION}-${DISTRO_VERSION}," > ${D}${sysconfdir}/init.d/checkversion
chmod 0755 ${D}${sysconfdir}/init.d/checkversion
- ln -sf ../init.d/checkversion ${D}${sysconfdir}/rcS.d/S00version
+ ln -sf ../init.d/checkversion ${D}${sysconfdir}/rcS.d/S01version
fi
if [ "${MACHINE}" == "c7x0" ]; then
install -m 0755 ${WORKDIR}/corgikeymap-2.6.map ${D}${sysconfdir}
install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d
- ln -sf ../init.d/keymap ${D}${sysconfdir}/rcS.d/S04keymap
+ ln -sf ../init.d/keymap ${D}${sysconfdir}/rcS.d/S00keymap
fi
@@ -121,7 +121,7 @@ do_install () {
ln -sf ../init.d/umountnfs.sh ${D}${sysconfdir}/rc0.d/S31umountnfs.sh
# ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc0.d/S40umountfs
ln -sf ../init.d/halt ${D}${sysconfdir}/rc0.d/S90halt
- ln -sf ../init.d/banner ${D}${sysconfdir}/rcS.d/S01banner
+ ln -sf ../init.d/banner ${D}${sysconfdir}/rcS.d/S02banner
ln -sf ../init.d/checkroot.sh ${D}${sysconfdir}/rcS.d/S10checkroot.sh
# ln -sf ../init.d/checkfs.sh ${D}${sysconfdir}/rcS.d/S30checkfs.sh
ln -sf ../init.d/mountall.sh ${D}${sysconfdir}/rcS.d/S35mountall.sh
@@ -130,12 +130,12 @@ do_install () {
ln -sf ../init.d/bootmisc.sh ${D}${sysconfdir}/rcS.d/S55bootmisc.sh
# ln -sf ../init.d/urandom ${D}${sysconfdir}/rcS.d/S55urandom
ln -sf ../init.d/finish ${D}${sysconfdir}/rcS.d/S99finish
- ln -sf ../init.d/devices ${D}${sysconfdir}/rcS.d/S04devices
+ ln -sf ../init.d/devices ${D}${sysconfdir}/rcS.d/S05devices
# udev will run at S03 if installed
- ln -sf ../init.d/sysfs.sh ${D}${sysconfdir}/rcS.d/S02sysfs
+ ln -sf ../init.d/sysfs.sh ${D}${sysconfdir}/rcS.d/S03sysfs
ln -sf ../init.d/devpts.sh ${D}${sysconfdir}/rcS.d/S38devpts.sh
if [ "${TARGET_ARCH}" = "arm" ]; then
- ln -sf ../init.d/alignment.sh ${D}${sysconfdir}/rcS.d/S05alignment
+ ln -sf ../init.d/alignment.sh ${D}${sysconfdir}/rcS.d/S06alignment
fi
install -m 0755 ${WORKDIR}/device_table.txt ${D}${sysconfdir}/device_table
diff --git a/packages/udev/udev.inc b/packages/udev/udev.inc
index baa5e9ba8a..553988f574 100644
--- a/packages/udev/udev.inc
+++ b/packages/udev/udev.inc
@@ -1,7 +1,7 @@
DESCRIPTION = "udev is a program which dynamically creates and removes device nodes from \
/dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel."
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
PACKAGES =+ "udev-utils"
FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest"
@@ -9,7 +9,7 @@ FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest"
inherit update-rc.d
INITSCRIPT_NAME = "udev"
-INITSCRIPT_PARAMS = "start 03 S ."
+INITSCRIPT_PARAMS = "start 04 S ."
export HOSTCC = "${BUILD_CC}"
export udevdir ?= "/dev"