merge of '125082859a77d2fb336606219b6218e166f6dfde'

     and 'd56b36a235e386bdd0684cdb650a872836d4e393'

10 files changed, 249 insertions, 99 deletions

diff --git a/packages/images/opie-image-16mb.bb b/packages/images/opie-image-16mb.bb
new file mode 100644
index 0000000000..9c0ed1cacc
--- /dev/null
+++ b/packages/images/opie-image-16mb.bb
@@ -0,0 +1,69 @@
+export IMAGE_BASENAME = "opie-image-16mb"
+export IMAGE_LINGUAS = ""
+
+LICENSE = "MIT"
+PR = "r1"
+
+DEPENDS = "${MACHINE_TASK_PROVIDER} task-opie-16mb"
+RDEPENDS = "${INSTALL_PACKAGES}"
+
+INSTALL_PACKAGES = "task-boot \
+                    ipkg ipkg-collateral \
+                    dropbear \
+                    task-opie-16mb-base \
+                    task-opie-16mb-applets \
+                    task-opie-16mb-inputmethods \
+                    task-opie-16mb-settings \
+                    task-opie-16mb-apps \
+                    task-opie-16mb-pim \
+		    task-opie-irda"
+
+export PACKAGE_INSTALL = "${INSTALL_PACKAGES}"
+
+# merge feed-sources into ipkg.conf for opie-aqpkg as it can't handle feed-sources outside of ipkg.conf.
+merge_feeds() {
+
+        if ! test -z "${FEED_URIS}"
+        then
+                # Die gracefully if ipkg-collateral failed
+                if ! test -e "${IMAGE_ROOTFS}/etc/ipkg.conf"
+                then
+                        echo "[${IMAGE_ROOTFS}/etc/ipkg.conf] is missing!"
+                        exit 1
+                fi
+
+                # comment out existing feed-sources inserted by ipkg-collateral
+                cat ${IMAGE_ROOTFS}/etc/ipkg.conf | sed "s/^src\ /#src\ /" > ${IMAGE_ROOTFS}/etc/ipkg.conf_
+                rm ${IMAGE_ROOTFS}/etc/ipkg.conf && mv ${IMAGE_ROOTFS}/etc/ipkg.conf_ ${IMAGE_ROOTFS}/etc/ipkg.conf
+
+                # extract, then delete destinations
+                cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf.dest
+                cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep -v "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf_
+                rm ${IMAGE_ROOTFS}/etc/ipkg.conf && mv ${IMAGE_ROOTFS}/etc/ipkg.conf_ ${IMAGE_ROOTFS}/etc/ipkg.conf
+
+
+                for line in ${FEED_URIS}
+                do
+                        # strip leading and trailing spaces/tabs, then split into name and uri
+                        line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`"
+                        feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`"
+                        feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`"
+
+                        # insert new feed-sources
+                        echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg.conf
+                done
+
+                # remove temporary files and rebuild ipkg.conf
+                echo "" >> ${IMAGE_ROOTFS}/etc/ipkg.conf
+                cat ${IMAGE_ROOTFS}/etc/ipkg.conf.dest >> ${IMAGE_ROOTFS}/etc/ipkg.conf
+                rm ${IMAGE_ROOTFS}/etc/ipkg.conf.dest
+
+                # remove -feed.conf files which are no longer needed
+                cd ${IMAGE_ROOTFS}/etc/ipkg/ && rm -- *-feed.conf
+        fi
+}
+
+# merge feed-sources into ipkg.conf and create /etc/timestamp from build date
+IMAGE_PREPROCESS_COMMAND = "merge_feeds; create_etc_timestamp"
+
+inherit image
diff --git a/packages/initscripts/initscripts-1.0/mountall.sh b/packages/initscripts/initscripts-1.0/mountall.sh
index 65d5d26b24..30f5b5ea37 100755
--- a/packages/initscripts/initscripts-1.0/mountall.sh
+++ b/packages/initscripts/initscripts-1.0/mountall.sh
@@ -4,6 +4,9 @@
 # Version:	@(#)mountall.sh  2.83-2  01-Nov-2001  miquels@cistron.nl
 #
 . /etc/default/rcS
+if test -f /etc/default/mountall; then
+    . /etc/default/mountall
+fi
 
 #
 # Mount local filesystems in /etc/fstab. For some reason, people
@@ -11,7 +14,7 @@
 # about this. So we mount "proc" filesystems without -v.
 #
 test "$VERBOSE" != no && echo "Mounting local filesystems..."
-mount -at nonfs,nosmbfs,noncpfs 2>/dev/null
+mount -a $MOUNTALL 2>/dev/null
 
 #
 # We might have mounted something over /dev, see if /dev/initctl is there.
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index c390968bc1..1203fb4231 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 = "r94"
+PR = "r95"
 
 SRC_URI = "file://halt \
            file://ramdisk \
diff --git a/packages/tasks/task-opie-16mb.bb b/packages/tasks/task-opie-16mb.bb
new file mode 100644
index 0000000000..610e06ffb0
--- /dev/null
+++ b/packages/tasks/task-opie-16mb.bb
@@ -0,0 +1,54 @@
+DESCRIPTION = "Tasks for small OPIE image"
+SECTION = "opie/base"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+ALLOW_EMPTY = "1"
+LICENSE = "MIT"
+
+PR = "r0"
+
+PACKAGES = "task-opie-16mb-base \
+            task-opie-16mb-applets \
+            task-opie-16mb-inputmethods \
+            task-opie-16mb-settings \
+            task-opie-16mb-apps \
+            task-opie-16mb-pim \
+           "
+
+#
+# Dependencies to get the launcher up and running
+#
+RDEPENDS_task-opie-16mb-base = "opie-init opie-alarm opie-qcop opie-qss opie-quicklauncher \
+                           opie-taskbar opie-pics opie-sounds opie-freetype \
+                           ttf-dejavu-sans ttf-dejavu-sans-mono"
+
+#
+# things for reasonable bootstrap image
+#
+RDEPENDS_task-opie-16mb-applets = "opie-aboutapplet opie-clockapplet opie-suspendapplet \
+                                   opie-homeapplet opie-rotateapplet \
+		                   opie-brightnessapplet opie-volumeapplet \
+                                   opie-screenshotapplet \
+    ${@base_contains("COMBINED_FEATURES", "irda", "opie-irdaapplet", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "apm", "opie-batteryapplet", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-pcmciaapplet", "",d)} \
+    ${@base_contains("MACHINE_FEATURES", "keyboard", "opie-vtapplet opie-logoutapplet", "",d)}"
+
+#
+# clamshell models can benefit from the autorotate applet
+#
+RDEPENDS_task-opie-16mb-applets_append_c7x0   = " opie-autorotateapplet"
+RDEPENDS_task-opie-16mb-applets_append_spitz  = " opie-autorotateapplet"
+RDEPENDS_task-opie-16mb-applets_append_akita  = " opie-autorotateapplet"
+
+RDEPENDS_task-opie-16mb-inputmethods = "opie-multikey"
+
+RDEPENDS_task-opie-16mb-settings = "opie-packagemanager opie-light-and-power opie-appearance \
+                           opie-systemtime opie-networksettings opie-button-settings \
+                           opie-icon-reload opie-launcher-settings opie-security \
+                           opie-securityplugin-pin"
+
+RDEPENDS_task-opie-16mb-apps = "opie-console opie-clock opie-backup opie-sysinfo \
+                       opie-advancedfm"
+
+RDEPENDS_task-opie-16mb-pim = "opie-addressbook opie-datebook opie-drawpad \
+                      opie-search opie-textedit opie-today opie-todo"
diff --git a/packages/tasks/task-opie-all.bb b/packages/tasks/task-opie-all.bb
new file mode 100644
index 0000000000..c47aa0c420
--- /dev/null
+++ b/packages/tasks/task-opie-all.bb
@@ -0,0 +1,65 @@
+DESCRIPTION = "Tasks for OPIE stuff"

+SECTION = "opie/base"

+ALLOW_EMPTY = "1"

+LICENSE = "MIT"

+

+PACKAGES = "task-opie-applets task-opie-inputmethods task-opie-styles \

+            task-opie-decorations task-opie-multimedia"

+

+#

+# all OPIE stuff

+#

+RDEPENDS_task-opie-applets = "opie-aboutapplet opie-autorotateapplet opie-batteryapplet \

+                     opie-bluetoothapplet opie-brightnessapplet opie-cardmon \

+                     opie-clipboardapplet opie-clockapplet opie-homeapplet \

+                     opie-irdaapplet opie-lockapplet opie-logoutapplet \

+                     opie-mailapplet opie-memoryapplet opie-multikeyapplet \

+                     opie-networkapplet opie-notesapplet opie-pcmciaapplet \

+                     opie-pyquicklaunchapplet opie-restartapplet \

+                     opie-restartapplet2 opie-rotateapplet \

+                     opie-screenshotapplet opie-suspendapplet opie-vmemo \

+                     opie-volumeapplet opie-vtapplet opie-zkbapplet \

+                     "

+RDEPENDS_task-opie-inputmethods = "opie-dasher opie-dvorak opie-handwriting \

+                          opie-handwriting-classicset opie-jumpx opie-keyboard \

+                          opie-keyview opie-kjumpx opie-multikey opie-unikeyboard"

+

+RDEPENDS_task-opie-styles = "opie-style-flat opie-style-fresh opie-style-liquid opie-style-metal \

+                    opie-style-web opie-style-phase opie-theme"

+

+RDEPENDS_task-opie-decorations = "opie-deco-flat opie-deco-liquid opie-deco-polished"

+

+RDEPENDS_task-opie-multimedia = "opie-mediaplayer1 \

+                        opie-mediaplayer1-libmadplugin \

+                        opie-mediaplayer1-libmodplugin \

+                        opie-mediaplayer1-libtremorplugin \

+                        opie-mediaplayer1-libwavplugin \

+                        opie-mediaplayer2 \

+                        opie-mediaplayer2-skin-default \

+                        opie-mediaplayer2-skin-default-landscape \

+                        opie-mediaplayer2-skin-pod \

+                        opie-mediaplayer2-skin-techno \

+                        opie-powerchord opie-recorder opie-tonleiter"

+

+RDEPENDS_task-opie-settings = "opie-appearance opie-aqpkg opie-backup opie-button-settings \

+                      opie-citytime opie-confeditor opie-doctab \

+                      opie-formatter opie-language opie-launcher-settings \

+                      opie-light-and-power opie-mediummount opie-networksettings \

+                      opie-packagemanager opie-security opie-sshkeys opie-sysinfo \

+                      opie-systemtime opie-usermanager opie-icon-reload \

+                      opie-vmemo-settings"

+

+RDEPENDS_task-opie-pim = "task-opie-base-pim task-opie-todayplugins task-opie-datebookplugins \

+                 opie-mail opie-pimconverter"

+

+RDEPENDS_task-opie-datebookplugins= "opie-datebook-birthdayplugin \

+                            opie-datebook-chrisholidayplugin \

+                            opie-datebook-nationalholidayplugin"

+

+RDEPENDS_task-opie-todayplugins = "opie-today-addressbookplugin opie-today-datebookplugin \

+                          opie-today-fortuneplugin opie-today-mailplugin \

+                          opie-today-stocktickerplugin opie-today-todolistplugin \

+                          opie-today-weatherplugin"

+

+RDEPENDS_task-opie-wlan = "wireless-tools opie-wellenreiter opie-networksettings-wlanplugin"

+

diff --git a/packages/tasks/task-opie-apps.bb b/packages/tasks/task-opie-apps.bb
new file mode 100644
index 0000000000..1c03dcc9d9
--- /dev/null
+++ b/packages/tasks/task-opie-apps.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Tasks for OPIE stuff"
+SECTION = "opie/base"
+ALLOW_EMPTY = "1"
+LICENSE = "MIT"
+
+PACKAGES = "task-opie-apps task-opie-extra-apps"
+
+RDEPENDS_task-opie-apps = "opie-advancedfm opie-bartender opie-calculator \
+                  opie-checkbook opie-clock \
+                  opie-console opie-dagger opie-embeddedkonsole \
+                  opie-euroconv opie-eye opie-ftp opie-gutenbrowser \
+                  opie-helpbrowser opie-irc opie-keypebble opie-odict \
+                  opie-oxygen opie-rdesktop opie-reader opie-remote \
+                  opie-sheet opie-tableviewer opie-tinykate \
+                  opie-wellenreiter opie-write opie-zsafe"
+
+#
+# additional things for a >= 24mb distribution
+#
+
+RDEPENDS_task-opie-extra-apps = "opie-calculator opie-checkbook opie-mail opie-eye \
+                        opie-rdesktop opie-wellenreiter opie-irc \
+                        opie-mediaplayer2 \
+                        qpdf2"
+# konqueror-embedded
diff --git a/packages/tasks/task-opie-games.bb b/packages/tasks/task-opie-games.bb
new file mode 100644
index 0000000000..70d2f39b29
--- /dev/null
+++ b/packages/tasks/task-opie-games.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Tasks for OPIE stuff"

+SECTION = "opie/base"

+ALLOW_EMPTY = "1"

+LICENSE = "MIT"

+

+PACKAGES = "task-opie-games task-opie-extra-games"

+

+RDEPENDS_task-opie-games = "opie-backgammon opie-bounce opie-buzzword opie-fifteen \

+                   opie-go opie-kbill opie-kcheckers opie-kpacman opie-mindbreaker \

+                   opie-minesweep opie-oyatzee opie-parashoot opie-qasteroids \

+                   opie-sfcave opie-snake opie-solitaire opie-tetrix opie-tictac \

+                   opie-wordgame opie-zlines opie-zsame"

+

+#

+# additional things for a >= 24mb distribution

+#

+

+RDEPENDS_task-opie-extra-games = "opie-parashoot opie-mindbreaker opie-fifteen opie-tictac \

+                         opie-tetrix"

+

diff --git a/packages/tasks/task-opie.bb b/packages/tasks/task-opie.bb
index 960770ef7c..7380b5fc20 100644
--- a/packages/tasks/task-opie.bb
+++ b/packages/tasks/task-opie.bb
@@ -5,20 +5,18 @@ ALLOW_EMPTY = "1"
 LICENSE = "MIT"
 PROVIDES = "task-opie-everything"
 
-PR = "r7"
+PR = "r9"
 
-PACKAGES = "task-opie-applets task-opie-apps task-opie-base \
+PACKAGES = "task-opie-base \
             task-opie-base-applets task-opie-base-apps \
             task-opie-base-decorations task-opie-base-inputmethods \
             task-opie-base-pim task-opie-base-settings \
             task-opie-base-styles task-opie-bluetooth \
             task-opie-base-todayplugins \
-            task-opie-datebookplugins task-opie-decorations \
-            task-opie-extra-apps task-opie-extra-settings \
-            task-opie-extra-styles task-opie-extra-games \
-            task-opie-games task-opie-inputmethods task-opie-irda \
-            task-opie-multimedia task-opie-pim task-opie-settings \
-            task-opie-styles task-opie-todayplugins task-opie-wlan"
+            task-opie-extra-settings \
+            task-opie-extra-styles \
+            task-opie-irda \
+           "
 
 RDEPENDS_task-opie-everything := "${PACKAGES}"
 
@@ -36,7 +34,7 @@ RDEPENDS_task-opie-base = "opie-init opie-alarm opie-qcop opie-qss opie-quicklau
 #
 RDEPENDS_task-opie-base-applets = "opie-aboutapplet opie-clockapplet opie-suspendapplet \
                                    opie-homeapplet opie-rotateapplet \
-		   opie-brightnessapplet opie-volumeapplet \
+		                   opie-brightnessapplet opie-volumeapplet \
                                    opie-screenshotapplet \
     ${@base_contains("COMBINED_FEATURES", "irda", "opie-irdaapplet", "",d)} \
     ${@base_contains("COMBINED_FEATURES", "apm", "opie-batteryapplet", "",d)} \
@@ -85,93 +83,7 @@ RDEPENDS_task-opie-base-pim = "opie-addressbook opie-datebook opie-drawpad \
                       task-opie-base-todayplugins \
                       opie-datebook-birthdayplugin"
 
-#
-# all OPIE stuff
-#
-RDEPENDS_task-opie-applets = "opie-aboutapplet opie-autorotateapplet opie-batteryapplet \
-                     opie-bluetoothapplet opie-brightnessapplet opie-cardmon \
-                     opie-clipboardapplet opie-clockapplet opie-homeapplet \
-                     opie-irdaapplet opie-lockapplet opie-logoutapplet \
-                     opie-mailapplet opie-memoryapplet opie-multikeyapplet \
-                     opie-networkapplet opie-notesapplet opie-pcmciaapplet \
-                     opie-pyquicklaunchapplet opie-restartapplet \
-                     opie-restartapplet2 opie-rotateapplet \
-                     opie-screenshotapplet opie-suspendapplet opie-vmemo \
-                     opie-volumeapplet opie-vtapplet opie-zkbapplet \
-                     "
-RDEPENDS_task-opie-apps = "opie-advancedfm opie-bartender opie-calculator \
-                  opie-checkbook opie-clock \
-                  opie-console opie-dagger opie-embeddedkonsole \
-                  opie-euroconv opie-eye opie-ftp opie-gutenbrowser \
-                  opie-helpbrowser opie-irc opie-keypebble opie-odict \
-                  opie-oxygen opie-rdesktop opie-reader opie-remote \
-                  opie-sheet opie-tableviewer opie-tinykate \
-                  opie-wellenreiter opie-write opie-zsafe"
-
-RDEPENDS_task-opie-decorations = "opie-deco-flat opie-deco-liquid opie-deco-polished"
-
-RDEPENDS_task-opie-games = "opie-backgammon opie-bounce opie-buzzword opie-fifteen \
-                   opie-go opie-kbill opie-kcheckers opie-kpacman opie-mindbreaker \
-                   opie-minesweep opie-oyatzee opie-parashoot opie-qasteroids \
-                   opie-sfcave opie-snake opie-solitaire opie-tetrix opie-tictac \
-                   opie-wordgame opie-zlines opie-zsame"
-
-RDEPENDS_task-opie-inputmethods = "opie-dasher opie-dvorak opie-handwriting \
-                          opie-handwriting-classicset opie-jumpx opie-keyboard \
-                          opie-keyview opie-kjumpx opie-multikey opie-unikeyboard"
-
-RDEPENDS_task-opie-multimedia = "opie-mediaplayer1 \
-                        opie-mediaplayer1-libmadplugin \
-                        opie-mediaplayer1-libmodplugin \
-                        opie-mediaplayer1-libtremorplugin \
-                        opie-mediaplayer1-libwavplugin \
-                        opie-mediaplayer2 \
-                        opie-mediaplayer2-skin-default \
-                        opie-mediaplayer2-skin-default-landscape \
-                        opie-mediaplayer2-skin-pod \
-                        opie-mediaplayer2-skin-techno \
-                        opie-powerchord opie-recorder opie-tonleiter"
-
-RDEPENDS_task-opie-settings = "opie-appearance opie-aqpkg opie-backup opie-button-settings \
-                      opie-citytime opie-confeditor opie-doctab \
-                      opie-formatter opie-language opie-launcher-settings \
-                      opie-light-and-power opie-mediummount opie-networksettings \
-                      opie-packagemanager opie-security opie-sshkeys opie-sysinfo \
-                      opie-systemtime opie-usermanager opie-icon-reload \
-                      opie-vmemo-settings"
-
-RDEPENDS_task-opie-styles = "opie-style-flat opie-style-fresh opie-style-liquid opie-style-metal \
-                    opie-style-web opie-style-phase opie-theme"
-
-RDEPENDS_task-opie-datebookplugins= "opie-datebook-birthdayplugin \
-                            opie-datebook-chrisholidayplugin \
-                            opie-datebook-nationalholidayplugin"
-
-RDEPENDS_task-opie-todayplugins = "opie-today-addressbookplugin opie-today-datebookplugin \
-                          opie-today-fortuneplugin opie-today-mailplugin \
-                          opie-today-stocktickerplugin opie-today-todolistplugin \
-                          opie-today-weatherplugin"
-
-RDEPENDS_task-opie-pim = "task-opie-base-pim task-opie-todayplugins task-opie-datebookplugins \
-                 opie-mail opie-pimconverter"
-
 RDEPENDS_task-opie-bluetooth = "bluez-utils obexftp obexpush libopieobex0 \
                        opie-bluepin opie-bluetoothmanager opie-bluetoothapplet"
 
-RDEPENDS_task-opie-wlan = "wireless-tools opie-wellenreiter opie-networksettings-wlanplugin"
-
 RDEPENDS_task-opie-irda = "irda-utils libopieobex0 obexftp obexpush"
-
-#
-# additional things for a >= 24mb distribution
-#
-
-RDEPENDS_task-opie-extra-apps = "opie-calculator opie-checkbook opie-mail opie-eye \
-                        opie-rdesktop opie-wellenreiter opie-irc \
-                        opie-mediaplayer2 \
-                        qpdf2"
-# konqueror-embedded
-
-RDEPENDS_task-opie-extra-games = "opie-parashoot opie-mindbreaker opie-fifteen opie-tictac \
-                         opie-tetrix"
-
diff --git a/packages/util-linux/util-linux.inc b/packages/util-linux/util-linux.inc
index a5ff009669..2b527678c4 100644
--- a/packages/util-linux/util-linux.inc
+++ b/packages/util-linux/util-linux.inc
@@ -23,7 +23,7 @@ FILES_util-linux-cfdisk = "/sbin/cfdisk"
 FILES_util-linux-sfdisk = "/sbin/sfdisk"
 FILES_util-linux-swaponoff = "/sbin/swapon.${PN} /sbin/swapoff.${PN}"
 FILES_util-linux-losetup = "/sbin/losetup.${PN}"
-FILES_util-linux-mount = "/bin/mount.${PN}"
+FILES_util-linux-mount = "/bin/mount.${PN} ${sysconfdir}/default/mountall"
 FILES_util-linux-umount = "/bin/umount.${PN}"
 FILES_util-linux-readprofile = "/usr/sbin/readprofile"
 
@@ -95,6 +95,8 @@ do_install () {
 	mv ${D}${base_bindir}/umount ${D}${base_bindir}/umount.${PN}
 	mv ${D}${base_bindir}/mount ${D}${base_bindir}/mount.${PN}
 	mv ${D}${base_sbindir}/fdisk ${D}${base_sbindir}/fdisk.${PN}
+	install -d ${D}${sysconfdir}/default/
+	echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall
 
 	checklink swapon ${D}${base_sbindir}/swapoff ".${PN}"
 	checklink shutdown ${D}${base_sbindir}/reboot ".${PN}"
diff --git a/packages/util-linux/util-linux_2.12r.bb b/packages/util-linux/util-linux_2.12r.bb
index 0409f61b74..9d4b59c855 100644
--- a/packages/util-linux/util-linux_2.12r.bb
+++ b/packages/util-linux/util-linux_2.12r.bb
@@ -4,4 +4,4 @@ SRC_URI += "file://util-linux_2.12r-12.diff.gz;patch=1"
 SRC_URI += "file://glibc-fix.patch;patch=1"
 SRC_URI += "file://glibc-umount2.patch;patch=1"
 
-PR = "r11"
+PR = "r12"