diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2005-07-05 15:00:57 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-05 15:00:57 +0000 |
| commit | 6e8987a32745bdb779c3e79bda5ef42f7a2f0955 (patch) | |
| tree | 269ce829bc812c5f1a6d1e4bdd024556c2323f7f | |
| parent | 02e68aa6b80ad23d8b5a198fd8e1fd705a12dfb3 (diff) | |
| parent | 621eae27e9fdacdae0433dafe0e428c1941c95ab (diff) | |
merge of 44956d593fd4538bf972ccf1c800c55fc6155982
and 6a2d27de7343d2b00b2f4422f97e85a010f1868a
| -rw-r--r-- | conf/machine/nokia770.conf | 2 | ||||
| -rw-r--r-- | packages/maemo/nokia770-init/fixup-770.sh | 8 | ||||
| -rw-r--r-- | packages/maemo/nokia770-init_1.0.bb | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index f24c842d7b..a922d5b4da 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -36,7 +36,7 @@ BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils nokia770-init \ pcmcia-cs apmd ppp wireless-tools console-tools openswan wpa-supplicant-nossl lrzsz ppp-dialin" BOOTSTRAP_EXTRA_RDEPENDS = "udev sysfsutils nokia770-init \ -pcmcia-cs apm ppp wireless-tools irda-utils udev-utils console-tools" +pcmcia-cs apm ppp wireless-tools udev-utils console-tools" # NFS Modules #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc" diff --git a/packages/maemo/nokia770-init/fixup-770.sh b/packages/maemo/nokia770-init/fixup-770.sh index 02c18d4108..b65fb131e3 100644 --- a/packages/maemo/nokia770-init/fixup-770.sh +++ b/packages/maemo/nokia770-init/fixup-770.sh @@ -4,6 +4,14 @@ case "$1" in echo -n "Unmounting virtual fs from initrd" umount /mnt/initfs/sys umount /mnt/initfs/proc + ln -s /dev/vc/0 /dev/tty0 + ln -s /dev/vc/1 /dev/tty1 + ln -s /dev/vc/2 /dev/tty2 + ln -s /dev/vc/3 /dev/tty3 + ln -s /dev/vc/4 /dev/tty4 + ln -s /dev/vc/5 /dev/tty5 + ln -s /dev/vc/6 /dev/tty6 + ln -s /dev/vc/7 /dev/tty7 ;; stop) ;; diff --git a/packages/maemo/nokia770-init_1.0.bb b/packages/maemo/nokia770-init_1.0.bb index 1cef924598..d93171cf11 100644 --- a/packages/maemo/nokia770-init_1.0.bb +++ b/packages/maemo/nokia770-init_1.0.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" MAINTAINER = "Florian Boor <florian@kernelconcepts.de" -PR = "r1" +PR = "r2" DEPENDS = "base-passwd hotplug-dbus" @@ -17,7 +17,7 @@ INITSCRIPT_PARAMS = "defaults 01" do_install () { install -d ${D}${sysconfdir}/init.d - install -m 755 ${S}/fixup-770.sh ${D}/${sysconfdir}/init.d/fixup-770.sh + install -m 755 ${WORKDIR}/fixup-770.sh ${D}/${sysconfdir}/init.d/fixup-770.sh install -d ${D}/lib/firmware } @@ -31,6 +31,7 @@ if [ "x$D" != "x" ]; then fi # set up some links to firmware and modules in initrd + mkdir -p /lib/firmware ln -sf /mnt/initfs/lib/firmware/* /lib/firmware/ rm -rf /lib/modules |