[oe-commits] org.oe.dev merge of '005e8450d6bc31cd6fba46f5f0464a08d3eb0a17'
pfalcon commit
openembedded-commits at lists.openembedded.org
Tue Jul 3 05:06:14 UTC 2007
merge of '005e8450d6bc31cd6fba46f5f0464a08d3eb0a17'
and 'b4ae3e3209f986e2f04e385ccdf8f1559f0c510b'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 4902c8e53850399e979d4c3c8c0ec1574220d312
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4902c8e53850399e979d4c3c8c0ec1574220d312
Files:
1
packages/opie-qcop/files
packages/opie-qcop/files/unbreak-logging.patch
classes/opie.bbclass
conf/bitbake.conf
conf/machine/wl500g.conf
packages/libopie/libopie2_cvs.bb
packages/libqpe/libqpe-opie.inc
packages/libqpe/libqpe-opie_cvs.bb
packages/opie-console/opie-console.inc
packages/opie-console/opie-console_cvs.bb
packages/opie-init/opie-init/opie
packages/opie-init/opie-init/opie_defaults
packages/opie-init/opie-init.inc
packages/opie-init/opie-init_1.2.2.bb
packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
packages/opie-networksettings/opie-networksettings_cvs.bb
packages/opie-oxygen/opie-oxygen.inc
packages/opie-qcop/opie-qcop_cvs.bb
packages/opie-ttf-support/opie-ttf-support_1.1.bb
packages/qte/qte-mt_2.3.10.bb
packages/slugos-init/files/boot/kexec
conf/distro/angstrom-2007.1-legacy.conf
packages/slugos-init/files/boot/network
packages/slugos-init/files/functions
packages/slugos-init/files/modulefunctions
packages/slugos-init/slugos-init_0.10.bb
packages/tasks/task-slugos.bb
Diffs:
#
# mt diff -r005e8450d6bc31cd6fba46f5f0464a08d3eb0a17 -r4902c8e53850399e979d4c3c8c0ec1574220d312
#
#
#
# add_dir "packages/opie-qcop/files"
#
# add_file "packages/opie-qcop/files/unbreak-logging.patch"
# content [78d5b44b38724d0bd7192f584e0306681ac936be]
#
# patch "classes/opie.bbclass"
# from [63b61b5cd7a8d7d3fb50c8802c996927a4316994]
# to [2653571d91e93ff5043997740e80656344ad35d8]
#
# patch "conf/bitbake.conf"
# from [d52250874c724734f38a1342376ffb804d7a19fb]
# to [4481b02aa24ad52f996889ffadf4f12e9912c116]
#
# patch "conf/machine/wl500g.conf"
# from [f078925639f82bd00755302772f7671bd1d7e603]
# to [d7067382eb29e1f5c251a2c48f5e4f7d36f6f0f9]
#
# patch "packages/libopie/libopie2_cvs.bb"
# from [0b8fdd63993047dd867ec4552c1c2b70706021a6]
# to [66b355cdaf0863882ba11282e95ea14ad73da233]
#
# patch "packages/libqpe/libqpe-opie.inc"
# from [30c1691eb0545cae035edf4a5dc84986235a36b6]
# to [3346fde77506aea54b8d7d57c5fe1dcae017a6ca]
#
# patch "packages/libqpe/libqpe-opie_cvs.bb"
# from [baf3a4ab2d24dd30f79920a234075d1f6384d066]
# to [f96cc1aefe160f38dd0536ab17ca7a8896d39937]
#
# patch "packages/opie-console/opie-console.inc"
# from [26cd72b1f13cad3ed41dcd0451d54d7b8db3ef8c]
# to [b00cb8042f00def502c053a84e38d7a15b8f6d76]
#
# patch "packages/opie-console/opie-console_cvs.bb"
# from [8289d1df5721cab3ef9a0f28d03201ed4ab7309a]
# to [42fb7a012fce1c5b7170d185cf345f499ec1bd94]
#
# patch "packages/opie-init/opie-init/opie"
# from [879c03529cdeef4128ae40faefe35801f5376f43]
# to [939a977703c5c993189c8355d175b621bfe71969]
#
# patch "packages/opie-init/opie-init/opie_defaults"
# from [971ecb87286e39af8be9705978014aa9f4a29506]
# to [75480531b6dcda113547fddda2009db52f8bc09f]
#
# patch "packages/opie-init/opie-init.inc"
# from [9bbf8651a7c66d185cc42caf5cc09ceb4c939a5b]
# to [5fcdf1ce5c56a1de2a9bf4ff41be0f31abe3b52d]
#
# patch "packages/opie-init/opie-init_1.2.2.bb"
# from [1b39d005ccd0c0c7b0398642458f2bde6c4c31d4]
# to [c2c9de8c7dd613b8f7b3b095200bb476c7bddaf9]
#
# patch "packages/opie-irdaapplet/opie-irdaapplet_cvs.bb"
# from [82e388ecfed65dc597b8f8ffabd7d396965e49b3]
# to [1e718aff97398e878d897b20f3aeaaa65c1770a3]
#
# patch "packages/opie-networksettings/opie-networksettings_cvs.bb"
# from [c639caa615cc88d0a83a3617de0b970e15031e01]
# to [fdf639c975afaedf8b2ce6fc7b065b61b9205e7d]
#
# patch "packages/opie-oxygen/opie-oxygen.inc"
# from [41a6c02041cdc980c0b339290bc88b49626b17aa]
# to [081a7c525fbf5e21763448c1c9f39138f0c05fc9]
#
# patch "packages/opie-qcop/opie-qcop_cvs.bb"
# from [d13764e02934981b413d161bd405d6c388571171]
# to [c2097d44582c668bbb719ae77cb032333a4a58de]
#
# patch "packages/opie-ttf-support/opie-ttf-support_1.1.bb"
# from [90f91510b34a3ea0a48e3c38214ce9c2c7b0ace6]
# to [485a535dc2b358d5755ccec0f9697b159b0bb964]
#
# patch "packages/qte/qte-mt_2.3.10.bb"
# from [a19fde79d9a812e04519973d4914b51d828a0cdb]
# to [f87b668c5dc754048758ef15a98e30583eb4067b]
#
============================================================
--- packages/opie-qcop/files/unbreak-logging.patch 78d5b44b38724d0bd7192f584e0306681ac936be
+++ packages/opie-qcop/files/unbreak-logging.patch 78d5b44b38724d0bd7192f584e0306681ac936be
@@ -0,0 +1,16 @@
+Index: opie/core/apps/qcop/qcopimpl.cpp
+===================================================================
+RCS file: /cvs/opie/core/apps/qcop/qcopimpl.cpp,v
+retrieving revision 1.2
+diff -u -r1.2 qcopimpl.cpp
+--- qcop/qcopimpl.cpp 2 Mar 2005 19:23:54 -0000 1.2
++++ qcop/qcopimpl.cpp 3 May 2007 03:09:36 -0000
+@@ -46,7 +46,7 @@
+
+ int doqcopimpl (int argc, char *argv[])
+ {
+- qInstallMsgHandler( disableqdebug );
++ //qInstallMsgHandler( disableqdebug );
+
+ if ( argc > 1 ) {
+ QString opt = argv[1];
============================================================
--- classes/opie.bbclass 63b61b5cd7a8d7d3fb50c8802c996927a4316994
+++ classes/opie.bbclass 2653571d91e93ff5043997740e80656344ad35d8
@@ -79,7 +79,7 @@ python opie_do_opie_install() {
S = bb.data.getVar( "S", d, 1 )
D = "%s/image" % bb.data.getVar( "WORKDIR", d, True )
WORKDIR = bb.data.getVar( "WORKDIR", d, True )
- palmtopdir = bb.data.getVar( "palmtopdir", d )
+ palmtopdir = bb.data.getVar( "palmtopdir", d, True )
APPDESKTOP = bb.data.getVar( "APPDESKTOP", d, True ) or "%s/%s" % ( WORKDIR, desktopdir )
if desktopdir is not None:
============================================================
--- conf/bitbake.conf d52250874c724734f38a1342376ffb804d7a19fb
+++ conf/bitbake.conf 4481b02aa24ad52f996889ffadf4f12e9912c116
@@ -319,8 +319,8 @@ export OPIEDIR = "${STAGING_DIR}/${HOST_
export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt2"
export QPEDIR = "${STAGING_DIR}/${HOST_SYS}"
export OPIEDIR = "${STAGING_DIR}/${HOST_SYS}"
-export palmtopdir = "/opt/QtPalmtop"
-export palmqtdir = "/opt/QtPalmtop"
+export palmtopdir = "${prefix}"
+export palmqtdir = "${prefix}"
##################################################################
# Download locations and utilities.
============================================================
--- conf/machine/wl500g.conf f078925639f82bd00755302772f7671bd1d7e603
+++ conf/machine/wl500g.conf d7067382eb29e1f5c251a2c48f5e4f7d36f6f0f9
@@ -1,6 +1,8 @@ TARGET_ARCH = "mipsel"
#@TYPE: Machine
#@NAME: Asus WL500g(x)
#@DESCRIPTION: Machine configuration for the MIPS based WL500g(x) devices
TARGET_ARCH = "mipsel"
+MACHINE_FEATURES = "kernel26 usbhost wifi ext2"
+
TARGET_CC_ARCH = "-Os -mips2"
============================================================
--- packages/libopie/libopie2_cvs.bb 0b8fdd63993047dd867ec4552c1c2b70706021a6
+++ packages/libopie/libopie2_cvs.bb 66b355cdaf0863882ba11282e95ea14ad73da233
@@ -1,16 +1,16 @@ PV = "1.2.2+cvs${SRCDATE}"
require ${PN}.inc
PV = "1.2.2+cvs${SRCDATE}"
-PR = "r8"
+PR = "r9"
DEFAULT_PREFERENCE = "-1"
SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \
- file://include.pro \
- file://wireless.patch;patch=1"
+ file://include.pro"
# Patches merged upstream, keep for reference (for 1.2.2)
# file://ipaq-lcd-rotate-cleanup.patch;patch=1 \
# file://exports.patch;patch=1 \
+# file://wireless.patch;patch=1"
SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
============================================================
--- packages/libqpe/libqpe-opie.inc 30c1691eb0545cae035edf4a5dc84986235a36b6
+++ packages/libqpe/libqpe-opie.inc 3346fde77506aea54b8d7d57c5fe1dcae017a6ca
@@ -74,6 +74,6 @@ FILES_${PN} = "${palmtopdir}/lib/libqpe.
}
FILES_${PN} = "${palmtopdir}/lib/libqpe.so.*"
-FILES_${PN}-dev = "${includedir} ${palmtopdir}/lib/*"
+FILES_${PN}-dev = "${includedir} ${palmtopdir}/lib/*.so"
FILES_${PN}-dbg = "${palmtopdir}/lib/.debug/"
#PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
============================================================
--- packages/libqpe/libqpe-opie_cvs.bb baf3a4ab2d24dd30f79920a234075d1f6384d066
+++ packages/libqpe/libqpe-opie_cvs.bb f96cc1aefe160f38dd0536ab17ca7a8896d39937
@@ -1,7 +1,7 @@ PV = "1.2.2+cvs${SRCDATE}"
require ${PN}.inc
PV = "1.2.2+cvs${SRCDATE}"
-PR = "r8"
+PR = "r9"
SRC_URI = "${HANDHELDS_CVS};module=opie/library \
file://fix-titleheight.patch;patch=1 \
============================================================
--- packages/opie-console/opie-console.inc 26cd72b1f13cad3ed41dcd0451d54d7b8db3ef8c
+++ packages/opie-console/opie-console.inc b00cb8042f00def502c053a84e38d7a15b8f6d76
@@ -13,6 +13,7 @@ do_install() {
do_install() {
install -d ${D}${palmtopdir}/pics/console/keys/
+ install -m 0644 ${WORKDIR}/pics/inline/pass.* ${D}${palmtopdir}/pics/
install -m 0644 ${WORKDIR}/pics/console/*.png ${D}${palmtopdir}/pics/console/
install -m 0644 ${WORKDIR}/pics/console/keys/*.png ${D}${palmtopdir}/pics/console/keys/
}
============================================================
--- packages/opie-console/opie-console_cvs.bb 8289d1df5721cab3ef9a0f28d03201ed4ab7309a
+++ packages/opie-console/opie-console_cvs.bb 42fb7a012fce1c5b7170d185cf345f499ec1bd94
@@ -1,6 +1,7 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \
${HANDHELDS_CVS};module=opie/pics \
============================================================
--- packages/opie-init/opie-init/opie 879c03529cdeef4128ae40faefe35801f5376f43
+++ packages/opie-init/opie-init/opie 939a977703c5c993189c8355d175b621bfe71969
@@ -1,11 +1,11 @@
#!/bin/sh
#
[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root
[ -z $HOME ] && export HOME=/home/$LOGNAME
-export QTDIR=/opt/QtPalmtop
-export OPIEDIR=/opt/QtPalmtop
-export QPEDIR=/opt/QtPalmtop
+export QTDIR="@palmtopdir@"
+export OPIEDIR="$QTDIR"
+export QPEDIR="$QTDIR"
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
export PATH=$PATH:$OPIEDIR/bin
============================================================
--- packages/opie-init/opie-init/opie_defaults 971ecb87286e39af8be9705978014aa9f4a29506
+++ packages/opie-init/opie-init/opie_defaults 75480531b6dcda113547fddda2009db52f8bc09f
@@ -7,7 +7,7 @@ esac
*Poodle) test "$KVER" = "2.6" && export QWS_CURSOR_ROTATION=90;;
esac
-export QTDIR="/opt/QtPalmtop"
+export QTDIR="@palmtopdir@"
export OPIEDIR="$QTDIR"
export QPEDIR="$QTDIR"
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$OPIEDIR/lib"
============================================================
--- packages/opie-init/opie-init.inc 9bbf8651a7c66d185cc42caf5cc09ceb4c939a5b
+++ packages/opie-init/opie-init.inc 5fcdf1ce5c56a1de2a9bf4ff41be0f31abe3b52d
@@ -18,8 +18,10 @@ do_install() {
install -d ${D}${palmtopdir}/bin
install -d ${D}${palmtopdir}/etc/skel
- install -m 0755 ${WORKDIR}/opie ${D}${sysconfdir}/init.d/opie
- install -m 0644 ${WORKDIR}/opie_defaults ${D}${sysconfdir}/profile.d/
+ sed -s "s|@palmtopdir@|${palmtopdir}|" ${WORKDIR}/opie >${WORKDIR}/opie.tmp
+ sed -s "s|@palmtopdir@|${palmtopdir}|" ${WORKDIR}/opie_defaults >${WORKDIR}/opie_defaults.tmp
+ install -m 0755 ${WORKDIR}/opie.tmp ${D}${sysconfdir}/init.d/opie
+ install -m 0644 ${WORKDIR}/opie_defaults.tmp ${D}${sysconfdir}/profile.d/
install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}${palmtopdir}/bin/
install -m 0644 ${WORKDIR}/qpe.conf ${D}${palmtopdir}/etc/skel/
@@ -38,6 +40,6 @@ do_install() {
esac
}
-FILES_opie-init_append = " ${sysconfdir} ${palmtopdir}"
+FILES_opie-init_append = " ${sysconfdir} ${palmtopdir}/bin"
PACKAGE_ARCH = "${MACHINE_ARCH}"
============================================================
--- packages/opie-init/opie-init_1.2.2.bb 1b39d005ccd0c0c7b0398642458f2bde6c4c31d4
+++ packages/opie-init/opie-init_1.2.2.bb c2c9de8c7dd613b8f7b3b095200bb476c7bddaf9
@@ -1,5 +1,5 @@ require ${PN}.inc
require ${PN}.inc
-PR = "r4"
+PR = "r5"
SRC_URI = "file://opie-reorgfiles \
file://opie \
============================================================
--- packages/opie-irdaapplet/opie-irdaapplet_cvs.bb 82e388ecfed65dc597b8f8ffabd7d396965e49b3
+++ packages/opie-irdaapplet/opie-irdaapplet_cvs.bb 1e718aff97398e878d897b20f3aeaaa65c1770a3
@@ -1,10 +1,10 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = r1
+PR = r2
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/irdaapplet \
${HANDHELDS_CVS};module=opie/pics \
${HANDHELDS_CVS};module=opie/sounds \
${HANDHELDS_CVS};module=opie/apps \
+ "
- file://learning-cpp.patch;patch=1"
============================================================
--- packages/opie-networksettings/opie-networksettings_cvs.bb c639caa615cc88d0a83a3617de0b970e15031e01
+++ packages/opie-networksettings/opie-networksettings_cvs.bb fdf639c975afaedf8b2ce6fc7b065b61b9205e7d
@@ -1,10 +1,10 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r1"
+PR = "r2"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/networksettings \
${HANDHELDS_CVS};module=opie/pics \
${HANDHELDS_CVS};module=opie/apps \
${HANDHELDS_CVS};module=opie/root \
+ "
- file://wireless.patch;patch=1"
============================================================
--- packages/opie-oxygen/opie-oxygen.inc 41a6c02041cdc980c0b339290bc88b49626b17aa
+++ packages/opie-oxygen/opie-oxygen.inc 081a7c525fbf5e21763448c1c9f39138f0c05fc9
@@ -1,4 +1,4 @@
-DESCRIPTION = "Opie Oxygen"
+DESCRIPTION = "Opie Oxygen - Periodic table of elements (Chemistry)"
SECTION = "opie/applications"
PRIORITY = "optional"
LICENSE = "GPL"
============================================================
--- packages/opie-qcop/opie-qcop_cvs.bb d13764e02934981b413d161bd405d6c388571171
+++ packages/opie-qcop/opie-qcop_cvs.bb c2097d44582c668bbb719ae77cb032333a4a58de
@@ -1,5 +1,7 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
+PR = "r2"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qcop \
+ file://unbreak-logging.patch;patch=1"
-SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qcop"
============================================================
--- packages/opie-ttf-support/opie-ttf-support_1.1.bb 90f91510b34a3ea0a48e3c38214ce9c2c7b0ace6
+++ packages/opie-ttf-support/opie-ttf-support_1.1.bb 485a535dc2b358d5755ccec0f9697b159b0bb964
@@ -1,6 +1,7 @@ SECTION = "opie/fonts"
DESCRIPTION = "Meta-package for Opie TTF support"
DEPENDS = "freetype"
SECTION = "opie/fonts"
+PR = "r1"
SRC_URI = "file://update-qtttffontdir.c"
S = "${WORKDIR}"
@@ -17,6 +18,6 @@ if [ -n "$D" ]; then exit 1; fi
pkg_postinst() {
#!/bin/sh
if [ -n "$D" ]; then exit 1; fi
-mkdir -p /opt/QtPalmtop/lib/fonts/
-${sbindir}/update-qtttffontdir ${datadir}/fonts/truetype >/opt/QtPalmtop/lib/fonts/fontdir
+mkdir -p ${palmtopdir}/lib/fonts/
+${sbindir}/update-qtttffontdir ${datadir}/fonts/truetype >${palmtopdir}/lib/fonts/fontdir
}
============================================================
--- packages/qte/qte-mt_2.3.10.bb a19fde79d9a812e04519973d4914b51d828a0cdb
+++ packages/qte/qte-mt_2.3.10.bb f87b668c5dc754048758ef15a98e30583eb4067b
@@ -1,7 +1,7 @@ require qte-common_${PV}.inc
require qte-common_${PV}.inc
-PR = "r13"
+PR = "r14"
EXTRA_OECONF += "-thread"
PACKAGE_ARCH = "${MACHINE_ARCH}"
+FILES_${PN} = "${palmqtdir}/lib/*.so.*"
-FILES_${PN} = "${palmqtdir}"
#
# mt diff -rb4ae3e3209f986e2f04e385ccdf8f1559f0c510b -r4902c8e53850399e979d4c3c8c0ec1574220d312
#
#
#
# add_file "packages/slugos-init/files/boot/kexec"
# content [b1ddcced6d9e71541270a6164d283c40b6bf4c53]
#
# patch "conf/distro/angstrom-2007.1-legacy.conf"
# from [6881282904bf0d4a7ea3e5a985cd8f22862e4561]
# to [c5b38dbf99bb41080ad1856aeae6bb5359c8d578]
#
# patch "packages/slugos-init/files/boot/network"
# from [7863638b33cded9710583ad3868e24dc35c04195]
# to [1998f275fdd6f6ea83d325e7fe519c4357799e70]
#
# patch "packages/slugos-init/files/functions"
# from [de19dc6cafe30138b066dde30da63533e5278a40]
# to [68db6b5c8036845c4660e107be5b5c6a9a1c0cad]
#
# patch "packages/slugos-init/files/modulefunctions"
# from [534b40287bd038eafad6f14953eb107d549b1230]
# to [2fa625b35ea31712fde433431b13ec9b7c79d43b]
#
# patch "packages/slugos-init/slugos-init_0.10.bb"
# from [71bdfe52397be1f4556cf272c28ecf7f960558ae]
# to [838d2b4d97516e7beb1501277067200126a20075]
#
# patch "packages/tasks/task-slugos.bb"
# from [9b3a116faea9265f7fc10285942e53fbc831e391]
# to [b17910995413514e0b7ea24f7ea3468dd3c2d63e]
#
============================================================
--- packages/slugos-init/files/boot/kexec b1ddcced6d9e71541270a6164d283c40b6bf4c53
+++ packages/slugos-init/files/boot/kexec b1ddcced6d9e71541270a6164d283c40b6bf4c53
@@ -0,0 +1,159 @@
+#!/bin/sh
+#
+# Loads the specified kernel and kexecs it.
+#
+# The access method and path from which to fetch the kernel
+# is specified in "$1" and "$2":
+#
+# flash /boot/zImage-ixp4xxbe
+# nfs spike:/home/slug/vmlinuz
+# wget http://devserv/kernels/vmlinuzbe
+# wget ftp://ftpserv/pub/zImage
+# /dev/sda1 /kernels/zImage-test
+# UUID /kernels/zImage-test
+#
+# Command-line options for the new kernel are in "$3".
+
+# Use the standard init path (see /etc/init.d/rcS)
+export PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+# Wait at least a short while for the disks...
+if [ ! "$sleep" -gt 0 ] ; then
+ sleep=1
+fi
+
+# Load the helper functions
+. /etc/default/functions
+. /etc/default/modulefunctions
+
+leds boot system
+
+if [ -n "$1" -a -n "$2" ] ; then
+
+ method="$1"
+ shift
+ kpath="$1"
+ shift
+ if [ -n "$1" ] ; then
+ kcmdline="$1"
+ shift
+ fi
+ kexec_image=
+ need_umount=0
+ do_kexec=0
+
+ mount -t proc proc /proc
+
+ case "$method" in
+
+ flash )
+ echo "Loading kexec kernel directly from \"$kpath\"..."
+ kexec_image="$kpath"
+ ;;
+
+ wget )
+ if /boot/network ; then
+ echo "mounting tmpfs partition..."
+ if mount -t tmpfs tmpfs /mnt ; then
+ need_umount=1
+ echo "Loading kexec kernel using wget \"$kpath\"..."
+ wget -P /mnt "$kpath"
+ t=`basename "$kpath"`
+ kexec_image="/mnt/$t"
+ fi
+ fi
+ ;;
+
+ nfs )
+ if /boot/network ; then
+ echo "Loading kexec kernel using nfs \"$kpath\"..."
+ echo "mounting nfs partition..."
+ if mount -o ro,nolock -t nfs `dirname "$kpath"` /mnt ; then
+ need_umount=1
+ t=`basename "$kpath"`
+ kexec_image="/mnt/$t"
+ fi
+ fi
+ ;;
+
+ /dev/* )
+ echo "Loading kexec kernel using disk \"$kpath\"..."
+ loaddiskmods
+ sleep "$sleep"
+ echo "mounting partition \"$method\"..."
+ if mount -o ro "$method" /mnt ; then
+ need_umount=1
+ kexec_image="/mnt/$kpath"
+ fi
+ ;;
+
+ UUID )
+ echo "Loading kexec kernel using disk UUID \"$kpath\"..."
+ loaddiskmods
+ sleep "$sleep"
+ if [ -n "$UUID" ] ; then
+ echo "mounting partition UUID \"$UUID\"..."
+ if mount -o ro -U "$UUID" /mnt ; then
+ need_umount=1
+ kexec_image="/mnt/$kpath"
+ fi
+ fi
+ ;;
+
+ * )
+ echo "Unrecognized method: \"$method\""
+ ;;
+
+ esac
+
+ if [ -n "$kexec_image" -a -f "$kexec_image" ] ; then
+ if kexec -l "$kexec_image" ; then
+ do_kexec=1
+ fi
+ else
+ echo "Unable to load \"$kexec_image\""
+ fi
+
+ if [ $do_kexec -eq 1 -a -n "$kcmdline" ] ; then
+ echo "Attempting to mount /sys (sysfs)..."
+ if mount -t sysfs sysfs /sys ; then
+ echo "Setting command line:"
+ echo " \"$kcmdline\""
+ echo "$kcmdline" > /sys/kernel/kexec_cmdline
+ echo "unmounting /sys..."
+ umount /sys
+ else
+ do_kexec=0
+ fi
+ fi
+
+ if [ $need_umount -eq 1 ] ; then
+ echo "unmounting /mnt..."
+ umount /mnt
+ fi
+
+ if [ $do_kexec -eq 1 ] ; then
+ echo "Remounting root as read-only..."
+ mount -o remount,ro /
+ echo "Invoking \"kexec -f -e\" ..."
+ kexec -f -e
+ echo "ERROR!"
+ # We should never return here! At this point, things are not
+ # too well. Remount the root as rw, and fallback.
+ echo "Remounting root as read-write..."
+ mount -o remount,rw /
+ fi
+else
+ echo "Usage: $0 flash|nfs|wget|UUID|/dev/<partition> <path-or-URL> [cmdline]"
+fi
+
+# fallback - use the flash boot
+echo "Falling back to flash boot..."
+leds beep -f 1000 -r 2
+exec /boot/flash
+
+# fallback to the fallback
+leds boot system panic
+exec <>/dev/console >&0 2>&0
+test -x /bin/sh && exec /bin/sh
+exit 1
============================================================
--- conf/distro/angstrom-2007.1-legacy.conf 6881282904bf0d4a7ea3e5a985cd8f22862e4561
+++ conf/distro/angstrom-2007.1-legacy.conf c5b38dbf99bb41080ad1856aeae6bb5359c8d578
@@ -1,9 +1,9 @@
#this is a special version of angstrom for legacy (e.g. kernel 2.4) software
# that means:
# * no udev
# * no sysfs
# * no EABI for ARM
-require conf/distro/angstrom-2007.1-oabi.conf
+require conf/distro/angstrom-2007.1.conf
# We'll have to fill this in as we go.
============================================================
--- packages/slugos-init/files/boot/network 7863638b33cded9710583ad3868e24dc35c04195
+++ packages/slugos-init/files/boot/network 1998f275fdd6f6ea83d325e7fe519c4357799e70
@@ -8,6 +8,11 @@
# function!
. /etc/default/functions
#
+# We may need to load the network driver modules here
+. /etc/default/modulefunctions
+loadnetmods
+#
+#
# Now all the information for booting should be in the configuration
# file. Config the loopback and network interfaces.
ifconfig lo 127.0.0.1 up
============================================================
--- packages/slugos-init/files/functions de19dc6cafe30138b066dde30da63533e5278a40
+++ packages/slugos-init/files/functions 68db6b5c8036845c4660e107be5b5c6a9a1c0cad
@@ -274,6 +274,8 @@ ifup(){
if test "$(config boot)" != static
then
test -n "$hostname" && HOSTNAME="-H $hostname"
+ # Pause a moment in case link negotiation takes a while
+ sleep 3
# The script writes the required shell variable assignments
# to file descriptor 9
eval $(udhcpc -i "$iface" -n -q -r "$ip" $HOSTNAME -s /boot/udhcpc.script 9>&1 >/dev/null)
============================================================
--- packages/slugos-init/files/modulefunctions 534b40287bd038eafad6f14953eb107d549b1230
+++ packages/slugos-init/files/modulefunctions 2fa625b35ea31712fde433431b13ec9b7c79d43b
@@ -21,7 +21,14 @@ loadnetmods(){
}
loadnetmods(){
- true
+ case "$(machine)" in
+ dsmg600)
+ modprobe via-velocity
+ ;;
+ *)
+ true
+ ;;
+ esac
}
loadmiscmods(){
============================================================
--- packages/slugos-init/slugos-init_0.10.bb 71bdfe52397be1f4556cf272c28ecf7f960558ae
+++ packages/slugos-init/slugos-init_0.10.bb 838d2b4d97516e7beb1501277067200126a20075
@@ -1,15 +1,16 @@ RDEPENDS = "busybox devio"
DESCRIPTION = "SlugOS initial network config via sysconf"
SECTION = "base"
PRIORITY = "required"
LICENSE = "GPL"
DEPENDS = "base-files devio"
RDEPENDS = "busybox devio"
-PR = "r86"
+PR = "r87"
SRC_URI = "file://boot/flash \
file://boot/disk \
file://boot/nfs \
file://boot/ram \
+ file://boot/kexec \
file://boot/network \
file://boot/udhcpc.script \
file://initscripts/fixfstab \
@@ -35,7 +36,7 @@ SCRIPTS = "turnup reflash leds sysconf"
USRSBINPROGS = ""
CPROGS = "${USRSBINPROGS} ${SBINPROGS}"
SCRIPTS = "turnup reflash leds sysconf"
-BOOTSCRIPTS = "flash disk nfs ram network udhcpc.script"
+BOOTSCRIPTS = "flash disk nfs ram kexec network udhcpc.script"
INITSCRIPTS = "syslog.buffer syslog.file syslog.network zleds\
leds_startup rmrecovery sysconfsetup umountinitrd.sh\
fixfstab loadmodules.sh"
============================================================
--- packages/tasks/task-slugos.bb 9b3a116faea9265f7fc10285942e53fbc831e391
+++ packages/tasks/task-slugos.bb b17910995413514e0b7ea24f7ea3468dd3c2d63e
@@ -6,7 +6,7 @@ LICENSE = "MIT"
DESCRIPTION = "Task packages for the SlugOS distribution"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r11"
+PR = "r12"
PACKAGE_ARCH = "${MACHINE_ARCH}"
ALLOW_EMPTY = "1"
@@ -97,12 +97,12 @@ SLUGOS_STANDARD_RRECOMMENDS += "\
# Add modules required for Wifi support
SLUGOS_STANDARD_RRECOMMENDS += "\
-madwifi-ng-modules madwifi-ng-tools \
+madwifi-ng-modules madwifi-ng-tools wireless-tools \
"
## Other wireless tools that should be considered
## should space be available in the rootfs
-# wireless-tools wpa-supplicant \
+# wpa-supplicant \
# zd1211-firmware kernel-module-zd1211rw \
# Add kexec tools for rebooting alternate kernels
More information about the Openembedded-commits
mailing list