diff options
Diffstat (limited to 'packages')
281 files changed, 1405 insertions, 621 deletions
diff --git a/packages/atd/atd_0.70.bb b/packages/atd/atd_0.70.bb index 5ba524b916..9862fac0dd 100644 --- a/packages/atd/atd_0.70.bb +++ b/packages/atd/atd_0.70.bb @@ -4,10 +4,10 @@ LICENSE = "GPLV2" RCONFLICTS = "at" RREPLACES = "at" -PR = "r3" +PR = "r4" SRC_URI = "${HANDHELDS_CVS};module=apps/atd;tag=ATD-0_70 \ - file://no-oknodo.patch;patch=1" + file://atd-startup.patch;patch=1;pnum=0" S = "${WORKDIR}/atd" inherit update-rc.d diff --git a/packages/atd/files/atd-startup.patch b/packages/atd/files/atd-startup.patch new file mode 100644 index 0000000000..dc4c1195d1 --- /dev/null +++ b/packages/atd/files/atd-startup.patch @@ -0,0 +1,39 @@ +? atd-startup.patch +Index: ChangeLog +=================================================================== +RCS file: /cvs/apps/atd/ChangeLog,v +retrieving revision 1.2 +diff -B -b -u -r1.2 ChangeLog +--- ChangeLog 2 Feb 2004 15:30:39 -0000 1.2 ++++ ChangeLog 13 Jan 2006 11:54:00 -0000 +@@ -1,3 +1,8 @@ ++2006-01-13 Florian Boor <florian@kernelconcepts.de> ++ ++ * dist/etc/init.d/atd: Remove obsolete --oknodo and add -m to ++ enable pidfile. ++ + V0.7 + - removed waiting for childpid after having spawned an event + this caused trouble with events rescheduling themselves +Index: dist/etc/init.d/atd +=================================================================== +RCS file: /cvs/apps/atd/dist/etc/init.d/atd,v +retrieving revision 1.3 +diff -B -b -u -r1.3 atd +--- dist/etc/init.d/atd 24 Jan 2003 15:09:03 -0000 1.3 ++++ dist/etc/init.d/atd 13 Jan 2006 11:54:00 -0000 +@@ -11,12 +11,12 @@ + echo -n "Starting at daemon: atd" + mkdir -p /var/spool/at + chmod a+w /var/spool/at +- start-stop-daemon --start --quiet --pidfile /var/run/atd.pid --exec /usr/sbin/atd /var/spool/at >/dev/null 2>&1 & ++ start-stop-daemon --start --quiet -m --pidfile /var/run/atd.pid --exec /usr/sbin/atd /var/spool/at >/dev/null 2>&1 & + echo "." + ;; + stop) + echo -n "Stopping at daemon: atd" +- start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/atd.pid --exec /usr/sbin/atd ++ start-stop-daemon --stop --quiet --pidfile /var/run/atd.pid --exec /usr/sbin/atd + rm -f /var/spool/at/trigger + echo "." + ;; diff --git a/packages/opie-securityplugins/opie-securityplugins.inc b/packages/blueprobe/blueprobe-0.16/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/opie-securityplugins/opie-securityplugins.inc +++ b/packages/blueprobe/blueprobe-0.16/.mtn2git_empty diff --git a/packages/blueprobe/blueprobe-0.16/h6300.patch b/packages/blueprobe/blueprobe-0.16/h6300.patch new file mode 100644 index 0000000000..39de7758b0 --- /dev/null +++ b/packages/blueprobe/blueprobe-0.16/h6300.patch @@ -0,0 +1,17 @@ +diff -Naur blueprobe-0.15_orig/blueprobe.init blueprobe-0.15_h6300_fix/blueprobe.init +--- blueprobe-0.15_orig/blueprobe.init 2005-10-05 22:37:35.706302041 +0300 ++++ blueprobe-0.15_h6300_fix/blueprobe.init 2005-10-05 22:54:51.840676832 +0300 +@@ -57,6 +57,13 @@ + SCRIPT=/etc/bluetooth/TIInit_3.2.26.bts + PROBE=no + ;; ++ "HP iPAQ H6300") ++ BLUETOOTH=yes ++ PORT=/dev/ttyS0 ++ SPEED=115200 ++ PROTO=texas ++ PROBE=no ++ ;; + *) + BLUETOOTH=no + ;; diff --git a/packages/blueprobe/blueprobe-0.16/hx4700.patch b/packages/blueprobe/blueprobe-0.16/hx4700.patch new file mode 100644 index 0000000000..69610e8c7b --- /dev/null +++ b/packages/blueprobe/blueprobe-0.16/hx4700.patch @@ -0,0 +1,30 @@ +--- blueprobe-0.14/blueprobe.init.orig 2005-09-05 22:03:57 +0200 ++++ blueprobe-0.14/blueprobe.init 2005-09-05 22:09:34 +0200 +@@ -47,6 +47,18 @@ + PROTO=bcsp + PROBE=yes + ;; ++ "HP iPAQ HX4700") ++ BLUETOOTH=yes ++ PORT=/dev/ttyS1 ++ PROTO=texas ++ SCRIPT=/etc/bluetooth/TIInit_3.2.26.bts ++ if [ -f "$SCRIPT" ]; then ++ SPEED=921600 ++ else ++ SPEED=115200 ++ fi ++ PROBE=no ++ ;; + *) + BLUETOOTH=no + ;; +@@ -67,5 +75,8 @@ + echo "BLUETOOTH_PORT=$PORT" >>/etc/sysconfig/bluetooth + echo "BLUETOOTH_SPEED=$SPEED" >>/etc/sysconfig/bluetooth + echo "BLUETOOTH_PROTOCOL=$PROTO" >>/etc/sysconfig/bluetooth ++ if [ "$SCRIPT" != "" ] && [ -f "$SCRIPT" ]; then ++ echo "BLUETOOTH_SCRIPT=$SCRIPT" >>/etc/sysconfig/bluetooth ++ fi + fi + fi diff --git a/packages/blueprobe/blueprobe_0.16.bb b/packages/blueprobe/blueprobe_0.16.bb index e54d2ed066..7ec102d0eb 100644 --- a/packages/blueprobe/blueprobe_0.16.bb +++ b/packages/blueprobe/blueprobe_0.16.bb @@ -2,3 +2,7 @@ SECTION = "base" LICENSE = "GPL" inherit gpe +PR = "r1" + +SRC_URI += "file://hx4700.patch;patch=1 \ + file://h6300.patch;patch=1" diff --git a/packages/btsco/.mtn2git_empty b/packages/btsco/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/btsco/.mtn2git_empty diff --git a/packages/btsco/btsco-module-0.41/.mtn2git_empty b/packages/btsco/btsco-module-0.41/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/btsco/btsco-module-0.41/.mtn2git_empty diff --git a/packages/btsco/btsco-module-0.41/makefile.patch b/packages/btsco/btsco-module-0.41/makefile.patch new file mode 100644 index 0000000000..cf57b59475 --- /dev/null +++ b/packages/btsco/btsco-module-0.41/makefile.patch @@ -0,0 +1,16 @@ +--- btsco-0.41/kernel/Makefile.orig 2006-01-13 00:32:58.000000000 +0100 ++++ btsco-0.41/kernel/Makefile 2006-01-13 00:33:35.000000000 +0100 +@@ -10,10 +10,10 @@ + + + default: +- @make -C /lib/modules/`uname -r`/build M=`pwd` modules ++ $(MAKE) -C $(KERNEL_SRC) M=`pwd` modules + + install: +- @make -C /lib/modules/`uname -r`/build M=`pwd` modules_install ++ $(MAKE) -C $(KERNEL_SRC) M=`pwd` modules_install + + clean: +- @make -C /lib/modules/`uname -r`/build M=`pwd` clean ++ $(MAKE) -C $(KERNEL_SRC) M=`pwd` clean diff --git a/packages/btsco/btsco-module_0.41.bb b/packages/btsco/btsco-module_0.41.bb new file mode 100644 index 0000000000..c4997cf5bd --- /dev/null +++ b/packages/btsco/btsco-module_0.41.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Bluetooth-alsa headset module" +SECTION = "kernel/modules" +HOMEPAGE = "http://bluetooth-alsa.sourceforge.net/" +LICENSE = "GPL" +DEPENDS = "alsa-lib bluez-libs" + +inherit module + +SRC_URI = "${SOURCEFORGE_MIRROR}/bluetooth-alsa/btsco-0.41.tar.gz \ + file://makefile.patch;patch=1" + +S = "${WORKDIR}/btsco-${PV}/kernel" + +MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e'" + +do_install() { + install -m 0755 -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra + install -m 0644 ${S}/snd-bt-sco${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra/ +} diff --git a/packages/btsco/btsco_0.41.bb b/packages/btsco/btsco_0.41.bb new file mode 100644 index 0000000000..dae5877483 --- /dev/null +++ b/packages/btsco/btsco_0.41.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Bluetooth-alsa headset tool" +HOMEPAGE = "http://bluetooth-alsa.sourceforge.net/" +LICENSE = "GPL" +MAINTAINER = "Robert Woerle <robert@linuxdevelopment.de>" +DEPENDS = "alsa-lib bluez-libs" + +inherit autotools pkgconfig + +SRC_URI = "${SOURCEFORGE_MIRROR}/bluetooth-alsa/btsco-0.41.tar.gz" + +S = "${WORKDIR}/${PN}-${PV}" diff --git a/packages/cumulus/cumulus_cvs.bb b/packages/cumulus/cumulus_cvs.bb index ff58977b11..9fdad829b9 100644 --- a/packages/cumulus/cumulus_cvs.bb +++ b/packages/cumulus/cumulus_cvs.bb @@ -6,7 +6,7 @@ LICENSE = "GPL" APPTYPE = "binary" APPNAME = "cumulus" APPDESKTOP = "${S}" -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r0" SRC_URI = "http://www.kflog.org/fileadmin/user_upload/cumulus_snapshots/cumulus-snapshot.tbz" diff --git a/packages/ffmpeg/ffmpeg_cvs.bb b/packages/ffmpeg/ffmpeg_cvs.bb index 3973ce0f48..bfd68eb3e2 100644 --- a/packages/ffmpeg/ffmpeg_cvs.bb +++ b/packages/ffmpeg/ffmpeg_cvs.bb @@ -1,4 +1,5 @@ -PV = "0.4.9-pre1+cvs${SRCDATE}" +#Remove the dash after cvs below when 0.4.9 changes in PV +PV = "0.4.9-pre1+cvs-${SRCDATE}" DESCRIPTION = "ffmpeg" SECTION = "libs" PRIORITY = "optional" diff --git a/packages/gaim/gaim_2.0.0-cvs-mco1.bb b/packages/gaim/gaim_2.0.0-cvs-mco1.bb index 7160d8120f..8ff63ee8b9 100644 --- a/packages/gaim/gaim_2.0.0-cvs-mco1.bb +++ b/packages/gaim/gaim_2.0.0-cvs-mco1.bb @@ -1,6 +1,7 @@ PR = "r3" SRCDATE_${PN} = "20050904" -PV = "2.0.0+cvs${SRCDATE}-mco1" +#Change to x.y.z+cvs${SRCDATE}-mco1 when 2.0.0 changes +PV = "2.0.0-cvs-mco1-${SRCDATE}" WEBCVSURL = "http://handhelds.org/cgi-bin/cvsweb.cgi/~checkout~/gaim" diff --git a/packages/gaim/gaim_cvs.bb b/packages/gaim/gaim_cvs.bb index 3daaf44c19..801ec7dd25 100644 --- a/packages/gaim/gaim_cvs.bb +++ b/packages/gaim/gaim_cvs.bb @@ -1,5 +1,6 @@ PR = "r0" -PV = "2.0+cvs${SRCDATE}" +#Remove the dash below when 2.0 changes in PV +PV = "2.0+cvs-${SRCDATE}" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gaim;module=gaim \ file://no-superimposed-version-on-logo.patch;patch=1 \ diff --git a/packages/gchub/gchub-module_svn.bb b/packages/gchub/gchub-module_svn.bb index fe951aaa4e..676e0b0804 100644 --- a/packages/gchub/gchub-module_svn.bb +++ b/packages/gchub/gchub-module_svn.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Kernel module for the GameCube Hub input device" DEPENDS = "virtual/kernel" MAINTAINER = "Micah Dowty <micah@navi.cx>" LICENSE = "GPL" -PV = "0.0+svn${SRCDATE}" +PV = "1:0.0+svn${SRCDATE}" SRC_URI = "svn://svn.navi.cx/misc/trunk/wasabi/devices;module=gchub;proto=http" diff --git a/packages/git/git.bb b/packages/git/git.bb index 3a1228d621..0bd00f8c93 100644 --- a/packages/git/git.bb +++ b/packages/git/git.bb @@ -6,8 +6,7 @@ MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>" PKGDATE = "${@time.strftime('%Y-%m-%d',time.gmtime())}" -SRC_URI = "http://www.codemonkey.org.uk/projects/git-snapshots/git/git-${PKGDATE}.tar.gz \ - file://Makefile.patch;patch=1" +SRC_URI = "http://www.codemonkey.org.uk/projects/git-snapshots/git/git-${PKGDATE}.tar.gz" S = "${WORKDIR}/git-snapshot-${DATE}" diff --git a/packages/gomunicator/gomunicator_cvs.bb b/packages/gomunicator/gomunicator_cvs.bb index 3c3f9352c7..d45d467d45 100644 --- a/packages/gomunicator/gomunicator_cvs.bb +++ b/packages/gomunicator/gomunicator_cvs.bb @@ -4,7 +4,8 @@ LICENSE = "GPLv2" AUTHOR = "Robert Woerle" MAINTAINER = "Koen Kooi <koen@handhelds.org>" DEPENDS = "libgpewidget gtk+ glib-2.0" -PV = "0.1.3+cvs${SRCDATE}" +#Remove the dash below when 0.1.3 changes in PV +PV = "0.1.3+cvs-${SRCDATE}" inherit autotools pkgconfig diff --git a/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb b/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb index 302d78d109..86e5cabcf0 100644 --- a/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb +++ b/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb @@ -7,7 +7,8 @@ SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpe-buttonbox" DEPENDS = "libgpewidget libgpelaunch" S = "${WORKDIR}/${PN}" -PV = "0.5+cvs${SRCDATE}" +#Remove the dash below when 0.5 changes in PV +PV = "0.5+cvs-${SRCDATE}" PR = "r0" inherit autotools diff --git a/packages/gpe-clock/gpe-clock_0.23.bb b/packages/gpe-clock/gpe-clock_0.23.bb new file mode 100644 index 0000000000..51b001208b --- /dev/null +++ b/packages/gpe-clock/gpe-clock_0.23.bb @@ -0,0 +1,9 @@ +inherit gpe + +DESCRIPTION = "GPE panel clock" +DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd libgpelaunch" +RDEPENDS = "gpe-announce atd" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" + diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb new file mode 100644 index 0000000000..4a09fb827d --- /dev/null +++ b/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb @@ -0,0 +1,51 @@ +SRC_URI = "ftp://ftp.handhelds.org/projects/gpe/source/gpe-mini-browser-${PV}.tar.gz" +DESCRIPTION = "A lightweight webbrowser for the GPE platform" +LICENSE = "GPL" +DEPENDS = "osb-nrcit sqlite libgpewidget" +RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg" + + +S = "${WORKDIR}/gpe-mini-browser-${PV}" + +inherit autotools + +do_install() { + install -d ${D}/usr/share/applications + install -m 0644 ${S}/gpe-mini-browser.desktop ${D}/usr/share/applications/gpe-mini-browser.desktop + install -d ${D}/usr/share/pixmaps + install -m 0644 ${S}/gpe-mini-browser.png ${D}/usr/share/pixmaps/gpe-mini-browser.png + autotools_do_install +} + +pkg_postinst_${PN}-doc () { + #!/bin/sh + if [ "x$D" != "x" ]; then + if [ -e /etc/gpe/gpe-help.conf ]; then + echo gpe-mini-browser= /usr/share/doc/gpe/gpe-mini-browser.html >> /etc/gpe/gpe-help.conf + else + echo [Help] >> /etc/gpe/gpe-help.conf + echo gpe-mini-browser= /usr/share/doc/gpe/gpe-mini-browser.html >> /etc/gpe/gpe-help.conf + fi + if [ -x /usr/bin/gpe-helpindex ]; then + echo generating help-index + gpe-helpindex + else + echo not generating index for gpe-mini-browser + fi + fi +} + +pkg_postrm_${PN}-doc () { + #!/bin/sh + if [ -e /etc/gpe/gpe-help.conf ]; then + sed '/^\<gpe-mini-browser\>/d' /etc/gpe/gpe-help.conf > /tmp/gpe-help.conf + mv /tmp/gpe-help.conf /etc/gpe/gpe-help.conf + fi + if [ -x /usr/bin/gpe-helpindex ]; then + echo generating help-index + gpe-helpindex + else + echo not generating index for gpe-mini-browser + fi +} + diff --git a/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb b/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb index 2f5574d91b..d2e9ed6edb 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb @@ -1,5 +1,5 @@ PR = "r2" -PV = "0.17+cvs${SRCDATE}" +PV = "0.18+cvs${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpe-mini-browser" DESCRIPTION = "A lightweight webbrowser for the GPE platform" diff --git a/packages/gpe-timesheet/gpe-timesheet_0.21.bb b/packages/gpe-timesheet/gpe-timesheet_0.21.bb new file mode 100644 index 0000000000..0cd8b539f0 --- /dev/null +++ b/packages/gpe-timesheet/gpe-timesheet_0.21.bb @@ -0,0 +1,9 @@ +LICENSE = "GPL" +inherit gpe + +DESCRIPTION = "GPE time tracker" +DEPENDS = "libgpewidget gtk+ sqlite" +SECTION = "gpe" +RDEPENDS = "gpe-icons" + +SRC_URI = "${GPE_MIRROR}/gpe-timesheet-${PV}.tar.gz" diff --git a/packages/gpe-today/gpe-today_cvs.bb b/packages/gpe-today/gpe-today_cvs.bb index 1ce5babfbb..33af763f07 100644 --- a/packages/gpe-today/gpe-today_cvs.bb +++ b/packages/gpe-today/gpe-today_cvs.bb @@ -7,7 +7,8 @@ PRIORITY = "optional" S = "${WORKDIR}/${PN}" -PV = "0.10+cvs${SRCDATE}" +#Remove the dash below when 0.10 changes in PV +PV = "0.10+cvs-${SRCDATE}" PR = "r0" inherit gpe diff --git a/packages/gpesyncd/gpesyncd_cvs.bb b/packages/gpesyncd/gpesyncd_cvs.bb index 457b75c343..94ce44f30e 100644 --- a/packages/gpesyncd/gpesyncd_cvs.bb +++ b/packages/gpesyncd/gpesyncd_cvs.bb @@ -8,7 +8,8 @@ SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpesyncd" DEPENDS = "libgpevtype sqlite libmimedir glib-2.0" S = "${WORKDIR}/${PN}" -PV = "0.0+cvs${SRCDATE}" +#Remove the dash below when 0.0 changes in PV +PV = "0.0+cvs-${SRCDATE}" PR = "r0" inherit autotools diff --git a/packages/gpsdrive/gpsdrive_cvs.bb b/packages/gpsdrive/gpsdrive_cvs.bb index c4bc1382c8..a01f12d094 100644 --- a/packages/gpsdrive/gpsdrive_cvs.bb +++ b/packages/gpsdrive/gpsdrive_cvs.bb @@ -1,7 +1,8 @@ inherit autotools pkgconfig PR = "r1" -PV = "2.10pre3+cvs${SRCDATE}" +#Remove the dash below when 2.10pre3 changes in PV +PV = "2.10pre3+cvs-${SRCDATE}" DEFAULT_PREFERENCE="-1" PACKAGES += "gpsdrive-add" diff --git a/packages/inputpipe/inputpipe_svn.bb b/packages/inputpipe/inputpipe_svn.bb index 87ececd731..ffa59a762a 100644 --- a/packages/inputpipe/inputpipe_svn.bb +++ b/packages/inputpipe/inputpipe_svn.bb @@ -3,7 +3,8 @@ PRIORITY = "optional" DESCRIPTION = "Inputpipe is a network transparency layer for linux input devices" MAINTAINER = "Micah Dowty <micah@navi.cx>" LICENSE = "GPL" -PV = "0.5+svn${SRCDATE}" +#Remove the dash below when 0.5 changes in PV +PV = "0.5+svn-${SRCDATE}" SRC_URI = "svn://svn.navi.cx/misc/trunk;module=inputpipe;proto=http" S = "${WORKDIR}/inputpipe" diff --git a/packages/ixp425-eth/files/modprobe.conf b/packages/ixp425-eth/files/modprobe.conf new file mode 100644 index 0000000000..bfcbf916cf --- /dev/null +++ b/packages/ixp425-eth/files/modprobe.conf @@ -0,0 +1,3 @@ +# Add an alias for eth0 to ixp425_eth to cause the S40networking +# init script to load the ixp425_eth driver on the first boot +alias eth0 ixp425_eth diff --git a/packages/ixp425-eth/ixp400-eth-1.4/modprobe.conf b/packages/ixp425-eth/ixp400-eth-1.4/modprobe.conf new file mode 100644 index 0000000000..9d579eeac1 --- /dev/null +++ b/packages/ixp425-eth/ixp400-eth-1.4/modprobe.conf @@ -0,0 +1,3 @@ +# Add an alias for eth0 to ixp400_eth to cause the S40networking +# init script to load the ixp400_eth driver on the first boot +alias eth0 ixp400_eth diff --git a/packages/ixp425-eth/ixp400-eth-1.5/modprobe.conf b/packages/ixp425-eth/ixp400-eth-1.5/modprobe.conf new file mode 100644 index 0000000000..9d579eeac1 --- /dev/null +++ b/packages/ixp425-eth/ixp400-eth-1.5/modprobe.conf @@ -0,0 +1,3 @@ +# Add an alias for eth0 to ixp400_eth to cause the S40networking +# init script to load the ixp400_eth driver on the first boot +alias eth0 ixp400_eth diff --git a/packages/ixp425-eth/ixp400-eth_1.4.bb b/packages/ixp425-eth/ixp400-eth_1.4.bb index 94024e9b75..6e14f67c0e 100644 --- a/packages/ixp425-eth/ixp400-eth_1.4.bb +++ b/packages/ixp425-eth/ixp400-eth_1.4.bb @@ -10,7 +10,8 @@ SRC_URI += "file://2.6.13.patch;patch=1" SRC_URI += "file://2.6.14.patch;patch=1" SRC_URI += "file://ixp400_pollcontroller.patch;patch=1" SRC_URI += "file://2.6.14-mm.patch;patch=1" -PR = "r7" +SRC_URI += "file://modprobe.conf" +PR = "r9" DEPENDS = "ixp4xx-csr" RDEPENDS = "ixp4xx-csr" @@ -20,6 +21,7 @@ S = "${WORKDIR}" COMPATIBLE_HOST = "^arm.*-linux.*" PROVIDES = "virtual/ixp-eth" +RPROVIDES = "ixp-eth" inherit module @@ -53,4 +55,6 @@ do_compile () { do_install () { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net install -m 0644 ixp400_eth.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net/ + install -d ${D}${sysconfdir}/modprobe.d + install -m 0644 modprobe.conf ${D}${sysconfdir}/modprobe.d/eth0 } diff --git a/packages/ixp425-eth/ixp400-eth_1.5.bb b/packages/ixp425-eth/ixp400-eth_1.5.bb index f5d2b34070..8d922f81d7 100644 --- a/packages/ixp425-eth/ixp400-eth_1.5.bb +++ b/packages/ixp425-eth/ixp400-eth_1.5.bb @@ -18,8 +18,9 @@ SRC_URI += "file://continue-if-qmgr-init-fails.patch;patch=1" SRC_URI += "file://netdev_max_backlog.patch;patch=1" SRC_URI += "file://debug.patch;patch=1" SRC_URI += "file://Makefile.patch;patch=1" +SRC_URI += "file://modprobe.conf" -PR = "r3" +PR = "r5" DEPENDS = "ixp4xx-csr" RDEPENDS = "ixp4xx-csr" @@ -29,6 +30,7 @@ S = "${WORKDIR}" COMPATIBLE_HOST = "^arm.*-linux.*" PROVIDES = "virtual/ixp-eth" +RPROVIDES = "ixp-eth" inherit module @@ -84,4 +86,6 @@ do_compile_append () { do_install () { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net install -m 0644 ixp400_eth.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net/ + install -d ${D}${sysconfdir}/modprobe.d + install -m 0644 modprobe.conf ${D}${sysconfdir}/modprobe.d/eth0 } diff --git a/packages/ixp425-eth/ixp425-eth_1.1.bb b/packages/ixp425-eth/ixp425-eth_1.1.bb index 7f55bcec3b..53e713178a 100644 --- a/packages/ixp425-eth/ixp425-eth_1.1.bb +++ b/packages/ixp425-eth/ixp425-eth_1.1.bb @@ -10,7 +10,8 @@ SRC_URI = "http://www.intel.com/design/network/swsup/ixp400LinuxEthernetDriverPa file://mm4.patch;patch=1" SRC_URI += "file://2.6.13.patch;patch=1" SRC_URI += "file://2.6.14.patch;patch=1" -PR = "r12" +SRC_URI += "file://modprobe.conf" +PR = "r15" RDEPENDS = "ixp4xx-csr" @@ -19,6 +20,7 @@ S = "${WORKDIR}" COMPATIBLE_HOST = "^armeb-linux.*" PROVIDES = "virtual/ixp-eth" +RPROVIDES = "ixp-eth" inherit module @@ -46,4 +48,6 @@ do_compile () { do_install () { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net install -m 0644 ixp425_eth.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net/ + install -d ${D}${sysconfdir}/modprobe.d + install -m 0644 modprobe.conf ${D}${sysconfdir}/modprobe.d/eth0 } diff --git a/packages/ixp425-eth/ixp425-eth_1.2.bb b/packages/ixp425-eth/ixp425-eth_1.2.bb index 9336e1fe6d..3cc9a6c70a 100644 --- a/packages/ixp425-eth/ixp425-eth_1.2.bb +++ b/packages/ixp425-eth/ixp425-eth_1.2.bb @@ -8,7 +8,8 @@ SRC_URI += "file://ixp400linuxethernetdriver-1_2-kernel26_hr_20050929.patch;patc SRC_URI += "file://makefile.patch;patch=1" SRC_URI += "file://2.6.13.patch;patch=1" SRC_URI += "file://2.6.14.patch;patch=1" -PR = "r2" +SRC_URI += "file://modprobe.conf" +PR = "r4" DEPENDS = "ixp4xx-csr" RDEPENDS = "ixp4xx-csr" @@ -18,6 +19,7 @@ S = "${WORKDIR}" COMPATIBLE_HOST = "^armeb-linux.*" PROVIDES = "virtual/ixp-eth" +RPROVIDES = "ixp-eth" inherit module @@ -46,4 +48,6 @@ do_compile () { do_install () { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net install -m 0644 ixp425_eth.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net/ + install -d ${D}${sysconfdir}/modprobe.d + install -m 0644 modprobe.conf ${D}${sysconfdir}/modprobe.d/eth0 } diff --git a/packages/kbdd/kbdd_cvs.bb b/packages/kbdd/kbdd_cvs.bb index a4ecc512a3..12516114f6 100644 --- a/packages/kbdd/kbdd_cvs.bb +++ b/packages/kbdd/kbdd_cvs.bb @@ -10,7 +10,8 @@ SRC_URI = "${HANDHELDS_CVS};module=apps/kbdd;date=${SRCDATE} \ file://kbdd.conf \ file://kbdd-modules" -PV="0.8+cvs${SRCDATE}" +#Remove the dash below when 0.8 changes in PV +PV="0.8+cvs-${SRCDATE}" PR="r5" inherit update-rc.d linux_modules diff --git a/packages/libgpevtype/libgpevtype_cvs.bb b/packages/libgpevtype/libgpevtype_cvs.bb index aaaec8cb77..7ba1398329 100644 --- a/packages/libgpevtype/libgpevtype_cvs.bb +++ b/packages/libgpevtype/libgpevtype_cvs.bb @@ -8,7 +8,7 @@ DEPENDS = "libmimedir" DEFAULT_PREFERENCE = "-1" S = "${WORKDIR}/${PN}" -PV = "0.12+cvs${SRCDATE}" +PV = "0.14+cvs${SRCDATE}" PR = "r0" inherit pkgconfig gpe autotools diff --git a/packages/libgpewidget/libgpewidget_0.107.bb b/packages/libgpewidget/libgpewidget_0.107.bb new file mode 100644 index 0000000000..3bd2996e67 --- /dev/null +++ b/packages/libgpewidget/libgpewidget_0.107.bb @@ -0,0 +1,20 @@ +LICENSE = "LGPL" +DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications." +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native" + +PACKAGES =+ "libgpewidget-bin" + +SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" + +inherit pkgconfig autotools + +FILES_libgpewidget-bin = "${bindir}" + +EXTRA_OECONF = "--enable-cairo" + +do_stage () { + autotools_stage_all +} + diff --git a/packages/libgpewidget/libgpewidget_cvs.bb b/packages/libgpewidget/libgpewidget_cvs.bb index b5b9a9b6aa..6e60b95133 100644 --- a/packages/libgpewidget/libgpewidget_cvs.bb +++ b/packages/libgpewidget/libgpewidget_cvs.bb @@ -9,7 +9,7 @@ LICENSE = "LGPL" DEFAULT_PREFERENCE = "-1" S = "${WORKDIR}/${PN}" -PV = "0.105+cvs${SRCDATE}" +PV = "0.107+cvs${SRCDATE}" PR = "r0" inherit autotools pkgconfig diff --git a/packages/libmailwrapper/libmailwrapper_cvs.bb b/packages/libmailwrapper/libmailwrapper_cvs.bb index 408193f776..8a5722ee18 100644 --- a/packages/libmailwrapper/libmailwrapper_cvs.bb +++ b/packages/libmailwrapper/libmailwrapper_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/mail/libmailwrapper " diff --git a/packages/libmatchbox/libmatchbox_svn.bb b/packages/libmatchbox/libmatchbox_svn.bb index 370bed7f51..9a49853fe1 100644 --- a/packages/libmatchbox/libmatchbox_svn.bb +++ b/packages/libmatchbox/libmatchbox_svn.bb @@ -1,6 +1,7 @@ include libmatchbox.inc -PV = "1.7+cvs${SRCDATE}" +#Remove the dash below when 1.7 changes in PV +PV = "1.7+cvs-${SRCDATE}" DEFAULT_PREFERENCE = "-1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http\ diff --git a/packages/libmimedir/libmimedir_cvs.bb b/packages/libmimedir/libmimedir_cvs.bb index 9e8d904ba7..33e918b278 100644 --- a/packages/libmimedir/libmimedir_cvs.bb +++ b/packages/libmimedir/libmimedir_cvs.bb @@ -4,7 +4,8 @@ PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "intltool-native" PR = "r1" -PV = "0.3.1+cvs${SRCDATE}" +#Remove the dash below when 0.3.1 changes in PV +PV = "0.3.1+cvs-${SRCDATE}" DEFAULT_PREFERENCE = -1 diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb index d9b16ff4e3..8d5ff7486b 100644 --- a/packages/libopie/libopie2_cvs.bb +++ b/packages/libopie/libopie2_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \ file://include.pro" diff --git a/packages/libopieobex/libopieobex0_cvs.bb b/packages/libopieobex/libopieobex0_cvs.bb index cde3fb5859..c51ca8ecc6 100644 --- a/packages/libopieobex/libopieobex0_cvs.bb +++ b/packages/libopieobex/libopieobex0_cvs.bb @@ -1,5 +1,5 @@ include libopieobex0.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \ diff --git a/packages/libopietooth/libopietooth1_cvs.bb b/packages/libopietooth/libopietooth1_cvs.bb index e259dcb8c7..4d1a66acd6 100644 --- a/packages/libopietooth/libopietooth1_cvs.bb +++ b/packages/libopietooth/libopietooth1_cvs.bb @@ -1,4 +1,4 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/lib" -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" include libopietooth1.inc diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb index db32c0e121..8e0278daa1 100644 --- a/packages/libqpe/libqpe-opie_cvs.bb +++ b/packages/libqpe/libqpe-opie_cvs.bb @@ -1,6 +1,7 @@ include ${PN}.inc - -PV = "1.2.1+cvs${SRCDATE}" + +# Remove the dash below when 1.2.1 changes +PV = "1.2.1+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/library \ file://fix-titleheight.patch;patch=1" diff --git a/packages/libqtaux/libqtaux2_cvs.bb b/packages/libqtaux/libqtaux2_cvs.bb index db821756b9..85cd5bdbb3 100644 --- a/packages/libqtaux/libqtaux2_cvs.bb +++ b/packages/libqtaux/libqtaux2_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/libqtaux" diff --git a/packages/libsm/libsm_cvs.bb b/packages/libsm/libsm_cvs.bb index 6c64da33d4..ff5fcd8c0e 100644 --- a/packages/libsm/libsm_cvs.bb +++ b/packages/libsm/libsm_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0+cvs${SRCDATE}" +PV = "6.0.3+cvs${SRCDATE}" LICENSE = "MIT-X" SECTION = "libs" PRIORITY = "optional" @@ -6,6 +6,8 @@ DEPENDS = "x11 ice" DESCRIPTION = "Session management library" PR = "r1" +DEFAULT_PREFERENCE="-1" + SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=SM" S = "${WORKDIR}/SM" diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc index 54679ebfdf..233d2a655c 100644 --- a/packages/linux/ixp4xx-kernel.inc +++ b/packages/linux/ixp4xx-kernel.inc @@ -7,22 +7,43 @@ # Define the following *before* including this file as # required: # -# IXP4XX_PATCHES - full list of patches to apply -# +# IXP4XX_PATCHES - full list of patches to apply, to add files +# generate a patch against /dev/null # IXP4XX_SUFFIX - the suffix to add after 'zImage-' in the -# deploy/images directory - defaults to "ixp4xx" +# deploy/images directory, should identify the machines the +# kernel will run on, ixp4xx[lb] for generic kernels (le or +# be). Controls the package architecture of the ipk. +# IXP4XX_MACHID - if set the kernel will be forced to use this +# machine id and be forced to LE on LE systems - please always +# remember to override IXP4XX_SUFFIX if this is done, the kernel +# will simply not work on other machines. +# IXP4XX_LEFIXUP - if set prepend the LE fixup code to the kernel +# and byte swap (quad word) the whole kernel image for a BE +# boot loader # -# -------------------------------------------------------------- +# If you set CMDLINE_ROOT you should *also* change IXP4XX_SUFFIX +# because the resultant kernel may not work on other systems. +# +# DEFAULT_PREFERENCE is set automagically in this file as +# follows: # -# Within this file bitbake variables local to the file are -# named N1K_FOO +# 10 For *released* kernels +# 8 For mm or ac patched versions of released kernels +# 6 For rc patched kernels (release candidates) +# 4 For mm or ac patched rc (release candidate) kernels +# 2 For pre or bk versions +# 0 For mm or ac patched pre or bk versions +# +# -------------------------------------------------------------- # SECTION = "kernel" DESCRIPTION = "Linux kernel for the Intel IXP4xx device" LICENSE = "GPL" MAINTAINER = "NSLU2-Linux <www.nslu2-linux.org>" -DEPENDS += "devio-native" +# Defaults for the prefix flags +IXP4XX_MACHID ?= "" +IXP4XX_LEFIXUP ?= "" # Linux kernel source has the general form linux-X.Y.Z-patchP, # X.Y is the major version number, Z (which may have multiple @@ -130,18 +151,16 @@ python () { # FILESPATH: this list is in order last-searched-first, therefore # the first entry is the *latest* and/or most specific -FILESPATH = "${IXP4XX_FILESPATH}:${FILE_DIRNAME}/ixp4xx-kernel/" +FILESPATH = "${FILE_DIRNAME}/${P}:${IXP4XX_FILESPATH}" # The working directory will be the 'base' version (which may not be the # same as implied by the PV variable because it corresponds to the prior # minor version for rc and pre patched versions). S = "${WORKDIR}/linux-${IXP4XX_SRCVER}" -# IXP4XX_PATCHES is a list of additional patches to apply +# IXP4XX_PATCHES is the list of patches. IXP4XX_PATCHES ?= "" -IXP4XX_SUFFIX ?= "ixp4xx" - SRC_URI = "${IXP4XX_SRCURI}" SRC_URI += "${IXP4XX_PATCHES}" SRC_URI += "file://defconfig" @@ -150,15 +169,38 @@ COMPATIBLE_HOST = 'arm.*-linux' inherit kernel +# PACKAGE_ARCH must reliably identify what machines this kernel +# will run on +PACKAGE_ARCH_kernel-image = "${IXP4XX_SUFFIX}" +PACKAGE_ARCH_kernel-dev = "${IXP4XX_SUFFIX}" +PACKAGE_ARCH_kernel = "${IXP4XX_SUFFIX}" + ARCH = "arm" KERNEL_IMAGETYPE = "zImage" + # To specify the console set KERNEL_CONSOLE in the .bb file. # CMDLINE_ROOT contains the boot options, CMDLINE_KERNEL_OPTIONS # contains the things for a specific kernel. -# CMDLINE_KERNEL_OPTIONS ?= "reboot=s" -CMDLINE_KERNEL_OPTIONS ?= -CMDLINE_ROOT = "root=/dev/mtdblock2 rw rootfstype=jffs2 mem=64M@0x00000000 init=/linuxrc" -CMDLINE_DEBUG = +# +# These are set from MACHINE specific defaults below, but an override +# in local.conf will still take precedence. +# +# CMDLINE_KERNEL_OPTIONS: overridable in local.conf +# MACH_KERNEL_OPTIONS: the default, added to so additional stuff can be +# put in from local.conf etc. +MACH_KERNEL_OPTIONS += "rtc-x1205.hctosys=1 rtc-x1205.probe=0,0x6f" +MACH_KERNEL_OPTIONS += "rtc-ds1672.probe=0,0x68 rtc-ds1672.hctosys=1" +MACH_KERNEL_OPTIONS += "pcf8563.hctosys=1" +# +CMDLINE_KERNEL_OPTIONS ?= "${MACH_KERNEL_OPTIONS}" + +# CMDLINE_ROOT: machine specific boot options - should not be set on a +# generic kernel! +CMDLINE_ROOT ?= "init=/linuxrc" + +# CMDLINE_DEBUG: debug options such as noirqdebug, defaults to empty +# override in local.conf etc +CMDLINE_DEBUG ?= "" CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_KERNEL_OPTIONS} ${CMDLINE_DEBUG} ${CMDLINE_CONSOLE}" # Add the architecture compiler flags to KERNEL_CC and KERNEL_LD as @@ -177,6 +219,9 @@ EXTRA_OEMAKE += "MAKEFLAGS='--no-print-directory'" # Override KERNEL_RELEASE from kernel.bbclass to match: KERNEL_RELEASE = "${KERNEL_VERSION}" +# Set the correct CONFIG_CPU_xxx_ENDIAN and CONFIG_CMDLINE at the head +# of the .config file and remove any settings in defconfig then append +# defconfig to .config do_configure_prepend() { rm -f ${S}/.config echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >>'${S}/.config' @@ -184,15 +229,92 @@ do_configure_prepend() { then echo 'CONFIG_CPU_BIG_ENDIAN=y' >>'${S}/.config' fi - sed -e '/CONFIG_CPU_BIG_ENDIAN/d' -e '/CONFIG_CMDLINE=/d' '${WORKDIR}/defconfig' >>'${S}/.config' + if test '${SLUGOS_IMAGESEX}' = big-endian + then + echo 'CONFIG_JFFS2_BIG_ENDIAN=y' >>'${S}/.config' + fi + if test '${SLUGOS_IMAGESEX}' = little-endian + then + echo 'CONFIG_JFFS2_LITTLE_ENDIAN=y' >>'${S}/.config' + fi + sed -e '/CONFIG_CPU_BIG_ENDIAN/d' -e '/CONFIG_CMDLINE=/d' \ + -e '/CONFIG_JFFS2_NATIVE_ENDIAN=/d' \ + -e '/CONFIG_JFFS2_BIG_ENDIAN=/d' \ + -e '/CONFIG_JFFS2_LITTLE_ENDIAN=/d' \ + '${WORKDIR}/defconfig' >>'${S}/.config' rm -rf ${S}/include/asm-arm/arch ${S}/include/asm-arm/proc \ ${S}/include/asm-arm/.proc ${S}/include/asm-arm/.arch } +# IXP4XX_MACHID and IXP4XX_LEFIXUP handling +# +# This mach_fixup function adds the required prefix to the image to +# force the machine id in the kernel to be a particular value. For +# LE builds it also forces the CPU into LE mode - this is actually +# harmless even if the CPU is already in LE mode. This deals with +# two known problems on some boards: +# +# 1) The machine type set by the boot loader is wrong - e.g. the type +# for an ixdp425, not the actual board type. Prefix the code with +# two instructions: +# e3a01c<hh> e38110<ll> +# Where the machine ID is 0xhhll +# 2) For LE kernels it is necessary to prefix change-to-le code to +# the kernel image if the boot loader runs with the CPU in BE +# (which is normal for IXP4XX boards): +# ee110f10 e3c00080 ee010f10 +# and to byte swap the (LE) image to match the BE flash layout +# +# (2) is not required with an LE boot loader (neither the prefix +# nor the byte swapping) so this is controlled by a separate flag, +# however if the boot loader is LE it expects and LE image so the +# instructions written for the machine id must be LE. +# +# The argument to the function is the destination directory + +#SETMACH: set the machine id (register 1) to IXP4XX_MACHID +SETMACH = '${@["", ".= ${IXP4XX_MACHID} .256/ 255& 0xe3a01c00+; ${WRITE}; .= 255& 0xe3811000+; ${WRITE};"][bb.data.getVar("IXP4XX_MACHID", d, 1) and 1]}' + +#FIXUP: the correct instructions to copy the kernel prepended with the le fixup +FIXUP_armeb = 'cp$' +FIXUP_arm = '${@["cp$", "wb 0xee110f10,4;wb 0xe3c00080,4;wb 0xee010f10,4;xp $,4"][bb.data.getVar("IXP4XX_LEFIXUP", d, 1) and 1]}' + +#WRITE: the correct way to write a single ARM instruction (wb unless LE and !LEFIXUP). +WRITE_armeb = 'wb 4' +WRITE_arm = '${@["wl 4", "wb 4"][bb.data.getVar("IXP4XX_LEFIXUP", d, 1) and 1]}' + +DEPENDS += "devio-native" + +# ${SETMACH}${FIXUP} is a sequence of devio commands to copy the image, +# in the standard (generic) case it is just 'cp$' +copy_image() { + rm -f "$1".new + devio '<<arch/${ARCH}/boot/${KERNEL_IMAGETYPE}' >"$1".new '${SETMACH}${FIXUP}' || { + echo 'ERROR: arch/${ARCH}/boot/${KERNEL_IMAGETYPE}: failed to copy zImage' >&2 + return 1 + } + mv "$1".new "$1" +} + +do_install_append() { + copy_image '${STAGING_KERNEL_DIR}/${KERNEL_IMAGETYPE}' +} + do_deploy[dirs] = "${S}" do_deploy() { install -d ${DEPLOY_DIR}/images - install -m 644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${IXP4XX_SUFFIX} + copy_image '${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${IXP4XX_SUFFIX}' } addtask deploy before do_build after do_compile + +python () { + # check for IXP4XX_SUFFIX - if not set then we don't know what to build, + # also sanity check the SLUGOS_IMAGESEX + sex = bb.data.getVar("SLUGOS_IMAGESEX", d, 1) + if sex != 'little-endian' and sex != 'big-endian': + raise bb.parse.SkipPackage("slugos kernels require SLUGOS_IMAGESEX") + suffix = bb.data.getVar("IXP4XX_SUFFIX", d, 1) + if suffix == '': + raise bb.parse.SkipPackage("slugos kernels require IXP4XX_SUFFIX") +} diff --git a/packages/linux/ixp4xx-kernel/2.6.15/10-mtdpart-redboot-fis-byteswap.patch b/packages/linux/ixp4xx-kernel/2.6.15/10-mtdpart-redboot-fis-byteswap.patch index 077aa00816..3fa0535abf 100644 --- a/packages/linux/ixp4xx-kernel/2.6.15/10-mtdpart-redboot-fis-byteswap.patch +++ b/packages/linux/ixp4xx-kernel/2.6.15/10-mtdpart-redboot-fis-byteswap.patch @@ -32,13 +32,6 @@ retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- linux-2.6.15/drivers/mtd/redboot.c 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.15/drivers/mtd/redboot.c 1970-01-01 00:00:00.000000000 +0000 -@@ -1,5 +1,5 @@ - /* -- * $Id: redboot.c,v 1.18 2005/11/07 11:14:21 gleixner Exp $ -+ * $Id: redboot.c,v 1.19 2005/12/01 10:03:51 dwmw2 Exp $ - * - * Parse RedBoot-style Flash Image System (FIS) tables and - * produce a Linux partition array to match. @@ -89,8 +89,32 @@ static int parse_redboot_partitions(stru i = numslots; break; diff --git a/packages/linux/ixp4xx-kernel/2.6.15/40-rtc-class.patch b/packages/linux/ixp4xx-kernel/2.6.15/40-rtc-class.patch index feea3f2f8b..8e0380bfe5 100644 --- a/packages/linux/ixp4xx-kernel/2.6.15/40-rtc-class.patch +++ b/packages/linux/ixp4xx-kernel/2.6.15/40-rtc-class.patch @@ -653,7 +653,7 @@ +EXPORT_SYMBOL(rtc_tm_to_time); --- linux-nslu2.orig/arch/arm/Kconfig 2006-01-04 01:27:04.000000000 +0100 +++ linux-nslu2/arch/arm/Kconfig 2006-01-04 01:27:31.000000000 +0100 -@@ -750,6 +750,8 @@ source "drivers/usb/Kconfig" +@@ -748,6 +748,8 @@ source "drivers/usb/Kconfig" source "drivers/mmc/Kconfig" diff --git a/packages/linux/ixp4xx-kernel/2.6.15/55-rtc-pcf8563.patch b/packages/linux/ixp4xx-kernel/2.6.15/55-rtc-pcf8563.patch new file mode 100644 index 0000000000..d154b6ac11 --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.15/55-rtc-pcf8563.patch @@ -0,0 +1,174 @@ + drivers/char/Kconfig | 8 ++ + drivers/char/Makefile | 1 + drivers/char/pcf8563-rtc.c | 135 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 143 insertions(+), 1 deletion(-) + +--- linux-nas100d.orig/drivers/char/Kconfig 2005-11-16 22:29:03.000000000 +0100 ++++ linux-nas100d/drivers/char/Kconfig 2005-11-30 23:04:56.000000000 +0100 +@@ -783,6 +783,13 @@ config RTC_VR41XX + tristate "NEC VR4100 series Real Time Clock Support" + depends on CPU_VR41XX + ++config RTC_PCF8563 ++ tristate "PCF8563 I2C RTC Support" ++ depends on I2C && RTC_PCF8563_I2C ++ help ++ This driver enables the kernel to use the PCF8563 ++ I2C real time clock as the system clock. ++ + config COBALT_LCD + bool "Support for Cobalt LCD" + depends on MIPS_COBALT +@@ -1014,4 +1021,3 @@ config TELCLOCK + files for controlling the behavior of this hardware. + + endmenu +- +--- linux-nas100d.orig/drivers/char/Makefile 2005-11-16 22:29:03.000000000 +0100 ++++ linux-nas100d/drivers/char/Makefile 2005-11-30 23:01:35.000000000 +0100 +@@ -65,6 +65,7 @@ obj-$(CONFIG_SGI_IP27_RTC) += ip27-rtc.o + obj-$(CONFIG_DS1302) += ds1302.o + obj-$(CONFIG_S3C2410_RTC) += s3c2410-rtc.o + obj-$(CONFIG_RTC_VR41XX) += vr41xx_rtc.o ++obj-$(CONFIG_RTC_PCF8563) += pcf8563-rtc.o + ifeq ($(CONFIG_GENERIC_NVRAM),y) + obj-$(CONFIG_NVRAM) += generic_nvram.o + else +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-nas100d/drivers/char/pcf8563-rtc.c 2005-11-30 23:06:53.000000000 +0100 +@@ -0,0 +1,135 @@ ++/* ++ * drivers/char/pcf8563-rtc.c ++ * ++ * PCF8563 RTC platform driver ++ * ++ * Copyright (C) 2005 Tower Technologies ++ * ++ * Author: Alessandro Zummo <a.zummo@towertech.it> ++ * Maintainers: http://www.nslu2-linux.org/ ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ */ ++ ++#include <linux/module.h> ++#include <linux/device.h> ++#include <linux/time.h> ++#include <linux/rtc.h> ++#include <linux/init.h> ++#include <linux/platform_device.h> ++ ++#include <linux/i2c.h> ++#include <linux/pcf8563.h> ++ ++#include <asm/rtc.h> ++ ++#define DRV_VERSION "0.9" ++ ++extern int (*set_rtc)(void); ++ ++static int pcf8563_set_rtc(void) ++{ ++ int err; ++ ++ struct rtc_time new_tm, old_tm; ++ unsigned long cur_secs = xtime.tv_sec; ++ ++ if ((err = pcf8563_do_command(PCF8563_CMD_GETDATETIME, &old_tm) == 0)) ++ return err; ++ ++ /* FIXME xtime.tv_nsec = old_tm.tm_sec * 10000000; */ ++ new_tm.tm_sec = cur_secs % 60; ++ cur_secs /= 60; ++ new_tm.tm_min = cur_secs % 60; ++ cur_secs /= 60; ++ new_tm.tm_hour = cur_secs % 24; ++ ++ /* ++ * avoid writing when we're going to change the day ++ * of the month. We will retry in the next minute. ++ * This basically means that if the RTC must not drift ++ * by more than 1 minute in 11 minutes. ++ */ ++ if ((old_tm.tm_hour == 23 && old_tm.tm_min == 59) || ++ (new_tm.tm_hour == 23 && new_tm.tm_min == 59)) ++ return 1; ++ ++ return pcf8563_do_command(PCF8563_CMD_SETTIME, &new_tm); ++} ++ ++static int pcf8563_rtc_read_time(struct rtc_time *tm) ++{ ++ return pcf8563_do_command(PCF8563_CMD_GETDATETIME, tm); ++} ++ ++static int pcf8563_rtc_set_time(struct rtc_time *tm) ++{ ++ return pcf8563_do_command(PCF8563_CMD_SETDATETIME, tm); ++} ++ ++static int pcf8563_rtc_proc(char *buf) ++{ ++ char *p = buf; ++ ++ p += sprintf(p, "24hr\t\t: yes\n"); ++ ++ return p - buf; ++} ++ ++static struct rtc_ops pcf8563_rtc_ops = { ++ .owner = THIS_MODULE, ++ .proc = pcf8563_rtc_proc, ++ .read_time = pcf8563_rtc_read_time, ++ .set_time = pcf8563_rtc_set_time, ++}; ++ ++static int pcf8563_rtc_probe(struct device *dev) ++{ ++ int ret; ++ ++ if ((ret = register_rtc(&pcf8563_rtc_ops)) != 0) ++ return ret; ++ ++ set_rtc = pcf8563_set_rtc; ++ ++ printk(KERN_INFO "pcf8563-rtc: real time clock\n"); ++ ++ return 0; ++} ++ ++static int pcf8563_rtc_remove(struct device *dev) ++{ ++ set_rtc = NULL; ++ ++ unregister_rtc(&pcf8563_rtc_ops); ++ ++ return 0; ++} ++ ++static struct device_driver pcf8563_rtc_driver = { ++ .name = "pcf8563-rtc", ++ .bus = &platform_bus_type, ++ .probe = pcf8563_rtc_probe, ++ .remove = pcf8563_rtc_remove, ++}; ++ ++static int __init pcf8563_rtc_init(void) ++{ ++ return driver_register(&pcf8563_rtc_driver); ++} ++ ++static void __exit pcf8563_rtc_exit(void) ++{ ++ driver_unregister(&pcf8563_rtc_driver); ++} ++ ++module_init(pcf8563_rtc_init); ++module_exit(pcf8563_rtc_exit); ++ ++MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); ++MODULE_DESCRIPTION("Xicor PCF8563 RTC platform driver"); ++MODULE_LICENSE("GPL"); ++MODULE_VERSION(DRV_VERSION); diff --git a/packages/linux/ixp4xx-kernel/2.6.15/60-nas100d-rtc.patch b/packages/linux/ixp4xx-kernel/2.6.15/60-nas100d-rtc.patch new file mode 100644 index 0000000000..18ee72c497 --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.15/60-nas100d-rtc.patch @@ -0,0 +1,21 @@ + arch/arm/mach-ixp4xx/nas100d-setup.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- linux-nas100d.orig/arch/arm/mach-ixp4xx/nas100d-setup.c 2005-11-21 22:01:22.000000000 +0100 ++++ linux-nas100d/arch/arm/mach-ixp4xx/nas100d-setup.c 2005-11-30 23:04:07.000000000 +0100 +@@ -94,10 +94,15 @@ static struct platform_device nas100d_ua + .resource = nas100d_uart_resources, + }; + ++static struct platform_device nas100d_rtc = { ++ .name = "pcf8563-rtc", ++}; ++ + static struct platform_device *nas100d_devices[] __initdata = { + &nas100d_i2c_controller, + &nas100d_flash, + &nas100d_uart, ++ &nas100d_rtc, + }; + + static void nas100d_power_off(void) diff --git a/packages/linux/ixp4xx-kernel/2.6.15/60-nslu2-beeper.patch b/packages/linux/ixp4xx-kernel/2.6.15/60-nslu2-beeper.patch index 12fdc4d96e..6cd1025d38 100644 --- a/packages/linux/ixp4xx-kernel/2.6.15/60-nslu2-beeper.patch +++ b/packages/linux/ixp4xx-kernel/2.6.15/60-nslu2-beeper.patch @@ -5,7 +5,7 @@ --- linux-2.6.15/drivers/input/misc/Kconfig 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.15/drivers/input/misc/Kconfig 1970-01-01 00:00:00.000000000 +0000 -@@ -40,6 +40,18 @@ config INPUT_M68K_BEEP +@@ -50,6 +50,18 @@ config INPUT_M68K_BEEP tristate "M68k Beeper support" depends on M68K @@ -26,7 +26,7 @@ help --- linux-2.6.15/drivers/input/misc/Makefile 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.15/drivers/input/misc/Makefile 1970-01-01 00:00:00.000000000 +0000 -@@ -10,3 +10,4 @@ obj-$(CONFIG_INPUT_M68K_BEEP) += m68ksp +@@ -11,3 +11,4 @@ obj-$(CONFIG_INPUT_M68K_BEEP) += m68ksp obj-$(CONFIG_INPUT_98SPKR) += 98spkr.o obj-$(CONFIG_INPUT_UINPUT) += uinput.o obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o diff --git a/packages/linux/ixp4xx-kernel/2.6.15/75-nslu2-leds.patch b/packages/linux/ixp4xx-kernel/2.6.15/75-nslu2-leds.patch index 7497409e77..b0dc4b8c34 100644 --- a/packages/linux/ixp4xx-kernel/2.6.15/75-nslu2-leds.patch +++ b/packages/linux/ixp4xx-kernel/2.6.15/75-nslu2-leds.patch @@ -36,7 +36,7 @@ If you say Y here, the red LED will be used to give a good real --- linux-2.6.15/arch/arm/mach-ixp4xx/Makefile 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.15/arch/arm/mach-ixp4xx/Makefile 1970-01-01 00:00:00.000000000 +0000 -@@ -10,3 +10,7 @@ obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote- +@@ -11,3 +11,7 @@ obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote- obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-pci.o gtwx5715-setup.o obj-$(CONFIG_MACH_NSLU2) += nslu2-pci.o nslu2-setup.o nslu2-power.o diff --git a/packages/linux/ixp4xx-kernel/2.6.15/80-nslu2-io.patch b/packages/linux/ixp4xx-kernel/2.6.15/80-nslu2-io.patch index 26031f6f00..7a5b2d51cb 100644 --- a/packages/linux/ixp4xx-kernel/2.6.15/80-nslu2-io.patch +++ b/packages/linux/ixp4xx-kernel/2.6.15/80-nslu2-io.patch @@ -1,11 +1,12 @@ --- linux-2.6.15/arch/arm/mach-ixp4xx/Makefile 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.15/arch/arm/mach-ixp4xx/Makefile 1970-01-01 00:00:00.000000000 +0000 -@@ -8,5 +8,5 @@ obj-$(CONFIG_ARCH_IXDP4XX) += ixdp425-pc +@@ -8,6 +8,6 @@ obj-$(CONFIG_ARCH_IXDP4XX) += ixdp425-pc obj-$(CONFIG_MACH_IXDPG425) += ixdpg425-pci.o coyote-setup.o obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-pci.o coyote-setup.o obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-pci.o gtwx5715-setup.o -obj-$(CONFIG_MACH_NSLU2) += nslu2-pci.o nslu2-setup.o nslu2-power.o +obj-$(CONFIG_MACH_NSLU2) += nslu2-pci.o nslu2-setup.o nslu2-power.o nslu2-io.o + obj-$(CONFIG_MACH_NAS100D) += nas100d-pci.o nas100d-setup.o nas100d-power.o --- linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-io.c 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-io.c 1970-01-01 00:00:00.000000000 +0000 diff --git a/packages/linux/ixp4xx-kernel/2.6.15/85-timer.patch b/packages/linux/ixp4xx-kernel/2.6.15/85-timer.patch index 3d4a03f616..e8131447c8 100644 --- a/packages/linux/ixp4xx-kernel/2.6.15/85-timer.patch +++ b/packages/linux/ixp4xx-kernel/2.6.15/85-timer.patch @@ -215,7 +215,7 @@ - --- linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-setup.c 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-setup.c 1970-01-01 00:00:00.000000000 +0000 -@@ -119,6 +119,11 @@ static void nslu2_power_off(void) +@@ -114,6 +114,11 @@ static void nslu2_power_off(void) static void __init nslu2_init(void) { diff --git a/packages/linux/ixp4xx-kernel/2.6.15/92-nas100d-maclist.patch b/packages/linux/ixp4xx-kernel/2.6.15/92-nas100d-maclist.patch index 3143850b22..20ccbd56a6 100644 --- a/packages/linux/ixp4xx-kernel/2.6.15/92-nas100d-maclist.patch +++ b/packages/linux/ixp4xx-kernel/2.6.15/92-nas100d-maclist.patch @@ -33,7 +33,7 @@ + * When the RedBoot config partition is added the MAC address is read from + * it. + */ -+void flash_add(struct mtd_info *mtd) { ++static void nas100d_flash_add(struct mtd_info *mtd) { + if (strcmp(mtd->name, "RedBoot config") == 0) { + size_t retlen; + u_char mac[6]; @@ -52,12 +52,12 @@ +/* + * Nothing to do on remove at present. + */ -+void flash_remove(struct mtd_info *mtd) { ++static void nas100d_flash_remove(struct mtd_info *mtd) { +} + -+struct mtd_notifier flash_notifier = { -+ .add = flash_add, -+ .remove = flash_remove, ++static struct mtd_notifier nas100d_flash_notifier = { ++ .add = nas100d_flash_add, ++ .remove = nas100d_flash_remove, +}; + static void __init nas100d_init(void) @@ -65,7 +65,7 @@ + /* The flash has an ethernet MAC embedded in it which we need, + * that is all this notifier does. + */ -+ register_mtd_user(&flash_notifier); ++ register_mtd_user(&nas100d_flash_notifier); + ixp4xx_sys_init(); diff --git a/packages/linux/ixp4xx-kernel/2.6.15/92-nslu2-maclist.patch b/packages/linux/ixp4xx-kernel/2.6.15/92-nslu2-maclist.patch index c8b8a9bede..1b7e611690 100644 --- a/packages/linux/ixp4xx-kernel/2.6.15/92-nslu2-maclist.patch +++ b/packages/linux/ixp4xx-kernel/2.6.15/92-nslu2-maclist.patch @@ -36,7 +36,7 @@ + * When the RedBoot partition is added the MAC address is read from + * it. + */ -+void flash_add(struct mtd_info *mtd) { ++static void nslu2_flash_add(struct mtd_info *mtd) { + if (strcmp(mtd->name, "RedBoot") == 0) { + size_t retlen; + u_char mac[6]; @@ -55,12 +55,12 @@ +/* + * Nothing to do on remove at present. + */ -+void flash_remove(struct mtd_info *mtd) { ++static void nslu2_flash_remove(struct mtd_info *mtd) { +} + -+struct mtd_notifier flash_notifier = { -+ .add = flash_add, -+ .remove = flash_remove, ++static struct mtd_notifier nslu2_flash_notifier = { ++ .add = nslu2_flash_add, ++ .remove = nslu2_flash_remove, +}; + static void __init nslu2_init(void) @@ -73,7 +73,7 @@ + /* The flash has an ethernet MAC embedded in it which we need, + * that is all this notifier does. + */ -+ register_mtd_user(&flash_notifier); ++ register_mtd_user(&nslu2_flash_notifier); + ixp4xx_sys_init(); diff --git a/packages/linux/ixp4xx-kernel/2.6.15/defconfig b/packages/linux/ixp4xx-kernel/2.6.15/defconfig index 5e782ba8f3..ff69ccc6f1 100644 --- a/packages/linux/ixp4xx-kernel/2.6.15/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.15/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.15 -# Mon Nov 14 10:44:43 2005 +# Sun Jan 8 02:47:26 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -32,6 +32,7 @@ CONFIG_HOTPLUG=y CONFIG_KOBJECT_UEVENT=y # CONFIG_IKCONFIG is not set CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_EMBEDDED=y # CONFIG_KALLSYMS is not set CONFIG_PRINTK=y @@ -39,7 +40,6 @@ CONFIG_BUG=y # CONFIG_BASE_FULL is not set CONFIG_FUTEX=y CONFIG_EPOLL=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SHMEM=y CONFIG_CC_ALIGN_FUNCTIONS=0 CONFIG_CC_ALIGN_LABELS=0 @@ -111,22 +111,20 @@ CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y # # IXP4xx Platforms # -# CONFIG_ARCH_AVILA is not set -CONFIG_ARCH_ADI_COYOTE=y CONFIG_MACH_NSLU2=y -CONFIG_MACH_NAS100D=y -CONFIG_ARCH_IXDP425=y +# CONFIG_ARCH_AVILA is not set +# CONFIG_ARCH_ADI_COYOTE is not set +# CONFIG_ARCH_IXDP425 is not set # CONFIG_MACH_IXDPG425 is not set # CONFIG_MACH_IXDP465 is not set -CONFIG_ARCH_IXCDP1100=y -CONFIG_ARCH_PRPMC1100=y -CONFIG_ARCH_IXDP4XX=y +# CONFIG_ARCH_PRPMC1100 is not set +CONFIG_MACH_NAS100D=y # CONFIG_MACH_GTWX5715 is not set # # IXP4xx Options # -# CONFIG_IXP4XX_INDIRECT_PCI is not set +CONFIG_IXP4XX_INDIRECT_PCI=y # # Processor Type @@ -172,7 +170,6 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 -# CONFIG_LEDS is not set CONFIG_ALIGNMENT_TRAP=y # @@ -180,7 +177,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc x1205.hctosys=1 x1205.probe=0,0x6f noirqdebug console=ttyS0,115200n8" +CONFIG_CMDLINE="root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc rtc-x1205.hctosys=1 rtc-x1205.probe=0,0x6f noirqdebug console=ttyS0,115200n8" # CONFIG_XIP_KERNEL is not set # @@ -333,7 +330,6 @@ CONFIG_IP_NF_TARGET_CLASSIFY=m # # CONFIG_IP6_NF_QUEUE is not set # CONFIG_IP6_NF_IPTABLES is not set -# CONFIG_IP6_NF_TARGET_NFQUEUE is not set # # Bridge: Netfilter Configuration @@ -414,6 +410,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=m # +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# # Memory Technology Devices (MTD) # CONFIG_MTD=y @@ -876,7 +877,7 @@ CONFIG_IXP4XX_WATCHDOG=y # CONFIG_USBPCWATCHDOG is not set # CONFIG_NVRAM is not set # CONFIG_RTC is not set -CONFIG_RTC_X1205=n +CONFIG_RTC_PCF8563=y # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set @@ -944,12 +945,12 @@ CONFIG_SENSORS_EEPROM=y # CONFIG_SENSORS_PCF8591 is not set # CONFIG_SENSORS_RTC8564 is not set # CONFIG_SENSORS_MAX6875 is not set -CONFIG_RTC_X1205_I2C=y +# CONFIG_RTC_X1205_I2C is not set +CONFIG_RTC_PCF8563_I2C=y # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set # CONFIG_I2C_DEBUG_CHIP is not set -CONFIG_RTC_PCF8563_I2C=y # # Hardware Monitoring support @@ -1027,6 +1028,7 @@ CONFIG_VIDEO_ZORAN_DC30=m CONFIG_VIDEO_ZORAN_LML33=m CONFIG_VIDEO_ZORAN_LML33R10=m CONFIG_VIDEO_SAA7134=m +# CONFIG_VIDEO_SAA7134_ALSA is not set CONFIG_VIDEO_MXB=m CONFIG_VIDEO_DPC=m CONFIG_VIDEO_HEXIUM_ORION=m @@ -1034,6 +1036,8 @@ CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_CX88=m # CONFIG_VIDEO_EM28XX is not set CONFIG_VIDEO_OVCAMCHIP=m +# CONFIG_VIDEO_AUDIO_DECODER is not set +# CONFIG_VIDEO_DECODER is not set # # Radio Adapters @@ -1278,6 +1282,7 @@ CONFIG_USB_NET_ZAURUS=m CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_GENERIC=y # CONFIG_USB_SERIAL_AIRPRIME is not set +# CONFIG_USB_SERIAL_ANYDATA is not set CONFIG_USB_SERIAL_BELKIN=m CONFIG_USB_SERIAL_WHITEHEAT=m CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m @@ -1297,7 +1302,6 @@ CONFIG_USB_SERIAL_KEYSPAN_PDA=m CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m -# CONFIG_USB_SERIAL_NOKIA_DKU2 is not set CONFIG_USB_SERIAL_PL2303=m # CONFIG_USB_SERIAL_HP4X is not set CONFIG_USB_SERIAL_SAFE=m @@ -1341,6 +1345,25 @@ CONFIG_USB_EZUSB=y # CONFIG_MMC is not set # +# Real Time Clock +# +CONFIG_RTC_CLASS=y + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y + +# +# RTC drivers +# +CONFIG_RTC_DRV_X1205=y +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_TEST is not set + +# # File systems # CONFIG_EXT2_FS=m @@ -1594,13 +1617,3 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y - -CONFIG_RTC_CLASS=y -# RTC interfaces -CONFIG_RTC_INTF_SYSFS=y -CONFIG_RTC_INTF_PROC=y -CONFIG_RTC_INTF_DEV=y -# RTC drivers -CONFIG_RTC_DRV_X1205=y -CONFIG_RTC_DRV_DS1672=n -CONFIG_RTC_DRV_TEST=n diff --git a/packages/linux/ixp4xx-kernel_2.6.15.bb b/packages/linux/ixp4xx-kernel_2.6.15.bb index 5b8451a3e0..39ad707916 100644 --- a/packages/linux/ixp4xx-kernel_2.6.15.bb +++ b/packages/linux/ixp4xx-kernel_2.6.15.bb @@ -8,31 +8,26 @@ PR_CONFIG = "0" # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches # applied to the kernel. -PR = "r1.${PR_CONFIG}" +PR = "r3.${PR_CONFIG}" include ixp4xx-kernel.inc -# file://60-nas100d-i2c.patch;patch=1 \ -# file://60-nas100d-ide.patch;patch=1 \ -# file://75-nslu2-leds.patch;patch=1 \ -# file://80-nslu2-io.patch;patch=1 \ -# file://92-nslu2-maclist.patch;patch=1 \ - # IXP4XX_PATCHES - full list of patches to apply -IXP4XX_PATCHES = "\ - file://00-memory-h-page-shift.patch;patch=1 \ - file://10-mtdpart-redboot-fis-byteswap.patch;patch=1 \ - file://15-jffs2-endian-config.patch;patch=1 \ - file://40-rtc-class.patch;patch=1 \ - file://50-nas100d-arch.patch;patch=1 \ - file://60-nslu2-beeper.patch;patch=1 \ - file://85-timer.patch;patch=1 \ - file://91-maclist.patch;patch=1 \ - file://92-nas100d-maclist.patch;patch=1 \ -" +IXP4XX_PATCHES = "" -# These options get added to the kernel command line, only put things -# specific to the bootstrap of *this* kernel in here - DISTRO specfic -# config must be in CMDLINE_ROOT (see the full definition of CMDLINE -# in ixp4xx-kernel.inc) -CMDLINE_KERNEL_OPTIONS = "x1205.hctosys=1 x1205.probe=0,0x6f pcf8563.hctosys=1" +IXP4XX_PATCHES += "file://00-memory-h-page-shift.patch;patch=1" +IXP4XX_PATCHES += "file://10-mtdpart-redboot-fis-byteswap.patch;patch=1" +IXP4XX_PATCHES += "file://15-jffs2-endian-config.patch;patch=1" +IXP4XX_PATCHES += "file://40-rtc-class.patch;patch=1" +IXP4XX_PATCHES += "file://50-nas100d-arch.patch;patch=1" +IXP4XX_PATCHES += "file://55-rtc-pcf8563.patch;patch=1" +IXP4XX_PATCHES += "file://60-nas100d-i2c.patch;patch=1" +# IXP4XX_PATCHES += "file://60-nas100d-ide.patch;patch=1" +IXP4XX_PATCHES += "file://60-nas100d-rtc.patch;patch=1" +IXP4XX_PATCHES += "file://60-nslu2-beeper.patch;patch=1" +# IXP4XX_PATCHES += "file://75-nslu2-leds.patch;patch=1" +IXP4XX_PATCHES += "file://80-nslu2-io.patch;patch=1" +IXP4XX_PATCHES += "file://85-timer.patch;patch=1" +IXP4XX_PATCHES += "file://91-maclist.patch;patch=1" +IXP4XX_PATCHES += "file://92-nas100d-maclist.patch;patch=1" +IXP4XX_PATCHES += "file://92-nslu2-maclist.patch;patch=1" diff --git a/packages/linux/nas100d-kernel.inc b/packages/linux/nas100d-kernel.inc index 6dd8a46001..69e9f4d285 100644 --- a/packages/linux/nas100d-kernel.inc +++ b/packages/linux/nas100d-kernel.inc @@ -210,7 +210,19 @@ do_configure_prepend() { then echo 'CONFIG_CPU_BIG_ENDIAN=y' >>'${S}/.config' fi - sed -e '/CONFIG_CPU_BIG_ENDIAN/d' -e '/CONFIG_CMDLINE=/d' '${WORKDIR}/defconfig' >>'${S}/.config' + if test '${SLUGOS_IMAGESEX}' = big-endian + then + echo 'CONFIG_JFFS2_BIG_ENDIAN=y' >>'${S}/.config' + fi + if test '${SLUGOS_IMAGESEX}' = little-endian + then + echo 'CONFIG_JFFS2_LITTLE_ENDIAN=y' >>'${S}/.config' + fi + sed -e '/CONFIG_CPU_BIG_ENDIAN/d' -e '/CONFIG_CMDLINE=/d' \ + -e '/CONFIG_JFFS2_NATIVE_ENDIAN=/d' \ + -e '/CONFIG_JFFS2_BIG_ENDIAN=/d' \ + -e '/CONFIG_JFFS2_LITTLE_ENDIAN=/d' \ + '${WORKDIR}/defconfig' >>'${S}/.config' rm -rf ${S}/include/asm-arm/arch ${S}/include/asm-arm/proc \ ${S}/include/asm-arm/.proc ${S}/include/asm-arm/.arch } diff --git a/packages/linux/nas100d-kernel/2.6.15/defconfig b/packages/linux/nas100d-kernel/2.6.15/defconfig index 69832a6da5..3f7bbe9aa5 100644 --- a/packages/linux/nas100d-kernel/2.6.15/defconfig +++ b/packages/linux/nas100d-kernel/2.6.15/defconfig @@ -32,6 +32,7 @@ CONFIG_HOTPLUG=y CONFIG_KOBJECT_UEVENT=y # CONFIG_IKCONFIG is not set CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_EMBEDDED=y # CONFIG_KALLSYMS is not set CONFIG_PRINTK=y @@ -39,7 +40,6 @@ CONFIG_BUG=y # CONFIG_BASE_FULL is not set CONFIG_FUTEX=y CONFIG_EPOLL=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SHMEM=y CONFIG_CC_ALIGN_FUNCTIONS=0 CONFIG_CC_ALIGN_LABELS=0 @@ -60,6 +60,23 @@ CONFIG_OBSOLETE_MODPARM=y CONFIG_KMOD=y # +# Block layer +# + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +# CONFIG_IOSCHED_AS is not set +CONFIG_IOSCHED_DEADLINE=y +# CONFIG_IOSCHED_CFQ is not set +# CONFIG_DEFAULT_AS is not set +CONFIG_DEFAULT_DEADLINE=y +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="deadline" + +# # System Type # # CONFIG_ARCH_CLPS7500 is not set @@ -81,6 +98,7 @@ CONFIG_ARCH_IXP4XX=y # CONFIG_ARCH_LH7A40X is not set # CONFIG_ARCH_OMAP is not set # CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_REALVIEW is not set # CONFIG_ARCH_IMX is not set # CONFIG_ARCH_H720X is not set # CONFIG_ARCH_AAEC2000 is not set @@ -93,6 +111,7 @@ CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y # # IXP4xx Platforms # +# CONFIG_MACH_NSLU2 is not set # CONFIG_ARCH_AVILA is not set # CONFIG_ARCH_ADI_COYOTE is not set # CONFIG_ARCH_IXDP425 is not set @@ -150,6 +169,7 @@ CONFIG_FLATMEM_MANUAL=y CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 CONFIG_ALIGNMENT_TRAP=y # @@ -157,7 +177,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/mtdblock2 rw rootfstype=jffs2 mem=64M@0x00000000 init=/linuxrc console=ttyS0,115200n8 pcf8563.hctosys=1" +CONFIG_CMDLINE="root=/dev/mtdblock2 rw rootfstype=jffs2 mem=64M@0x00000000 init=/linuxrc pcf8563.hctosys=1 console=ttyS0,115200n8" # CONFIG_XIP_KERNEL is not set # @@ -168,6 +188,7 @@ CONFIG_CMDLINE="root=/dev/mtdblock2 rw rootfstype=jffs2 mem=64M@0x00000000 init= # At least one emulation must be selected # CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set # CONFIG_FPE_FASTFPE is not set # @@ -229,6 +250,10 @@ CONFIG_IPV6_TUNNEL=m CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# # CONFIG_NETFILTER_NETLINK is not set # @@ -305,7 +330,6 @@ CONFIG_IP_NF_TARGET_CLASSIFY=m # # CONFIG_IP6_NF_QUEUE is not set # CONFIG_IP6_NF_IPTABLES is not set -# CONFIG_IP6_NF_TARGET_NFQUEUE is not set # # Bridge: Netfilter Configuration @@ -339,6 +363,10 @@ CONFIG_IPDDP_DECAP=y # CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# # CONFIG_NET_SCHED is not set CONFIG_NET_CLS_ROUTE=y @@ -382,6 +410,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=m # +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# # Memory Technology Devices (MTD) # CONFIG_MTD=y @@ -403,6 +436,7 @@ CONFIG_MTD_BLOCK=y # CONFIG_FTL is not set # CONFIG_NFTL is not set # CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set # # RAM/ROM/Flash chip drivers @@ -442,7 +476,6 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y # CONFIG_MTD_PHYSMAP is not set # CONFIG_MTD_ARM_INTEGRATOR is not set CONFIG_MTD_IXP4XX=y -# CONFIG_MTD_EDB7312 is not set # CONFIG_MTD_PCI is not set # CONFIG_MTD_PLATRAM is not set @@ -469,6 +502,11 @@ CONFIG_MTD_IXP4XX=y # CONFIG_MTD_NAND is not set # +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set + +# # Parallel port support # # CONFIG_PARPORT is not set @@ -497,14 +535,6 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD_WCACHE is not set - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -# CONFIG_IOSCHED_AS is not set -CONFIG_IOSCHED_DEADLINE=y -# CONFIG_IOSCHED_CFQ is not set # CONFIG_ATA_OVER_ETH is not set # @@ -602,6 +632,7 @@ CONFIG_SCSI_MULTI_LUN=y # # SCSI low-level drivers # +# CONFIG_ISCSI_TCP is not set # CONFIG_BLK_DEV_3W_XXXX_RAID is not set # CONFIG_SCSI_3W_9XXX is not set # CONFIG_SCSI_ACARD is not set @@ -700,6 +731,7 @@ CONFIG_TUN=m # Ethernet (10 or 100Mbit) # CONFIG_NET_ETHERNET=y +CONFIG_MACLIST=y CONFIG_MII=y # CONFIG_HAPPYMEAL is not set # CONFIG_SUNGEM is not set @@ -799,6 +831,7 @@ CONFIG_PPP_ASYNC=m # CONFIG_PPP_SYNC_TTY is not set CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m +# CONFIG_PPP_MPPE is not set # CONFIG_PPPOE is not set # CONFIG_SLIP is not set # CONFIG_NET_FC is not set @@ -910,6 +943,7 @@ CONFIG_RTC=y # TPM devices # # CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set # # I2C support @@ -956,17 +990,18 @@ CONFIG_I2C_IXP4XX=y # # CONFIG_SENSORS_DS1337 is not set # CONFIG_SENSORS_DS1374 is not set -CONFIG_SENSORS_EEPROM=n +# CONFIG_SENSORS_EEPROM is not set # CONFIG_SENSORS_PCF8574 is not set # CONFIG_SENSORS_PCA9539 is not set # CONFIG_SENSORS_PCF8591 is not set # CONFIG_SENSORS_RTC8564 is not set # CONFIG_SENSORS_MAX6875 is not set +# CONFIG_RTC_X1205_I2C is not set +CONFIG_RTC_PCF8563_I2C=y CONFIG_I2C_DEBUG_CORE=y CONFIG_I2C_DEBUG_ALGO=y CONFIG_I2C_DEBUG_BUS=y CONFIG_I2C_DEBUG_CHIP=y -CONFIG_RTC_PCF8563_I2C=y # # Hardware Monitoring support @@ -1044,12 +1079,16 @@ CONFIG_VIDEO_ZORAN_DC30=m CONFIG_VIDEO_ZORAN_LML33=m CONFIG_VIDEO_ZORAN_LML33R10=m CONFIG_VIDEO_SAA7134=m +# CONFIG_VIDEO_SAA7134_ALSA is not set CONFIG_VIDEO_MXB=m CONFIG_VIDEO_DPC=m CONFIG_VIDEO_HEXIUM_ORION=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_CX88=m +# CONFIG_VIDEO_EM28XX is not set CONFIG_VIDEO_OVCAMCHIP=m +# CONFIG_VIDEO_AUDIO_DECODER is not set +# CONFIG_VIDEO_DECODER is not set # # Radio Adapters @@ -1197,15 +1236,15 @@ CONFIG_USB_UHCI_HCD=y # USB Device Class drivers # # CONFIG_OBSOLETE_OSS_USB_DRIVER is not set +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m # -# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' # -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m # -# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information +# may also be needed; see USB_STORAGE Help for more information # CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_DEBUG is not set @@ -1296,6 +1335,7 @@ CONFIG_USB_NET_ZAURUS=m CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_GENERIC=y # CONFIG_USB_SERIAL_AIRPRIME is not set +# CONFIG_USB_SERIAL_ANYDATA is not set CONFIG_USB_SERIAL_BELKIN=m CONFIG_USB_SERIAL_WHITEHEAT=m CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m @@ -1358,6 +1398,25 @@ CONFIG_USB_EZUSB=y # CONFIG_MMC is not set # +# Real Time Clock +# +CONFIG_RTC_CLASS=y + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y + +# +# RTC drivers +# +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_TEST is not set + +# # File systems # CONFIG_EXT2_FS=m @@ -1436,6 +1495,7 @@ CONFIG_RAMFS=y CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y diff --git a/packages/linux/nslu2-kernel.inc b/packages/linux/nslu2-kernel.inc index f41b61c033..ee0d233ac2 100644 --- a/packages/linux/nslu2-kernel.inc +++ b/packages/linux/nslu2-kernel.inc @@ -200,7 +200,19 @@ do_configure_prepend() { then echo 'CONFIG_CPU_BIG_ENDIAN=y' >>'${S}/.config' fi - sed -e '/CONFIG_CPU_BIG_ENDIAN/d' -e '/CONFIG_CMDLINE=/d' '${WORKDIR}/defconfig' >>'${S}/.config' + if test '${SLUGOS_IMAGESEX}' = big-endian + then + echo 'CONFIG_JFFS2_BIG_ENDIAN=y' >>'${S}/.config' + fi + if test '${SLUGOS_IMAGESEX}' = little-endian + then + echo 'CONFIG_JFFS2_LITTLE_ENDIAN=y' >>'${S}/.config' + fi + sed -e '/CONFIG_CPU_BIG_ENDIAN/d' -e '/CONFIG_CMDLINE=/d' \ + -e '/CONFIG_JFFS2_NATIVE_ENDIAN=/d' \ + -e '/CONFIG_JFFS2_BIG_ENDIAN=/d' \ + -e '/CONFIG_JFFS2_LITTLE_ENDIAN=/d' \ + '${WORKDIR}/defconfig' >>'${S}/.config' rm -rf ${S}/include/asm-arm/arch ${S}/include/asm-arm/proc \ ${S}/include/asm-arm/.proc ${S}/include/asm-arm/.arch } diff --git a/packages/linux/nslu2-kernel/2.6.15/defconfig b/packages/linux/nslu2-kernel/2.6.15/defconfig index 218f2cae76..9f7bf76471 100644 --- a/packages/linux/nslu2-kernel/2.6.15/defconfig +++ b/packages/linux/nslu2-kernel/2.6.15/defconfig @@ -32,6 +32,7 @@ CONFIG_HOTPLUG=y CONFIG_KOBJECT_UEVENT=y # CONFIG_IKCONFIG is not set CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_EMBEDDED=y # CONFIG_KALLSYMS is not set CONFIG_PRINTK=y @@ -39,7 +40,6 @@ CONFIG_BUG=y # CONFIG_BASE_FULL is not set CONFIG_FUTEX=y CONFIG_EPOLL=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SHMEM=y CONFIG_CC_ALIGN_FUNCTIONS=0 CONFIG_CC_ALIGN_LABELS=0 @@ -330,7 +330,6 @@ CONFIG_IP_NF_TARGET_CLASSIFY=m # # CONFIG_IP6_NF_QUEUE is not set # CONFIG_IP6_NF_IPTABLES is not set -# CONFIG_IP6_NF_TARGET_NFQUEUE is not set # # Bridge: Netfilter Configuration @@ -411,6 +410,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=m # +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# # Memory Technology Devices (MTD) # CONFIG_MTD=y @@ -873,7 +877,6 @@ CONFIG_IXP4XX_WATCHDOG=y # CONFIG_USBPCWATCHDOG is not set # CONFIG_NVRAM is not set # CONFIG_RTC is not set -CONFIG_RTC_X1205=n # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set @@ -1023,6 +1026,7 @@ CONFIG_VIDEO_ZORAN_DC30=m CONFIG_VIDEO_ZORAN_LML33=m CONFIG_VIDEO_ZORAN_LML33R10=m CONFIG_VIDEO_SAA7134=m +# CONFIG_VIDEO_SAA7134_ALSA is not set CONFIG_VIDEO_MXB=m CONFIG_VIDEO_DPC=m CONFIG_VIDEO_HEXIUM_ORION=m @@ -1030,6 +1034,8 @@ CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_CX88=m # CONFIG_VIDEO_EM28XX is not set CONFIG_VIDEO_OVCAMCHIP=m +# CONFIG_VIDEO_AUDIO_DECODER is not set +# CONFIG_VIDEO_DECODER is not set # # Radio Adapters @@ -1274,6 +1280,7 @@ CONFIG_USB_NET_ZAURUS=m CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_GENERIC=y # CONFIG_USB_SERIAL_AIRPRIME is not set +# CONFIG_USB_SERIAL_ANYDATA is not set CONFIG_USB_SERIAL_BELKIN=m CONFIG_USB_SERIAL_WHITEHEAT=m CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m @@ -1293,7 +1300,6 @@ CONFIG_USB_SERIAL_KEYSPAN_PDA=m CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m -# CONFIG_USB_SERIAL_NOKIA_DKU2 is not set CONFIG_USB_SERIAL_PL2303=m # CONFIG_USB_SERIAL_HP4X is not set CONFIG_USB_SERIAL_SAFE=m @@ -1337,6 +1343,25 @@ CONFIG_USB_EZUSB=y # CONFIG_MMC is not set # +# Real Time Clock +# +CONFIG_RTC_CLASS=y + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y + +# +# RTC drivers +# +CONFIG_RTC_DRV_X1205=y +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_TEST is not set + +# # File systems # CONFIG_EXT2_FS=m @@ -1590,13 +1615,3 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y - -CONFIG_RTC_CLASS=y -# RTC interfaces -CONFIG_RTC_INTF_SYSFS=y -CONFIG_RTC_INTF_PROC=y -CONFIG_RTC_INTF_DEV=y -# RTC drivers -CONFIG_RTC_DRV_X1205=y -CONFIG_RTC_DRV_DS1672=n -CONFIG_RTC_DRV_TEST=n diff --git a/packages/madwifi/madwifi-modules_cvs-bsd.bb b/packages/madwifi/madwifi-modules_cvs-bsd.bb index 1092180037..6da2c34baf 100644 --- a/packages/madwifi/madwifi-modules_cvs-bsd.bb +++ b/packages/madwifi/madwifi-modules_cvs-bsd.bb @@ -5,7 +5,7 @@ MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" LICENSE = "GPL" RDEPENDS = "kernel (${KERNEL_VERSION})" DEPENDS = "virtual/kernel" -PV = "cvs-bsd+${SRCDATE}" +PV = "1:0.0+cvs${SRCDATE}-bsd" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/madwifi;module=madwifi;tag=BSD;date=${SRCDATE}" diff --git a/packages/madwifi/madwifi-modules_cvs.bb b/packages/madwifi/madwifi-modules_cvs.bb index 4e00bf609c..0bef3d506e 100644 --- a/packages/madwifi/madwifi-modules_cvs.bb +++ b/packages/madwifi/madwifi-modules_cvs.bb @@ -5,7 +5,7 @@ MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" LICENSE = "GPL" RDEPENDS = "kernel (${KERNEL_VERSION})" DEPENDS = "virtual/kernel" -PV = "0.0+cvs${SRCDATE}" +PV = "1:0.0+cvs${SRCDATE}" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/madwifi;module=madwifi" diff --git a/packages/meta/slugos-image.bb b/packages/meta/slugos-image.bb index ad16b6ae93..1fa67bb9d3 100644 --- a/packages/meta/slugos-image.bb +++ b/packages/meta/slugos-image.bb @@ -4,27 +4,25 @@ # conf/distro/slugos.conf to get the standard settings). # LICENSE = "MIT" -PR = "r17" -PROVIDES += "${SLUGOS_IMAGENAME}-image" +PR = "r19" # SLUGOS_IMAGENAME defines the name of the image to be build, if it # is not set this package will be skipped! IMAGE_BASENAME = "${SLUGOS_IMAGENAME}" IMAGE_FSTYPES = "jffs2" +EXTRA_IMAGECMD_jffs2 = "--pad --${SLUGOS_IMAGESEX} --eraseblock=0x20000 -D ${SLUGOS_DEVICE_TABLE}" +IMAGE_LINGUAS = "" -# Kernel suffix - 'nslu2be' or 'nslu2le' for a truely generic image, -# override in the DISTRO configuration if patches or defconfig are -# changed for the DISTRO! -N2K_SUFFIX ?= "nslu2${ARCH_BYTE_SEX}" +# Setting USE_DEVFS prevents *any* entries being created initially +# in /dev +USE_DEVFS = "1" #FIXME: this is historical, there should be a minimal slugos device table and # this stuff shouldn't be in here at all (put it in slugos-image.bb!) # Why have anything in the config file to control the image build - why not # just select a different image .bb file (e.g. slugos-ramdisk-image.bb) to # build with different options. -# IMAGE_SEX = "${@['big-endian', 'little-endian'][bb.data.getVar('ARCH_BYTE_SEX', d, 1) == 'le']}" SLUGOS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}" -EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${SLUGOS_DEVICE_TABLE}" # IMAGE_PREPROCESS_COMMAND is run before making the image. In SlugOS the # kernel image is removed from the root file system to recover the space used - @@ -33,55 +31,20 @@ EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${SLUGOS_DEVI IMAGE_PREPROCESS_COMMAND = "rm ${IMAGE_ROOTFS}/boot/zImage*;" # Building a full image. If required do a post-process command which builds -# the full image using slugimage. -# -#NOTE: you do not actually need the boot loader in normal use because it is -# *not* overwritten by a standard upslug upgrade, so you can make an image with -# just non-LinkSys software which can be flashed into the NSLU2. Because -# LinkSys have made "EraseAll" available, however, (this does overwrite RedBoot) -# it is a bad idea to produce flash images without a valid RedBoot - that allows -# an innocent user upgrade attempt to instantly brick the NSLU2. -NSLU2_SLUGIMAGE_ARGS ?= "" - -nslu2_pack_image() { - if test '${SLUGOS_FLASH_IMAGE}' = yes - then - install -d ${DEPLOY_DIR_IMAGE}/slug - install -m 0644 ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \ - ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ - ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ - ${DEPLOY_DIR_IMAGE}/slug/ - install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-${N2K_SUFFIX} \ - ${DEPLOY_DIR_IMAGE}/slug/vmlinuz - install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ - ${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2 - cd ${DEPLOY_DIR_IMAGE}/slug - slugimage -p -b RedBoot -s SysConf -r Ramdisk:1,Flashdisk:flashdisk.jffs2 -t \ - Trailer -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flashdisk.img \ - ${NSLU2_SLUGIMAGE_ARGS} - rm -rf ${DEPLOY_DIR_IMAGE}/slug - fi -} - -IMAGE_POSTPROCESS_COMMAND += "nslu2_pack_image;" +# the full flash image using slugimage. At present this only works for NSLU2 images. +PACK_IMAGE = "" +IMAGE_POSTPROCESS_COMMAND += "${PACK_IMAGE}" +PACK_IMAGE_DEPENDS = "" +EXTRA_IMAGEDEPENDS += "${PACK_IMAGE_DEPENDS}" -SLUGOS_IMAGE_DEPENDS = "${@['', 'slugimage-native nslu2-linksys-firmware'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'yes']}" - -IMAGE_LINGUAS = "" -# Setting USE_DEVFS prevents *any* entries being created initially -# in /dev -USE_DEVFS = "1" +# These depends define native utilities - they do not get put in the flash and +# are not required to build the image. +IMAGE_TOOLS = "" +EXTRA_IMAGEDEPENDS += "${IMAGE_TOOLS}" # CONFIG: -# SLUGOS_IMAGE_DEPENDS: set above, do not change # SLUGOS_EXTRA_RDEPENDS: set in conf, things to add to the image -# SLUGOS_EXTRA_DEPENDS: set in conf, things to build, not added -# to the image. -# SLUGOS_NATIVE_DEPENDS: set in conf, things to build, intended -# for native (run-on-host) tools -# -# SLUGOS_SUPPORT: set to here, see below, added to build and -# to the image. +# SLUGOS_SUPPORT: set to here, see below, added to the image. # SLUGOS_KERNEL: set here, kernel modules added to the image # # Do not override the last two unless you really know what you @@ -103,34 +66,65 @@ SLUGOS_SUPPORT ?= "diffutils cpio findutils udev" # other than the network to output error messages!) SLUGOS_KERNEL ?= "kernel-module-af-packet kernel-module-netconsole" -# The things explicitly included in the following lists are the -# absolute minimum to have any chance of a bootable system. -DEPENDS = "${SLUGOS_IMAGE_DEPENDS} \ - virtual/kernel base-files base-passwd \ - busybox dropbear hotplug-ng initscripts-slugos netbase \ - sysvinit tinylogin portmap \ - virtual/ixp-eth slugos-init \ - module-init-tools modutils-initscripts \ - ipkg-collateral ipkg ipkg-link \ - ${SLUGOS_SUPPORT} \ - ${SLUGOS_EXTRA_DEPENDS} \ - ${SLUGOS_NATIVE_DEPENDS}" +#FIXME: this is temporary to ensure the correct versions are obtained +DEPENDS = "virtual/kernel virtual/ixp-eth" -IPKG_INSTALL = "base-files base-passwd \ - busybox dropbear hotplug-ng initscripts-slugos netbase \ - update-modules sysvinit tinylogin portmap \ - ${PREFERRED_PROVIDER_virtual/ixp-eth} slugos-init \ +RDEPENDS = "kernel ixp-eth \ + base-files base-passwd netbase \ + busybox hotplug-ng initscripts-slugos slugos-init \ + update-modules sysvinit tinylogin \ module-init-tools modutils-initscripts \ ipkg-collateral ipkg ipkg-link \ + portmap \ + dropbear \ ${SLUGOS_SUPPORT} \ ${SLUGOS_KERNEL} \ ${SLUGOS_EXTRA_RDEPENDS}" +IPKG_INSTALL = "${RDEPENDS}" + inherit image_ipk python () { # Don't build slugos images unless the configuration is set up # for an image build! - if bb.data.getVar("SLUGOS_IMAGENAME", d, 1) == '': + if bb.data.getVar("SLUGOS_IMAGENAME", d, 1) == '' or bb.data.getVar("SLUGOS_IMAGESEX", d, 1) == '': raise bb.parse.SkipPackage("absent or broken SlugOS configuration") } + +#-------------------------------------------------------------------------------- +# NSLU2 specific +# +#NOTE: you do not actually need the boot loader in normal use because it is +# *not* overwritten by a standard upslug upgrade, so you can make an image with +# just non-LinkSys software which can be flashed into the NSLU2. Because +# LinkSys have made "EraseAll" available, however, (this does overwrite RedBoot) +# it is a bad idea to produce flash images without a valid RedBoot - that allows +# an innocent user upgrade attempt to instantly brick the NSLU2. +PACK_IMAGE_nslu2 = "nslu2_pack_image;" +PACK_IMAGE_DEPENDS_nslu2 = "${@['', 'slugimage-native nslu2-linksys-firmware'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'yes']}" + +NSLU2_SLUGIMAGE_ARGS ?= "" + +nslu2_pack_image() { + if test '${SLUGOS_FLASH_IMAGE}' = yes + then + install -d ${DEPLOY_DIR_IMAGE}/slug + install -m 0644 ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \ + ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ + ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ + ${DEPLOY_DIR_IMAGE}/slug/ + install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-${IXP4XX_SUFFIX} \ + ${DEPLOY_DIR_IMAGE}/slug/vmlinuz + install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + ${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2 + cd ${DEPLOY_DIR_IMAGE}/slug + slugimage -p -b RedBoot -s SysConf -r Ramdisk:1,Flashdisk:flashdisk.jffs2 -t \ + Trailer -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flashdisk.img \ + ${NSLU2_SLUGIMAGE_ARGS} + rm -rf ${DEPLOY_DIR_IMAGE}/slug + fi +} + +# upslug2 (in tmp/work/upslug2-native-*) is the program to write the NSLU2 flash +IMAGE_TOOLS_nslu2 = "upslug2-native" diff --git a/packages/meta/slugos-imagename.bb b/packages/meta/slugos-imagename.bb new file mode 100644 index 0000000000..35578442c2 --- /dev/null +++ b/packages/meta/slugos-imagename.bb @@ -0,0 +1,35 @@ +# This is an inglorious hack to provide a package to match +# ${SLUGOS_IMAGENAME}-image +MAINTAINER = "John Bowler <jbowler@acm.org> +PN = "${SLUGOS_IMAGENAME}-image" +PV = "0" +PR = "r0" +DEPENDS = "slugos-image" +PACKAGES = "" +INHIBIT_DEFAULT_DEPS = "1" + +SLUGOS_IMAGENAME ?= "slugos" + +do_fetch() { +} +do_unpack() { +} +do_patch() { +} +do_configure() { +} +do_compile() { +} +do_install() { +} +do_stage() { +} +do_build() { +} + +python () { + # Don't build slugos images unless the configuration is set up + # for an image build! + if bb.data.getVar("SLUGOS_IMAGENAME", d, 1) == '': + raise bb.parse.SkipPackage("absent SlugOS configuration") +} diff --git a/packages/mileage/mileage_cvs.bb b/packages/mileage/mileage_cvs.bb index 88658eb0d1..355db4d3ea 100644 --- a/packages/mileage/mileage_cvs.bb +++ b/packages/mileage/mileage_cvs.bb @@ -3,7 +3,8 @@ HOMEPAGE = "http://mileage.sourceforge.net" SECTION = "opie/applications" PRIORITY = "optional" LICENSE = "GPL" -PV = "4.2.0+cvs${SRCDATE}" +#Change to form x.y.z+cvs${SRCDATE} when 4.2.0 changes in PV +PV = "4.2.0-cvs-${SRCDATE}" PR = "r1" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/mileage;module=mileage" diff --git a/packages/mystun-server/mystun-server_cvs.bb b/packages/mystun-server/mystun-server_cvs.bb index 7a4d8b015a..cfdf72f475 100644 --- a/packages/mystun-server/mystun-server_cvs.bb +++ b/packages/mystun-server/mystun-server_cvs.bb @@ -4,7 +4,7 @@ MAINTAINER = "Sven-Ola Tuecke <sven-ola@gmx.de>" SECTION = "console/telephony" PRIORITY = "optional" LICENSE = "GPL" -PV = "0.0+cvs${SRCDATE}" +PV = "1:0.0+cvs${SRCDATE}" SRC_URI="cvs://anonymous@cvs.mystun.berlios.de/cvsroot/mystun;module=mystun \ file://init \ diff --git a/packages/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.bb b/packages/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.bb index 7290f4d56c..95a41a5317 100644 --- a/packages/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.bb +++ b/packages/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "opie-mediaplayer1" RDEPENDS = "opie-mediaplayer1" -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" APPNAME = "mpeg3plugin" SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer" diff --git a/packages/nylon/nylon-scripts_cvs.bb b/packages/nylon/nylon-scripts_cvs.bb index 4098f17d2e..0f98108623 100644 --- a/packages/nylon/nylon-scripts_cvs.bb +++ b/packages/nylon/nylon-scripts_cvs.bb @@ -5,7 +5,7 @@ SECTION = "base" PRIORITY = "optional" MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" LICENSE = "GPLv2" -PV = "0.0+cvs${SRCDATE}" +PV = "1:0.0+cvs${SRCDATE}" PR = "r2" SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz" diff --git a/packages/nylon/nylon-statistics.bb b/packages/nylon/nylon-statistics.bb index 0212df309d..9216568b0d 100644 --- a/packages/nylon/nylon-statistics.bb +++ b/packages/nylon/nylon-statistics.bb @@ -4,7 +4,7 @@ SECTION = "base" PRIORITY = "optional" MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" LICENSE = "GPLv2" -PV = "0.0+cvs${SRCDATE}" +PV = "1:0.0+cvs${SRCDATE}" PR = "r1" SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz" diff --git a/packages/nylon/yamonenv.bb b/packages/nylon/yamonenv.bb index a11b1cd65e..bf4c94200e 100644 --- a/packages/nylon/yamonenv.bb +++ b/packages/nylon/yamonenv.bb @@ -3,7 +3,7 @@ SECTION = "base" PRIORITY = "optional" MAINTAINER = "Michael Stickel <michael.stickel@4g-systems.biz>" LICENSE = "GPL" -PV = "0.0+cvs${SRCDATE}" +PV = "1:0.0+cvs${SRCDATE}" SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz" S = "${WORKDIR}/${PN}" diff --git a/packages/olsrd/olsrd_cvs.bb b/packages/olsrd/olsrd_cvs.bb index 27c433d4e9..6aca392434 100644 --- a/packages/olsrd/olsrd_cvs.bb +++ b/packages/olsrd/olsrd_cvs.bb @@ -5,7 +5,7 @@ MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" SECTION = "console/network" PRIORITY = "optional" LICENSE = "BSD" -PV = "0.0+cvs${SRCDATE}" +PV = "1:0.0+cvs${SRCDATE}" SRC_URI="cvs://anonymous@cvs.sourceforge.net/cvsroot/olsrd;module=olsrd-current \ file://init \ diff --git a/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb b/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb index f242613c50..fb4bf05e8a 100644 --- a/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb +++ b/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/aboutapplet" diff --git a/packages/opie-addressbook/opie-addressbook_cvs.bb b/packages/opie-addressbook/opie-addressbook_cvs.bb index 309aedc55d..fe99e83d5e 100644 --- a/packages/opie-addressbook/opie-addressbook_cvs.bb +++ b/packages/opie-addressbook/opie-addressbook_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/addressbook \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-advancedfm/opie-advancedfm_cvs.bb b/packages/opie-advancedfm/opie-advancedfm_cvs.bb index c93125bf51..b552bf6152 100644 --- a/packages/opie-advancedfm/opie-advancedfm_cvs.bb +++ b/packages/opie-advancedfm/opie-advancedfm_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-alarm/opie-alarm_cvs.bb b/packages/opie-alarm/opie-alarm_cvs.bb index eb50f5ab4d..e44a4c7049 100644 --- a/packages/opie-alarm/opie-alarm_cvs.bb +++ b/packages/opie-alarm/opie-alarm_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/opiealarm \ file://01opiealarm " diff --git a/packages/opie-appearance/opie-appearance_cvs.bb b/packages/opie-appearance/opie-appearance_cvs.bb index a31f2ab3eb..de78ccb83a 100644 --- a/packages/opie-appearance/opie-appearance_cvs.bb +++ b/packages/opie-appearance/opie-appearance_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/appearance2 \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-aqpkg/opie-aqpkg_cvs.bb b/packages/opie-aqpkg/opie-aqpkg_cvs.bb index dd4b17fbad..0316ba2aeb 100644 --- a/packages/opie-aqpkg/opie-aqpkg_cvs.bb +++ b/packages/opie-aqpkg/opie-aqpkg_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/aqpkg \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb b/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb index 55b28db27f..52a63b4135 100644 --- a/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb +++ b/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/autorotateapplet \ ${HANDHELDS_CVS};module=opie/pics" diff --git a/packages/opie-backgammon/opie-backgammon_cvs.bb b/packages/opie-backgammon/opie-backgammon_cvs.bb index 6ba16adde6..8cc6e52bfd 100644 --- a/packages/opie-backgammon/opie-backgammon_cvs.bb +++ b/packages/opie-backgammon/opie-backgammon_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/backgammon \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-backup/opie-backup_cvs.bb b/packages/opie-backup/opie-backup_cvs.bb index aaf2af8950..b609b09b07 100644 --- a/packages/opie-backup/opie-backup_cvs.bb +++ b/packages/opie-backup/opie-backup_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/backup \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-bartender/opie-bartender_cvs.bb b/packages/opie-bartender/opie-bartender_cvs.bb index 01f1daf94c..79cc45e64c 100644 --- a/packages/opie-bartender/opie-bartender_cvs.bb +++ b/packages/opie-bartender/opie-bartender_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-bartender \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb b/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb index 97b2056a74..f7148388a2 100644 --- a/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb +++ b/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/batteryapplet \ diff --git a/packages/opie-bluepin/opie-bluepin_cvs.bb b/packages/opie-bluepin/opie-bluepin_cvs.bb index 765dc35d93..d29e0a0db3 100644 --- a/packages/opie-bluepin/opie-bluepin_cvs.bb +++ b/packages/opie-bluepin/opie-bluepin_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/blue-pin" diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb index 513968608f..aab0257453 100644 --- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb +++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/applet \ ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet" diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb b/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb index 42ea7f54eb..f6040cfdd1 100644 --- a/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb +++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/manager \ ${HANDHELDS_CVS};module=opie/apps \ diff --git a/packages/opie-bounce/opie-bounce_cvs.bb b/packages/opie-bounce/opie-bounce_cvs.bb index 01f6c96cb2..500931029f 100644 --- a/packages/opie-bounce/opie-bounce_cvs.bb +++ b/packages/opie-bounce/opie-bounce_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/bounce \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb b/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb index 7102e405bf..2a34e2534a 100644 --- a/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb +++ b/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/brightnessapplet \ ${HANDHELDS_CVS};module=opie/pics" diff --git a/packages/opie-button-settings/opie-button-settings_cvs.bb b/packages/opie-button-settings/opie-button-settings_cvs.bb index c25796d83d..31afa66235 100644 --- a/packages/opie-button-settings/opie-button-settings_cvs.bb +++ b/packages/opie-button-settings/opie-button-settings_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/button \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-buzzword/opie-buzzword_cvs.bb b/packages/opie-buzzword/opie-buzzword_cvs.bb index e33a0da77b..751643df29 100644 --- a/packages/opie-buzzword/opie-buzzword_cvs.bb +++ b/packages/opie-buzzword/opie-buzzword_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/buzzword \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-calculator/opie-calculator_cvs.bb b/packages/opie-calculator/opie-calculator_cvs.bb index 8b78452789..5c86dd0e65 100644 --- a/packages/opie-calculator/opie-calculator_cvs.bb +++ b/packages/opie-calculator/opie-calculator_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/calculator \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-calibrate/opie-calibrate_cvs.bb b/packages/opie-calibrate/opie-calibrate_cvs.bb index 42e28331a5..b4d39b9a15 100644 --- a/packages/opie-calibrate/opie-calibrate_cvs.bb +++ b/packages/opie-calibrate/opie-calibrate_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate" diff --git a/packages/opie-camera/opie-camera_cvs.bb b/packages/opie-camera/opie-camera_cvs.bb index afae32fb8e..b6cc271caa 100644 --- a/packages/opie-camera/opie-camera_cvs.bb +++ b/packages/opie-camera/opie-camera_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/${APPNAME} \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-cardmon/opie-cardmon_cvs.bb b/packages/opie-cardmon/opie-cardmon_cvs.bb index d9255760cc..25cbf6cce1 100644 --- a/packages/opie-cardmon/opie-cardmon_cvs.bb +++ b/packages/opie-cardmon/opie-cardmon_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/cardmon \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-checkbook/opie-checkbook_cvs.bb b/packages/opie-checkbook/opie-checkbook_cvs.bb index c93125bf51..b552bf6152 100644 --- a/packages/opie-checkbook/opie-checkbook_cvs.bb +++ b/packages/opie-checkbook/opie-checkbook_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-citytime/opie-citytime_cvs.bb b/packages/opie-citytime/opie-citytime_cvs.bb index 7e77ab149a..de2ab19bf4 100644 --- a/packages/opie-citytime/opie-citytime_cvs.bb +++ b/packages/opie-citytime/opie-citytime_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/citytime \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb b/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb index 06b5814bc2..b0ba1ba507 100644 --- a/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb +++ b/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/clipboardapplet \ diff --git a/packages/opie-clock/opie-clock_cvs.bb b/packages/opie-clock/opie-clock_cvs.bb index 19567838c2..6bff77d83f 100644 --- a/packages/opie-clock/opie-clock_cvs.bb +++ b/packages/opie-clock/opie-clock_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/clock \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-clockapplet/opie-clockapplet_cvs.bb b/packages/opie-clockapplet/opie-clockapplet_cvs.bb index 609b2a7f7c..52276b64c3 100644 --- a/packages/opie-clockapplet/opie-clockapplet_cvs.bb +++ b/packages/opie-clockapplet/opie-clockapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/clockapplet \ diff --git a/packages/opie-confeditor/opie-confeditor_cvs.bb b/packages/opie-confeditor/opie-confeditor_cvs.bb index 773d64833a..7b1e721310 100644 --- a/packages/opie-confeditor/opie-confeditor_cvs.bb +++ b/packages/opie-confeditor/opie-confeditor_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/confedit \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-console/opie-console_cvs.bb b/packages/opie-console/opie-console_cvs.bb index 606915dff7..1103e1f285 100644 --- a/packages/opie-console/opie-console_cvs.bb +++ b/packages/opie-console/opie-console_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-dagger/opie-dagger_cvs.bb b/packages/opie-dagger/opie-dagger_cvs.bb index f7d353cd81..7d3730cb10 100644 --- a/packages/opie-dagger/opie-dagger_cvs.bb +++ b/packages/opie-dagger/opie-dagger_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/dagger \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-dasher/opie-dasher_cvs.bb b/packages/opie-dasher/opie-dasher_cvs.bb index b22d4b6664..cd9c7488c4 100644 --- a/packages/opie-dasher/opie-dasher_cvs.bb +++ b/packages/opie-dasher/opie-dasher_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/dasher \ ${HANDHELDS_CVS};module=opie/share " diff --git a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb index afb8cfad87..6277c5651a 100644 --- a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb +++ b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/datebook/holiday/birthday " diff --git a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb index 36bfd6e5e1..98e5ae4c0f 100644 --- a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb +++ b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/datebook/holiday/christian " diff --git a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb index e69f6128fd..84178aae18 100644 --- a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb +++ b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/datebook/holiday/national \ ${HANDHELDS_CVS};module=opie/etc/nationaldays " diff --git a/packages/opie-datebook/opie-datebook_cvs.bb b/packages/opie-datebook/opie-datebook_cvs.bb index 9b7fca26b7..d4f8a6717a 100644 --- a/packages/opie-datebook/opie-datebook_cvs.bb +++ b/packages/opie-datebook/opie-datebook_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/datebook \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-deco-flat/opie-deco-flat_cvs.bb b/packages/opie-deco-flat/opie-deco-flat_cvs.bb index 824f49eb23..6920cac224 100644 --- a/packages/opie-deco-flat/opie-deco-flat_cvs.bb +++ b/packages/opie-deco-flat/opie-deco-flat_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/decorations/flat " diff --git a/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb b/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb index 6652b7da1e..c957dd3a94 100644 --- a/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb +++ b/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/decorations/liquid " diff --git a/packages/opie-deco-polished/opie-deco-polished_cvs.bb b/packages/opie-deco-polished/opie-deco-polished_cvs.bb index d13b22cbaa..cbc595a76d 100644 --- a/packages/opie-deco-polished/opie-deco-polished_cvs.bb +++ b/packages/opie-deco-polished/opie-deco-polished_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/decorations/polished " diff --git a/packages/opie-doctab/opie-doctab_cvs.bb b/packages/opie-doctab/opie-doctab_cvs.bb index b0ba81aea5..b318842596 100644 --- a/packages/opie-doctab/opie-doctab_cvs.bb +++ b/packages/opie-doctab/opie-doctab_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/doctab \ ${HANDHELDS_CVS};module=opie/apps \ diff --git a/packages/opie-drawpad/opie-drawpad_cvs.bb b/packages/opie-drawpad/opie-drawpad_cvs.bb index dd0fc890d5..c2c8e6c8a5 100644 --- a/packages/opie-drawpad/opie-drawpad_cvs.bb +++ b/packages/opie-drawpad/opie-drawpad_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/graphics/drawpad \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-dvorak/opie-dvorak_cvs.bb b/packages/opie-dvorak/opie-dvorak_cvs.bb index 9416c5721c..aabac9b928 100644 --- a/packages/opie-dvorak/opie-dvorak_cvs.bb +++ b/packages/opie-dvorak/opie-dvorak_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/dvorak \ ${HANDHELDS_CVS};module=opie/inputmethods/pickboard" diff --git a/packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb b/packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb index 6b87647a00..98b0ecd0ef 100644 --- a/packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb +++ b/packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/${APPNAME} \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-euroconv/opie-euroconv_cvs.bb b/packages/opie-euroconv/opie-euroconv_cvs.bb index c9fc45a974..bb59d3028b 100644 --- a/packages/opie-euroconv/opie-euroconv_cvs.bb +++ b/packages/opie-euroconv/opie-euroconv_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/euroconv \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-examples-python/opie-examples-python_cvs.bb b/packages/opie-examples-python/opie-examples-python_cvs.bb index e561bf0be0..75a52cb7a7 100644 --- a/packages/opie-examples-python/opie-examples-python_cvs.bb +++ b/packages/opie-examples-python/opie-examples-python_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/examples/python \ diff --git a/packages/opie-examples/opie-examples_cvs.bb b/packages/opie-examples/opie-examples_cvs.bb index 2af54daeef..795b813608 100644 --- a/packages/opie-examples/opie-examples_cvs.bb +++ b/packages/opie-examples/opie-examples_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/examples \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-eye/opie-eye_cvs.bb b/packages/opie-eye/opie-eye_cvs.bb index 0a02210f82..ffe7e770ff 100644 --- a/packages/opie-eye/opie-eye_cvs.bb +++ b/packages/opie-eye/opie-eye_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/graphics/opie-eye \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-fifteen/opie-fifteen_cvs.bb b/packages/opie-fifteen/opie-fifteen_cvs.bb index f533d68c82..e342fa69c3 100644 --- a/packages/opie-fifteen/opie-fifteen_cvs.bb +++ b/packages/opie-fifteen/opie-fifteen_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/fifteen \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-formatter/opie-formatter_cvs.bb b/packages/opie-formatter/opie-formatter_cvs.bb index caca62089f..99af13112a 100644 --- a/packages/opie-formatter/opie-formatter_cvs.bb +++ b/packages/opie-formatter/opie-formatter_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/formatter \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-freetype/opie-freetype_cvs.bb b/packages/opie-freetype/opie-freetype_cvs.bb index 0384318f22..4788f044e9 100644 --- a/packages/opie-freetype/opie-freetype_cvs.bb +++ b/packages/opie-freetype/opie-freetype_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/freetype" diff --git a/packages/opie-ftp/opie-ftp_cvs.bb b/packages/opie-ftp/opie-ftp_cvs.bb index d9380ad7f8..d8ce8c7334 100644 --- a/packages/opie-ftp/opie-ftp_cvs.bb +++ b/packages/opie-ftp/opie-ftp_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opieftp \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-ftplib/opie-ftplib_cvs.bb b/packages/opie-ftplib/opie-ftplib_cvs.bb index fe4033e8ac..2025ea084c 100644 --- a/packages/opie-ftplib/opie-ftplib_cvs.bb +++ b/packages/opie-ftplib/opie-ftplib_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/ftplib" diff --git a/packages/opie-go/opie-go_cvs.bb b/packages/opie-go/opie-go_cvs.bb index 05187dc365..3985f619cf 100644 --- a/packages/opie-go/opie-go_cvs.bb +++ b/packages/opie-go/opie-go_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/go \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb b/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb index c476a66243..3cb2c37810 100644 --- a/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb +++ b/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-gutenbrowser \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-handwriting/opie-handwriting_cvs.bb b/packages/opie-handwriting/opie-handwriting_cvs.bb index b1488be209..ada35ece86 100644 --- a/packages/opie-handwriting/opie-handwriting_cvs.bb +++ b/packages/opie-handwriting/opie-handwriting_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/handwriting \ ${HANDHELDS_CVS};module=opie/etc/qimpen" diff --git a/packages/opie-help-en/opie-help-en_cvs.bb b/packages/opie-help-en/opie-help-en_cvs.bb index 3a9f76e508..c54c006709 100644 --- a/packages/opie-help-en/opie-help-en_cvs.bb +++ b/packages/opie-help-en/opie-help-en_cvs.bb @@ -1,5 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.1+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/help/en/html " diff --git a/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb b/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb index ad29b882fc..5e4bdd9eb0 100644 --- a/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb +++ b/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/${APPNAME} \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-homeapplet/opie-homeapplet_cvs.bb b/packages/opie-homeapplet/opie-homeapplet_cvs.bb index 785cb0b329..120f4bbab8 100644 --- a/packages/opie-homeapplet/opie-homeapplet_cvs.bb +++ b/packages/opie-homeapplet/opie-homeapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/homeapplet \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-i18n/opie-i18n_cvs.bb b/packages/opie-i18n/opie-i18n_cvs.bb index e1cce42445..1a1ef7c35b 100644 --- a/packages/opie-i18n/opie-i18n_cvs.bb +++ b/packages/opie-i18n/opie-i18n_cvs.bb @@ -1,6 +1,7 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.1+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/i18n \ ${HANDHELDS_CVS};module=opie/etc/dict" diff --git a/packages/opie-i18n/opie-lrelease-native_cvs.bb b/packages/opie-i18n/opie-lrelease-native_cvs.bb index 67a69dda20..6f52c45d74 100644 --- a/packages/opie-i18n/opie-lrelease-native_cvs.bb +++ b/packages/opie-i18n/opie-lrelease-native_cvs.bb @@ -1,5 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.1+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lrelease \ ${HANDHELDS_CVS};module=opie/development/translation/shared" diff --git a/packages/opie-i18n/opie-lupdate-native_cvs.bb b/packages/opie-i18n/opie-lupdate-native_cvs.bb index 717d8a3769..f7f9a79c25 100644 --- a/packages/opie-i18n/opie-lupdate-native_cvs.bb +++ b/packages/opie-i18n/opie-lupdate-native_cvs.bb @@ -1,5 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.1+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lupdate \ ${HANDHELDS_CVS};module=opie/development/translation/shared" diff --git a/packages/opie-icon-reload/opie-icon-reload/reload.png b/packages/opie-icon-reload/opie-icon-reload/reload.png Binary files differindex 9cec49322c..d520167614 100644 --- a/packages/opie-icon-reload/opie-icon-reload/reload.png +++ b/packages/opie-icon-reload/opie-icon-reload/reload.png diff --git a/packages/opie-icon-reload/opie-icon-reload_cvs.bb b/packages/opie-icon-reload/opie-icon-reload_cvs.bb index f8c47a5c4f..0ce2a6b704 100644 --- a/packages/opie-icon-reload/opie-icon-reload_cvs.bb +++ b/packages/opie-icon-reload/opie-icon-reload_cvs.bb @@ -1,4 +1,5 @@ include ${PN}.inc - -PV = "1.2.1+cvs${SRCDATE}" + +#Remove the dash below when 1.2.1 changes +PV = "1.2.1+cvs-${SRCDATE}" diff --git a/packages/opie-irc/opie-irc_cvs.bb b/packages/opie-irc/opie-irc_cvs.bb index 63d0243d54..feabe89d68 100644 --- a/packages/opie-irc/opie-irc_cvs.bb +++ b/packages/opie-irc/opie-irc_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opieirc \ ${HANDHELDS_CVS};module=opie/help \ diff --git a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb index db6c62e7e9..836c6dfeef 100644 --- a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb +++ b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/irdaapplet \ diff --git a/packages/opie-jumpx/opie-jumpx_cvs.bb b/packages/opie-jumpx/opie-jumpx_cvs.bb index ed12b6f80d..cd5a25c39a 100644 --- a/packages/opie-jumpx/opie-jumpx_cvs.bb +++ b/packages/opie-jumpx/opie-jumpx_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/jumpx \ ${HANDHELDS_CVS};module=opie/pics" diff --git a/packages/opie-kbill/opie-kbill_cvs.bb b/packages/opie-kbill/opie-kbill_cvs.bb index cd8074bfff..20522f3968 100644 --- a/packages/opie-kbill/opie-kbill_cvs.bb +++ b/packages/opie-kbill/opie-kbill_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/kbill \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-kcheckers/opie-kcheckers_cvs.bb b/packages/opie-kcheckers/opie-kcheckers_cvs.bb index 13a1c4a493..445ad42970 100644 --- a/packages/opie-kcheckers/opie-kcheckers_cvs.bb +++ b/packages/opie-kcheckers/opie-kcheckers_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/kcheckers \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-keyboard/opie-keyboard_cvs.bb b/packages/opie-keyboard/opie-keyboard_cvs.bb index 400c29670a..2ec7441ce2 100644 --- a/packages/opie-keyboard/opie-keyboard_cvs.bb +++ b/packages/opie-keyboard/opie-keyboard_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/keyboard " diff --git a/packages/opie-keypebble/opie-keypebble_cvs.bb b/packages/opie-keypebble/opie-keypebble_cvs.bb index fd141e1b9c..37e32da01c 100644 --- a/packages/opie-keypebble/opie-keypebble_cvs.bb +++ b/packages/opie-keypebble/opie-keypebble_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/comm/${APPNAME} \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-keytabs/opie-keytabs_cvs.bb b/packages/opie-keytabs/opie-keytabs_cvs.bb index 4d9c11c529..51c58328ca 100644 --- a/packages/opie-keytabs/opie-keytabs_cvs.bb +++ b/packages/opie-keytabs/opie-keytabs_cvs.bb @@ -1,5 +1,6 @@ include ${PN}.inc - -PV = "1.2.1+cvs${SRCDATE}" + +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.1+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/etc" diff --git a/packages/opie-keyview/opie-keyview_cvs.bb b/packages/opie-keyview/opie-keyview_cvs.bb index 17249dde4c..d819cd45da 100644 --- a/packages/opie-keyview/opie-keyview_cvs.bb +++ b/packages/opie-keyview/opie-keyview_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/development/keyview " diff --git a/packages/opie-kjumpx/opie-kjumpx_cvs.bb b/packages/opie-kjumpx/opie-kjumpx_cvs.bb index c3b8ad585f..1ac78ad3fd 100644 --- a/packages/opie-kjumpx/opie-kjumpx_cvs.bb +++ b/packages/opie-kjumpx/opie-kjumpx_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/kjumpx \ ${HANDHELDS_CVS};module=opie/pics" diff --git a/packages/opie-kpacman/opie-kpacman_cvs.bb b/packages/opie-kpacman/opie-kpacman_cvs.bb index 976a7e0d3c..f48122d5ea 100644 --- a/packages/opie-kpacman/opie-kpacman_cvs.bb +++ b/packages/opie-kpacman/opie-kpacman_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/kpacman \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-language/opie-language_cvs.bb b/packages/opie-language/opie-language_cvs.bb index 9cec4e7915..77af7c1b68 100644 --- a/packages/opie-language/opie-language_cvs.bb +++ b/packages/opie-language/opie-language_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/language \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-launcher-settings/opie-launcher-settings_cvs.bb b/packages/opie-launcher-settings/opie-launcher-settings_cvs.bb index 0ebac4c2aa..8b8f30b77d 100644 --- a/packages/opie-launcher-settings/opie-launcher-settings_cvs.bb +++ b/packages/opie-launcher-settings/opie-launcher-settings_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/launcher \ ${HANDHELDS_CVS};module=opie/apps \ diff --git a/packages/opie-libqrsync/opie-libqrsync_cvs.bb b/packages/opie-libqrsync/opie-libqrsync_cvs.bb index 525301ee57..cd5c0573c5 100644 --- a/packages/opie-libqrsync/opie-libqrsync_cvs.bb +++ b/packages/opie-libqrsync/opie-libqrsync_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/rsync" diff --git a/packages/opie-light-and-power/opie-light-and-power_cvs.bb b/packages/opie-light-and-power/opie-light-and-power_cvs.bb index f5eb7bed33..5d0222401a 100644 --- a/packages/opie-light-and-power/opie-light-and-power_cvs.bb +++ b/packages/opie-light-and-power/opie-light-and-power_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/light-and-power \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-lockapplet/opie-lockapplet_cvs.bb b/packages/opie-lockapplet/opie-lockapplet_cvs.bb index 7f539b4f0b..4a67fc8558 100644 --- a/packages/opie-lockapplet/opie-lockapplet_cvs.bb +++ b/packages/opie-lockapplet/opie-lockapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/lockapplet \ diff --git a/packages/opie-login/opie-login_cvs.bb b/packages/opie-login/opie-login_cvs.bb index e9911a76ee..a5141716e7 100644 --- a/packages/opie-login/opie-login_cvs.bb +++ b/packages/opie-login/opie-login_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/${APPNAME} \ ${HANDHELDS_CVS};module=opie/core/apps/calibrate \ diff --git a/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb b/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb index 8ef5777cbd..5e12de96fa 100644 --- a/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb +++ b/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/logoutapplet \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-mail/opie-mail_cvs.bb b/packages/opie-mail/opie-mail_cvs.bb index e0fa33633b..026970805a 100644 --- a/packages/opie-mail/opie-mail_cvs.bb +++ b/packages/opie-mail/opie-mail_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/mail \ ${HANDHELDS_CVS};module=opie/apps \ diff --git a/packages/opie-mailapplet/opie-mailapplet_cvs.bb b/packages/opie-mailapplet/opie-mailapplet_cvs.bb index 74120f4cd9..e906bf2058 100644 --- a/packages/opie-mailapplet/opie-mailapplet_cvs.bb +++ b/packages/opie-mailapplet/opie-mailapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/mail/taskbarapplet \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb index 2b51e65298..0ca2b3fd39 100644 --- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb +++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \ file://libmadplugin.pro" diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb index 2f84c397cb..618d3b6a59 100644 --- a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb +++ b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer " diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb index 75a87a2dbf..01141f2eac 100644 --- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb +++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \ file://vorbis.pro " diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb index 2f84c397cb..618d3b6a59 100644 --- a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb +++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer " diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb index ea0bb39217..d182973f87 100644 --- a/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb +++ b/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb index caa4eb7992..387af9c0e8 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb @@ -3,7 +3,8 @@ SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" MAINTAINER = "Team Opie <opie@handhelds.org>" -PV = "1.2.1+cvs${SRCDATE}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.1+cvs-${SRCDATE}" APPNAME = "opieplayer2" RPROVIDES = "opie-mediaplayer2-skin" diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb index 7e349f9e7b..2e189417dc 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb @@ -3,7 +3,8 @@ SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" MAINTAINER = "Team Opie <opie@handhelds.org>" -PV = "1.2.1+cvs${SRCDATE}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.1+cvs-${SRCDATE}" APPNAME = "opieplayer2" RPROVIDES = "opie-mediaplayer2-skin" diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb index 3d5072a8a4..279eb2caff 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb @@ -3,7 +3,8 @@ SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" MAINTAINER = "Team Opie <opie@handhelds.org>" -PV = "1.2.1+cvs${SRCDATE}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.1+cvs-${SRCDATE}" APPNAME = "opieplayer2" RPROVIDES = "opie-mediaplayer2-skin" diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb index 8b648dd79e..17c3a030c5 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb @@ -3,7 +3,8 @@ SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" MAINTAINER = "Team Opie <opie@handhelds.org>" -PV = "1.2.1+cvs${SRCDATE}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.1+cvs-${SRCDATE}" APPNAME = "opieplayer2" RPROVIDES = "opie-mediaplayer2-skin" diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb index 093aa74c1d..5d887b073f 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb @@ -1,6 +1,7 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.1+cvs-${SRCDATE}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opieplayer2 \ diff --git a/packages/opie-mediummount/opie-mediummount_cvs.bb b/packages/opie-mediummount/opie-mediummount_cvs.bb index 1456365045..51d7a1fc77 100644 --- a/packages/opie-mediummount/opie-mediummount_cvs.bb +++ b/packages/opie-mediummount/opie-mediummount_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb b/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb index 1b1eadb6ac..e219cf59bb 100644 --- a/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb +++ b/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/memoryapplet \ diff --git a/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb b/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb index 22d538aaaa..0ccb32b59e 100644 --- a/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb +++ b/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/mindbreaker \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-minesweep/opie-minesweep_cvs.bb b/packages/opie-minesweep/opie-minesweep_cvs.bb index 961f3f536b..e7315a5a60 100644 --- a/packages/opie-minesweep/opie-minesweep_cvs.bb +++ b/packages/opie-minesweep/opie-minesweep_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/minesweep \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-multikey/opie-multikey_cvs.bb b/packages/opie-multikey/opie-multikey_cvs.bb index da8c6ce221..9bd8b3ca36 100644 --- a/packages/opie-multikey/opie-multikey_cvs.bb +++ b/packages/opie-multikey/opie-multikey_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/multikey \ ${HANDHELDS_CVS};module=opie/share" diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb b/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb index 76497ef7e9..be6a1ed2d6 100644 --- a/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb +++ b/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/multikeyapplet \ diff --git a/packages/opie-networkapplet/opie-networkapplet_cvs.bb b/packages/opie-networkapplet/opie-networkapplet_cvs.bb index 45d1c75c19..f1bc9b2ceb 100644 --- a/packages/opie-networkapplet/opie-networkapplet_cvs.bb +++ b/packages/opie-networkapplet/opie-networkapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/networkapplet \ ${HANDHELDS_CVS};module=opie/pics" diff --git a/packages/opie-networksettings/opie-networksettings_cvs.bb b/packages/opie-networksettings/opie-networksettings_cvs.bb index 41fe8fead7..c14f18881b 100644 --- a/packages/opie-networksettings/opie-networksettings_cvs.bb +++ b/packages/opie-networksettings/opie-networksettings_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/networksettings \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-notesapplet/opie-notesapplet_cvs.bb b/packages/opie-notesapplet/opie-notesapplet_cvs.bb index 8b67613ccd..73f5b6e9d4 100644 --- a/packages/opie-notesapplet/opie-notesapplet_cvs.bb +++ b/packages/opie-notesapplet/opie-notesapplet_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/notesapplet" diff --git a/packages/opie-odict/opie-odict_cvs.bb b/packages/opie-odict/opie-odict_cvs.bb index d2b2fd25d9..d21ab62be3 100644 --- a/packages/opie-odict/opie-odict_cvs.bb +++ b/packages/opie-odict/opie-odict_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/odict \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-oxygen/opie-oxygen_cvs.bb b/packages/opie-oxygen/opie-oxygen_cvs.bb index 198df08f1f..147aff9c73 100644 --- a/packages/opie-oxygen/opie-oxygen_cvs.bb +++ b/packages/opie-oxygen/opie-oxygen_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-oyatzee/opie-oyatzee_cvs.bb b/packages/opie-oyatzee/opie-oyatzee_cvs.bb index 87e65aa9ca..ef624083ba 100644 --- a/packages/opie-oyatzee/opie-oyatzee_cvs.bb +++ b/packages/opie-oyatzee/opie-oyatzee_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/oyatzee \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-packagemanager/opie-packagemanager_cvs.bb b/packages/opie-packagemanager/opie-packagemanager_cvs.bb index cacdb5541d..f376326bf2 100644 --- a/packages/opie-packagemanager/opie-packagemanager_cvs.bb +++ b/packages/opie-packagemanager/opie-packagemanager_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/${APPNAME};cvsdate=${SRCDATE} \ ${HANDHELDS_CVS};module=opie/pics;cvsdate=${SRCDATE} \ diff --git a/packages/opie-parashoot/opie-parashoot_cvs.bb b/packages/opie-parashoot/opie-parashoot_cvs.bb index b7439af955..ad2164a50b 100644 --- a/packages/opie-parashoot/opie-parashoot_cvs.bb +++ b/packages/opie-parashoot/opie-parashoot_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/parashoot \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb b/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb index e329b2411a..95c80f47e5 100644 --- a/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb +++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/pcmcia \ ${HANDHELDS_CVS};module=opie/pics" diff --git a/packages/opie-pickboard/opie-pickboard_cvs.bb b/packages/opie-pickboard/opie-pickboard_cvs.bb index c3ee83e592..4b940922d2 100644 --- a/packages/opie-pickboard/opie-pickboard_cvs.bb +++ b/packages/opie-pickboard/opie-pickboard_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/pickboard" diff --git a/packages/opie-pics/opie-pics_cvs.bb b/packages/opie-pics/opie-pics_cvs.bb index 5252da4c92..55b3caf94d 100644 --- a/packages/opie-pics/opie-pics_cvs.bb +++ b/packages/opie-pics/opie-pics_cvs.bb @@ -1,6 +1,7 @@ include ${PN}.inc - -PV = "1.2.1+cvs${SRCDATE}" + +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.1+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/pics \ ${HANDHELDS_CVS};module=opie/pics-hires" diff --git a/packages/opie-pimconverter/opie-pimconverter_cvs.bb b/packages/opie-pimconverter/opie-pimconverter_cvs.bb index 692420bbfc..736ecca4aa 100644 --- a/packages/opie-pimconverter/opie-pimconverter_cvs.bb +++ b/packages/opie-pimconverter/opie-pimconverter_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/pimconverter \ diff --git a/packages/opie-powerchord/opie-powerchord_cvs.bb b/packages/opie-powerchord/opie-powerchord_cvs.bb index a4b7f2122d..bb20df9975 100644 --- a/packages/opie-powerchord/opie-powerchord_cvs.bb +++ b/packages/opie-powerchord/opie-powerchord_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/powerchord \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb index a209c4864f..c0e9c777e5 100644 --- a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb +++ b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/pyquicklaunch \ diff --git a/packages/opie-qasteroids/opie-qasteroids_cvs.bb b/packages/opie-qasteroids/opie-qasteroids_cvs.bb index 82730437d1..d2d783e432 100644 --- a/packages/opie-qasteroids/opie-qasteroids_cvs.bb +++ b/packages/opie-qasteroids/opie-qasteroids_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/qasteroids \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-qcop/opie-qcop_cvs.bb b/packages/opie-qcop/opie-qcop_cvs.bb index be1ec45a67..b240e74d0f 100644 --- a/packages/opie-qcop/opie-qcop_cvs.bb +++ b/packages/opie-qcop/opie-qcop_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qcop" diff --git a/packages/opie-qss/opie-qss_cvs.bb b/packages/opie-qss/opie-qss_cvs.bb index ac9cfc697f..014f5fb451 100644 --- a/packages/opie-qss/opie-qss_cvs.bb +++ b/packages/opie-qss/opie-qss_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qss" diff --git a/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb b/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb index 7ffd7a8ef2..3500fab721 100644 --- a/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb +++ b/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/tools/quicklauncher" diff --git a/packages/opie-rdesktop/opie-rdesktop_cvs.bb b/packages/opie-rdesktop/opie-rdesktop_cvs.bb index 2112bede6b..ea29f97790 100644 --- a/packages/opie-rdesktop/opie-rdesktop_cvs.bb +++ b/packages/opie-rdesktop/opie-rdesktop_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opierdesktop \ ${HANDHELDS_CVS};module=opie/apps \ diff --git a/packages/opie-reader/opie-reader_cvs.bb b/packages/opie-reader/opie-reader_cvs.bb index bcac865f95..c4edc7043e 100644 --- a/packages/opie-reader/opie-reader_cvs.bb +++ b/packages/opie-reader/opie-reader_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-reader \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-recorder/opie-recorder_cvs.bb b/packages/opie-recorder/opie-recorder_cvs.bb index 3a6ec5ab44..04b4d44618 100644 --- a/packages/opie-recorder/opie-recorder_cvs.bb +++ b/packages/opie-recorder/opie-recorder_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opierec \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-remote/opie-remote_cvs.bb b/packages/opie-remote/opie-remote_cvs.bb index 6ef478950b..9276829349 100644 --- a/packages/opie-remote/opie-remote_cvs.bb +++ b/packages/opie-remote/opie-remote_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/remote \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-restartapplet/opie-restartapplet2_cvs.bb b/packages/opie-restartapplet/opie-restartapplet2_cvs.bb index ea233607f9..62461b6a22 100644 --- a/packages/opie-restartapplet/opie-restartapplet2_cvs.bb +++ b/packages/opie-restartapplet/opie-restartapplet2_cvs.bb @@ -3,7 +3,7 @@ SECTION = "opie/applets" PRIORITY = "optional" MAINTAINER = "Team Opie <opie@handhelds.org>" LICENSE = "GPL" -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" APPNAME = "restartapplet" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/restartapplet2 \ diff --git a/packages/opie-restartapplet/opie-restartapplet_cvs.bb b/packages/opie-restartapplet/opie-restartapplet_cvs.bb index ab7c5f676a..255ab53a36 100644 --- a/packages/opie-restartapplet/opie-restartapplet_cvs.bb +++ b/packages/opie-restartapplet/opie-restartapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/restartapplet \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb b/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb index 7ebe4b0338..912cea6cbb 100644 --- a/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb +++ b/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/restartapplet2 \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb b/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb index 35598cf81a..f74599cd43 100644 --- a/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb +++ b/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/rotateapplet \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb b/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb index 84cdbc6c32..d03726301c 100644 --- a/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb +++ b/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/screenshotapplet \ diff --git a/packages/opie-search/opie-search_cvs.bb b/packages/opie-search/opie-search_cvs.bb index 6acae68910..020d315a7a 100644 --- a/packages/opie-search/opie-search_cvs.bb +++ b/packages/opie-search/opie-search_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/osearch \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-security/opie-security_cvs.bb b/packages/opie-security/opie-security_cvs.bb index 4aa9a1f255..980b03b7c1 100644 --- a/packages/opie-security/opie-security_cvs.bb +++ b/packages/opie-security/opie-security_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/security \ diff --git a/packages/opie-securityplugins/opie-securityplugin-blueping.inc b/packages/opie-securityplugins/opie-securityplugin-blueping.inc new file mode 100644 index 0000000000..35f972ef9a --- /dev/null +++ b/packages/opie-securityplugins/opie-securityplugin-blueping.inc @@ -0,0 +1,15 @@ +DESCRIPTION = "Blueping plugin for opie-security authentication. \ +This is a bluetooth-based authentication plugin (you need \ +to have another Bluetooth device around to use it)." +RDEPENDS += "bluez-utils" +APPNAME = "multiauthbluepingplugin" + +include opie-securityplugin.inc + +S = "${WORKDIR}/blueping" + +do_install() { + install -d ${D}${palmtopdir}/pics/security/ + install -m 0644 ${WORKDIR}/pics/security/bluepingplugin.png ${D}${palmtopdir}/pics/security/ +} + diff --git a/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.1.bb b/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.1.bb index 85127240ab..65de7b78ec 100644 --- a/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.1.bb +++ b/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.1.bb @@ -1,26 +1,5 @@ -DESCRIPTION = "Blueping plugin for opie-security authentication. \ -This is a bluetooth-based authentication plugin (you need \ -to have another Bluetooth device around to use it)." -SECTION = "opie/security" -PRIORITY = "optional" -MAINTAINER = "Team Opie <opie@handhelds.org>" -LICENSE = "GPL" -I18N_FILES = "libmultiauthbluepingplugin.ts" -RDEPENDS = "opie-security bluez-utils" - -APPNAME = "multiauthbluepingplugin" - +include opie-securityplugin-blueping.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/blueping \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " -S = "${WORKDIR}/blueping" - -inherit opie - -# FILES plugins/security/libmultiauthbluepingplugin.so* pics/security/bluepingplugin.png root/etc/suspend-scripts/S50bluetooth -do_install() { - install -d ${D}${palmtopdir}/pics/security/ - install -m 0644 ${WORKDIR}/pics/security/bluepingplugin.png ${D}${palmtopdir}/pics/security/ -} - diff --git a/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb index 3d78f3757d..52bcbe6d16 100644 --- a/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb +++ b/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb @@ -1,25 +1,7 @@ -DESCRIPTION = "Blueping plugin for opie-security authentication. \ -This is a bluetooth-based authentication plugin (you need \ -to have another Bluetooth device around to use it)." -SECTION = "opie/security" -PRIORITY = "optional" -MAINTAINER = "Team Opie <opie@handhelds.org>" -LICENSE = "GPL" -I18N_FILES = "libmultiauthbluepingplugin.ts" -RDEPENDS = "opie-security bluez-utils" -PV = "1.2.1+cvs${SRCDATE}" -APPNAME = "multiauthbluepingplugin" +include opie-securityplugin-blueping.inc + +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/blueping \ ${HANDHELDS_CVS};module=opie/pics " -S = "${WORKDIR}/blueping" - -inherit opie - -# FILES plugins/security/libmultiauthbluepingplugin.so* pics/security/bluepingplugin.png root/etc/suspend-scripts/S50bluetooth -do_install() { - install -d ${D}${palmtopdir}/pics/security/ - install -m 0644 ${WORKDIR}/pics/security/bluepingplugin.png ${D}${palmtopdir}/pics/security/ -} - diff --git a/packages/opie-securityplugins/opie-securityplugin-dummy.inc b/packages/opie-securityplugins/opie-securityplugin-dummy.inc new file mode 100644 index 0000000000..bb0a9b962b --- /dev/null +++ b/packages/opie-securityplugins/opie-securityplugin-dummy.inc @@ -0,0 +1,14 @@ +DESCRIPTION = "Dummy plugin for opie-security authentication. \ +This is a very simple authentication plugin (you just have \ +to press a button basically), for demonstration purpose." +APPNAME = "multiauthdummyplugin" + +include opie-securityplugin.inc + +S = "${WORKDIR}/dummy" + +do_install() { + install -d ${D}${palmtopdir}/pics/security + install -m 0644 ${WORKDIR}/pics/security/dummyplugin.png ${D}${palmtopdir}/pics/security/ +} + diff --git a/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.1.bb b/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.1.bb index 825c14ea53..4a5bc3c2e0 100644 --- a/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.1.bb +++ b/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.1.bb @@ -1,26 +1,5 @@ -DESCRIPTION = "Dummy plugin for opie-security authentication. \ -This is a very simple authentication plugin (you just have \ -to press a button basically), for demonstration purpose." -SECTION = "opie/security" -PRIORITY = "optional" -MAINTAINER = "Team Opie <opie@handhelds.org>" -LICENSE = "GPL" -I18N_FILES = "libmultiauthdummyplugin.ts" -RDEPENDS = "opie-security" - -APPNAME = "multiauthdummyplugin" - +include opie-securityplugin-dummy.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/dummy \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " -S = "${WORKDIR}/dummy" - -inherit opie - -# FILES plugins/security/libmultiauthdummyplugin.so* pics/security/dummyplugin.png -do_install() { - install -d ${D}${palmtopdir}/pics/security - install -m 0644 ${WORKDIR}/pics/security/dummyplugin.png ${D}${palmtopdir}/pics/security/ -} - diff --git a/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb index 93cf6ac712..b0d1e8d49e 100644 --- a/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb +++ b/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb @@ -1,25 +1,7 @@ -DESCRIPTION = "Dummy plugin for opie-security authentication. \ -This is a very simple authentication plugin (you just have \ -to press a button basically), for demonstration purpose." -SECTION = "opie/security" -PRIORITY = "optional" -MAINTAINER = "Team Opie <opie@handhelds.org>" -LICENSE = "GPL" -I18N_FILES = "libmultiauthdummyplugin.ts" -RDEPENDS = "opie-security" -PV = "1.2.1+cvs${SRCDATE}" -APPNAME = "multiauthdummyplugin" +include opie-securityplugin-dummy.inc + +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/dummy \ ${HANDHELDS_CVS};module=opie/pics " -S = "${WORKDIR}/dummy" - -inherit opie - -# FILES plugins/security/libmultiauthdummyplugin.so* pics/security/dummyplugin.png -do_install() { - install -d ${D}${palmtopdir}/pics/security - install -m 0644 ${WORKDIR}/pics/security/dummyplugin.png ${D}${palmtopdir}/pics/security/ -} - diff --git a/packages/opie-securityplugins/opie-securityplugin-notice.inc b/packages/opie-securityplugins/opie-securityplugin-notice.inc new file mode 100644 index 0000000000..09a4025760 --- /dev/null +++ b/packages/opie-securityplugins/opie-securityplugin-notice.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "Notice plugin for opie-security authentication. \ +It allows you to display, for example, a notice from your legal departement." +APPNAME = "multiauthnoticeplugin" + +include opie-securityplugin.inc + +S = "${WORKDIR}/notice" + +do_install() { + install -d ${D}${palmtopdir}/pics/security/ + install -m 0644 ${WORKDIR}/pics/security/noticeplugin*.png ${D}${palmtopdir}/pics/security/ +} + diff --git a/packages/opie-securityplugins/opie-securityplugin-notice_1.2.1.bb b/packages/opie-securityplugins/opie-securityplugin-notice_1.2.1.bb index b1f11bcf6a..08bd1b13c0 100644 --- a/packages/opie-securityplugins/opie-securityplugin-notice_1.2.1.bb +++ b/packages/opie-securityplugins/opie-securityplugin-notice_1.2.1.bb @@ -1,25 +1,5 @@ -DESCRIPTION = "Notice plugin for opie-security authentication. \ -It allows you to display, for example, a notice from your legal departement." -SECTION = "opie/security" -PRIORITY = "optional" -MAINTAINER = "Team Opie <opie@handhelds.org>" -LICENSE = "GPL" -I18N_FILES = "libmultiauthnoticeplugin.ts" -RDEPENDS = "opie-security" - -APPNAME = "multiauthnoticeplugin" - +include opie-securityplugin-notice.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/notice \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " -S = "${WORKDIR}/notice" - -inherit opie - -# FILES plugins/security/libmultiauthnoticeplugin.so* pics/security/noticeplugin.png pics/security/noticeplugin_small.png -do_install() { - install -d ${D}${palmtopdir}/pics/security/ - install -m 0644 ${WORKDIR}/pics/security/noticeplugin*.png ${D}${palmtopdir}/pics/security/ -} - diff --git a/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb index 34e79d78b5..5223edbaf8 100644 --- a/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb +++ b/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb @@ -1,24 +1,7 @@ -DESCRIPTION = "Notice plugin for opie-security authentication. \ -It allows you to display, for example, a notice from your legal departement." -SECTION = "opie/security" -PRIORITY = "optional" -MAINTAINER = "Team Opie <opie@handhelds.org>" -LICENSE = "GPL" -I18N_FILES = "libmultiauthnoticeplugin.ts" -RDEPENDS = "opie-security" -PV = "1.2.1+cvs${SRCDATE}" -APPNAME = "multiauthnoticeplugin" +include opie-securityplugin-notice.inc + +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/notice \ ${HANDHELDS_CVS};module=opie/pics " -S = "${WORKDIR}/notice" - -inherit opie - -# FILES plugins/security/libmultiauthnoticeplugin.so* pics/security/noticeplugin.png pics/security/noticeplugin_small.png -do_install() { - install -d ${D}${palmtopdir}/pics/security/ - install -m 0644 ${WORKDIR}/pics/security/noticeplugin*.png ${D}${palmtopdir}/pics/security/ -} - diff --git a/packages/opie-securityplugins/opie-securityplugin-pin.inc b/packages/opie-securityplugins/opie-securityplugin-pin.inc new file mode 100644 index 0000000000..6286d8abcf --- /dev/null +++ b/packages/opie-securityplugins/opie-securityplugin-pin.inc @@ -0,0 +1,15 @@ +DESCRIPTION = "PIN plugin for opie-security authentication. \ +It implements the same kind of widgets as opie-security package, \ +but this implementation can be used along with other authentication \ +methods in the Opie Multi-Authentication Framework." +APPNAME = "multiauthpinplugin" + +include opie-securityplugin.inc + +S = "${WORKDIR}/pin" + +do_install() { + install -d ${D}${palmtopdir}/pics/security/ + install -m 0644 ${WORKDIR}/pics/security/pinplugin.png ${D}${palmtopdir}/pics/security/ +} + diff --git a/packages/opie-securityplugins/opie-securityplugin-pin_1.2.1.bb b/packages/opie-securityplugins/opie-securityplugin-pin_1.2.1.bb index 5a2d03f6d5..c5ccde6b5c 100644 --- a/packages/opie-securityplugins/opie-securityplugin-pin_1.2.1.bb +++ b/packages/opie-securityplugins/opie-securityplugin-pin_1.2.1.bb @@ -1,27 +1,5 @@ -DESCRIPTION = "PIN plugin for opie-security authentication. \ -It implements the same kind of widgets as opie-security package, \ -but this implementation can be used along with other authentication \ -methods in the Opie Multi-Authentication Framework." -SECTION = "opie/security" -PRIORITY = "optional" -MAINTAINER = "Team Opie <opie@handhelds.org>" -LICENSE = "GPL" -I18N_FILES = "libmultiauthpinplugin.ts" -RDEPENDS = "opie-security" - -APPNAME = "multiauthpinplugin" - +include opie-securityplugin-pin.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/pin \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " - -S = "${WORKDIR}/pin" - -inherit opie - -# FILES plugins/security/libmultiauthpinplugin.so* pics/security/pinplugin.png -do_install() { - install -d ${D}${palmtopdir}/pics/security/ - install -m 0644 ${WORKDIR}/pics/security/pinplugin.png ${D}${palmtopdir}/pics/security/ -} + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb index b85132b5e2..bf2a607650 100644 --- a/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb +++ b/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb @@ -1,26 +1,7 @@ -DESCRIPTION = "PIN plugin for opie-security authentication. \ -It implements the same kind of widgets as opie-security package, \ -but this implementation can be used along with other authentication \ -methods in the Opie Multi-Authentication Framework." -SECTION = "opie/security" -PRIORITY = "optional" -MAINTAINER = "Team Opie <opie@handhelds.org>" -LICENSE = "GPL" -I18N_FILES = "libmultiauthpinplugin.ts" -RDEPENDS = "opie-security" -PV = "1.2.1+cvs${SRCDATE}" -APPNAME = "multiauthpinplugin" +include opie-securityplugin-pin.inc + +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/pin \ ${HANDHELDS_CVS};module=opie/pics " -S = "${WORKDIR}/pin" - -inherit opie - -# FILES plugins/security/libmultiauthpinplugin.so* pics/security/pinplugin.png -do_install() { - install -d ${D}${palmtopdir}/pics/security/ - install -m 0644 ${WORKDIR}/pics/security/pinplugin.png ${D}${palmtopdir}/pics/security/ -} - diff --git a/packages/opie-securityplugins/opie-securityplugin.inc b/packages/opie-securityplugins/opie-securityplugin.inc new file mode 100644 index 0000000000..855a610f6d --- /dev/null +++ b/packages/opie-securityplugins/opie-securityplugin.inc @@ -0,0 +1,8 @@ +SECTION = "opie/security" +PRIORITY = "optional" +MAINTAINER = "Team Opie <opie@handhelds.org>" +LICENSE = "GPL" +RDEPENDS = "opie-security" +I18N_FILES = "lib${APPNAME}.ts" + +inherit opie diff --git a/packages/opie-securityplugins/opie-securityplugins_1.2.1.bb b/packages/opie-securityplugins/opie-securityplugins_1.2.1.bb deleted file mode 100644 index c541bc78ed..0000000000 --- a/packages/opie-securityplugins/opie-securityplugins_1.2.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -include ${PN}.inc - - - diff --git a/packages/opie-securityplugins/opie-securityplugins_cvs.bb b/packages/opie-securityplugins/opie-securityplugins_cvs.bb deleted file mode 100644 index f8c47a5c4f..0000000000 --- a/packages/opie-securityplugins/opie-securityplugins_cvs.bb +++ /dev/null @@ -1,4 +0,0 @@ -include ${PN}.inc - -PV = "1.2.1+cvs${SRCDATE}" - diff --git a/packages/opie-sfcave/opie-sfcave_cvs.bb b/packages/opie-sfcave/opie-sfcave_cvs.bb index 8b087d4f0b..b383491746 100644 --- a/packages/opie-sfcave/opie-sfcave_cvs.bb +++ b/packages/opie-sfcave/opie-sfcave_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/sfcave \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-sh-snes/files/snes.png b/packages/opie-sh-snes/files/snes.png Binary files differindex 2bb69e733f..2c0abfe7e6 100644 --- a/packages/opie-sh-snes/files/snes.png +++ b/packages/opie-sh-snes/files/snes.png diff --git a/packages/opie-sh-snes/opie-sh-snes_cvs.bb b/packages/opie-sh-snes/opie-sh-snes_cvs.bb index f8c47a5c4f..0ce2a6b704 100644 --- a/packages/opie-sh-snes/opie-sh-snes_cvs.bb +++ b/packages/opie-sh-snes/opie-sh-snes_cvs.bb @@ -1,4 +1,5 @@ include ${PN}.inc - -PV = "1.2.1+cvs${SRCDATE}" + +#Remove the dash below when 1.2.1 changes +PV = "1.2.1+cvs-${SRCDATE}" diff --git a/packages/opie-sh/opie-sh_cvs.bb b/packages/opie-sh/opie-sh_cvs.bb index 782f06e4ba..efa04a2178 100644 --- a/packages/opie-sh/opie-sh_cvs.bb +++ b/packages/opie-sh/opie-sh_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/opie-sh \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-sheet/opie-sheet_cvs.bb b/packages/opie-sheet/opie-sheet_cvs.bb index dbf3aa0825..629457892a 100644 --- a/packages/opie-sheet/opie-sheet_cvs.bb +++ b/packages/opie-sheet/opie-sheet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-sheet \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-snake/opie-snake_cvs.bb b/packages/opie-snake/opie-snake_cvs.bb index 1c6b515278..c2a9e9b47d 100644 --- a/packages/opie-snake/opie-snake_cvs.bb +++ b/packages/opie-snake/opie-snake_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/snake \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-solitaire/opie-solitaire_cvs.bb b/packages/opie-solitaire/opie-solitaire_cvs.bb index b5aae11de6..184bec3f73 100644 --- a/packages/opie-solitaire/opie-solitaire_cvs.bb +++ b/packages/opie-solitaire/opie-solitaire_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/solitaire \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-sounds/opie-sounds_cvs.bb b/packages/opie-sounds/opie-sounds_cvs.bb index 9d58620165..63854616fa 100644 --- a/packages/opie-sounds/opie-sounds_cvs.bb +++ b/packages/opie-sounds/opie-sounds_cvs.bb @@ -1,5 +1,6 @@ include ${PN}.inc - -PV = "1.2.1+cvs${SRCDATE}" + +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.1+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/sounds" diff --git a/packages/opie-sshkeys/opie-sshkeys_cvs.bb b/packages/opie-sshkeys/opie-sshkeys_cvs.bb index a6e7536f36..bb1c458f9f 100644 --- a/packages/opie-sshkeys/opie-sshkeys_cvs.bb +++ b/packages/opie-sshkeys/opie-sshkeys_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/sshkeys \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-stumbler/files/opiestumbler.png b/packages/opie-stumbler/files/opiestumbler.png Binary files differindex 6d491ed7e8..8ca7b4b604 100644 --- a/packages/opie-stumbler/files/opiestumbler.png +++ b/packages/opie-stumbler/files/opiestumbler.png diff --git a/packages/opie-stumbler/opie-stumbler_cvs.bb b/packages/opie-stumbler/opie-stumbler_cvs.bb index 3bc3f32fca..0c772b23af 100644 --- a/packages/opie-stumbler/opie-stumbler_cvs.bb +++ b/packages/opie-stumbler/opie-stumbler_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opiestumbler \ ${HANDHELDS_CVS};module=opie/apps \ diff --git a/packages/opie-style-flat/opie-style-flat_cvs.bb b/packages/opie-style-flat/opie-style-flat_cvs.bb index 23f048b193..02e203f24b 100644 --- a/packages/opie-style-flat/opie-style-flat_cvs.bb +++ b/packages/opie-style-flat/opie-style-flat_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/flat " diff --git a/packages/opie-style-fresh/opie-style-fresh_cvs.bb b/packages/opie-style-fresh/opie-style-fresh_cvs.bb index 53e7d08d6f..8e82eb2010 100644 --- a/packages/opie-style-fresh/opie-style-fresh_cvs.bb +++ b/packages/opie-style-fresh/opie-style-fresh_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/fresh " diff --git a/packages/opie-style-liquid/opie-style-liquid_cvs.bb b/packages/opie-style-liquid/opie-style-liquid_cvs.bb index 0f62f0ce89..d3110b062b 100644 --- a/packages/opie-style-liquid/opie-style-liquid_cvs.bb +++ b/packages/opie-style-liquid/opie-style-liquid_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/liquid " diff --git a/packages/opie-style-metal/opie-style-metal_cvs.bb b/packages/opie-style-metal/opie-style-metal_cvs.bb index 46dd132960..70e8511995 100644 --- a/packages/opie-style-metal/opie-style-metal_cvs.bb +++ b/packages/opie-style-metal/opie-style-metal_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/metal " diff --git a/packages/opie-style-phase/opie-style-phase_cvs.bb b/packages/opie-style-phase/opie-style-phase_cvs.bb index 158e6ee471..1a4370c959 100644 --- a/packages/opie-style-phase/opie-style-phase_cvs.bb +++ b/packages/opie-style-phase/opie-style-phase_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/phase" diff --git a/packages/opie-style-web/opie-style-web_cvs.bb b/packages/opie-style-web/opie-style-web_cvs.bb index 3e16a97f49..7a62ed8340 100644 --- a/packages/opie-style-web/opie-style-web_cvs.bb +++ b/packages/opie-style-web/opie-style-web_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/web" diff --git a/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb b/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb index 09cf46c96e..62b2920441 100644 --- a/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb +++ b/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/suspendapplet \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-symlinker/opie-symlinker_cvs.bb b/packages/opie-symlinker/opie-symlinker_cvs.bb index be4d1d6fe5..8a525c069b 100644 --- a/packages/opie-symlinker/opie-symlinker_cvs.bb +++ b/packages/opie-symlinker/opie-symlinker_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/symlinker " diff --git a/packages/opie-sysinfo/opie-sysinfo_cvs.bb b/packages/opie-sysinfo/opie-sysinfo_cvs.bb index 3454154dc2..800fdb998f 100644 --- a/packages/opie-sysinfo/opie-sysinfo_cvs.bb +++ b/packages/opie-sysinfo/opie-sysinfo_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/sysinfo \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-systemtime/opie-systemtime_cvs.bb b/packages/opie-systemtime/opie-systemtime_cvs.bb index 30606d7926..4b9d2ea7ac 100644 --- a/packages/opie-systemtime/opie-systemtime_cvs.bb +++ b/packages/opie-systemtime/opie-systemtime_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/netsystemtime \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-tableviewer/opie-tableviewer_cvs.bb b/packages/opie-tableviewer/opie-tableviewer_cvs.bb index d391539791..7e5995836e 100644 --- a/packages/opie-tableviewer/opie-tableviewer_cvs.bb +++ b/packages/opie-tableviewer/opie-tableviewer_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/tableviewer \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index f662b2f4aa..b9e6ff9720 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ diff --git a/packages/opie-tetrix/opie-tetrix_cvs.bb b/packages/opie-tetrix/opie-tetrix_cvs.bb index 0dc932668d..32ecabb861 100644 --- a/packages/opie-tetrix/opie-tetrix_cvs.bb +++ b/packages/opie-tetrix/opie-tetrix_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/tetrix \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-textedit/opie-textedit_cvs.bb b/packages/opie-textedit/opie-textedit_cvs.bb index ad29b882fc..5e4bdd9eb0 100644 --- a/packages/opie-textedit/opie-textedit_cvs.bb +++ b/packages/opie-textedit/opie-textedit_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/${APPNAME} \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-theme/opie-theme_cvs.bb b/packages/opie-theme/opie-theme_cvs.bb index 2e237fa95b..dd00a68b1a 100644 --- a/packages/opie-theme/opie-theme_cvs.bb +++ b/packages/opie-theme/opie-theme_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/theme \ ${HANDHELDS_CVS};module=opie/plugins/styles " diff --git a/packages/opie-tictac/opie-tictac_cvs.bb b/packages/opie-tictac/opie-tictac_cvs.bb index a5e62a0566..5e0147450a 100644 --- a/packages/opie-tictac/opie-tictac_cvs.bb +++ b/packages/opie-tictac/opie-tictac_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/tictac \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-tinykate/opie-tinykate_cvs.bb b/packages/opie-tinykate/opie-tinykate_cvs.bb index e166b9ad7f..237bbe4623 100644 --- a/packages/opie-tinykate/opie-tinykate_cvs.bb +++ b/packages/opie-tinykate/opie-tinykate_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/tinykate \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb index 3ffbf54318..4bb9617da5 100644 --- a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb +++ b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/addressbook " diff --git a/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb b/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb index a13eb97a21..91cb7e428b 100644 --- a/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb +++ b/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/datebook " diff --git a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb index f9e3822561..3a756a7a35 100644 --- a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb +++ b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/todayplugins/fortune " diff --git a/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb b/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb index 3153a1a3fe..462a1f77fa 100644 --- a/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb +++ b/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/mail " diff --git a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb index 07aacd9f09..42896a07ed 100644 --- a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb +++ b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/todayplugins/stockticker \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb b/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb index f1e301cdb9..c1c27599a8 100644 --- a/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb +++ b/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/todolist " diff --git a/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb b/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb index 04d5635422..5cc9e2bc1e 100644 --- a/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb +++ b/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/todayplugins/weather \ ${HANDHELDS_CVS};module=opie/pics" diff --git a/packages/opie-today/opie-today_cvs.bb b/packages/opie-today/opie-today_cvs.bb index de4af163f9..5135a334cb 100644 --- a/packages/opie-today/opie-today_cvs.bb +++ b/packages/opie-today/opie-today_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-todo/opie-todo_cvs.bb b/packages/opie-todo/opie-todo_cvs.bb index f7a9db7bb5..6ae1079847 100644 --- a/packages/opie-todo/opie-todo_cvs.bb +++ b/packages/opie-todo/opie-todo_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/todo \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-tonleiter/opie-tonleiter_cvs.bb b/packages/opie-tonleiter/opie-tonleiter_cvs.bb index f02528c4b6..77dcd1c8db 100644 --- a/packages/opie-tonleiter/opie-tonleiter_cvs.bb +++ b/packages/opie-tonleiter/opie-tonleiter_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/tonleiter \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb b/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb index f9da0438ff..e31427c256 100644 --- a/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb +++ b/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/unikeyboard " diff --git a/packages/opie-usermanager/opie-usermanager_cvs.bb b/packages/opie-usermanager/opie-usermanager_cvs.bb index b987644d1d..648caeb97c 100644 --- a/packages/opie-usermanager/opie-usermanager_cvs.bb +++ b/packages/opie-usermanager/opie-usermanager_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/usermanager \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb b/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb index cc4118500e..5ea8b91fba 100644 --- a/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb +++ b/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/sound \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-vmemo/opie-vmemo_cvs.bb b/packages/opie-vmemo/opie-vmemo_cvs.bb index 297433a108..9f66e5864e 100644 --- a/packages/opie-vmemo/opie-vmemo_cvs.bb +++ b/packages/opie-vmemo/opie-vmemo_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/vmemo \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb b/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb index e2a03712d5..50e180dd8f 100644 --- a/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb +++ b/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/volumeapplet \ diff --git a/packages/opie-vtapplet/opie-vtapplet_cvs.bb b/packages/opie-vtapplet/opie-vtapplet_cvs.bb index 13c2d80b9c..4b73250b50 100644 --- a/packages/opie-vtapplet/opie-vtapplet_cvs.bb +++ b/packages/opie-vtapplet/opie-vtapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/vtapplet \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb b/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb index 16ac12c510..e223d11a73 100644 --- a/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb +++ b/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/wellenreiter \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb b/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb index efb8c65d78..fd5f3f584c 100644 --- a/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb +++ b/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/wirelessapplet" diff --git a/packages/opie-wordgame/opie-wordgame_cvs.bb b/packages/opie-wordgame/opie-wordgame_cvs.bb index adc05e192e..3f143e1dc4 100644 --- a/packages/opie-wordgame/opie-wordgame_cvs.bb +++ b/packages/opie-wordgame/opie-wordgame_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/wordgame \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-write/opie-write_cvs.bb b/packages/opie-write/opie-write_cvs.bb index c93125bf51..b552bf6152 100644 --- a/packages/opie-write/opie-write_cvs.bb +++ b/packages/opie-write/opie-write_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb b/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb index 92ba1f3bd3..91167ca860 100644 --- a/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb +++ b/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/zkbapplet \ ${HANDHELDS_CVS};module=opie/share \ diff --git a/packages/opie-zlines/opie-zlines_cvs.bb b/packages/opie-zlines/opie-zlines_cvs.bb index c3ffa80d43..4e99318420 100644 --- a/packages/opie-zlines/opie-zlines_cvs.bb +++ b/packages/opie-zlines/opie-zlines_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/zlines \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-zsafe/opie-zsafe_cvs.bb b/packages/opie-zsafe/opie-zsafe_cvs.bb index 88b3519bfc..5e58e8e544 100644 --- a/packages/opie-zsafe/opie-zsafe_cvs.bb +++ b/packages/opie-zsafe/opie-zsafe_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/zsafe \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-zsame/opie-zsame_cvs.bb b/packages/opie-zsame/opie-zsame_cvs.bb index 2b0e7adfae..8e9011b806 100644 --- a/packages/opie-zsame/opie-zsame_cvs.bb +++ b/packages/opie-zsame/opie-zsame_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/zsame \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/pkgconfig/pkgconfig-0.15.0/pkg.m4 b/packages/pkgconfig/pkgconfig-0.15.0/pkg.m4 new file mode 100644 index 0000000000..cbb46dbf83 --- /dev/null +++ b/packages/pkgconfig/pkgconfig-0.15.0/pkg.m4 @@ -0,0 +1,156 @@ +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# +# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi + +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# +# Similar to PKG_CHECK_MODULES, make sure that the first instance of +# this or PKG_CHECK_MODULES is called, or make sure to call +# PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_ifval([$2], [$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$PKG_CONFIG"; then + if test -n "$$1"; then + pkg_cv_[]$1="$$1" + else + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + fi +else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + ifelse([$4], , [AC_MSG_ERROR(dnl +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT +])], + [$4]) +elif test $pkg_failed = untried; then + ifelse([$4], , [AC_MSG_FAILURE(dnl +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], + [$4]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + ifelse([$3], , :, [$3]) +fi[]dnl +])# PKG_CHECK_MODULES diff --git a/packages/pkgconfig/pkgconfig_0.15.0.bb b/packages/pkgconfig/pkgconfig_0.15.0.bb index e38e20438d..31fc7820fe 100644 --- a/packages/pkgconfig/pkgconfig_0.15.0.bb +++ b/packages/pkgconfig/pkgconfig_0.15.0.bb @@ -5,10 +5,11 @@ It replaces the ubiquitous *-config scripts you may have \ seen with a single tool." HOMEPAGE = "http://www.freedesktop.org/software/pkgconfig/" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-${PV}.tar.gz \ file://configure.patch;patch=1 \ + file://pkg.m4 \ file://glibconfig-sysdefs.h" inherit autotools @@ -16,6 +17,7 @@ inherit autotools acpaths = "-I ." do_configure_prepend () { install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h glib-1.2.8/ + install -m 0644 ${WORKDIR}/pkg.m4 ${S}/ } do_stage_append() { diff --git a/packages/portaudio/portaudio_0.0.19.bb b/packages/portaudio/portaudio_0.0.19.bb index 68809e7c41..efb3cc31db 100644 --- a/packages/portaudio/portaudio_0.0.19.bb +++ b/packages/portaudio/portaudio_0.0.19.bb @@ -3,7 +3,7 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" -PV = "0.0.19+cvs${SRCDATE}" +PV = "1:0.0.19+cvs${SRCDATE}" PR = "r1" SRC_URI = "http://www.portaudio.com/archives/pa_snapshot_v19.tar.gz" diff --git a/packages/prism54/prism54-module_cvs.bb b/packages/prism54/prism54-module_cvs.bb index e0d5b76a8b..7953eb46b3 100644 --- a/packages/prism54/prism54-module_cvs.bb +++ b/packages/prism54/prism54-module_cvs.bb @@ -1,5 +1,5 @@ SECTION = "base" -PV = "0.0+cvs${SRCDATE}" +PV = "1.2+cvs${SRCDATE}" include prism54-module_1.2.bb diff --git a/packages/putty/putty_svn.bb b/packages/putty/putty_svn.bb index b14d957a4d..55f827b467 100644 --- a/packages/putty/putty_svn.bb +++ b/packages/putty/putty_svn.bb @@ -1,7 +1,8 @@ DESCRIPTION = "PuTTY is a free implementation of Telnet and SSH for Win32 and Unix platforms" SECTION = "console/network" LICENSE = "MIT" -PV = "0.58+cvs${SRCDATE}" +#Remove the dash below when 0.58 changes in PV +PV = "0.58+cvs-${SRCDATE}" SRC_URI = "svn://ixion.tartarus.org/main;module=putty \ file://lib.pro \ diff --git a/packages/qplot/qplot_2.0.1+cvs20020420.bb b/packages/qplot/qplot_2.0.1+cvs20020420.bb index af257baa79..b78afd9a76 100644 --- a/packages/qplot/qplot_2.0.1+cvs20020420.bb +++ b/packages/qplot/qplot_2.0.1+cvs20020420.bb @@ -5,7 +5,8 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" HOMEPAGE = "http://qplot.sourceforge.net/" SRCDATE = 20020420 -PV = "2.0.1+cvs${SRCDATE}" +#Change to form x.y.z+cvs${SRCDATE} when 2.0.1 changes in PV +PV = "2.0.1-cvs-${SRCDATE}" PR = "r1" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/qplot;module=qplot \ diff --git a/packages/slugimage/slugimage-native.bb b/packages/slugimage/slugimage-native.bb index eba23580f2..6b21d208e6 100644 --- a/packages/slugimage/slugimage-native.bb +++ b/packages/slugimage/slugimage-native.bb @@ -1,5 +1,9 @@ -SECTION = "unknown" +# slugimage - a program to construct NSLU2 image files include slugimage.bb + +# slugimage depends on perl, we assume that this is installed. +RDEPENDS = "" + inherit native FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/slugimage-${PV}', '${FILE_DIRNAME}/slugimage', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/packages/slugimage/slugimage.bb b/packages/slugimage/slugimage.bb index 9b4e651369..9bcc692fe7 100644 --- a/packages/slugimage/slugimage.bb +++ b/packages/slugimage/slugimage.bb @@ -1,16 +1,16 @@ -SECTION = "unknown" +# slugimage - normally built native, a perl script +SECTION = "console/utils" LICENSE = "BSD" DESCRIPTION = "Slugimage is a small app to disassemble and reassemble \ flash images for the Linksys NSLU2 device. It also has jffs2 support" -MAINTAINER = "Chris Larson <kergoth@handhelds.org>" -PR = "r3" +MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>" +PR = "r4" -RDEPENDS = "perl-native" +RDEPENDS = "perl" SRC_URI = "cvs://anonymous:@cvs.sourceforge.net/cvsroot/nslu;module=slugimage;tag=SLUGIMAGE_3_2" S = "${WORKDIR}" - do_install () { install -d ${D}${bindir} install -m 0755 slugimage/slugimage ${D}${bindir}/ diff --git a/packages/slugos-init/files/modprobe.conf b/packages/slugos-init/files/modprobe.conf deleted file mode 100644 index 08482e8c6d..0000000000 --- a/packages/slugos-init/files/modprobe.conf +++ /dev/null @@ -1,3 +0,0 @@ -# Add an alias for eth0 to MODULE to cause the S40networking -# init script to load the MODULE driver on the first boot -alias eth0 MODULE diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index 4bca35f47f..d22bdde4ad 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -24,7 +24,6 @@ SRC_URI = "file://linuxrc \ file://conffiles \ file://turnup \ file://reflash \ - file://modprobe.conf \ file://links.conf \ file://leds.h \ file://leds.c \ @@ -105,9 +104,6 @@ do_install() { # Configuration files install -m 0644 conffiles ${D}${sysconfdir}/default - # Change MODULE in modprobe.conf to the correct module name - rm -f ${D}${sysconfdir}/modprobe.conf - sed 's/MODULE/'"$(echo '${PREFERRED_PROVIDER_virtual/ixp-eth}'|sed 's/-/_/g')"'/g' modprobe.conf >${D}${sysconfdir}/modprobe.conf set +ex } @@ -148,4 +144,4 @@ FILES_${PN} = "/" # It is bad to overwrite /linuxrc as it puts the system back to # a flash boot (and the flash has potentially not been upgraded!) -CONFFILES_${PN} = "${sysconfdir}/modprobe.conf /linuxrc ${sysconfdir}/default/conffiles" +CONFFILES_${PN} = "/linuxrc ${sysconfdir}/default/conffiles" diff --git a/packages/tremor/tremor_svn.bb b/packages/tremor/tremor_svn.bb index 8b9d538f92..fd3dead30a 100644 --- a/packages/tremor/tremor_svn.bb +++ b/packages/tremor/tremor_svn.bb @@ -3,7 +3,7 @@ PRIORITY = "optional" MAINTAINER = "Greg Gilbert <greg@treke.net>" DEPENDS = "libogg" DESCRIPTION = "tremor is a fixed point implementation of the vorbis codec." -PV = "0.0+svn${SRCDATE}" +PV = "1:0.0+svn${SRCDATE}" LICENSE = "BSD" DEFAULT_PREFERENCE = "-1" diff --git a/packages/usbutils/usbutils_cvs.bb b/packages/usbutils/usbutils_cvs.bb index 0c9d303256..85c4b51b21 100644 --- a/packages/usbutils/usbutils_cvs.bb +++ b/packages/usbutils/usbutils_cvs.bb @@ -3,7 +3,7 @@ SECTION = "base" DEPENDS += "libusb" LICENSE = "GPL" PRIORITY = "optional" -PV = "0.70+cvs${SRCDATE}" +PV = "0.71+cvs${SRCDATE}" PR = "r3" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/linux-usb;module=usbutils" |
