diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-10 03:24:12 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-10 03:24:12 +0000 |
| commit | 2427fe5ac44f39555ca3b1fee8e0a234917cbe96 (patch) | |
| tree | 645d2eb99781cb79ea1ddf3514b29cef996b4ea1 | |
| parent | 931b88d4f952a2fbba63d9cbfbe6e5816cacfa95 (diff) | |
| parent | 8bc640253e3402ed705484106527fa8f437e99e8 (diff) | |
merge of 050df893918bae2f4a6a2cb3fcdc9f0ee8e8ee04
and 1819e7c9879b392cfb2bdae2cd3d9d59c7e28a49
572 files changed, 1020 insertions, 1068 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index b0ca9358bd..9b87828594 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -722,9 +722,9 @@ python __anonymous () { pn = bb.data.getVar('PN', d, 1) - cvsdate = bb.data.getVar('CVSDATE_%s' % pn, d, 1) - if cvsdate != None: - bb.data.setVar('CVSDATE', cvsdate, d) + srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1) + if srcdate != None: + bb.data.setVar('SRCDATE', srcdate, d) use_nls = bb.data.getVar('USE_NLS_%s' % pn, d, 1) if use_nls != None: diff --git a/classes/image_ipk.bbclass b/classes/image_ipk.bbclass index 5fdd340673..c2f1c8d682 100644 --- a/classes/image_ipk.bbclass +++ b/classes/image_ipk.bbclass @@ -1,11 +1,15 @@ inherit rootfs_ipk +# We need to follow RDEPENDS and RRECOMMENDS for images +BUILD_ALL_DEPS = "1" + # Images are generally built explicitly, do not need to be part of world. EXCLUDE_FROM_WORLD = "1" USE_DEVFS ?= "0" DEPENDS += "makedevs-native" +PACKAGE_ARCH = "${MACHINE_ARCH}" def get_image_deps(d): import bb diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index ea99ec5401..2e54d06b28 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -5,6 +5,9 @@ DEPENDS += "virtual/${TARGET_PREFIX}depmod-${@get_kernelmajorversion('${PV}')} v inherit kernel-arch +PACKAGES_DYNAMIC += "kernel-module-*" +PACKAGES_DYNAMIC += "kernel-image-*" + export OS = "${TARGET_OS}" export CROSS_COMPILE = "${TARGET_PREFIX}" KERNEL_IMAGETYPE = "zImage" diff --git a/classes/native.bbclass b/classes/native.bbclass index 955a8ae646..feada55b3d 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -5,6 +5,7 @@ inherit base EXCLUDE_FROM_WORLD = "1" PACKAGES = "" +PACKAGE_ARCH = "${BUILD_ARCH}" TARGET_ARCH = "${BUILD_ARCH}" TARGET_OS = "${BUILD_OS}" diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 6d3e1eb686..a70b1e8cdd 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -1,7 +1,6 @@ inherit package DEPENDS_prepend="${@["ipkg-utils-native ", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}" BOOTSTRAP_EXTRA_RDEPENDS += "ipkg-collateral ipkg ipkg-link" -BOOTSTRAP_EXTRA_DEPENDS += "ipkg-collateral ipkg ipkg-link" PACKAGEFUNCS += "do_package_ipk" python package_ipk_fn () { diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 06d9e61ac5..8682b46d4c 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -67,6 +67,14 @@ TIME := "${@time.strftime('%H%M%S',time.gmtime())}" DATETIME = "${DATE}${TIME}" ################################################################## +# Openembedded Software Prerequisites. +################################################################## + +# python-native should be here but python relies on building +# its own in staging +ASSUME_PROVIDED = "cvs-native svn-native" + +################################################################## # Package default variables. ################################################################## @@ -270,7 +278,6 @@ BUILD_OPTIMIZATION = "-O2" # Bootstrap stuff. ################################################################## -BOOTSTRAP_EXTRA_DEPENDS = "" BOOTSTRAP_EXTRA_RDEPENDS = "" BOOTSTRAP_EXTRA_RRECOMMENDS = "" @@ -309,7 +316,7 @@ RESUMECOMMAND = "" RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} ${URI}" UPDATECOMMAND = "" UPDATECOMMAND_cvs = "/usr/bin/env cvs update -d -P ${CVSCOOPTS}" -CVSDATE = "${DATE}" +SRCDATE = "${DATE}" SRC_URI = "file://${FILE}" diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf index 90745ebe2d..1a5600c986 100644 --- a/conf/distro/familiar-unstable.conf +++ b/conf/distro/familiar-unstable.conf @@ -14,8 +14,8 @@ FEED_URIS += " \ base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates" -#CVSDATE = 20050331 -#CVSDATE = "now" +#SRCDATE = 20050331 +#SRCDATE = "now" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" diff --git a/conf/distro/familiar.conf b/conf/distro/familiar.conf index 98807d63ab..9cc84e96c4 100644 --- a/conf/distro/familiar.conf +++ b/conf/distro/familiar.conf @@ -8,7 +8,8 @@ TARGET_OS = "linux" PARALLEL_INSTALL_MODULES = "1" UDEV_DEVFS_RULES = "1" -BOOTSTRAP_EXTRA_DEPENDS += "familiar-version" BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version" DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" + +include conf/distro/include/multimachine.conf
\ No newline at end of file diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/.mtn2git_empty b/conf/distro/include/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/.mtn2git_empty +++ b/conf/distro/include/.mtn2git_empty diff --git a/classes/multimachine.inc b/conf/distro/include/multimachine.conf index 1f73ffd30f..1f73ffd30f 100644 --- a/classes/multimachine.inc +++ b/conf/distro/include/multimachine.conf diff --git a/conf/distro/jlime-shrek.conf b/conf/distro/jlime-shrek.conf index e25c7e64de..c3f88c5511 100644 --- a/conf/distro/jlime-shrek.conf +++ b/conf/distro/jlime-shrek.conf @@ -10,7 +10,7 @@ DISTRO_TYPE = "release" export FEED_URLS_jlime = "shrek##http://www.jlime.com/downloads/releases/shrek/${TARGET_ARCH}/feed/" -CVSDATE = 20050518 +SRCDATE = 20050518 PREFERRED_PROVIDERS = "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" @@ -37,7 +37,6 @@ BBINCLUDELOGS = "yes" MODUTILS = "26" IMAGE_FSTYPES = "tar.bz2" -BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs ncurses nano virtual/kernel wireless-tools console-tools" BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs ncurses nano wireless-tools \ kernel-module-3c574-cs kernel-module-3c589-cs kernel-module-8390 \ kernel-module-airo-cs kernel-module-airo console-tools \ diff --git a/conf/distro/maemo-1.0.conf b/conf/distro/maemo-1.0.conf index 15ec45f34e..f83e4b1d96 100644 --- a/conf/distro/maemo-1.0.conf +++ b/conf/distro/maemo-1.0.conf @@ -11,7 +11,7 @@ FEED_URIS += " \ base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates" -#CVSDATE = 20050331 +#SRCDATE = 20050331 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf index 77d14dc518..c7fcb83610 100644 --- a/conf/distro/nylon.conf +++ b/conf/distro/nylon.conf @@ -19,7 +19,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc" -#CVSDATE = 20040916 +#SRCDATE = 20040916 PREFERRED_VERSION_glibc = "2.3.3" PREFERRED_VERSION_gcc-cross-initial = "3.3.4" diff --git a/conf/distro/openomap.conf b/conf/distro/openomap.conf index 6f0bca9342..192400b9a1 100644 --- a/conf/distro/openomap.conf +++ b/conf/distro/openomap.conf @@ -8,5 +8,4 @@ TARGET_FPU ?= "soft" # 2.4 vs 2.6 is a distro decision. MODUTILS = "26" -BOOTSTRAP_EXTRA_DEPENDS += "udev" BOOTSTRAP_EXTRA_RDEPENDS += "udev" diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf index 2e4a943337..009f9c9290 100644 --- a/conf/distro/openzaurus-unstable.conf +++ b/conf/distro/openzaurus-unstable.conf @@ -14,7 +14,7 @@ DISTRO_TYPE = "debug" # console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \ # devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel" -# CVSDATE = "20050704" +# SRCDATE = "20050704" # # Zaurus diff --git a/conf/distro/openzaurus.conf b/conf/distro/openzaurus.conf index 1a4fc7c3f8..b110ad84e9 100644 --- a/conf/distro/openzaurus.conf +++ b/conf/distro/openzaurus.conf @@ -14,3 +14,5 @@ TARGET_FPU = "soft" PARALLEL_INSTALL_MODULES = "1" DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" + +include conf/distro/include/multimachine.conf
\ No newline at end of file diff --git a/conf/distro/preferred-gpe-versions-2.6.inc b/conf/distro/preferred-gpe-versions-2.6.inc index 98c1a969fa..d4422e86e9 100644 --- a/conf/distro/preferred-gpe-versions-2.6.inc +++ b/conf/distro/preferred-gpe-versions-2.6.inc @@ -3,10 +3,10 @@ # #work around some breakages -CVSDATE_xserver-kdrive=20050207 -CVSDATE_minimo=20050401 -CVSDATE_cairo=20050330 -CVSDATE_xext=20050222 +SRCDATE_xserver-kdrive=20050207 +SRCDATE_minimo=20050401 +SRCDATE_cairo=20050330 +SRCDATE_xext=20050222 #set some preferred providers: PREFERRED_PROVIDER_gconf=gconf-dbus @@ -32,10 +32,10 @@ PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" PREFERRED_VERSION_rxvt-unicode ?= "5.3" PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" PREFERRED_VERSION_xst ?= "0.14" -#PREFERRED_VERSION_xextensions ?= "0.0cvs${CVSDATE}" -PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" -PREFERRED_VERSION_xhost ?= "0.0cvs20040413" -PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}" +#PREFERRED_VERSION_xextensions ?= "0.0+cvs${SRCDATE}" +PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" +PREFERRED_VERSION_xhost ?= "0.0+cvs20040413" +PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_gpe-login ?= "0.76" PREFERRED_VERSION_gpe-session-scripts ?= "0.62" PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" @@ -77,9 +77,9 @@ PREFERRED_VERSION_gpe-tetris ?= "0.6-2" PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6" PREFERRED_VERSION_xdemineur ?= "2.1.1" PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1" -PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}" +PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_dillo2 ?= "0.6.6" -PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}" +PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}" PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" PREFERRED_VERSION_linphone ?= "0.12.2" PREFERRED_VERSION_firefox ?= "1.0" diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc index 9f2c041839..59567312ad 100644 --- a/conf/distro/preferred-gpe-versions-2.7.inc +++ b/conf/distro/preferred-gpe-versions-2.7.inc @@ -3,7 +3,7 @@ # #work around some breakages -#CVSDATE_minimo=20050401 +#SRCDATE_minimo=20050401 #set some preferred providers: PREFERRED_PROVIDER_gconf=gconf-dbus @@ -14,7 +14,7 @@ PREFERRED_VERSION_libmatchbox ?= "1.7" PREFERRED_VERSION_matchbox ?= "0.9.1" PREFERRED_VERSION_matchbox-common ?= "0.9.1" PREFERRED_VERSION_matchbox-desktop ?= "0.9.1" -PREFERRED_VERSION_matchbox-wm ?= "0.9.5+cvs-${CVSDATE}" +PREFERRED_VERSION_matchbox-wm ?= "0.9.5+cvs${SRCDATE}" PREFERRED_VERSION_matchbox-panel ?= "0.9.2" PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6" PREFERRED_VERSION_atk ?= "1.9.0" @@ -36,10 +36,10 @@ PREFERRED_VERSION_rxvt-unicode ?= "5.6" PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" PREFERRED_VERSION_xst ?= "0.15" PREFERRED_VERSION_xextensions ?= "1.0.1" -PREFERRED_VERSION_xserver-kdrive = "0.0cvs20050207" -PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" -PREFERRED_VERSION_xhost ?= "0.0cvs20040413" -PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}" +PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20050207" +PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" +PREFERRED_VERSION_xhost ?= "0.0+cvs20040413" +PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_gpe-login ?= "0.83" PREFERRED_VERSION_gpe-session-scripts ?= "0.66" PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" @@ -82,13 +82,13 @@ PREFERRED_VERSION_gpe-tetris ?= "0.6-4" PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6" PREFERRED_VERSION_xdemineur ?= "2.1.1" PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1" -PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}" +PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_dillo2 ?= "0.6.6" -PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}" +PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}" PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" PREFERRED_VERSION_linphone ?= "0.12.2" PREFERRED_VERSION_firefox ?= "1.0" -PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904" +PREFERRED_VERSION_gaim ?= "2.0.0+cvs20050904-mco1" PREFERRED_VERSION_poppler ?= "0.3.3" PREFERRED_VERSION_evince ?= "0.3.2" PREFERRED_VERSION_gpe_mini_browser ?= "0.18" diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc index b68eb32c2a..676e0ee9f9 100644 --- a/conf/distro/preferred-gpe-versions.inc +++ b/conf/distro/preferred-gpe-versions.inc @@ -3,7 +3,7 @@ # #work around some breakages -#CVSDATE_xext=20050222 +#SRCDATE_xext=20050222 #set some preferred providers: PREFERRED_PROVIDER_gconf=gconf-dbus @@ -31,9 +31,9 @@ PREFERRED_VERSION_rxvt-unicode ?= "5.3" #PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" #PREFERRED_VERSION_xst ?= "0.14" PREFERRED_VERSION_xextensions ?= "1.0.1" -PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" -PREFERRED_VERSION_xhost ?= "0.0cvs20040413" -PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}" +PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" +PREFERRED_VERSION_xhost ?= "0.0+cvs20040413" +PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}" #PREFERRED_VERSION_gpe-login ?= "0.76" #PREFERRED_VERSION_gpe-session-scripts ?= "0.62" #PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" @@ -75,9 +75,9 @@ PREFERRED_VERSION_dbus ?= "0.23.4" #PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6" #PREFERRED_VERSION_xdemineur ?= "2.1.1" #PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1" -PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}" +PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}" #PREFERRED_VERSION_dillo2 ?= "0.6.6" -PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}" +PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}" #PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" #PREFERRED_VERSION_linphone ?= "0.12.2" #PREFERRED_VERSION_firefox ?= "1.0" diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf index bf07d6b1f0..11bb62a5d1 100644 --- a/conf/distro/sharprom-compatible.conf +++ b/conf/distro/sharprom-compatible.conf @@ -56,7 +56,7 @@ include conf/distro/preferred-opie-versions.inc # GPE # -CVSDATE_xserver-kdrive = "20050208" +SRCDATE_xserver-kdrive = "20050208" PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins" diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index cab425a25f..8eb0b01aa8 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -170,7 +170,7 @@ PREFERRED_VERSION_ixp400-eth ?= "1.5" # Select the smallest provider of x11 libraries PREFERRED_PROVIDER_x11 ?= "diet-x11" -CVSDATE_diet-x11 ?= "20060106" +SRCDATE_diet-x11 ?= "20060106" # Ensure consistency across all SlugOS builds for the provider of a # relational database - use the latest version of the SleepyCat diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 8515247d40..cbe829c2a1 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -34,11 +34,11 @@ BBMASK = "" # provide packages for toolchain and additional libraries yourself. You also # have to set PATH in your environment to make sure BitBake finds additional binaries. # Note: You will definitely need to say: -# ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95" +# ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95" # to build any of two Linux 2.4 Embedix kernels, # i.e. openzaurus-sa-2.4.18 and openzaurus-pxa-2.4.18 - and don't forget # to rename the binaries as instructed in the Wiki. -# ASSUME_PROVIDED = "virtual/${TARGET_PREFIX}gcc virtual/libc" +# ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc" # Select between multiple alternative providers, if more than one is eligible. PREFERRED_PROVIDERS = "virtual/qte:qte virtual/libqpe:libqpe-opie" diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index 6cf622ae1c..da699e7258 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -4,7 +4,7 @@ KERNEL_VERSION ?= "2.6" -include conf/machine/zaurus-clamshell.conf -include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf +include conf/machine/include/zaurus-clamshell.conf +include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf ROOT_FLASH_SIZE = "58" diff --git a/conf/machine/blueangel.conf b/conf/machine/blueangel.conf index ef9bd3419e..3f90ccf84c 100644 --- a/conf/machine/blueangel.conf +++ b/conf/machine/blueangel.conf @@ -12,9 +12,6 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel_kernel26 = "xanadux-ba-2.6" PREFERRED_PROVIDER_virtual/kernel = "xanadux-ba-2.6" -BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params" -BOOTSTRAP_EXTRA_DEPENDS_append_kernel26 = " xanadux-ba-2.6 udev module-init-tools" - BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${BA_MODULES}', d)}" BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools" @@ -26,10 +23,10 @@ SERIAL_CONSOLE = "115200 tts/2 vt100" USE_VT = "0" -include conf/machine/handheld-common.conf +include conf/machine/include/handheld-common.conf GUI_MACHINE_CLASS = "smallscreen" ROOT_FLASH_SIZE = "32" # optimize images, but build feeds without using tune-xscale so as to retain backwards compatibility -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf diff --git a/conf/machine/borzoi.conf b/conf/machine/borzoi.conf index b7bb5a0afe..185c9f02cb 100644 --- a/conf/machine/borzoi.conf +++ b/conf/machine/borzoi.conf @@ -4,15 +4,13 @@ KERNEL_VERSION ?= "2.6" -include conf/machine/zaurus-clamshell.conf -include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf +include conf/machine/include/zaurus-clamshell.conf +include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf -PIVOTBOOT_EXTRA_DEPENDS += "pivotinit pcmcia-cs" PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs" PIVOTBOOT_EXTRA_RRECOMMENDS += "" # Useful things for the built-in Harddisk -BOOTSTRAP_EXTRA_DEPENDS += "hdparm e2fsprogs" BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs" IMAGE_FSTYPES = "jffs2 tar.gz" diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index 6b8348e117..af1c9dad1c 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -4,8 +4,8 @@ KERNEL_VERSION ?= "2.6" -include conf/machine/zaurus-clamshell.conf -include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf +include conf/machine/include/zaurus-clamshell.conf +include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf ROOT_FLASH_SIZE = "25" # yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it. diff --git a/conf/machine/colinux.conf b/conf/machine/colinux.conf index 8c66aa1ab4..1af280c2b3 100644 --- a/conf/machine/colinux.conf +++ b/conf/machine/colinux.conf @@ -5,5 +5,4 @@ TARGET_ARCH = "i686" IPKG_ARCHS = "all i686 i386 x86 ${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "linux-colinux" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel" BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules" diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 4af42deb24..3e95848a35 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -6,7 +6,6 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm ${MACHINE}" PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel ?= "collie-kernels-2.4-embedix" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support altboot" BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules-cs \ sharp-sdmmc-support kernel-module-net-fd kernel-module-sa1100-bi \ kernel-module-usbdcore kernel-module-usbdmonitor \ @@ -15,15 +14,14 @@ altboot" # kernel-module-collie-ssp kernel-module-collie-tc35143af if buzzer.patch applied # This is needed for the ramdisk script to work -BOOTSTRAP_EXTRA_DEPENDS += "e2fsprogs" BOOTSTRAP_EXTRA_RDEPENDS += "e2fsprogs-mke2fs" EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" IMAGE_LINGUAS = "" -include conf/machine/handheld-common.conf -include conf/machine/tune-strongarm.conf +include conf/machine/include/handheld-common.conf +include conf/machine/include/tune-strongarm.conf SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/devkitidp-pxa255.conf b/conf/machine/devkitidp-pxa255.conf index ff4a82f95c..39ef40ae16 100644 --- a/conf/machine/devkitidp-pxa255.conf +++ b/conf/machine/devkitidp-pxa255.conf @@ -10,9 +10,9 @@ IPKG_ARCHS = "all arm armv5te ${MACHINE}" PREFERRED_PROVIDER_virtual/bootloader = "uboot-${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel virtual/bootloader" +BOOTSTRAP_EXTRA_RDEPENDS += "uboot-${MACHINE} ${MACHINE}-kernel" -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf index 429242c9bd..0d3bcedee3 100644 --- a/conf/machine/epia.conf +++ b/conf/machine/epia.conf @@ -2,7 +2,6 @@ TARGET_ARCH = "i586" TARGET_VENDOR = "-oe" PREFERRED_PROVIDER_virtual/kernel = "linux-epia" IMAGE_FSTYPE = "ext2.gz" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev" BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev kernel-modules" udevdir = "/dev" OLDEST_KERNEL = "2.6.5" @@ -10,5 +9,5 @@ GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" IPKG_ARCHS = "i386" -include conf/machine/tune-c3.conf +include conf/machine/include/tune-c3.conf diff --git a/conf/machine/geodegx.conf b/conf/machine/geodegx.conf index 23a08cc99d..e4f56f16e3 100644 --- a/conf/machine/geodegx.conf +++ b/conf/machine/geodegx.conf @@ -6,7 +6,6 @@ TARGET_ARCH = "i486" IPKG_ARCHS = "all i486 geodegx" PREFERRED_PROVIDER_virtual/kernel = "linux-geodegx" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev" BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" udevdir = "/dev" diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf index 468fcf1838..7ebcccb293 100644 --- a/conf/machine/h1910.conf +++ b/conf/machine/h1910.conf @@ -8,11 +8,10 @@ OVERRIDES =. "${KERNEL}:" TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv5te h1910" -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf PREFERRED_PROVIDER_xserver = "xserver-kdrive" -BOOTSTRAP_EXTRA_DEPENDS = "udev apmd irda-utils network-suspend-scripts modutils-collateral mtd-utils" BOOTSTRAP_EXTRA_RDEPENDS = "udev apm apmd network-suspend-scripts modutils-collateral mtd-utils" BOOTSTRAP_EXTRA_RRECOMMENDS += "" diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf index 570dc3be1e..fb4dc8c710 100644 --- a/conf/machine/h1940.conf +++ b/conf/machine/h1940.conf @@ -7,12 +7,10 @@ TARGET_ARCH = arm PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-h1940" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -BOOTSTRAP_EXTRA_DEPENDS = "udev virtual/kernel modutils-collateral module-init-tools" BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel kernel-modules modutils-collateral module-init-tools" HANDHELD_MODULES = "" -BOOTSTRAP_EXTRA_DEPENDS += "apmd wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap network-suspend-scripts" BOOTSTRAP_EXTRA_RDEPENDS += "apm apmd network-suspend-scripts" BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap ${@linux_module_packages('${HANDHELD_MODULES}', d)}" diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 354e3a9552..37ae1a00e0 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -13,9 +13,7 @@ EXTRA_IMAGECMD_h2200_jffs2 = "--pad --no-cleanmarkers --pagesize=512 --erasebloc ROOT_FLASH_SIZE = "32" -BOOTSTRAP_EXTRA_DEPENDS_append = " h2200-bootloader handhelds-pxa-2.6 udev module-init-tools" - -BOOTSTRAP_EXTRA_RRECOMMENDS = " ${@linux_module_packages('${H2200_MODULES}', d)}" +BOOTSTRAP_EXTRA_RRECOMMENDS += " ${@linux_module_packages('${H2200_MODULES}', d)}" BOOTSTRAP_EXTRA_RDEPENDS_append = " h2200-bootloader kernel udev module-init-tools" #ship in rootfs: @@ -42,9 +40,9 @@ SERIAL_CONSOLE = "115200 tts/0 vt100" USE_VT = "0" -include conf/machine/ipaq-common.conf -include conf/machine/handheld-common.conf +include conf/machine/include/ipaq-common.conf +include conf/machine/include/handheld-common.conf GUI_MACHINE_CLASS = "smallscreen" -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index 48990d5618..b364758428 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -7,7 +7,6 @@ IPKG_ARCHS = "all arm ipaqsa h3600" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa" EXTRA_IMAGECMD_h3600_jffs2 = "-e 0x40000 -p" -BOOTSTRAP_EXTRA_DEPENDS = "alsa-driver handhelds-sa ipaq-boot-params" BOOTSTRAP_EXTRA_RDEPENDS = "alsa-driver kernel ipaq-boot-params ${@linux_module_packages('${H3600_MODULES}', d)}" ROOT_FLASH_SIZE = "16" @@ -35,8 +34,8 @@ USE_VT = "0" IMAGE_LINGUAS = "" -include conf/machine/ipaq-common.conf -include conf/machine/handheld-common.conf -include conf/machine/tune-strongarm.conf +include conf/machine/include/ipaq-common.conf +include conf/machine/include/handheld-common.conf +include conf/machine/include/tune-strongarm.conf SERIAL_CONSOLE = "115200 ttySA0" diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index cff74131d5..238f6ad17a 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -16,10 +16,6 @@ EXTRA_IMAGECMD_h3900_jffs2 = "-e 0x40000 -p" ROOT_FLASH_SIZE = "32" -BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params" -BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 = " handhelds-pxa at76c503a-modules" -BOOTSTRAP_EXTRA_DEPENDS_append_kernel26 = " handhelds-pxa-2.6 udev module-init-tools" - BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3900_MODULES}', d)}" BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 = " at76c503a-modules" BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools" @@ -33,10 +29,10 @@ SERIAL_CONSOLE = "115200 tts/0 vt100" USE_DEVFS_kernel24 = "1" USE_VT = "0" -include conf/machine/ipaq-common.conf -include conf/machine/handheld-common.conf +include conf/machine/include/ipaq-common.conf +include conf/machine/include/handheld-common.conf GUI_MACHINE_CLASS = "smallscreen" #use tune xscale for extra performance. Distro feeds be built with tune-strongarm -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf index 166701a46b..2335f5b913 100644 --- a/conf/machine/h6300.conf +++ b/conf/machine/h6300.conf @@ -10,7 +10,6 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-h6300-omap1" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -BOOTSTRAP_EXTRA_DEPENDS = "udev virtual/kernel sysfsutils console-tools modutils-collateral module-init-tools nano minicom gdb" BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel kernel-modules sysfsutils console-tools modutils-collateral module-init-tools nano minicom gdb" H6300_MODULES = "fat vfat nfs \ @@ -18,7 +17,6 @@ bluetooth rfcomm bnep l2cap hci_uart \ irda irlan irtty ircomm ircomm-tty \ omapts" -BOOTSTRAP_EXTRA_DEPENDS += "apmd wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap network-suspend-scripts" BOOTSTRAP_EXTRA_RDEPENDS += "apm apmd network-suspend-scripts" BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap ${@linux_module_packages('${H6300_MODULES}', d)}" @@ -26,4 +24,4 @@ SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" #Use OMAP 1510 cpu specifig arm9tdmi options for gcc -include conf/machine/tune-arm9tdmi.conf +include conf/machine/include/tune-arm9tdmi.conf diff --git a/conf/machine/include/.mtn2git_empty b/conf/machine/include/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/conf/machine/include/.mtn2git_empty diff --git a/conf/machine/handheld-common.conf b/conf/machine/include/handheld-common.conf index 40fd9780f9..467d5e59f1 100644 --- a/conf/machine/handheld-common.conf +++ b/conf/machine/include/handheld-common.conf @@ -19,7 +19,6 @@ input uinput \ PCMCIA_MANAGER ?= "pcmcia-cs" # Configuration bits for "generic handheld" -BOOTSTRAP_EXTRA_DEPENDS += "${PCMCIA_MANAGER} apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin network-suspend-scripts" BOOTSTRAP_EXTRA_RDEPENDS += "${PCMCIA_MANAGER} apm apmd network-suspend-scripts" BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}" diff --git a/conf/machine/ipaq-common.conf b/conf/machine/include/ipaq-common.conf index 791abd2103..eb696cf9f9 100644 --- a/conf/machine/ipaq-common.conf +++ b/conf/machine/include/ipaq-common.conf @@ -1,7 +1,5 @@ IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd atmelwlandriver sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs keybdev" -BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules atmelwlandriver" -BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 += "mipv6" BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}" BOOTSTRAP_EXTRA_RRECOMMENDS_append_kernel24 += "mipv6" diff --git a/conf/machine/poodle-2.4.conf b/conf/machine/include/poodle-2.4.conf index dc603d3bcc..5453fda605 100644 --- a/conf/machine/poodle-2.4.conf +++ b/conf/machine/include/poodle-2.4.conf @@ -3,10 +3,6 @@ PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" # Later versions are broken on kernel 2.4 PREFERRED_VERSION_orinoco-modules = "0.13e" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel \ -hostap-modules orinoco-modules sharp-sdmmc-support \ -hostap-utils prism3-firmware prism3-support" - BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules orinoco-modules-cs sharp-sdmmc-support \ kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \ kernel-module-usbdcore kernel-module-usbdmonitor \ diff --git a/conf/machine/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf index 7edebad2d3..885bf40b4f 100644 --- a/conf/machine/poodle-2.6.conf +++ b/conf/machine/include/poodle-2.6.conf @@ -1,5 +1,4 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils modutils-collateral hostap-modules orinoco-modules" BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs udev-utils" diff --git a/conf/machine/thinclient-common.conf b/conf/machine/include/thinclient-common.conf index e6c97886c9..4a96b42525 100644 --- a/conf/machine/thinclient-common.conf +++ b/conf/machine/include/thinclient-common.conf @@ -13,7 +13,6 @@ input uinput \ " # Configuration bits for "generic thinclient" -BOOTSTRAP_EXTRA_DEPENDS += "apmd ppp bluez-utils wireless-tools" BOOTSTRAP_EXTRA_RDEPENDS += "apm" BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp bluez-utils wireless-tools ${@linux_module_packages('${THINCLIENT_MODULES}', d)}" diff --git a/conf/machine/tosa-2.4.conf b/conf/machine/include/tosa-2.4.conf index 6e208f4fc6..88df07cddb 100644 --- a/conf/machine/tosa-2.4.conf +++ b/conf/machine/include/tosa-2.4.conf @@ -4,9 +4,6 @@ PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" # Later versions are broken on kernel 2.4 PREFERRED_VERSION_orinoco-modules = "0.13e" -BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules wlan-ng-utils virtual/kernel hostap-modules \ - orinoco-modules sharp-sdmmc-support usbutils console-tools" - BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils console-tools \ kernel-module-acm \ kernel-module-evdev kernel-module-net-fd \ diff --git a/conf/machine/tosa-2.6.conf b/conf/machine/include/tosa-2.6.conf index 5455e3f0d5..fdd706d093 100644 --- a/conf/machine/tosa-2.6.conf +++ b/conf/machine/include/tosa-2.6.conf @@ -1,4 +1,4 @@ -include conf/machine/zaurus-clamshell-2.6.conf +include conf/machine/include/zaurus-clamshell-2.6.conf # SOUND Modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd kernel-module-snd-ac97-bus kernel-module-snd-ac97-codec kernel-module-snd-mixer-oss kernel-module-snd-page-alloc kernel-module-snd-pcm kernel-module-snd-pcm-oss kernel-module-snd-pxa2xx-ac97 kernel-module-snd-pxa2xx-pcm kernel-module-snd-timer kernel-module-soundcore" diff --git a/conf/machine/tune-arm920t.conf b/conf/machine/include/tune-arm920t.conf index 936b137517..936b137517 100644 --- a/conf/machine/tune-arm920t.conf +++ b/conf/machine/include/tune-arm920t.conf diff --git a/conf/machine/tune-arm926ejs.conf b/conf/machine/include/tune-arm926ejs.conf index 5e2f6b7c62..5e2f6b7c62 100644 --- a/conf/machine/tune-arm926ejs.conf +++ b/conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/tune-arm9tdmi.conf b/conf/machine/include/tune-arm9tdmi.conf index cfc3bad1c1..cfc3bad1c1 100644 --- a/conf/machine/tune-arm9tdmi.conf +++ b/conf/machine/include/tune-arm9tdmi.conf diff --git a/conf/machine/tune-c3.conf b/conf/machine/include/tune-c3.conf index e6a522af10..e6a522af10 100644 --- a/conf/machine/tune-c3.conf +++ b/conf/machine/include/tune-c3.conf diff --git a/conf/machine/tune-ppc603e.conf b/conf/machine/include/tune-ppc603e.conf index 7c8714cfc2..7c8714cfc2 100644 --- a/conf/machine/tune-ppc603e.conf +++ b/conf/machine/include/tune-ppc603e.conf diff --git a/conf/machine/tune-ppce500.conf b/conf/machine/include/tune-ppce500.conf index 11717eba70..11717eba70 100644 --- a/conf/machine/tune-ppce500.conf +++ b/conf/machine/include/tune-ppce500.conf diff --git a/conf/machine/tune-sh3.conf b/conf/machine/include/tune-sh3.conf index 192dd8fd22..192dd8fd22 100644 --- a/conf/machine/tune-sh3.conf +++ b/conf/machine/include/tune-sh3.conf diff --git a/conf/machine/tune-sh4.conf b/conf/machine/include/tune-sh4.conf index 866f7f89d5..866f7f89d5 100644 --- a/conf/machine/tune-sh4.conf +++ b/conf/machine/include/tune-sh4.conf diff --git a/conf/machine/tune-strongarm.conf b/conf/machine/include/tune-strongarm.conf index 8654c996ef..8654c996ef 100644 --- a/conf/machine/tune-strongarm.conf +++ b/conf/machine/include/tune-strongarm.conf diff --git a/conf/machine/tune-supersparc.conf b/conf/machine/include/tune-supersparc.conf index 1b1ec1207f..1b1ec1207f 100644 --- a/conf/machine/tune-supersparc.conf +++ b/conf/machine/include/tune-supersparc.conf diff --git a/conf/machine/tune-xscale.conf b/conf/machine/include/tune-xscale.conf index 0b98f09fc8..0b98f09fc8 100644 --- a/conf/machine/tune-xscale.conf +++ b/conf/machine/include/tune-xscale.conf diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/include/zaurus-clamshell-2.4.conf index d61dc197b2..184258c8b6 100644 --- a/conf/machine/zaurus-clamshell-2.4.conf +++ b/conf/machine/include/zaurus-clamshell-2.4.conf @@ -9,10 +9,6 @@ PREFERRED_PROVIDERS_append_borzoi = " virtual/kernel:openzaurus-pxa27x" # Later versions are broken on kernel 2.4 PREFERRED_VERSION_orinoco-modules = "0.13e" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support \ -pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \ -wpa-supplicant-nossl ppp ppp-dialin openswan" - BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \ pcmcia-cs apmd apm wireless-tools console-tools irda-utils hostap-utils prism3-firmware prism3-support \ wpa-supplicant-nossl ppp ppp-dialin openswan" diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf index 757fc6acf3..e89183b204 100644 --- a/conf/machine/zaurus-clamshell-2.6.conf +++ b/conf/machine/include/zaurus-clamshell-2.6.conf @@ -3,10 +3,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel udev sysfsutils spectrum-fw orinoco-conf \ -pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \ -ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils module-init-tools alsa-lib" - BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ pcmcia-cs apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf" diff --git a/conf/machine/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf index f55f2d2554..e4d7616510 100644 --- a/conf/machine/zaurus-clamshell.conf +++ b/conf/machine/include/zaurus-clamshell.conf @@ -4,22 +4,20 @@ IPKG_ARCHS = "all arm armv4 armv5te c7x0" PREFERRED_PROVIDER_xserver = "xserver-kdrive" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n" -EXTRA_IMAGEDEPENDS = "sharp-flash-header-c700" +EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700 zaurus-updater" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ --output=${T}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}; \ cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img" -BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater" - GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_DEPENDS += "gaim sylpheed chkhinge" GPE_EXTRA_INSTALL += "gaim sylpheed chkhinge" -include conf/machine/handheld-common.conf +include conf/machine/include/handheld-common.conf # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index 626b5cf218..e502a12dc2 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -9,9 +9,6 @@ PREFERRED_VERSIONS_handhelds-pxa-2.6 = "2.6.12-hh3" PREFERRED_VERSION_orinoco-modules = "0.15rc1" -BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params" -BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev module-init-tools" - ROOT_FLASH_SIZE = "80" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}" @@ -23,15 +20,15 @@ PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \ SERIAL_CONSOLE = "115200 ttyS0" -include conf/machine/ipaq-common.conf -include conf/machine/handheld-common.conf +include conf/machine/include/ipaq-common.conf +include conf/machine/include/handheld-common.conf GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_DEPENDS += "gaim" GPE_EXTRA_INSTALL += "gaim" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \ diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf index 4ac63b556d..b3f54995c8 100644 --- a/conf/machine/jornada56x.conf +++ b/conf/machine/jornada56x.conf @@ -7,7 +7,6 @@ IPKG_ARCHS = "all arm ${MACHINE}" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa-2.6" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel" BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules module-init-tools" EXTRA_IMAGECMD_jornada56x_jffs2 = "-e 0x40000 -p" @@ -16,5 +15,5 @@ USE_DEVFS = "1" SERIAL_CONSOLE = "115200 ttySA0" -include conf/machine/handheld-common.conf -include conf/machine/tune-strongarm.conf +include conf/machine/include/handheld-common.conf +include conf/machine/include/tune-strongarm.conf diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf index 5e81c35430..6526f50ef4 100644 --- a/conf/machine/jornada6xx.conf +++ b/conf/machine/jornada6xx.conf @@ -7,4 +7,4 @@ IPKG_ARCHS = "all sh3 ${MACHINE}" PREFERRED_VERSION_glibc = "2.3.4" PREFERRED_VERSION_glibc-initial = "2.3.4" -include conf/machine/tune-sh3.conf +include conf/machine/include/tune-sh3.conf diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf index b3e1840469..82eff0b563 100644 --- a/conf/machine/jornada7xx.conf +++ b/conf/machine/jornada7xx.conf @@ -5,4 +5,4 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm ${MACHINE}" -include conf/machine/tune-strongarm.conf
\ No newline at end of file +include conf/machine/include/tune-strongarm.conf
\ No newline at end of file diff --git a/conf/machine/lite5200.conf b/conf/machine/lite5200.conf index f990d1390e..8df7b51d69 100644 --- a/conf/machine/lite5200.conf +++ b/conf/machine/lite5200.conf @@ -16,4 +16,4 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" IMAGE_FSTYPES = "jffs2 tar.bz2" -include conf/machine/tune-ppc603e.conf +include conf/machine/include/tune-ppc603e.conf diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf index f3981ed4c5..ff899f44e1 100644 --- a/conf/machine/mainstone.conf +++ b/conf/machine/mainstone.conf @@ -9,9 +9,7 @@ IPKG_ARCHS = "all arm armv5te ${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel" - -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/nas100d.conf b/conf/machine/nas100d.conf index aa37f0920d..45df317bac 100644 --- a/conf/machine/nas100d.conf +++ b/conf/machine/nas100d.conf @@ -135,12 +135,12 @@ USE_VT = "0" #------------------------------------------------------------------------------- # Package versions #------------------------------------------------------------------------------- -CVSDATE_gnu-config ?= "20050713" -CVSDATE_gnu-config-native ?= "20050713" -CVSDATE_ipkg-utils ?= "20050713" -CVSDATE_ipkg-utils-native ?= "20050713" -CVSDATE_ipkg-link ?= "20050713" -CVSDATE_irssi ?= "20050930" +SRCDATE_gnu-config ?= "20050713" +SRCDATE_gnu-config-native ?= "20050713" +SRCDATE_ipkg-utils ?= "20050713" +SRCDATE_ipkg-utils-native ?= "20050713" +SRCDATE_ipkg-link ?= "20050713" +SRCDATE_irssi ?= "20050930" CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/" INHERIT += "nslu2-mirrors" diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf index 30223a485d..abcf9d2de7 100644 --- a/conf/machine/netvista.conf +++ b/conf/machine/netvista.conf @@ -6,7 +6,6 @@ TARGET_ARCH = "i386" IPKG_ARCHS = "all i386" PREFERRED_PROVIDER_xserver = "xserver-xorg" PREFERRED_PROVIDER_virtual/kernel = "linux-netvista" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils module-init-tools strace" BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils" #BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules" #IMAGE_FSTYPE = "cramfs" @@ -20,7 +19,6 @@ GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser abiword" GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser abiword" -#BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev module-init-tools strace" #BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules strace #udevdir = "/dev" diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index 9f49f24563..7b9a24ba0c 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -15,7 +15,7 @@ GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser tscalib" GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser tscalib" # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/tune-arm926ejs.conf +include conf/machine/include/tune-arm926ejs.conf #size of the root partition (yes, it is 123 MB) @@ -30,9 +30,6 @@ SERIAL_CONSOLE = "115200 ttyS0" #build omap1 till nokia releases the patches PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel sysfsutils nokia770-init \ -pcmcia-cs apmd ppp wireless-tools console-tools openswan wpa-supplicant-nossl lrzsz ppp-dialin" - BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils nokia770-init \ pcmcia-cs apm ppp wireless-tools console-tools" @@ -56,5 +53,5 @@ pcmcia-cs apm ppp wireless-tools console-tools" ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " -include conf/machine/handheld-common.conf +include conf/machine/include/handheld-common.conf diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index 1f70d9923b..8c4e253407 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -141,10 +141,10 @@ USE_VT = "0" #------------------------------------------------------------------------------- # Package versions #------------------------------------------------------------------------------- -CVSDATE_ipkg-utils ?= "20060106" -CVSDATE_ipkg-utils-native ?= "20060106" -CVSDATE_ipkg-link ?= "20060106" -CVSDATE_irssi ?= "20050930" +SRCDATE_ipkg-utils ?= "20060106" +SRCDATE_ipkg-utils-native ?= "20060106" +SRCDATE_ipkg-link ?= "20060106" +SRCDATE_irssi ?= "20050930" CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/" INHERIT += "nslu2-mirrors" diff --git a/conf/machine/omap1510inn.conf b/conf/machine/omap1510inn.conf index 40aaa2917a..9c460b44b8 100644 --- a/conf/machine/omap1510inn.conf +++ b/conf/machine/omap1510inn.conf @@ -9,10 +9,9 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel modutils-collateral" BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -include conf/machine/tune-arm926ejs.conf +include conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/omap1610h2.conf b/conf/machine/omap1610h2.conf index 40aaa2917a..9c460b44b8 100644 --- a/conf/machine/omap1610h2.conf +++ b/conf/machine/omap1610h2.conf @@ -9,10 +9,9 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel modutils-collateral" BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -include conf/machine/tune-arm926ejs.conf +include conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/omap1710h3.conf b/conf/machine/omap1710h3.conf index 40aaa2917a..9c460b44b8 100644 --- a/conf/machine/omap1710h3.conf +++ b/conf/machine/omap1710h3.conf @@ -9,10 +9,9 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel modutils-collateral" BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -include conf/machine/tune-arm926ejs.conf +include conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/omap2420h4.conf b/conf/machine/omap2420h4.conf index 2e81beb306..db333b2e19 100644 --- a/conf/machine/omap2420h4.conf +++ b/conf/machine/omap2420h4.conf @@ -9,10 +9,9 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel modutils-collateral" BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -include conf/machine/tune-arm926ejs.conf +include conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index de21822b15..822d766a98 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -9,7 +9,6 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel modutils-collateral" BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" @@ -31,4 +30,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-cfbfillrect kernel-module-omapfb kern # DSP Interface BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-dsp" -include conf/machine/tune-arm926ejs.conf +include conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index 8b33912835..a1bf5fbec3 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -6,20 +6,20 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv4 armv5te poodle" KERNEL_VERSION ?= "2.4" -include conf/machine/poodle-${KERNEL_VERSION}.conf +include conf/machine/include/poodle-${KERNEL_VERSION}.conf EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}" -BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater" +EXTRA_IMAGEDEPENDS += "zaurus-updater" -include conf/machine/handheld-common.conf +include conf/machine/include/handheld-common.conf ROOT_FLASH_SIZE = "22" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index 56cc2c0852..30444c1533 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -17,11 +17,6 @@ PREFERRED_PROVIDERS_kernel26 += "virtual/${TARGET_PREFIX}depmod-2.6:module-init- # Later versions are broken on kernel 2.4 PREFERRED_VERSION_orinoco-modules_kernel24 = "0.13e" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules" -BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 += "pcmcia-cs apmd hostap-utils \ -wpa-supplicant-nossl" -BOOTSTRAP_EXTRA_DEPENDS_append_kernel26 += "udev module-init-tools" - BOOTSTRAP_EXTRA_RDEPENDS = "kernel" BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 += "udev module-init-tools" BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 += "hostap-modules orinoco-modules \ @@ -32,7 +27,6 @@ kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \ kernel-module-pcnet-cs kernel-module-8390" # This is needed for the ramdisk script to work -BOOTSTRAP_EXTRA_DEPENDS += "e2fsprogs" BOOTSTRAP_EXTRA_RDEPENDS += "e2fsprogs-mke2fs" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n" @@ -46,6 +40,6 @@ USE_VT = "0" GPE_EXTRA_DEPENDS += "gaim sylpheed suspend-desktop" GPE_EXTRA_INSTALL += "gaim sylpheed suspend-desktop" -include conf/machine/handheld-common.conf -include conf/machine/tune-strongarm.conf +include conf/machine/include/handheld-common.conf +include conf/machine/include/tune-strongarm.conf diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 2b22680554..e1cb468d8f 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -4,15 +4,13 @@ KERNEL_VERSION ?= "2.6" -include conf/machine/zaurus-clamshell.conf -include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf +include conf/machine/include/zaurus-clamshell.conf +include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf -PIVOTBOOT_EXTRA_DEPENDS += "pivotinit pcmcia-cs" PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs" PIVOTBOOT_EXTRA_RRECOMMENDS += "" # Useful things for the built-in Harddisk -BOOTSTRAP_EXTRA_DEPENDS += "hdparm e2fsprogs" BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs" IMAGE_FSTYPES = "jffs2 tar.gz" @@ -20,4 +18,3 @@ IMAGE_FSTYPES = "jffs2 tar.gz" ROOT_FLASH_SIZE = "100" # actually that should really read ROOTFS_SIZE = "100", because with modern kernels, # we boot from the built-in harddisk in C3000. ROOT_FLASH_SIZE is really 5 MegaByte - diff --git a/conf/machine/sun4cdm.conf b/conf/machine/sun4cdm.conf index ee3f34dc34..d73ab85f87 100644 --- a/conf/machine/sun4cdm.conf +++ b/conf/machine/sun4cdm.conf @@ -2,7 +2,6 @@ TARGET_ARCH = "sparc" IMAGE_FSTYPE = "cramfs" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel module-init-tools udev" BOOTSTRAP_EXTRA_RDEPENDS = "kernel module-init-tools udev" udevdir = "/dev" diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index 20cf6946ae..a4bdba8675 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -6,21 +6,21 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv4 armv5te tosa" KERNEL_VERSION ?= "2.4" -include conf/machine/tosa-${KERNEL_VERSION}.conf +include conf/machine/include/tosa-${KERNEL_VERSION}.conf EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" -BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater" +EXTRA_IMAGEDEPENDS += "zaurus-updater" GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_DEPENDS += "gaim" ROOT_FLASH_SIZE = "28" -include conf/machine/handheld-common.conf +include conf/machine/include/handheld-common.conf # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/triton.conf b/conf/machine/triton.conf index aea420907f..cb5c8fb9cd 100644 --- a/conf/machine/triton.conf +++ b/conf/machine/triton.conf @@ -6,7 +6,6 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv5te ${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "triton-kernel" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel" BOOTSTRAP_EXTRA_RDEPENDS = "virtual/kernel" EXTRA_IMAGECMD_jffs2 = "--pad=0x1dc0000 --little-endian --eraseblock=0x40000 -n" @@ -15,5 +14,5 @@ SERIAL_CONSOLE = "38400 ttyS0" KERNEL_CONSOLE = "ttys0,38400" USE_VT = "0" -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf diff --git a/conf/machine/wrt54.conf b/conf/machine/wrt54.conf index 2d6e0f9d17..569d78b5a0 100644 --- a/conf/machine/wrt54.conf +++ b/conf/machine/wrt54.conf @@ -8,7 +8,8 @@ IPKG_ARCHS = "all mipsel ${MACHINE}" SERIAL_CONSOLE = "tts/0" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel wrt-utils wrt-init loader" +#FIXME loader should perhaps be an EXTRA_IMAGEDEPENDS? +#BOOTSTRAP_EXTRA_DEPENDS += "loader" BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wl kernel-module-et kernel-module-wlcompat kernel-module-diag" BOOTSTRAP_EXTRA_RDEPENDS += "wrt-init wrt-utils" BOOTSTRAP_EXTRA_RRECOMMENDS += "" diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf index 4c5359e3c4..02583c9fae 100644 --- a/conf/machine/x86.conf +++ b/conf/machine/x86.conf @@ -6,7 +6,6 @@ TARGET_ARCH = "i386" # TARGET_VENDOR = "-oe" IPKG_ARCHS = "all i386 x86" PREFERRED_PROVIDER_virtual/kernel = "linux-x86" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev" BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" udevdir = "/dev" diff --git a/packages/alsa/alsa-utils_1.0.10.bb b/packages/alsa/alsa-utils_1.0.10.bb index 916afedd16..94e49ebf25 100644 --- a/packages/alsa/alsa-utils_1.0.10.bb +++ b/packages/alsa/alsa-utils_1.0.10.bb @@ -52,6 +52,4 @@ DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configura RDEPENDS_alsa-utils-aplay += "alsa-conf" RDEPENDS_alsa-utils-amixer += "alsa-conf" -# ALSA can be in kernel -RRECOMMENDS_alsa-utils += "${ALSA_PACKAGES}" ALLOW_EMPTY_alsa-utils = "1" diff --git a/packages/alsa/alsa-utils_1.0.8.bb b/packages/alsa/alsa-utils_1.0.8.bb index 8e8297c85b..0a93c32e3f 100644 --- a/packages/alsa/alsa-utils_1.0.8.bb +++ b/packages/alsa/alsa-utils_1.0.8.bb @@ -53,5 +53,4 @@ DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configura RDEPENDS_alsa-utils-aplay += "alsa-conf" RDEPENDS_alsa-utils-amixer += "alsa-conf" -RDEPENDS_alsa-utils += "${ALSA_PACKAGES}" ALLOW_EMPTY_alsa-utils = "1" diff --git a/packages/at76c503a/at76c503a-modules_cvs.bb b/packages/at76c503a/at76c503a-modules_cvs.bb index 1c8f1faa9c..7422cc610c 100644 --- a/packages/at76c503a/at76c503a-modules_cvs.bb +++ b/packages/at76c503a/at76c503a-modules_cvs.bb @@ -4,7 +4,7 @@ SRC_URI = "cvs://anonymous@cvs.berlios.de/cvsroot/at76c503a;module=at76c503a \ file://makefile.cc.patch;patch=1" S = "${WORKDIR}/at76c503a" PR = "r4" -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" inherit module diff --git a/packages/avahi/avahi_0.6.3.bb b/packages/avahi/avahi_0.6.3.bb new file mode 100644 index 0000000000..fbd7208d1d --- /dev/null +++ b/packages/avahi/avahi_0.6.3.bb @@ -0,0 +1,52 @@ +DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS" +HOMEPAGE = "http://avahi.org" +LICENSE= "GPL" +DEPENDS = "expat libdaemon dbus-0.60" +RRECOMMENDS = "libnss-mdns" +SECTION = "net" +PRIORITY = "optional" +PR = "r0" + +SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz" + +PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc avahi-utils" + +FILES_libavahi-common = "${libdir}/libavahi-common.so.*" +FILES_libavahi-core= "${libdir}/libavahi-core.so.*" +FILES_avahi-daemon = "${sbindir}/avahi-daemon \ + ${sysconfdir}/avahi/avahi-daemon.conf \ + ${sysconfdir}/avahi/services \ + ${sysconfdir}/dbus-1 \ + ${sysconfdir}/init.d/avahi-daemon \ + ${datadir}/avahi/introspection/*.introspect \ + ${datadir}/avahi/avahi-service.dtd \ + ${datadir}/avahi/service-types" +FILES_libavahi-client = "${libdir}/libavahi-client.so.*" +FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ + ${sysconfdir}/avahi/avahi-dnsconfd.action \ + ${sysconfdir}/init.d/avahi-dnsconfd" +FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" +FILES_avahi-utils = "${bindir}/avahi-*" + +CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" + +EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python" +inherit autotools +inherit update-rc.d + +INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" +INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" +INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" +INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" +INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" + +pkg_postinst_avahi-daemon () { + grep avahi /etc/group || addgroup avahi + grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi + /etc/init.d/dbus-1 force-reload +} + +pkg_postrm_avahi-daemon () { + deluser avahi || true + delgroup avahi || true +} diff --git a/packages/avetanabt/avetanabt_cvs.bb b/packages/avetanabt/avetanabt_cvs.bb index 2d9c0040ed..baf2b70a8c 100644 --- a/packages/avetanabt/avetanabt_cvs.bb +++ b/packages/avetanabt/avetanabt_cvs.bb @@ -6,7 +6,7 @@ MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>" LICENSE = "GPL" HOMEPAGE = "http://sourceforge.net/projects/avetanabt/" -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" PR = "r3" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/avetanabt;module=avetanabt \ @@ -32,7 +32,7 @@ do_compile() { # create own version.xml (add version information available at runtime) ${STAGING_BINDIR}/head -n 4 version.xml >> build/version.xml - ${STAGING_BINDIR}/echo " <build value=\"cvs${CVSDATE}\" date=\"${CVSDATE}\" time=\"${@time.strftime('%H:%M',time.gmtime())}\"/>" >> build/version.xml + ${STAGING_BINDIR}/echo " <build value=\"cvs${SRCDATE}\" date=\"${SRCDATE}\" time=\"${@time.strftime('%H:%M',time.gmtime())}\"/>" >> build/version.xml ${STAGING_BINDIR}/tail -n 3 version.xml >> build/version.xml # move classes into jar archive diff --git a/packages/binutils/binutils_cvs.bb b/packages/binutils/binutils_cvs.bb index f295795554..e870c8f0b5 100644 --- a/packages/binutils/binutils_cvs.bb +++ b/packages/binutils/binutils_cvs.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/" LICENSE = "GPL" MAINTAINER = "Gerald Britton <gbritton@doomcom.org>" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs" -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" PR = "r2" PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks" diff --git a/packages/bitbake/bitbake_svn.bb b/packages/bitbake/bitbake_svn.bb index 47056eaee9..a4ff2ae540 100644 --- a/packages/bitbake/bitbake_svn.bb +++ b/packages/bitbake/bitbake_svn.bb @@ -6,7 +6,7 @@ DEFAULT_PREFERENCE = "-1" # We don't need a toolchain... INHIBIT_DEFAULT_DEPS = "1" -PV = "0.0svn${CVSDATE}" +PV = "0.0+svn${SRCDATE}" SRC_URI = "svn://svn.berlios.de/bitbake/trunk;module=bitbake" # SRC_URI = "svn+ssh://svn.berlios.de/bitbake/trunk;module=bitbake" S = "${WORKDIR}/bitbake" diff --git a/packages/bl/bl_cvs.bb b/packages/bl/bl_cvs.bb index c0f206225a..a207702eba 100644 --- a/packages/bl/bl_cvs.bb +++ b/packages/bl/bl_cvs.bb @@ -1,6 +1,6 @@ SECTION = "base" LICENSE= "GPL" -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" DESCRIPTION = "Command line tool for iPaq backlight control" MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" diff --git a/packages/cairo/cairo_cvs.bb b/packages/cairo/cairo_cvs.bb index fc37ec5673..1a53d5a03a 100644 --- a/packages/cairo/cairo_cvs.bb +++ b/packages/cairo/cairo_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@debian.org>" diff --git a/packages/cairo/libsvg-cairo_20050601.bb b/packages/cairo/libsvg-cairo_20050601.bb index f04af713f2..eddc886571 100644 --- a/packages/cairo/libsvg-cairo_20050601.bb +++ b/packages/cairo/libsvg-cairo_20050601.bb @@ -1,5 +1,5 @@ -PV = "0.0cvs${FIXEDCVSDATE}" -FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +PV = "0.0+cvs${FIXEDSRCDATE}" +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" SECTION = "libs" LICENSE = "LGPL" @@ -8,7 +8,7 @@ MAINTAINER = "Phil Blundell <pb@debian.org>" DEPENDS = "libsvg cairo" DESCRIPTION = "SVG rendering library" DEFAULT_PREFERENCE = "1" -SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libsvg-cairo;date=${FIXEDCVSDATE}" +SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libsvg-cairo;date=${FIXEDSRCDATE}" S = "${WORKDIR}/libsvg-cairo" inherit autotools pkgconfig diff --git a/packages/cairo/libsvg-cairo_cvs.bb b/packages/cairo/libsvg-cairo_cvs.bb index 47c255c07c..4cbebadc56 100644 --- a/packages/cairo/libsvg-cairo_cvs.bb +++ b/packages/cairo/libsvg-cairo_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" SECTION = "libs" LICENSE = "LGPL" PRIORITY = "optional" diff --git a/packages/cairo/libsvg_cvs.bb b/packages/cairo/libsvg_cvs.bb index 8cdb7a96c2..9ce7d7af08 100644 --- a/packages/cairo/libsvg_cvs.bb +++ b/packages/cairo/libsvg_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@debian.org>" diff --git a/packages/cairo/xsvg_cvs.bb b/packages/cairo/xsvg_cvs.bb index e17c930d88..89677d01fc 100644 --- a/packages/cairo/xsvg_cvs.bb +++ b/packages/cairo/xsvg_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT-X" SECTION = "libs" PRIORITY = "optional" diff --git a/packages/clucene/clucene_0.8.12-pre.bb b/packages/clucene/clucene_0.8.12-pre.bb index 83cbd68f25..ab0328b9a3 100644 --- a/packages/clucene/clucene_0.8.12-pre.bb +++ b/packages/clucene/clucene_0.8.12-pre.bb @@ -2,7 +2,7 @@ DESCRIPTION = "CLucene is a C++ port of Lucene: the high-performance, full-featu SECTION = "libs" LICENSE = "LGPL" PRIORITY = "optional" -CVSDATE = "20040704" +SRCDATE = "20040704" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/clucene;module=. \ file://compile-fix.patch;patch=1" S = "${WORKDIR}" diff --git a/packages/compositeext/compositeext_cvs.bb b/packages/compositeext/compositeext_cvs.bb index 4b01bcfef0..75317fabcd 100644 --- a/packages/compositeext/compositeext_cvs.bb +++ b/packages/compositeext/compositeext_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" SECTION = "libs" MAINTAINER = "Greg Gilbert <greg@treke.net>" diff --git a/packages/corsair/corsair_0.2.0.bb b/packages/corsair/corsair_0.2.0.bb index 2c5ce53433..2b6bfe0f9c 100644 --- a/packages/corsair/corsair_0.2.0.bb +++ b/packages/corsair/corsair_0.2.0.bb @@ -9,7 +9,7 @@ RDEPENDS = "opie-pics" PV = "0.2.0" PR = "r4" -CVSDATE = "20050911" +SRCDATE = "20050911" #application was released 20050910 - next versions will be released as tarballs #corsair-024.patch from 'mistermix' http://www.oesf.org/forums/index.php?showtopic=14661 diff --git a/packages/cumulus/cumulus_cvs.bb b/packages/cumulus/cumulus_cvs.bb index b98a1a9506..ff58977b11 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" PR = "r0" SRC_URI = "http://www.kflog.org/fileadmin/user_upload/cumulus_snapshots/cumulus-snapshot.tbz" diff --git a/packages/damageext/damageext_cvs.bb b/packages/damageext/damageext_cvs.bb index 6c68c457c8..1489e5355b 100644 --- a/packages/damageext/damageext_cvs.bb +++ b/packages/damageext/damageext_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT-X" SECTION = "libs" MAINTAINER = "Greg Gilbert <greg@treke.net>" diff --git a/packages/dri/drm-kernel_cvs.bb b/packages/dri/drm-kernel_cvs.bb index 21728774f5..a454617fc8 100644 --- a/packages/dri/drm-kernel_cvs.bb +++ b/packages/dri/drm-kernel_cvs.bb @@ -7,7 +7,7 @@ SRC_URI = "cvs://anoncvs@dri.freedesktop.org/cvs/dri;module=drm;method=pserver \ inherit module-base -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" S = "${WORKDIR}/drm" do_compile() { @@ -21,6 +21,8 @@ do_install() { for i in *.ko; do install -m 0644 $i ${D}${base_libdir}/modules/${KERNEL_VERSION}/drm/; done } +PACKAGES_DYNAMIC = "drm-module-*" + python populate_packages_prepend () { root = bb.data.expand('/lib/modules/${KERNEL_VERSION}/drm', d) diff --git a/packages/dri/drm_cvs.bb b/packages/dri/drm_cvs.bb index 1ee545a698..c7eaba02b9 100644 --- a/packages/dri/drm_cvs.bb +++ b/packages/dri/drm_cvs.bb @@ -2,7 +2,7 @@ SECTION = "x11/base" LICENSE = "MIT" SRC_URI = "cvs://anoncvs@dri.freedesktop.org/cvs/dri;module=drm;method=pserver" -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" PR = "r2" S = "${WORKDIR}/drm" diff --git a/packages/dvbtools/dvbstream_cvs.bb b/packages/dvbtools/dvbstream_cvs.bb index f25ec23652..0a468669a8 100644 --- a/packages/dvbtools/dvbstream_cvs.bb +++ b/packages/dvbtools/dvbstream_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" SECTION = "console/multimedia" PRIORITY = "optional" LICENSE = "GPLV2" diff --git a/packages/dvbtools/dvbtune_cvs.bb b/packages/dvbtools/dvbtune_cvs.bb index 76052c66ab..c770aa1305 100644 --- a/packages/dvbtools/dvbtune_cvs.bb +++ b/packages/dvbtools/dvbtune_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" SECTION = "console/multimedia" PRIORITY = "optional" LICENSE = "GPLv2" diff --git a/packages/e17/e-iconbar_20050926.bb b/packages/e17/e-iconbar_20050926.bb index f0ca322f96..ad9f004a8b 100644 --- a/packages/e17/e-iconbar_20050926.bb +++ b/packages/e17/e-iconbar_20050926.bb @@ -3,7 +3,7 @@ DEPENDS = "edb eet evas-x11 ecore-x11 edje esmart-x11 imlib2-x11" LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" -CVSDATE = "${PV}" +SRCDATE = "${PV}" PR = "r1" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/iconbar" diff --git a/packages/e17/e-modules_20050926.bb b/packages/e17/e-modules_20050926.bb index da6fd1f1a8..f6699b887b 100644 --- a/packages/e17/e-modules_20050926.bb +++ b/packages/e17/e-modules_20050926.bb @@ -3,7 +3,7 @@ DEPENDS = "ecore-x11 evas-x11 esmart-x11 edje eet e" LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" -CVSDATE = "${PV}" +SRCDATE = "${PV}" PR = "r1" inherit autotools diff --git a/packages/e17/e-utils_20051009.bb b/packages/e17/e-utils_20051009.bb index 4d0ba6fa73..6f1260f8fe 100644 --- a/packages/e17/e-utils_20051009.bb +++ b/packages/e17/e-utils_20051009.bb @@ -3,7 +3,7 @@ DEPENDS = "virtual/ecore virtual/evas virtual/esmart edje eet ewl engrave virtua LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" -CVSDATE = "${PV}" +SRCDATE = "${PV}" PR = "r1" inherit autotools diff --git a/packages/e17/e-wm_0.16.999.018.bb b/packages/e17/e-wm_0.16.999.018.bb index c39b2ab9e1..25915b2872 100644 --- a/packages/e17/e-wm_0.16.999.018.bb +++ b/packages/e17/e-wm_0.16.999.018.bb @@ -3,7 +3,7 @@ DEPENDS = "evas-x11 ecore-x11 edje eet embryo e" LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" -CVSDATE = "${PV}" +SRCDATE = "${PV}" PR = "r3" SRC_URI = "http://enlightenment.freedesktop.org/files/enlightenment-${PV}.tar.gz \ diff --git a/packages/e17/e-wm_20050926.bb b/packages/e17/e-wm_20050926.bb index 4f53a6e990..5fec497c4f 100644 --- a/packages/e17/e-wm_20050926.bb +++ b/packages/e17/e-wm_20050926.bb @@ -3,7 +3,7 @@ DEPENDS = "evas-x11 ecore-x11 edje eet embryo e" LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" -CVSDATE = "${PV}" +SRCDATE = "${PV}" PR = "r3" DEFAULT_PREFERENCE = "-1" diff --git a/packages/e17/eclair_20050926.bb b/packages/e17/eclair_20050926.bb index 7138f06f88..0a4b78d397 100644 --- a/packages/e17/eclair_20050926.bb +++ b/packages/e17/eclair_20050926.bb @@ -4,7 +4,7 @@ DEPENDS = "evas-x11 ecore-x11 embryo imlib2-x11 edje-native edje libxine-x11 emo LICENSE = "MIT" HOMEPAGE = "http://www.enlightenment.org" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" -CVSDATE = "${PV}" +SRCDATE = "${PV}" PR = "r1" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/eclair" diff --git a/packages/e17/entice_20050926.bb b/packages/e17/entice_20050926.bb index 364e65cbbf..44f668de1e 100644 --- a/packages/e17/entice_20050926.bb +++ b/packages/e17/entice_20050926.bb @@ -5,7 +5,7 @@ DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11" LICENSE = "MIT" HOMEPAGE = "http://www.enlightenment.org" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" -CVSDATE = "${PV}" +SRCDATE = "${PV}" PR = "r1" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entice" diff --git a/packages/e17/entrance_20050926.bb b/packages/e17/entrance_20050926.bb index 1c27111f49..9599c9fcac 100644 --- a/packages/e17/entrance_20050926.bb +++ b/packages/e17/entrance_20050926.bb @@ -6,7 +6,7 @@ DEPENDS = "edb edb-native evas-x11 ecore-x11 edje esmart-x11 bash keylaunch dete RDEPENDS += "bash keylaunch detect-stylus xserver-common glibc-gconv-iso8859-1" HOMEPAGE = "http://www.enlightenment.org" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" -CVSDATE = "${PV}" +SRCDATE = "${PV}" PR = "r9" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entrance \ diff --git a/packages/e17/evidence_20050926.bb b/packages/e17/evidence_20050926.bb index 0950b590c6..f27f8f1076 100644 --- a/packages/e17/evidence_20050926.bb +++ b/packages/e17/evidence_20050926.bb @@ -6,7 +6,7 @@ MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" DEPENDS = "pkgconfig gtk+ glib-2.0 ecore-x11 evas-x11 edb eet edje imlib2-x11 libpng epeg jpeg pcre curl taglib libvorbis libogg libxine-x11 emotion freetype" RDEPENDS += "examine" PR = "r0" -CVSDATE = "${PV}" +SRCDATE = "${PV}" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/evidence;module=evidence" S = "${WORKDIR}/evidence" diff --git a/packages/e17/examine_20050926.bb b/packages/e17/examine_20050926.bb index 244bf2bcaf..3a78a961a4 100644 --- a/packages/e17/examine_20050926.bb +++ b/packages/e17/examine_20050926.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" PR = "r0" -CVSDATE = "${PV}" +SRCDATE = "${PV}" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/examine" S = "${WORKDIR}/examine" diff --git a/packages/efl/e_0.16.999.018.bb b/packages/efl/e_0.16.999.018.bb index 49b1b0b6bd..35bb776269 100644 --- a/packages/efl/e_0.16.999.018.bb +++ b/packages/efl/e_0.16.999.018.bb @@ -1,7 +1,6 @@ DESCRIPTION = "Enlightenment Window Mananger Library" DEPENDS = "virtual/evas virtual/ecore edje eet embryo" LICENSE = "MIT" -CVSDATE = "${PV}" PR = "r1" inherit efl diff --git a/packages/efl/e_20050926.bb b/packages/efl/e_20050926.bb index eb2282c06b..e9efc5123e 100644 --- a/packages/efl/e_20050926.bb +++ b/packages/efl/e_20050926.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Enlightenment Window Mananger Library" DEPENDS = "virtual/evas virtual/ecore edje eet embryo" LICENSE = "MIT" -CVSDATE = "${PV}" +SRCDATE = "${PV}" PR = "r1" inherit efl diff --git a/packages/esound/esound-gpe_20020817.bb b/packages/esound/esound-gpe_20020817.bb index b8b3a7e5f2..1b98a1291e 100644 --- a/packages/esound/esound-gpe_20020817.bb +++ b/packages/esound/esound-gpe_20020817.bb @@ -6,7 +6,7 @@ PR = "r4" PROVIDES += "esound" RPROVIDES += "esound" -CVSDATE = "${PV}" +SRCDATE = "${PV}" SRC_URI = "${HANDHELDS_CVS};module=gpe/base/esound \ file://audiofile-please.patch;patch=1 \ file://configure.patch;patch=1" diff --git a/packages/fdclock/fdclock_cvs.bb b/packages/fdclock/fdclock_cvs.bb index adf7f965d6..2c37fb67b0 100644 --- a/packages/fdclock/fdclock_cvs.bb +++ b/packages/fdclock/fdclock_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "BSD-X" SECTION = "x11" PRIORITY = "optional" diff --git a/packages/ffmpeg/ffmpeg_cvs.bb b/packages/ffmpeg/ffmpeg_cvs.bb index 5896fb2752..3973ce0f48 100644 --- a/packages/ffmpeg/ffmpeg_cvs.bb +++ b/packages/ffmpeg/ffmpeg_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.4.9-pre1+cvs-${CVSDATE}" +PV = "0.4.9-pre1+cvs${SRCDATE}" DESCRIPTION = "ffmpeg" SECTION = "libs" PRIORITY = "optional" diff --git a/packages/fixesext/fixesext_cvs.bb b/packages/fixesext/fixesext_cvs.bb index 887ae2a138..c279256fa2 100644 --- a/packages/fixesext/fixesext_cvs.bb +++ b/packages/fixesext/fixesext_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" SECTION = "libs" MAINTAINER = "Greg Gilbert <greg@treke.net>" diff --git a/packages/fontconfig/fontconfig_2.2.95.bb b/packages/fontconfig/fontconfig_2.2.95.bb index 6989b7a053..7b2237ae5d 100644 --- a/packages/fontconfig/fontconfig_2.2.95.bb +++ b/packages/fontconfig/fontconfig_2.2.95.bb @@ -7,10 +7,11 @@ SRC_URI = "http://pdx.freedesktop.org/fontconfig/release/fontconfig-${PV}.tar.gz file://fc-glyphname.patch;patch=1 \ file://fc-lang.patch;patch=1 \ file://local.conf" -PR = "r1" +PR = "r2" -PACKAGES =+ "fontconfig-utils " +PACKAGES =+ "fontconfig-utils" FILES_fontconfig-utils = "${bindir}/*" +AUTO_LIBNAME_PKGS = "fontconfig-utils" S = "${WORKDIR}/fontconfig-${PV}" diff --git a/packages/frodo/frodo_4.2.bb b/packages/frodo/frodo_4.2.bb index a779cdcfbb..8158cb2d5b 100644 --- a/packages/frodo/frodo_4.2.bb +++ b/packages/frodo/frodo_4.2.bb @@ -3,7 +3,7 @@ SECTION = "opie/applications" PRIORITY = "optional" DEPENDS = "libsdl-qpe" LICENSE = "GPL" -CVSDATE = "20040801" +SRCDATE = "20040801" PR = "r1" SRC_URI = "cvs://anoncvs:anoncvs@down.physik.uni-mainz.de/cvs;module=Frodo4 \ diff --git a/packages/fs/fs_cvs.bb b/packages/fs/fs_cvs.bb index c3064b6616..282a96cbcd 100644 --- a/packages/fs/fs_cvs.bb +++ b/packages/fs/fs_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "BSD-X" SECTION = "libs" PRIORITY = "optional" diff --git a/packages/gaim/gaim.inc b/packages/gaim/gaim.inc index 4b5f22b515..83b03f8527 100644 --- a/packages/gaim/gaim.inc +++ b/packages/gaim/gaim.inc @@ -21,6 +21,8 @@ FILES_${PN}-dev += "${libdir}/gaim/*.la" inherit autotools gettext +PACKAGES_DYNAMIC = "gaim-protocol-*" + python populate_packages_prepend () { root = bb.data.expand('${libdir}/gaim', d) diff --git a/packages/gaim/gaim_2.0.0-cvs-mco1.bb b/packages/gaim/gaim_2.0.0-cvs-mco1.bb index 6b45a89461..7160d8120f 100644 --- a/packages/gaim/gaim_2.0.0-cvs-mco1.bb +++ b/packages/gaim/gaim_2.0.0-cvs-mco1.bb @@ -1,6 +1,6 @@ PR = "r3" -CVSDATE_${PN} = "20050904" -PV = "2.0.0-cvs-mco1-${CVSDATE}" +SRCDATE_${PN} = "20050904" +PV = "2.0.0+cvs${SRCDATE}-mco1" 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 cc77b41772..3daaf44c19 100644 --- a/packages/gaim/gaim_cvs.bb +++ b/packages/gaim/gaim_cvs.bb @@ -1,5 +1,5 @@ PR = "r0" -PV = "2.0+cvs-${CVSDATE}" +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/gammu/gammu_1.03.0.bb b/packages/gammu/gammu_1.03.0.bb index f68d308fc8..ac5ee676d5 100644 --- a/packages/gammu/gammu_1.03.0.bb +++ b/packages/gammu/gammu_1.03.0.bb @@ -69,6 +69,8 @@ PACKAGES =+ "libgammu" FILES_${PN} = "${bindir}/gammu" FILES_libgammu = "${libdir}/libGammu.so*" +PACKAGES_DYNAMIC = "gammu-locale-*" + python populate_packages_prepend () { help_dir = bb.data.expand('${datadir}/gammu/', d) diff --git a/packages/gcc/gcc_csl-arm-20050416.bb b/packages/gcc/gcc_csl-arm-20050416.bb index 87ac9840ce..58badbb8ab 100644 --- a/packages/gcc/gcc_csl-arm-20050416.bb +++ b/packages/gcc/gcc_csl-arm-20050416.bb @@ -4,7 +4,7 @@ SRC_URI += "file://15342.patch;patch=1 file://gcc-3.4.0-arm-lib1asm.patch;patch= PR = "r3" -CVSDATE = "20050416" +SRCDATE = "20050416" OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" DEFAULT_PREFERENCE_arm-linux = "-1" DEFAULT_PREFERENCE_arm-linuxeabi = "1" diff --git a/packages/gcc/gcc_csl-arm-20050603.bb b/packages/gcc/gcc_csl-arm-20050603.bb index 142a350a09..e322bba647 100644 --- a/packages/gcc/gcc_csl-arm-20050603.bb +++ b/packages/gcc/gcc_csl-arm-20050603.bb @@ -1,13 +1,13 @@ include gcc_csl-arm.bb -PV = "3.4.4+csl-arm-${CVSDATE}" +PV = "3.4.4+csl-arm-${SRCDATE}" BINV = "3.4.4" SRC_URI += "file://15342.patch;patch=1 file://gcc-3.4.0-arm-lib1asm.patch;patch=1 file://no-libfloat.patch;patch=1" PR = "r0" -CVSDATE = "20050603" +SRCDATE = "20050603" OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" DEFAULT_PREFERENCE_arm = "-1" diff --git a/packages/gcc/gcc_csl-arm.bb b/packages/gcc/gcc_csl-arm.bb index 7ac11c805d..03c6b8c19f 100644 --- a/packages/gcc/gcc_csl-arm.bb +++ b/packages/gcc/gcc_csl-arm.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" MAINTAINER = "Gerald Britton <gbritton@doomcom.org>" -PV = "3.4.3+csl-arm-${CVSDATE}" +PV = "3.4.3+csl-arm-${SRCDATE}" BINV = "3.4.3" FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm" DEFAULT_PREFERENCE = "-1" @@ -13,7 +13,7 @@ inherit autotools gettext include gcc-package.inc -SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/cvsroot/gcc;method=pserver;tag=csl-arm-branch;module=gcc;date=${CVSDATE} \ +SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/cvsroot/gcc;method=pserver;tag=csl-arm-branch;module=gcc;date=${SRCDATE} \ file://gcc34-arm-tune.patch;patch=1" include gcc3-build.inc diff --git a/packages/gchub/gchub-module_svn.bb b/packages/gchub/gchub-module_svn.bb index be8bd7a88c..fe951aaa4e 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 = "svn-${CVSDATE}" +PV = "0.0+svn${SRCDATE}" SRC_URI = "svn://svn.navi.cx/misc/trunk/wasabi/devices;module=gchub;proto=http" diff --git a/packages/genext2fs/genext2fs_1.3+cvs.bb b/packages/genext2fs/genext2fs_1.3+cvs.bb index 6a1fcf89af..90e7bda4f7 100644 --- a/packages/genext2fs/genext2fs_1.3+cvs.bb +++ b/packages/genext2fs/genext2fs_1.3+cvs.bb @@ -1,6 +1,6 @@ include genext2fs.inc -PV_append = "${CVSDATE}" +PV_append = "${SRCDATE}" PR = "r3" FILESPATH = "${FILE_DIRNAME}/genext2fs-1.3+cvs:${FILE_DIRNAME}/genext2fs:${FILE_DIRNAME}/files" SRC_URI = "cvs://anonymous:@cvs.sourceforge.net/cvsroot/genext2fs;module=genext2fs" diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index 053794ed7f..9a91e3ab24 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -95,6 +95,8 @@ mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/ rm -rf ${TMP_LOCALE} } +PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-*" + python package_do_split_gconvs () { import os, re if (bb.data.getVar('PACKAGE_NO_GCONV', d, 1) == '1'): diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index 5ee5583fc8..e7adcd0a39 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -6,7 +6,7 @@ PRIORITY = "required" MAINTAINER = "Phil Blundell <pb@handhelds.org>" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" -CVSDATE = "20050627" +SRCDATE = "20050627" PR = "r1" GLIBC_ADDONS ?= "ports,linuxthreads" diff --git a/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb index 99dd80b7ef..0390b87535 100644 --- a/packages/glibc/glibc_cvs.bb +++ b/packages/glibc/glibc_cvs.bb @@ -7,7 +7,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" PR = "r0" -PV = "2.3.5+cvs${CVSDATE}" +PV = "2.3.5+cvs${SRCDATE}" GLIBC_ADDONS ?= "ports,linuxthreads" GLIBC_EXTRA_OECONF ?= "" diff --git a/packages/gnome/gconf-dbus_cvs.bb b/packages/gnome/gconf-dbus_cvs.bb index cf326d255a..f8be0c4eee 100644 --- a/packages/gnome/gconf-dbus_cvs.bb +++ b/packages/gnome/gconf-dbus_cvs.bb @@ -7,7 +7,7 @@ PROVIDES = "gconf" RPROVIDES_${PN} = "gconf" RPROVIDES_${PN}-dev = "gconf-dev" -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" PR = "r8" SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gconf;tag=gconf-dbus-2-6 \ diff --git a/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb b/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb index fbec93c02b..4f2a861eb2 100644 --- a/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb +++ b/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb @@ -81,6 +81,8 @@ do_install() { oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install } +PACKAGES_DYNAMIC = "gnome=vfs-plugin-*" + python populate_packages_prepend () { print bb.data.getVar('FILES_gnome-vfs', d, 1) diff --git a/packages/gnome/gnome-vfs_2.12.0.bb b/packages/gnome/gnome-vfs_2.12.0.bb index bdc159302a..29f6723486 100644 --- a/packages/gnome/gnome-vfs_2.12.0.bb +++ b/packages/gnome/gnome-vfs_2.12.0.bb @@ -80,6 +80,8 @@ do_install() { oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install } +PACKAGES_DYNAMIC = "gnome-vfs-plugin-*" + python populate_packages_prepend () { print bb.data.getVar('FILES_gnome-vfs', d, 1) diff --git a/packages/gnome/gnome-vfs_2.6.2.bb b/packages/gnome/gnome-vfs_2.6.2.bb index 7bef148ff2..65973ab5f6 100644 --- a/packages/gnome/gnome-vfs_2.6.2.bb +++ b/packages/gnome/gnome-vfs_2.6.2.bb @@ -75,6 +75,8 @@ do_install() { oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install } +PACKAGES_DYNAMIC = "gnome-vfs-plugin-*" + python populate_packages_prepend () { print bb.data.getVar('FILES_gnome-vfs', d, 1) diff --git a/packages/gnome/goffice_0.0.1.bb b/packages/gnome/goffice_0.0.1.bb index fdf8bafaf4..eabe184e36 100644 --- a/packages/gnome/goffice_0.0.1.bb +++ b/packages/gnome/goffice_0.0.1.bb @@ -6,12 +6,12 @@ DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" inherit gnome pkgconfig - - do_stage() { gnome_stage_includes } +PACKAGES_DYNAMIC = "goffice-plugin-*" + python populate_packages_prepend () { goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) diff --git a/packages/gnome/goffice_0.0.2.bb b/packages/gnome/goffice_0.0.2.bb index db26a617a5..59372fa5ec 100644 --- a/packages/gnome/goffice_0.0.2.bb +++ b/packages/gnome/goffice_0.0.2.bb @@ -6,13 +6,13 @@ DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" inherit gnome pkgconfig - - do_stage() { gnome_stage_includes oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR} } +PACKAGES_DYNAMIC = "goffice-plugin-*" + python populate_packages_prepend () { goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) diff --git a/packages/gnome/goffice_0.0.3.bb b/packages/gnome/goffice_0.0.3.bb index db26a617a5..59372fa5ec 100644 --- a/packages/gnome/goffice_0.0.3.bb +++ b/packages/gnome/goffice_0.0.3.bb @@ -6,13 +6,13 @@ DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" inherit gnome pkgconfig - - do_stage() { gnome_stage_includes oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR} } +PACKAGES_DYNAMIC = "goffice-plugin-*" + python populate_packages_prepend () { goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) diff --git a/packages/gnome/goffice_0.0.4.bb b/packages/gnome/goffice_0.0.4.bb index db26a617a5..59372fa5ec 100644 --- a/packages/gnome/goffice_0.0.4.bb +++ b/packages/gnome/goffice_0.0.4.bb @@ -6,13 +6,13 @@ DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" inherit gnome pkgconfig - - do_stage() { gnome_stage_includes oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR} } +PACKAGES_DYNAMIC = "goffice-plugin-*" + python populate_packages_prepend () { goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) diff --git a/packages/gnome/goffice_0.1.0.bb b/packages/gnome/goffice_0.1.0.bb index db26a617a5..59372fa5ec 100644 --- a/packages/gnome/goffice_0.1.0.bb +++ b/packages/gnome/goffice_0.1.0.bb @@ -6,13 +6,13 @@ DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" inherit gnome pkgconfig - - do_stage() { gnome_stage_includes oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR} } +PACKAGES_DYNAMIC = "goffice-plugin-*" + python populate_packages_prepend () { goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) diff --git a/packages/gnome/goffice_0.1.2.bb b/packages/gnome/goffice_0.1.2.bb index db26a617a5..59372fa5ec 100644 --- a/packages/gnome/goffice_0.1.2.bb +++ b/packages/gnome/goffice_0.1.2.bb @@ -6,13 +6,13 @@ DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" inherit gnome pkgconfig - - do_stage() { gnome_stage_includes oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR} } +PACKAGES_DYNAMIC = "goffice-plugin-*" + python populate_packages_prepend () { goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) diff --git a/packages/gnu-config/gnu-config_20050701.bb b/packages/gnu-config/gnu-config_20050701.bb index 3100068738..2066014adf 100644 --- a/packages/gnu-config/gnu-config_20050701.bb +++ b/packages/gnu-config/gnu-config_20050701.bb @@ -4,11 +4,11 @@ LICENSE = "GPL" DEPENDS = "" INHIBIT_DEFAULT_DEPS = "1" -FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" -PV = "0.1cvs${FIXEDCVSDATE}" +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +PV = "0.1+cvs${FIXEDSRCDATE}" PR = "r4" -SRC_URI = "cvs://anonymous@cvs.sv.gnu.org/cvsroot/config;module=config;method=pserver;date=${FIXEDCVSDATE} \ +SRC_URI = "cvs://anonymous@cvs.sv.gnu.org/cvsroot/config;module=config;method=pserver;date=${FIXEDSRCDATE} \ file://config-guess-uclibc.patch;patch=1 \ file://gnu-configize.in" S = "${WORKDIR}/config" diff --git a/packages/gnumeric/gnumeric_1.3.1.bb b/packages/gnumeric/gnumeric_1.3.1.bb index 164982aec3..299c36cbb2 100644 --- a/packages/gnumeric/gnumeric_1.3.1.bb +++ b/packages/gnumeric/gnumeric_1.3.1.bb @@ -11,6 +11,8 @@ SRC_URI += 'file://workbook-control-gui-priv.h.patch;patch=1' EXTRA_OEMAKE_prepend = ' ORBIT_IDL=`which orbit-idl-2` ' +PACKAGES_DYNAMIC = "gnumeric-plugin-*" + python populate_packages_prepend () { gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) diff --git a/packages/gnumeric/gnumeric_1.3.1.cvs.bb b/packages/gnumeric/gnumeric_1.3.1.cvs.bb index 10590efcac..6bbbf645c4 100644 --- a/packages/gnumeric/gnumeric_1.3.1.cvs.bb +++ b/packages/gnumeric/gnumeric_1.3.1.cvs.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" SECTION = "x11/utils" -#CVSDATE="20040719" +#SRCDATE="20040719" CVSTAG="GNUMERIC_1_3_1" DEFAULT_PREFERENCE = "-1" diff --git a/packages/gnumeric/gnumeric_1.5.3.bb b/packages/gnumeric/gnumeric_1.5.3.bb index 07960b1277..c3a594a391 100644 --- a/packages/gnumeric/gnumeric_1.5.3.bb +++ b/packages/gnumeric/gnumeric_1.5.3.bb @@ -11,6 +11,8 @@ SRC_URI += "file://remove-docs.patch;patch=1" EXTRA_OECONF=" --without-perl " +PACKAGES_DYNAMIC = "gnumeric-plugin-*" + python populate_packages_prepend () { gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) diff --git a/packages/gnumeric/gnumeric_1.5.5.bb b/packages/gnumeric/gnumeric_1.5.5.bb index 07960b1277..c3a594a391 100644 --- a/packages/gnumeric/gnumeric_1.5.5.bb +++ b/packages/gnumeric/gnumeric_1.5.5.bb @@ -11,6 +11,8 @@ SRC_URI += "file://remove-docs.patch;patch=1" EXTRA_OECONF=" --without-perl " +PACKAGES_DYNAMIC = "gnumeric-plugin-*" + python populate_packages_prepend () { gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) diff --git a/packages/gnumeric/gnumeric_1.5.90.bb b/packages/gnumeric/gnumeric_1.5.90.bb index 3f19f36757..18ab5472a4 100644 --- a/packages/gnumeric/gnumeric_1.5.90.bb +++ b/packages/gnumeric/gnumeric_1.5.90.bb @@ -11,6 +11,8 @@ SRC_URI += "file://remove-docs.patch;patch=1" EXTRA_OECONF=" --without-perl " +PACKAGES_DYNAMIC = "gnumeric-plugin-*" + python populate_packages_prepend () { gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) diff --git a/packages/gnumeric/gnumeric_1.6.0.bb b/packages/gnumeric/gnumeric_1.6.0.bb index 3f19f36757..18ab5472a4 100644 --- a/packages/gnumeric/gnumeric_1.6.0.bb +++ b/packages/gnumeric/gnumeric_1.6.0.bb @@ -11,6 +11,8 @@ SRC_URI += "file://remove-docs.patch;patch=1" EXTRA_OECONF=" --without-perl " +PACKAGES_DYNAMIC = "gnumeric-plugin-*" + python populate_packages_prepend () { gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) diff --git a/packages/gnumeric/gnumeric_1.6.1.bb b/packages/gnumeric/gnumeric_1.6.1.bb index 3f19f36757..18ab5472a4 100644 --- a/packages/gnumeric/gnumeric_1.6.1.bb +++ b/packages/gnumeric/gnumeric_1.6.1.bb @@ -11,6 +11,8 @@ SRC_URI += "file://remove-docs.patch;patch=1" EXTRA_OECONF=" --without-perl " +PACKAGES_DYNAMIC = "gnumeric-plugin-*" + python populate_packages_prepend () { gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) diff --git a/packages/gomunicator/gomunicator_cvs.bb b/packages/gomunicator/gomunicator_cvs.bb index 312b9fbd56..3c3f9352c7 100644 --- a/packages/gomunicator/gomunicator_cvs.bb +++ b/packages/gomunicator/gomunicator_cvs.bb @@ -1,13 +1,13 @@ DESCRIPTION = "Gomunicator is a GSM Voice and SMS application for GPE" -HOMEPAGE = "http://www.linuxdevelopment.org/projects.html" -LICENSE = "GPLv2" -AUTHOR = "Robert Woerle" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" -DEPENDS = "libgpewidget gtk+ glib-2.0" -PV = "0.1.3+cvs-${CVSDATE}" +HOMEPAGE = "http://www.linuxdevelopment.org/projects.html" +LICENSE = "GPLv2" +AUTHOR = "Robert Woerle" +MAINTAINER = "Koen Kooi <koen@handhelds.org>" +DEPENDS = "libgpewidget gtk+ glib-2.0" +PV = "0.1.3+cvs${SRCDATE}" inherit autotools pkgconfig -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/xanadux;module=gomunicator" -S = "${WORKDIR}/${PN}" +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/xanadux;module=gomunicator" +S = "${WORKDIR}/${PN}" diff --git a/packages/gpe-beam/gpe-beam_0.2.8.bb b/packages/gpe-beam/gpe-beam_0.2.8.bb index b8e69d6b11..4047f6e7a9 100644 --- a/packages/gpe-beam/gpe-beam_0.2.8.bb +++ b/packages/gpe-beam/gpe-beam_0.2.8.bb @@ -4,7 +4,7 @@ inherit gpe DESCRIPTION = "GPE infrared communication applet" DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus" -RDEPENDS = "libopenobex-1.0-1 irda-utils" +RDEPENDS = "irda-utils" SECTION = "gpe" PRIORITY = "optional" MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" diff --git a/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb b/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb index 361aae7038..302d78d109 100644 --- a/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb +++ b/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb @@ -1,14 +1,14 @@ DEFAULT_PREFERENCE = "-1" -LICENSE = "GPL" -DESCIPTION = "Buttonbox for gpe" +LICENSE = "GPL" +DESCIPTION = "Buttonbox for gpe" -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpe-buttonbox" +SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpe-buttonbox" -DEPENDS = "libgpewidget libgpelaunch" +DEPENDS = "libgpewidget libgpelaunch" -S = "${WORKDIR}/${PN}" -PV = "0.5+cvs-${CVSDATE}" -PR = "r0" +S = "${WORKDIR}/${PN}" +PV = "0.5+cvs${SRCDATE}" +PR = "r0" inherit autotools diff --git a/packages/gpe-calendar/gpe-calendar_cvs.bb b/packages/gpe-calendar/gpe-calendar_cvs.bb index 79c8602151..2862822cd5 100644 --- a/packages/gpe-calendar/gpe-calendar_cvs.bb +++ b/packages/gpe-calendar/gpe-calendar_cvs.bb @@ -1,13 +1,13 @@ LICENSE = "GPL" DEFAULT_PREFERENCE = "-1" -S = "${WORKDIR}/${PN}" -PV = "0.65+cvs-${CVSDATE}" +S = "${WORKDIR}/${PN}" +PV = "0.65+cvs${SRCDATE}" PR = "r0" inherit autotools gpe -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" +SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" DEPENDS = "libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype" SECTION = "gpe" diff --git a/packages/gpe-conf/gpe-conf_cvs.bb b/packages/gpe-conf/gpe-conf_cvs.bb index e13ac767c2..57aa454e02 100644 --- a/packages/gpe-conf/gpe-conf_cvs.bb +++ b/packages/gpe-conf/gpe-conf_cvs.bb @@ -1,7 +1,7 @@ DEFAULT_PREFERENCE = "-1" -S = "${WORKDIR}/${PN}" -PV = "0.1.26+cvs-${CVSDATE}" +S = "${WORKDIR}/${PN}" +PV = "0.1.26+cvs${SRCDATE}" PR = "r0" inherit gpe diff --git a/packages/gpe-contacts/gpe-contacts_cvs.bb b/packages/gpe-contacts/gpe-contacts_cvs.bb index 704e75d652..8fbb8737b9 100644 --- a/packages/gpe-contacts/gpe-contacts_cvs.bb +++ b/packages/gpe-contacts/gpe-contacts_cvs.bb @@ -1,13 +1,13 @@ LICENSE = "GPL" DEFAULT_PREFERENCE = "-1" -S = "${WORKDIR}/${PN}" -PV = "0.42+cvs${CVSDATE}" +S = "${WORKDIR}/${PN}" +PV = "0.42+cvs${SRCDATE}" PR = "r0" inherit autotools gpe -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" +SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus" diff --git a/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb b/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb index 65ec263197..2f5574d91b 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb @@ -1,11 +1,11 @@ -PR = "r2" -PV = "0.17+cvs-${CVSDATE}" +PR = "r2" +PV = "0.17+cvs${SRCDATE}" -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpe-mini-browser" -DESCRIPTION = "A lightweight webbrowser for the GPE platform" -LICENSE = "GPL" -DEPENDS = "sqlite gettext gtk+ glib-2.0 osb-nrcit libgpewidget" -RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg" +SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpe-mini-browser" +DESCRIPTION = "A lightweight webbrowser for the GPE platform" +LICENSE = "GPL" +DEPENDS = "sqlite gettext gtk+ glib-2.0 osb-nrcit libgpewidget" +RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg" DEFAULT_PREFERENCE = "-1" diff --git a/packages/gpe-today/gpe-today_cvs.bb b/packages/gpe-today/gpe-today_cvs.bb index a1ed5c6707..1ce5babfbb 100644 --- a/packages/gpe-today/gpe-today_cvs.bb +++ b/packages/gpe-today/gpe-today_cvs.bb @@ -1,14 +1,14 @@ DEFAULT_PREFERENCE = "-1" -DESCRIPTION = "Displays a summary of appointments and tasks for the day ahead" -DEPENDS = "gtk+ libxrandr libxsettings libxsettings-client libgpewidget libdisplaymigration libeventdb libgpepimc libtododb" -SECTION = "gpe" -PRIORITY = "optional" +DESCRIPTION = "Displays a summary of appointments and tasks for the day ahead" +DEPENDS = "gtk+ libxrandr libxsettings libxsettings-client libgpewidget libdisplaymigration libeventdb libgpepimc libtododb" +SECTION = "gpe" +PRIORITY = "optional" -S = "${WORKDIR}/${PN}" -PV = "0.10+cvs-${CVSDATE}" -PR = "r0" +S = "${WORKDIR}/${PN}" +PV = "0.10+cvs${SRCDATE}" +PR = "r0" inherit gpe diff --git a/packages/gpe-what/gpe-what_cvs.bb b/packages/gpe-what/gpe-what_cvs.bb index 46b3951349..3433fe675d 100644 --- a/packages/gpe-what/gpe-what_cvs.bb +++ b/packages/gpe-what/gpe-what_cvs.bb @@ -1,9 +1,9 @@ LICENSE = "GPL" DEFAULT_PREFERENCE = "-1" -S = "${WORKDIR}/${PN}" -PV = "0.33+cvs-${CVSDATE}" -PR = "r0" +S = "${WORKDIR}/${PN}" +PV = "0.33+cvs${SRCDATE}" +PR = "r0" inherit autotools gpe diff --git a/packages/gpesyncd/gpesyncd_cvs.bb b/packages/gpesyncd/gpesyncd_cvs.bb index fbc5953b57..457b75c343 100644 --- a/packages/gpesyncd/gpesyncd_cvs.bb +++ b/packages/gpesyncd/gpesyncd_cvs.bb @@ -8,7 +8,7 @@ SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpesyncd" DEPENDS = "libgpevtype sqlite libmimedir glib-2.0" S = "${WORKDIR}/${PN}" -PV = "0.0+cvs-${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" PR = "r0" inherit autotools diff --git a/packages/gpsdrive/gpsdrive_cvs.bb b/packages/gpsdrive/gpsdrive_cvs.bb index 271ea1f375..c4bc1382c8 100644 --- a/packages/gpsdrive/gpsdrive_cvs.bb +++ b/packages/gpsdrive/gpsdrive_cvs.bb @@ -1,7 +1,7 @@ inherit autotools pkgconfig PR = "r1" -PV = "2.10pre3+cvs-${CVSDATE}" +PV = "2.10pre3+cvs${SRCDATE}" DEFAULT_PREFERENCE="-1" PACKAGES += "gpsdrive-add" diff --git a/packages/gstreamer/gst-plugins_0.8.4.bb b/packages/gstreamer/gst-plugins_0.8.4.bb index 9b63f21a2c..0e6e1877cc 100644 --- a/packages/gstreamer/gst-plugins_0.8.4.bb +++ b/packages/gstreamer/gst-plugins_0.8.4.bb @@ -28,6 +28,8 @@ plugin_postinst() { fi } +PACKAGES_DYNAMIC = "gst-plugin-*" + python populate_packages_prepend () { gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d) postinst = bb.data.getVar('plugin_postinst', d, 1) diff --git a/packages/gstreamer/gst-plugins_0.8.6.bb b/packages/gstreamer/gst-plugins_0.8.6.bb index 2292b2642d..fdd29c7b2f 100644 --- a/packages/gstreamer/gst-plugins_0.8.6.bb +++ b/packages/gstreamer/gst-plugins_0.8.6.bb @@ -27,6 +27,8 @@ plugin_postinst() { fi } +PACKAGES_DYNAMIC = "gst-plugin-*" + python populate_packages_prepend () { gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d) postinst = bb.data.getVar('plugin_postinst', d, 1) diff --git a/packages/gstreamer/gst-plugins_0.8.7.bb b/packages/gstreamer/gst-plugins_0.8.7.bb index 430830e392..75bd75bd44 100644 --- a/packages/gstreamer/gst-plugins_0.8.7.bb +++ b/packages/gstreamer/gst-plugins_0.8.7.bb @@ -29,6 +29,8 @@ plugin_postinst() { fi } +PACKAGES_DYNAMIC = "gst-plugin-*" + python populate_packages_prepend () { gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d) postinst = bb.data.getVar('plugin_postinst', d, 1) diff --git a/packages/gstreamer/gst-plugins_0.8.8.bb b/packages/gstreamer/gst-plugins_0.8.8.bb index 3d94980c59..cfcd5a3a2f 100644 --- a/packages/gstreamer/gst-plugins_0.8.8.bb +++ b/packages/gstreamer/gst-plugins_0.8.8.bb @@ -31,6 +31,8 @@ plugin_postinst() { fi } +PACKAGES_DYNAMIC = "gst-plugin-*" + python populate_packages_prepend () { gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d) postinst = bb.data.getVar('plugin_postinst', d, 1) diff --git a/packages/gtk+/gtk+_2.2.4.bb b/packages/gtk+/gtk+_2.2.4.bb index 516a342540..962eb55895 100644 --- a/packages/gtk+/gtk+_2.2.4.bb +++ b/packages/gtk+/gtk+_2.2.4.bb @@ -64,6 +64,8 @@ do_install_append () { install -d ${D}${sysconfdir}/gtk-2.0 } +PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-*" + python populate_packages_prepend () { import os.path diff --git a/packages/gtk+/gtk+_2.4.13.bb b/packages/gtk+/gtk+_2.4.13.bb index 2b05db2eaa..3ea34fe702 100644 --- a/packages/gtk+/gtk+_2.4.13.bb +++ b/packages/gtk+/gtk+_2.4.13.bb @@ -62,6 +62,8 @@ do_install_append () { install -d ${D}${sysconfdir}/gtk-2.0 } +PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-*" + python populate_packages_prepend () { import os.path diff --git a/packages/gtk+/gtk+_2.4.4.bb b/packages/gtk+/gtk+_2.4.4.bb index d663ca4e83..dfd8b8922a 100644 --- a/packages/gtk+/gtk+_2.4.4.bb +++ b/packages/gtk+/gtk+_2.4.4.bb @@ -71,6 +71,8 @@ do_install_append () { install -d ${D}${sysconfdir}/gtk-2.0 } +PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-*" + python populate_packages_prepend () { import os.path diff --git a/packages/gtk+/gtk+_2.6.10.bb b/packages/gtk+/gtk+_2.6.10.bb index eaf55f7f51..374dba0a31 100644 --- a/packages/gtk+/gtk+_2.6.10.bb +++ b/packages/gtk+/gtk+_2.6.10.bb @@ -66,6 +66,8 @@ fi } +PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-*" + python populate_packages_prepend () { import os.path diff --git a/packages/gtk+/gtk+_2.6.3.bb b/packages/gtk+/gtk+_2.6.3.bb index b2fe65e8ca..32e3fba5e1 100644 --- a/packages/gtk+/gtk+_2.6.3.bb +++ b/packages/gtk+/gtk+_2.6.3.bb @@ -58,6 +58,8 @@ do_install_append () { install -d ${D}${sysconfdir}/gtk-2.0 } +PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-*" + python populate_packages_prepend () { import os.path diff --git a/packages/gtk+/gtk+_2.6.4-1.osso7.bb b/packages/gtk+/gtk+_2.6.4-1.osso7.bb index 146da9f3e0..fbebed2e45 100644 --- a/packages/gtk+/gtk+_2.6.4-1.osso7.bb +++ b/packages/gtk+/gtk+_2.6.4-1.osso7.bb @@ -150,6 +150,8 @@ do_install_append () { install -d ${D}${sysconfdir}/gtk-2.0 } +PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-*" + python populate_packages_prepend () { import os.path diff --git a/packages/gtk+/gtk+_2.6.7.bb b/packages/gtk+/gtk+_2.6.7.bb index d15ec695c7..65f1402fa7 100644 --- a/packages/gtk+/gtk+_2.6.7.bb +++ b/packages/gtk+/gtk+_2.6.7.bb @@ -64,6 +64,8 @@ fi } +PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-*" + python populate_packages_prepend () { import os.path diff --git a/packages/gtk+/gtk+_2.8.9.bb b/packages/gtk+/gtk+_2.8.9.bb index 3b390b4f6a..7ece5ca519 100644 --- a/packages/gtk+/gtk+_2.8.9.bb +++ b/packages/gtk+/gtk+_2.8.9.bb @@ -64,6 +64,8 @@ fi } +PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-*" + python populate_packages_prepend () { import os.path diff --git a/packages/gtk-engines/gtk-engines_2.6.1.bb b/packages/gtk-engines/gtk-engines_2.6.1.bb index 1d3b6bc1ff..add0cd912d 100644 --- a/packages/gtk-engines/gtk-engines_2.6.1.bb +++ b/packages/gtk-engines/gtk-engines_2.6.1.bb @@ -16,6 +16,8 @@ SRC_URI = "${GNOME_MIRROR}/${PN}/2.6/${PN}-${PV}.tar.bz2" inherit autotools pkgconfig +PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*" + python populate_packages_prepend() { import os.path diff --git a/packages/gtk-engines/gtk-engines_2.6.3.bb b/packages/gtk-engines/gtk-engines_2.6.3.bb index 1d3b6bc1ff..add0cd912d 100644 --- a/packages/gtk-engines/gtk-engines_2.6.3.bb +++ b/packages/gtk-engines/gtk-engines_2.6.3.bb @@ -16,6 +16,8 @@ SRC_URI = "${GNOME_MIRROR}/${PN}/2.6/${PN}-${PV}.tar.bz2" inherit autotools pkgconfig +PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*" + python populate_packages_prepend() { import os.path diff --git a/packages/gtk-engines/gtk-engines_2.6.5.bb b/packages/gtk-engines/gtk-engines_2.6.5.bb index 1d3b6bc1ff..add0cd912d 100644 --- a/packages/gtk-engines/gtk-engines_2.6.5.bb +++ b/packages/gtk-engines/gtk-engines_2.6.5.bb @@ -16,6 +16,8 @@ SRC_URI = "${GNOME_MIRROR}/${PN}/2.6/${PN}-${PV}.tar.bz2" inherit autotools pkgconfig +PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*" + python populate_packages_prepend() { import os.path diff --git a/packages/gtk-webcore/osb-browser_20050430.bb b/packages/gtk-webcore/osb-browser_20050430.bb index 75fd79636c..d50e0737ad 100644 --- a/packages/gtk-webcore/osb-browser_20050430.bb +++ b/packages/gtk-webcore/osb-browser_20050430.bb @@ -5,14 +5,14 @@ PRIORITY = "optional" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "gpe" -FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" -PV = "0.5.0+cvs${FIXEDCVSDATE}" +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +PV = "0.5.0+cvs${FIXEDSRCDATE}" PR = "r1" DEPENDS = "osb-nrcit gtk+ glib-2.0 libglade" RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-ico gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=osb-browser;date=${FIXEDCVSDATE} \ +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=osb-browser;date=${FIXEDSRCDATE} \ file://no-pedantic.patch;patch=1" S = "${WORKDIR}/osb-browser" diff --git a/packages/gtk-webcore/osb-jscore_20050430.bb b/packages/gtk-webcore/osb-jscore_20050430.bb index d7bf8cb7a1..aec6a48a0b 100644 --- a/packages/gtk-webcore/osb-jscore_20050430.bb +++ b/packages/gtk-webcore/osb-jscore_20050430.bb @@ -5,11 +5,11 @@ PRIORITY = "optional" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "gpe" -FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" -PV = "0.5.0+cvs${FIXEDCVSDATE}" +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +PV = "0.5.0+cvs${FIXEDSRCDATE}" PR = "r1" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=JavaScriptCore;date=${FIXEDCVSDATE} \ +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=JavaScriptCore;date=${FIXEDSRCDATE} \ file://libm.patch;patch=1" S = "${WORKDIR}/JavaScriptCore" diff --git a/packages/gtk-webcore/osb-nrcit_20050430.bb b/packages/gtk-webcore/osb-nrcit_20050430.bb index 6daa6a2016..39ff1f02d2 100644 --- a/packages/gtk-webcore/osb-nrcit_20050430.bb +++ b/packages/gtk-webcore/osb-nrcit_20050430.bb @@ -5,13 +5,13 @@ PRIORITY = "optional" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "gpe" -FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" -PV = "0.5.0+cvs${FIXEDCVSDATE}" +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +PV = "0.5.0+cvs${FIXEDSRCDATE}" PR = "r2" DEPENDS = "curl librsvg osb-nrcore" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCit;date=${FIXEDCVSDATE} \ +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCit;date=${FIXEDSRCDATE} \ file://stop-load.image-loading.patch;patch=1 \ file://gdk-colorspace.diff;patch=1" S = "${WORKDIR}/NRCit" diff --git a/packages/gtk-webcore/osb-nrcore_20050430.bb b/packages/gtk-webcore/osb-nrcore_20050430.bb index 8c83976eb4..758058d355 100644 --- a/packages/gtk-webcore/osb-nrcore_20050430.bb +++ b/packages/gtk-webcore/osb-nrcore_20050430.bb @@ -5,12 +5,12 @@ PRIORITY = "optional" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "gpe" -FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" -PV = "0.5.0+cvs${FIXEDCVSDATE}" +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +PV = "0.5.0+cvs${FIXEDSRCDATE}" DEPENDS = "glib-2.0 gtk+ pango osb-jscore" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCore;date=${FIXEDCVSDATE}" +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCore;date=${FIXEDSRCDATE}" S = "${WORKDIR}/NRCore" LEAD_SONAME = "libnrcore.so" diff --git a/packages/ice/ice_cvs.bb b/packages/ice/ice_cvs.bb index 7f0504694a..06b4e60d5e 100644 --- a/packages/ice/ice_cvs.bb +++ b/packages/ice/ice_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE= "MIT" SECTION = "libs" PRIORITY = "optional" diff --git a/packages/inputpipe/inputpipe_svn.bb b/packages/inputpipe/inputpipe_svn.bb index 7e19e51372..87ececd731 100644 --- a/packages/inputpipe/inputpipe_svn.bb +++ b/packages/inputpipe/inputpipe_svn.bb @@ -3,7 +3,7 @@ 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-${CVSDATE}" +PV = "0.5+svn${SRCDATE}" SRC_URI = "svn://svn.navi.cx/misc/trunk;module=inputpipe;proto=http" S = "${WORKDIR}/inputpipe" diff --git a/packages/ipkg-utils/ipkg-link_1.6cvs.bb b/packages/ipkg-utils/ipkg-link_1.6cvs.bb index 0560ce8d95..94f749cf62 100644 --- a/packages/ipkg-utils/ipkg-link_1.6cvs.bb +++ b/packages/ipkg-utils/ipkg-link_1.6cvs.bb @@ -2,7 +2,7 @@ SECTION = "base" DESCRIPTION = "Itsy Package Manager utilities link script" LICENSE = "GPL" CONFLICTS = "ipkg-utils" -PV_append = "${CVSDATE}" +PV_append = "${SRCDATE}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils" diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb b/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb index 2506dbab62..cd24007f02 100644 --- a/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb +++ b/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb @@ -2,7 +2,9 @@ SECTION = "base" include ipkg-utils_${PV}.bb PR = "r4" inherit native -DEPENDS = "" +RDEPENDS = "python-native" +# Avoid circular dependencies from package_ipk.bbclass +PACKAGES = "" do_stage() { for i in ${INSTALL}; do diff --git a/packages/ipkg-utils/ipkg-utils_1.6cvs.bb b/packages/ipkg-utils/ipkg-utils_1.6cvs.bb index c751908b49..e315c82264 100644 --- a/packages/ipkg-utils/ipkg-utils_1.6cvs.bb +++ b/packages/ipkg-utils/ipkg-utils_1.6cvs.bb @@ -1,12 +1,11 @@ DESCRIPTION = "Itsy Package Manager utilities" -DEPENDS = "" SECTION = "base" PRIORITY = "optional" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" LICENSE = "GPL" CONFLICTS = "ipkg-link" RDEPENDS = "python" -PV_append = "${CVSDATE}" +PV_append = "${SRCDATE}" PR = "r9" SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils" diff --git a/packages/irssi/irssi_svn.bb b/packages/irssi/irssi_svn.bb index 03a8125d72..ab37908a27 100644 --- a/packages/irssi/irssi_svn.bb +++ b/packages/irssi/irssi_svn.bb @@ -4,7 +4,7 @@ SECTION = "console/network" LICENSE = "GPL" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" DEPENDS += "ncurses glib-1.2" -PV = "0.8.10+svn${CVSDATE}" +PV = "0.8.10+svn${SRCDATE}" PR = "r2" PACKAGES += "${PN}-common" diff --git a/packages/irssi/xirssi_cvs.bb b/packages/irssi/xirssi_cvs.bb index e40d2107dd..0f19cc3746 100644 --- a/packages/irssi/xirssi_cvs.bb +++ b/packages/irssi/xirssi_cvs.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" DEPENDS += "irssi gtk+" RDEPENDS_${PN} += "irssi-common" -PV = "0.0+cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" PR = "r2" inherit autotools diff --git a/packages/kaffe/kaffe-gtk_cvs.bb b/packages/kaffe/kaffe-gtk_cvs.bb index 10b4adf506..07d26b75ce 100644 --- a/packages/kaffe/kaffe-gtk_cvs.bb +++ b/packages/kaffe/kaffe-gtk_cvs.bb @@ -1,6 +1,6 @@ MAINTAINER = "Rene Wagner <rw@handhelds.org>" -PV = "1.1.5+cvs${CVSDATE}" +PV = "1.1.5+cvs${SRCDATE}" DEFAULT_PREFERENCE = "-1" SRC_URI = "cvs://readonly:readonly@cvs.kaffe.org/cvs/kaffe;module=kaffe" diff --git a/packages/kaffe/kaffe-qt_cvs.bb b/packages/kaffe/kaffe-qt_cvs.bb index 06fbf68b90..023e3fbcb4 100644 --- a/packages/kaffe/kaffe-qt_cvs.bb +++ b/packages/kaffe/kaffe-qt_cvs.bb @@ -1,6 +1,6 @@ BROKEN = "1" -PV = "1.1.4+cvs${CVSDATE}" +PV = "1.1.4+cvs${SRCDATE}" SRC_URI = "cvs://readonly:readonly@cvs.kaffe.org/cvs/kaffe;module=kaffe" S = "${WORKDIR}/kaffe" diff --git a/packages/kaffe/kaffeh-native_cvs.bb b/packages/kaffe/kaffeh-native_cvs.bb index 2b10385e82..45bdd4088e 100644 --- a/packages/kaffe/kaffeh-native_cvs.bb +++ b/packages/kaffe/kaffeh-native_cvs.bb @@ -1,4 +1,4 @@ -PV = "1.1.5+cvs${CVSDATE}" +PV = "1.1.5+cvs${SRCDATE}" DEFAULT_PREFERENCE = "-1" PR = "r3" diff --git a/packages/kbdd/kbdd_cvs.bb b/packages/kbdd/kbdd_cvs.bb index 6c4a50f72e..a4ecc512a3 100644 --- a/packages/kbdd/kbdd_cvs.bb +++ b/packages/kbdd/kbdd_cvs.bb @@ -5,12 +5,12 @@ HOMEPAGE = "http://handhelds.org/moin/moin.cgi/kbdd" LICENSE = "GPLv2" DEPENDS = "virtual/kernel" RRECOMMENDS_${PN} = "${@linux_module_packages('keybdev uinput', d)}" -SRC_URI = "${HANDHELDS_CVS};module=apps/kbdd;date=${CVSDATE} \ +SRC_URI = "${HANDHELDS_CVS};module=apps/kbdd;date=${SRCDATE} \ file://kbdd.init \ file://kbdd.conf \ file://kbdd-modules" -PV="0.8+cvs-${CVSDATE}" +PV="0.8+cvs${SRCDATE}" PR="r5" inherit update-rc.d linux_modules diff --git a/packages/libcontactsdb/libcontactsdb_cvs.bb b/packages/libcontactsdb/libcontactsdb_cvs.bb index f2878411cb..229326752d 100644 --- a/packages/libcontactsdb/libcontactsdb_cvs.bb +++ b/packages/libcontactsdb/libcontactsdb_cvs.bb @@ -6,13 +6,13 @@ DEPENDS = "libgpewidget libgpepimc sqlite" LICENSE = "GPL" -S = "${WORKDIR}/${PN}" -PV = "0.1+cvs${CVSDATE}" +S = "${WORKDIR}/${PN}" +PV = "0.1+cvs${SRCDATE}" PR = "r0" inherit autotools gpe pkgconfig -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" +SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" headers = "contacts-db.h" diff --git a/packages/libfakekey/libfakekey_svn.bb b/packages/libfakekey/libfakekey_svn.bb index 172fecc8c7..7cdd557463 100644 --- a/packages/libfakekey/libfakekey_svn.bb +++ b/packages/libfakekey/libfakekey_svn.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" DEPENDS = "xtst" SECTION = "x11/wm" PR="r1" -PV = "0.0+svn${CVSDATE}" +PV = "0.0+svn${SRCDATE}" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" diff --git a/packages/libgpeplugin/libgpeplugin_cvs.bb b/packages/libgpeplugin/libgpeplugin_cvs.bb index be56d0cbad..17cbd86343 100644 --- a/packages/libgpeplugin/libgpeplugin_cvs.bb +++ b/packages/libgpeplugin/libgpeplugin_cvs.bb @@ -1,10 +1,10 @@ -DESCRIPTION = "Plugin system for GPE applications" -AUTHOR = "Luce DeCicco <ldecicco@gmail.com>" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +DESCRIPTION = "Plugin system for GPE applications" +AUTHOR = "Luce DeCicco <ldecicco@gmail.com>" +MAINTAINER = "Koen Kooi <koen@handhelds.org>" -DEPENDS = "gtk+ libgpewidget" -PV = "0.0+cvs${CVSDATE}" -PR = "r0" +DEPENDS = "gtk+ libgpewidget" +PV = "0.0+cvs${SRCDATE}" +PR = "r0" #put examples in a seperate package PACKAGES += ${PN}-examples diff --git a/packages/libgpevtype/libgpevtype_cvs.bb b/packages/libgpevtype/libgpevtype_cvs.bb index a1bcc5c01f..aaaec8cb77 100644 --- a/packages/libgpevtype/libgpevtype_cvs.bb +++ b/packages/libgpevtype/libgpevtype_cvs.bb @@ -7,13 +7,13 @@ DEPENDS = "libmimedir" DEFAULT_PREFERENCE = "-1" -S = "${WORKDIR}/${PN}" -PV = "0.12+cvs-${CVSDATE}" -PR = "r0" +S = "${WORKDIR}/${PN}" +PV = "0.12+cvs${SRCDATE}" +PR = "r0" inherit pkgconfig gpe autotools -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" +SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" headers = "tag-db.h vcard.h vevent.h vtodo.h" diff --git a/packages/libgpewidget/libgpewidget_cvs.bb b/packages/libgpewidget/libgpewidget_cvs.bb index f3d377a46c..b5b9a9b6aa 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-${CVSDATE}" +PV = "0.105+cvs${SRCDATE}" PR = "r0" inherit autotools pkgconfig diff --git a/packages/libmailwrapper/libmailwrapper_cvs.bb b/packages/libmailwrapper/libmailwrapper_cvs.bb index 55829044c2..408193f776 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 7f3714f485..370bed7f51 100644 --- a/packages/libmatchbox/libmatchbox_svn.bb +++ b/packages/libmatchbox/libmatchbox_svn.bb @@ -1,6 +1,6 @@ include libmatchbox.inc -PV = "1.7+cvs-${CVSDATE}" +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/libmikey/libmikey0_svn.bb b/packages/libmikey/libmikey0_svn.bb index 8d67fbf8f2..814f41202e 100644 --- a/packages/libmikey/libmikey0_svn.bb +++ b/packages/libmikey/libmikey0_svn.bb @@ -1,4 +1,4 @@ -PV = "0.3.2svn${CVSDATE}" +PV = "0.3.2+svn${SRCDATE}" LICENSE = "LGPL" DESCRIPTION = "C++ implementation of the Multimedia Internet KEYing (RFC3830)" diff --git a/packages/libmimedir/libmimedir_cvs.bb b/packages/libmimedir/libmimedir_cvs.bb index bbdfd4f24a..9e8d904ba7 100644 --- a/packages/libmimedir/libmimedir_cvs.bb +++ b/packages/libmimedir/libmimedir_cvs.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "intltool-native" PR = "r1" -PV = "0.3.1+cvs-${CVSDATE}" +PV = "0.3.1+cvs${SRCDATE}" DEFAULT_PREFERENCE = -1 diff --git a/packages/libmnetutil/libmnetutil0_svn.bb b/packages/libmnetutil/libmnetutil0_svn.bb index 1384cd5205..f455094535 100644 --- a/packages/libmnetutil/libmnetutil0_svn.bb +++ b/packages/libmnetutil/libmnetutil0_svn.bb @@ -1,4 +1,4 @@ -PV = "0.2.2svn${CVSDATE}" +PV = "0.2.2+svn${SRCDATE}" LICENSE = "LGPL" DESCRIPTION = "Networking class library for C++ programming" diff --git a/packages/libmsip/libmsip0_svn.bb b/packages/libmsip/libmsip0_svn.bb index a0050e9e02..02d69a2313 100644 --- a/packages/libmsip/libmsip0_svn.bb +++ b/packages/libmsip/libmsip0_svn.bb @@ -1,4 +1,4 @@ -PV = "0.2.2svn${CVSDATE}" +PV = "0.2.2+svn${SRCDATE}" LICENSE = "LGPL" DESCRIPTION = "C++ implementation Session Initiation Protocol (RFC3261)" diff --git a/packages/libmutil/libmutil0_svn.bb b/packages/libmutil/libmutil0_svn.bb index 9e6a8f5d36..ef110a5312 100644 --- a/packages/libmutil/libmutil0_svn.bb +++ b/packages/libmutil/libmutil0_svn.bb @@ -1,4 +1,4 @@ -PV = "0.2.2svn${CVSDATE}" +PV = "0.2.2+svn${SRCDATE}" LICENSE = "LGPL" DESCRIPTION = "Class library implementing utilities for C++ programming" diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb index 14d55f913b..d9b16ff4e3 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 40d4dd8508..cde3fb5859 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 da3ef3455a..e259dcb8c7 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" include libopietooth1.inc diff --git a/packages/libpixman/libpixman_cvs.bb b/packages/libpixman/libpixman_cvs.bb index 7b88f4c054..549c149fad 100644 --- a/packages/libpixman/libpixman_cvs.bb +++ b/packages/libpixman/libpixman_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@debian.org>" diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb index 06e626b132..db32c0e121 100644 --- a/packages/libqpe/libqpe-opie_cvs.bb +++ b/packages/libqpe/libqpe-opie_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs-${CVSDATE}" +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 3989da142d..db821756b9 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/libqtaux" diff --git a/packages/libsm/libsm_cvs.bb b/packages/libsm/libsm_cvs.bb index 056e33046a..5be7c6966b 100644 --- a/packages/libsm/libsm_cvs.bb +++ b/packages/libsm/libsm_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT-X" SECTION = "libs" PRIORITY = "optional" diff --git a/packages/libxcursor/libxcursor_cvs.bb b/packages/libxcursor/libxcursor_cvs.bb index 96b0da66f6..1b50f5a7e2 100644 --- a/packages/libxcursor/libxcursor_cvs.bb +++ b/packages/libxcursor/libxcursor_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" SECTION = "x11/libs" PRIORITY = "optional" diff --git a/packages/libxfixes/libxfixes_cvs.bb b/packages/libxfixes/libxfixes_cvs.bb index 4899229eb9..a18ceeb0cc 100644 --- a/packages/libxfixes/libxfixes_cvs.bb +++ b/packages/libxfixes/libxfixes_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" SECTION = "x11/libs" DEPENDS = "x11 fixesext" diff --git a/packages/libxft/libxft_cvs.bb b/packages/libxft/libxft_cvs.bb index d25b04e483..3827318cdd 100644 --- a/packages/libxft/libxft_cvs.bb +++ b/packages/libxft/libxft_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT-X" SECTION = "x11/libs" DEPENDS = "x11 xproto libxrender freetype fontconfig" diff --git a/packages/libxi/libxi_cvs.bb b/packages/libxi/libxi_cvs.bb index 08cee7406a..cd8f777775 100644 --- a/packages/libxi/libxi_cvs.bb +++ b/packages/libxi/libxi_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT-X" SECTION = "x11/libs" DEPENDS = "xproto x11 xextensions" diff --git a/packages/libxine/libxine-fb_1.0.bb b/packages/libxine/libxine-fb_1.0.bb index 762eee27db..668a2176fb 100644 --- a/packages/libxine/libxine-fb_1.0.bb +++ b/packages/libxine/libxine-fb_1.0.bb @@ -75,6 +75,8 @@ do_stage() { oe_libinstall -so -C src/xine-engine libxine ${STAGING_LIBDIR} } +PACKAGES_DYNAMIC = "libxine-plugin-* libxine-font-*" + python populate_packages_prepend () { plugindir = bb.data.expand('${libdir}/xine/plugins/1.0.0', d) do_split_packages(d, plugindir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s', extra_depends='' ) diff --git a/packages/libxine/libxine-x11_1.0.bb b/packages/libxine/libxine-x11_1.0.bb index 5acd9b93f5..fe809c1248 100644 --- a/packages/libxine/libxine-x11_1.0.bb +++ b/packages/libxine/libxine-x11_1.0.bb @@ -76,6 +76,8 @@ do_stage() { oe_libinstall -so -C src/xine-engine libxine ${STAGING_LIBDIR} } +PACKAGES_DYNAMIC = "libxine-plugin-* libxine-font-*" + python populate_packages_prepend () { bb.data.setVar('PKG_libxine', 'libxine', d) diff --git a/packages/libxine/libxine_1.1.0.bb b/packages/libxine/libxine_1.1.0.bb index 908243f354..e0c8e5473a 100644 --- a/packages/libxine/libxine_1.1.0.bb +++ b/packages/libxine/libxine_1.1.0.bb @@ -80,6 +80,8 @@ do_stage() { oe_libinstall -so -C src/xine-engine libxine ${STAGING_LIBDIR} } +PACKAGES_DYNAMIC = "libxine-plugin-* libxine-font-*" + python populate_packages_prepend () { bb.data.setVar('PKG_libxine', 'libxine', d) diff --git a/packages/libxkbfile/libxkbfile_cvs.bb b/packages/libxkbfile/libxkbfile_cvs.bb index 6d26e88c74..c90d308194 100644 --- a/packages/libxkbfile/libxkbfile_cvs.bb +++ b/packages/libxkbfile/libxkbfile_cvs.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" diff --git a/packages/libxp/libxp_cvs.bb b/packages/libxp/libxp_cvs.bb index 3205010a71..70bb20bf02 100644 --- a/packages/libxp/libxp_cvs.bb +++ b/packages/libxp/libxp_cvs.bb @@ -1,6 +1,6 @@ LICENSE = "MIT" -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" SECTION = "libs" DEPENDS = "x11 xext" diff --git a/packages/libxrandr/libxrandr_cvs.bb b/packages/libxrandr/libxrandr_cvs.bb index 4e8c96df97..efc47e92ab 100644 --- a/packages/libxrandr/libxrandr_cvs.bb +++ b/packages/libxrandr/libxrandr_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "BSD-X" SECTION = "x11/libs" DEPENDS = "randrext x11 libxrender xext" diff --git a/packages/libxrender/libxrender_cvs.bb b/packages/libxrender/libxrender_cvs.bb index c04163a058..ca6f16f1b8 100644 --- a/packages/libxrender/libxrender_cvs.bb +++ b/packages/libxrender/libxrender_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" PR = "r1" SECTION = "libs" DEPENDS = "renderext x11" diff --git a/packages/libxss/libxss_cvs.bb b/packages/libxss/libxss_cvs.bb index 07e1ce32ed..b395583cc8 100644 --- a/packages/libxss/libxss_cvs.bb +++ b/packages/libxss/libxss_cvs.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" PR = "r2" SECTION = "libs" diff --git a/packages/libxxf86dga/libxxf86dga_cvs.bb b/packages/libxxf86dga/libxxf86dga_cvs.bb index 008df1faf2..a03081b8ad 100644 --- a/packages/libxxf86dga/libxxf86dga_cvs.bb +++ b/packages/libxxf86dga/libxxf86dga_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "XFree86" SECTION = "x11/libs" diff --git a/packages/libxxf86vm/libxxf86vm_cvs.bb b/packages/libxxf86vm/libxxf86vm_cvs.bb index 044446b745..52e468dfce 100644 --- a/packages/libxxf86vm/libxxf86vm_cvs.bb +++ b/packages/libxxf86vm/libxxf86vm_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" SECTION = "x11/libs" diff --git a/packages/linux-input/files/.mtn2git_empty b/packages/linux-input/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux-input/files/.mtn2git_empty diff --git a/packages/linux-input/makefile.patch b/packages/linux-input/files/makefile.patch index 6499372f83..6499372f83 100644 --- a/packages/linux-input/makefile.patch +++ b/packages/linux-input/files/makefile.patch diff --git a/packages/linux-input/serio.h b/packages/linux-input/files/serio.h index 82670ed3f5..82670ed3f5 100644 --- a/packages/linux-input/serio.h +++ b/packages/linux-input/files/serio.h diff --git a/packages/linux-input/snes232.patch b/packages/linux-input/files/snes232.patch index 95523e4569..95523e4569 100644 --- a/packages/linux-input/snes232.patch +++ b/packages/linux-input/files/snes232.patch diff --git a/packages/linux-input/linux-input_cvs.bb b/packages/linux-input/linux-input_cvs.bb index c377a0a397..ca10e1c21b 100644 --- a/packages/linux-input/linux-input_cvs.bb +++ b/packages/linux-input/linux-input_cvs.bb @@ -1,6 +1,5 @@ -SECTION = "unknown" PR = "r2" -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" SRC_URI = "cvs://anonymous@cvs1.sourceforge.net/cvsroot/linuxconsole;module=ruby \ file://serio.h \ diff --git a/packages/linux/LAB-kernel_cvs.bb b/packages/linux/LAB-kernel_cvs.bb index 2ea1cd758a..6258a113d6 100644 --- a/packages/linux/LAB-kernel_cvs.bb +++ b/packages/linux/LAB-kernel_cvs.bb @@ -2,7 +2,7 @@ SECTION = "kernel" DESCRIPTION = "Liux As Bootloader kernelm" MAINTAINER = "Koen Kooi <koen@handhelds.org>" LICENSE = "GPL" -PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${CVSDATE}" +PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}" # KERNEL_CCSUFFIX = "-3.4.4" COMPATIBLE_HOST = "arm.*-linux" diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb index dca6a8c254..031ae2748a 100644 --- a/packages/linux/handhelds-pxa-2.6_cvs.bb +++ b/packages/linux/handhelds-pxa-2.6_cvs.bb @@ -2,7 +2,7 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel for PXA based devices." MAINTAINER = "Greg Gilbert <greg@treke.net>" LICENSE = "GPL" -PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${CVSDATE}" +PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}" # KERNEL_CCSUFFIX = "-3.4.4" COMPATIBLE_HOST = "arm.*-linux" diff --git a/packages/linux/handhelds-sa-2.6_cvs.bb b/packages/linux/handhelds-sa-2.6_cvs.bb index bd3c120acd..5daabd127c 100644 --- a/packages/linux/handhelds-sa-2.6_cvs.bb +++ b/packages/linux/handhelds-sa-2.6_cvs.bb @@ -10,7 +10,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26" S = "${WORKDIR}/kernel26" -PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${CVSDATE}" +PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}" K_MAJOR = "2" K_MINOR = "6" diff --git a/packages/linux/linux-openzaurus-2.6.15/.mtn2git_empty b/packages/linux/linux-openzaurus-2.6.15/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.15/.mtn2git_empty diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/add-oz-release-string.patch b/packages/linux/linux-openzaurus-2.6.15/add-oz-release-string.patch index 22a6fd3943..22a6fd3943 100644 --- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/add-oz-release-string.patch +++ b/packages/linux/linux-openzaurus-2.6.15/add-oz-release-string.patch diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/connectplus-remove-ide-HACK.patch b/packages/linux/linux-openzaurus-2.6.15/connectplus-remove-ide-HACK.patch index 4414b21191..4414b21191 100644 --- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/connectplus-remove-ide-HACK.patch +++ b/packages/linux/linux-openzaurus-2.6.15/connectplus-remove-ide-HACK.patch diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.15/defconfig-c7x0 index bbdc12f5f3..706726e60c 100644 --- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-c7x0 +++ b/packages/linux/linux-openzaurus-2.6.15/defconfig-c7x0 @@ -492,8 +492,8 @@ CONFIG_BT_HCIVHCI=m CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set CONFIG_IEEE80211_CRYPT_WEP=m -# CONFIG_IEEE80211_CRYPT_CCMP is not set -# CONFIG_IEEE80211_CRYPT_TKIP is not set +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_CRYPT_TKIP=m # # Device Drivers diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-collie b/packages/linux/linux-openzaurus-2.6.15/defconfig-collie index cbe06f9c3a..cbe06f9c3a 100644 --- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-collie +++ b/packages/linux/linux-openzaurus-2.6.15/defconfig-collie diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-cxx00 b/packages/linux/linux-openzaurus-2.6.15/defconfig-cxx00 index 698c98eeaa..9941367a3b 100644 --- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-cxx00 +++ b/packages/linux/linux-openzaurus-2.6.15/defconfig-cxx00 @@ -480,8 +480,8 @@ CONFIG_BT_HCIVHCI=m CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set CONFIG_IEEE80211_CRYPT_WEP=m -# CONFIG_IEEE80211_CRYPT_CCMP is not set -# CONFIG_IEEE80211_CRYPT_TKIP is not set +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_CRYPT_TKIP=m # # Device Drivers diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-ipaq-pxa270 b/packages/linux/linux-openzaurus-2.6.15/defconfig-ipaq-pxa270 index d826d06886..d826d06886 100644 --- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-ipaq-pxa270 +++ b/packages/linux/linux-openzaurus-2.6.15/defconfig-ipaq-pxa270 diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-poodle b/packages/linux/linux-openzaurus-2.6.15/defconfig-poodle index 646e08305a..646e08305a 100644 --- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-poodle +++ b/packages/linux/linux-openzaurus-2.6.15/defconfig-poodle diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.15/defconfig-tosa index 14acb3c56c..14acb3c56c 100644 --- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-tosa +++ b/packages/linux/linux-openzaurus-2.6.15/defconfig-tosa diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/pxa-serial-hack.patch b/packages/linux/linux-openzaurus-2.6.15/pxa-serial-hack.patch index b3a7f786ea..b3a7f786ea 100644 --- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/pxa-serial-hack.patch +++ b/packages/linux/linux-openzaurus-2.6.15/pxa-serial-hack.patch diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/packages/linux/linux-openzaurus-2.6.15/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch index 18bf4268fc..18bf4268fc 100644 --- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch +++ b/packages/linux/linux-openzaurus-2.6.15/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch diff --git a/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc7.bb b/packages/linux/linux-openzaurus_2.6.15.bb index b8ba47e09a..13f682cb65 100644 --- a/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc7.bb +++ b/packages/linux/linux-openzaurus_2.6.15.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r2" +PR = "r0" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -12,21 +12,17 @@ PR = "r2" # Patches submitted upstream are towards top of this list # Hacks should clearly named and at the bottom -SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.15-rc2.tar.bz2 \ - http://www.kernel.org/pub/linux/kernel/v2.6/testing/incr/patch-2.6.15-rc2-rc3.bz2;patch=1 \ - http://www.kernel.org/pub/linux/kernel/v2.6/testing/incr/patch-2.6.15-rc3-rc4.bz2;patch=1 \ - http://www.kernel.org/pub/linux/kernel/v2.6/testing/incr/patch-2.6.15-rc4-rc5.bz2;patch=1 \ - http://www.kernel.org/pub/linux/kernel/v2.6/testing/incr/patch-2.6.15-rc5-rc6.bz2;patch=1 \ - http://www.kernel.org/pub/linux/kernel/v2.6/testing/incr/patch-2.6.15-rc6-rc7.bz2;patch=1 \ +SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \ ${RPSRC}/pxa_ohci_platform-r5.patch;patch=1 \ ${RPSRC}/pxa_ohci_suspend-r5.patch;patch=1 \ ${RPSRC}/pxa_ohci_fixes-r0.patch;patch=1 \ ${RPSRC}/spitz_ohci-r0.patch;patch=1 \ ${RPSRC}/pxa_i2c_fixes-r5.patch;patch=1 \ ${RPSRC}/scoop_cpr_fix-r1.patch;patch=1 \ - ${RPSRC}/pxa2xx_release-r0.patch;patch=1 \ + ${RPSRC}/pxa2xx_release-r1.patch;patch=1 \ ${RPSRC}/ide_not_removable-r0.patch;patch=1 \ ${RPSRC}/sharpsl_pm_move-r0.patch;patch=1 \ + ${RPSRC}/sharpsl_pm_gcc4_fix-r0.patch;patch=1 \ ${RPSRC}/pcmcia_dev_ids-r3.patch;patch=1 \ ${RPSRC}/led_core-r10.patch;patch=1 \ ${RPSRC}/led_triggers-r8.patch;patch=1 \ @@ -97,7 +93,7 @@ SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \ ${DOSRC}/wm97xx-touch-lg2-r0.patch;patch=1 \ ${DOSRC}/wm9712-pm-r0.patch;patch=1 " -S = "${WORKDIR}/linux-2.6.15-rc2" +S = "${WORKDIR}/linux-2.6.15" # to get module dependencies working -KERNEL_RELEASE = "2.6.15-rc7" +KERNEL_RELEASE = "2.6.15" diff --git a/packages/logrotate-script/logrotate-script_cvs.bb b/packages/logrotate-script/logrotate-script_cvs.bb index da05f25a7d..e22a68a97a 100644 --- a/packages/logrotate-script/logrotate-script_cvs.bb +++ b/packages/logrotate-script/logrotate-script_cvs.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" LICENSE = "GPL" -SRC_URI = "http://meshcube.org/download/logrotate_${CVSDATE}.tgz" +SRC_URI = "http://meshcube.org/download/logrotate_${SRCDATE}.tgz" S = "${WORKDIR}/${PN}" do_install() { diff --git a/packages/madwifi/madwifi-modules_cvs-bsd.bb b/packages/madwifi/madwifi-modules_cvs-bsd.bb index 7a57117e98..1092180037 100644 --- a/packages/madwifi/madwifi-modules_cvs-bsd.bb +++ b/packages/madwifi/madwifi-modules_cvs-bsd.bb @@ -5,9 +5,9 @@ MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" LICENSE = "GPL" RDEPENDS = "kernel (${KERNEL_VERSION})" DEPENDS = "virtual/kernel" -PV = "cvs-bsd${CVSDATE}" +PV = "cvs-bsd+${SRCDATE}" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/madwifi;module=madwifi;tag=BSD;date=${CVSDATE}" +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/madwifi;module=madwifi;tag=BSD;date=${SRCDATE}" S = "${WORKDIR}/madwifi" diff --git a/packages/madwifi/madwifi-modules_cvs.bb b/packages/madwifi/madwifi-modules_cvs.bb index f222db83e4..4e00bf609c 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 = "cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/madwifi;module=madwifi" diff --git a/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb b/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb index 0044d21d79..9ab3e03b33 100644 --- a/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb +++ b/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb @@ -82,6 +82,8 @@ do_install() { oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install } +PACKAGES_DYNAMIC = "gnome-vfs-plugin-*" + python populate_packages_prepend () { print bb.data.getVar('FILES_gnome-vfs', d, 1) diff --git a/packages/manufacturers/manufacturers_20031209.bb b/packages/manufacturers/manufacturers_20031209.bb index 43de376211..43237dbcad 100644 --- a/packages/manufacturers/manufacturers_20031209.bb +++ b/packages/manufacturers/manufacturers_20031209.bb @@ -2,7 +2,7 @@ SECTION = "base" DESCRIPTION = "Ethernet manufacturer database" LICENSE = "PD" MAINTAINER = "Michael 'Mickey' Lauer <mickey@vanille.de>" -CVSDATE = "${PV}" +SRCDATE = "${PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/etc" S = "${WORKDIR}/etc" diff --git a/packages/matchbox-common/matchbox-common_svn.bb b/packages/matchbox-common/matchbox-common_svn.bb index 9dbdd13a14..97709bf31e 100644 --- a/packages/matchbox-common/matchbox-common_svn.bb +++ b/packages/matchbox-common/matchbox-common_svn.bb @@ -2,7 +2,7 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager common files" LICENSE = "GPL" DEPENDS = "libmatchbox" -PV = "0.9.1+cvs-${CVSDATE}" +PV = "0.9.1+svn${SRCDATE}" S = "${WORKDIR}/matchbox-common" DEFAULT_PREFERENCE = "-1" diff --git a/packages/matchbox-desktop/matchbox-desktop_svn.bb b/packages/matchbox-desktop/matchbox-desktop_svn.bb index a600103f9f..6f2365c016 100644 --- a/packages/matchbox-desktop/matchbox-desktop_svn.bb +++ b/packages/matchbox-desktop/matchbox-desktop_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox Window Manager Desktop" LICENSE = "GPL" DEPENDS = "libmatchbox startup-notification" SECTION = "x11/wm" -PV = "0.9.1+cvs-${CVSDATE}" +PV = "0.9.1+svn${SRCDATE}" DEFAULT_PREFERENCE = "-1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" diff --git a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb index 7a7795acb3..d2514d95c3 100644 --- a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb +++ b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" DEPENDS = "libfakekey expat libxft" SECTION = "x11" MAINTAINER = "Koen Kooi <koen@handhelds.org>" -PV = "0.0+svn${CVSDATE}" +PV = "0.0+svn${SRCDATE}" PR="r2" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" diff --git a/packages/matchbox-panel/matchbox-panel_svn.bb b/packages/matchbox-panel/matchbox-panel_svn.bb index d43c89f807..d12712f429 100644 --- a/packages/matchbox-panel/matchbox-panel_svn.bb +++ b/packages/matchbox-panel/matchbox-panel_svn.bb @@ -1,5 +1,5 @@ include matchbox-panel.inc -PV = "0.9.2+cvs-${CVSDATE}" +PV = "0.9.2+svn${SRCDATE}" DEFAULT_PREFERENCE = "-1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" diff --git a/packages/matchbox-stroke/matchbox-stroke_svn.bb b/packages/matchbox-stroke/matchbox-stroke_svn.bb index 99473397b0..9bbbe89027 100644 --- a/packages/matchbox-stroke/matchbox-stroke_svn.bb +++ b/packages/matchbox-stroke/matchbox-stroke_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox keyboard" LICENSE = "GPL" DEPENDS = "libfakekey expat libxft" SECTION = "x11/wm" -PV = "0.0+svn${CVSDATE}" +PV = "0.0+svn${SRCDATE}" PR="r1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" diff --git a/packages/matchbox-wm/matchbox-wm_svn.bb b/packages/matchbox-wm/matchbox-wm_svn.bb index d747243740..d8084b006e 100644 --- a/packages/matchbox-wm/matchbox-wm_svn.bb +++ b/packages/matchbox-wm/matchbox-wm_svn.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Matchbox window manager" LICENSE = "GPL" DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" -PV = "0.9.5+cvs-${CVSDATE}" +PV = "0.9.5+svn${SRCDATE}" PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb index edf41f7eae..572eef2230 100644 --- a/packages/meta/gpe-image.bb +++ b/packages/meta/gpe-image.bb @@ -42,8 +42,16 @@ GPE_EXTRA_INSTALL_none = "" XSERVER ?= "xserver-kdrive-fbdev" DEPENDS = "task-bootstrap \ - meta-gpe \ - ${GPE_EXTRA_DEPENDS}" + meta-gpe \ + ${GPE_EXTRA_DEPENDS}" + +RDEPENDS = "\ + gpe-task-base \ + gpe-task-pim \ + gpe-task-settings \ + gpe-task-apps \ + ${XSERVER} \ + ${GPE_EXTRA_INSTALL}" export IPKG_INSTALL = "task-bootstrap gpe-task-base \ gpe-task-pim gpe-task-settings \ diff --git a/packages/meta/meta-e-x11-core.bb b/packages/meta/meta-e-x11-core.bb index e8a20804a1..efd7430529 100644 --- a/packages/meta/meta-e-x11-core.bb +++ b/packages/meta/meta-e-x11-core.bb @@ -13,14 +13,10 @@ ALLOW_EMPTY = 1 # # X # -DEPENDS = "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig \ - ttf-bitstream-vera chkhinge" -RDEPENDS_task-e-x11-core = " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \ - ttf-bitstream-vera chkhinge" +RDEPENDS_task-e-x11-core = " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \ + ttf-bitstream-vera chkhinge" # # E-core # -DEPENDS += "entrance e-wm" RDEPENDS_task-e-x11-core += "entrance e-wm" - diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb index 4a4c2c6b63..82a6055089 100644 --- a/packages/meta/meta-e-x11.bb +++ b/packages/meta/meta-e-x11.bb @@ -8,8 +8,6 @@ FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \ ALLOW_EMPTY = 1 -DEPENDS = "task-e-x11-core entice eclair examine evidence e-modules" -# e-utils elitaire RDEPENDS_task-e-x11 = "task-e-x11-core entice eclair examine evidence e-modules" # e-utils elitaire diff --git a/packages/meta/meta-e.bb b/packages/meta/meta-e.bb index 2bdb84ac51..e933cc7415 100644 --- a/packages/meta/meta-e.bb +++ b/packages/meta/meta-e.bb @@ -9,8 +9,7 @@ task-e-libs = "evas edb ecore eet embryo edje etox ewl" task-e-base = "" RDEPENDS_e-libs = "${task-e-libs}" -DEPENDS += "${task-e-libs}" RDEPENDS_e-base = "${task-e-base}" -DEPENDS += "${task-e-base}" + LICENSE = MIT diff --git a/packages/meta/meta-gpe-extras.bb b/packages/meta/meta-gpe-extras.bb index 1ca5fd8c62..1e8c219929 100644 --- a/packages/meta/meta-gpe-extras.bb +++ b/packages/meta/meta-gpe-extras.bb @@ -5,24 +5,18 @@ PR="r1" ALLOW_EMPTY = 1 -gpe-task-apps-extra = "\ +RDEPENDS_gpe-task-apps-extra := "\ gpe-filemanager \ gpe-nmf \ gpe-soundbite \ mbmerlin" -RDEPENDS_gpe-task-apps-extra := "${gpe-task-apps-extra}" -DEPENDS += " ${gpe-task-apps-extra}" - -gpe-task-web = "\ +RDEPENDS_gpe-task-web := "\ gpe-irc \ minimo \ gaim" -RDEPENDS_gpe-task-web := "${gpe-task-web}" -DEPENDS += " ${gpe-task-web}" - -gpe-task-desktopapps = "\ +RDEPENDS_gpe-task-desktopapps := "\ firefox \ thunderbird \ galculator \ @@ -30,6 +24,4 @@ gpe-task-desktopapps = "\ gpdf \ totem" -RDEPENDS_gpe-task-desktopapps := "${gpe-task-desktopapps}" -DEPENDS += " ${gpe-task-desktopapps}" LICENSE = MIT diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb index ae0fe753d1..347608aaa1 100644 --- a/packages/meta/meta-gpe.bb +++ b/packages/meta/meta-gpe.bb @@ -5,14 +5,11 @@ PR = "r41" ALLOW_EMPTY = "1" -gpe-base-depends = "\ +RDEPENDS_gpe-base-depends := "\ diet-x11 \ virtual/xserver" -RDEPENDS_gpe-base-depends := "${gpe-base-depends}" -DEPENDS += " ${gpe-base-depends}" - -gpe-task-base = "\ +RDEPENDS_gpe-task-base := "\ gpe-bootsplash \ bluez-utils-dbus \ matchbox \ @@ -35,17 +32,14 @@ gpe-task-base = "\ detect-stylus \ suspend-desktop \ teleport \ - xauth" - -RDEPENDS_gpe-task-base := "gdk-pixbuf-loader-png \ - gdk-pixbuf-loader-xpm \ - gdk-pixbuf-loader-jpeg \ - pango-module-basic-x \ - pango-module-basic-fc \ - ${gpe-task-base}" -DEPENDS += " ${gpe-task-base}" - -gpe-task-pim = "\ + xauth \ + gdk-pixbuf-loader-png \ + gdk-pixbuf-loader-xpm \ + gdk-pixbuf-loader-jpeg \ + pango-module-basic-x \ + pango-module-basic-fc" + +RDEPENDS_gpe-task-pim := "\ gpe-timesheet \ gpe-todo \ gpe-calendar \ @@ -54,10 +48,7 @@ gpe-task-pim = "\ gpe-today \ gpesyncd" -RDEPENDS_gpe-task-pim := "${gpe-task-pim}" -DEPENDS += " ${gpe-task-pim}" - -gpe-task-settings = "\ +RDEPENDS_gpe-task-settings := "\ matchbox-panel-manager \ gpe-bluetooth \ gpe-beam \ @@ -74,10 +65,7 @@ gpe-task-settings = "\ minimix \ xmonobut" -RDEPENDS_gpe-task-settings := "${gpe-task-settings}" -DEPENDS += " ${gpe-task-settings}" - -gpe-task-apps = "\ +RDEPENDS_gpe-task-apps := "\ gpe-edit \ gpe-gallery \ gpe-calculator \ @@ -91,10 +79,7 @@ gpe-task-apps = "\ gpe-soundbite \ rosetta" -RDEPENDS_gpe-task-apps := "${gpe-task-apps}" -DEPENDS += " ${gpe-task-apps}" - -gpe-task-games = "\ +RDEPENDS_gpe-task-games := "\ gpe-go \ gpe-lights \ gpe-othello \ @@ -102,19 +87,12 @@ gpe-task-games = "\ gsoko \ xdemineur" -RDEPENDS_gpe-task-games := "${gpe-task-games}" -DEPENDS += " ${gpe-task-games}" - -gpe-task-connectivity = "\ - gpe-mini-browser \ -" -# gaim \ -# linphone-hh" - -RDEPENDS_gpe-task-connectivity := "${gpe-task-connectivity}" -DEPENDS += " ${gpe-task-connectivity}" - +RDEPENDS_gpe-task-connectivity := "\ + gpe-mini-browser" +# gaim +# linphone-hh +# FIXME - Some dependencies are broken somewhere for this to be needed DEPENDS += "matchbox-themes-extra" LICENSE = "MIT" diff --git a/packages/meta/meta-opie-all.bb b/packages/meta/meta-opie-all.bb index 8b6a3df829..dba7915f26 100644 --- a/packages/meta/meta-opie-all.bb +++ b/packages/meta/meta-opie-all.bb @@ -10,165 +10,145 @@ PACKAGES = "task-qpe-applets task-qpe-games task-qpe-inputmethods \ task-qpe-multimedia task-qpe-emulators task-qpe-applications \ task-qpe-fonts task-qpe-settings" -task-qpe-applets = "\ -subapplet \ -tasklistapplet \ -" -RDEPENDS_task-qpe-applets = "${task-qpe-applets}" -DEPENDS += " ${task-qpe-applets}" +RDEPENDS_task-qpe-applets = "\ + subapplet \ + tasklistapplet" -task-qpe-applications = "\ -camera-assistant \ -cumulus \ -dviviewer \ -inkwp \ -iqnotes \ -justreader \ -keyring \ -klimt \ -kstars-embedded \ -ktimetrackerpi \ -mileage \ -militaryalphabet \ -notez \ -petitepainture \ -pocketcellar \ -poqetpresenter \ -portabase \ -qpdf2 \ -qpealarmclock \ -qpe-gaim \ -qpegps \ -qpenmapfe \ -qplot \ -resistorui \ -shopper \ -timesleuth \ -txdrug \ -tximage \ -ubahnnav \ -visiscript \ -zeecookbook \ -zbedic \ -zbench \ -zgscore \ -zipsc \ -zlapspeed \ -zroadmap \ -zshopi \ -" -RDEPENDS_task-qpe-applications = "${task-qpe-applications}" -DEPENDS += " ${task-qpe-applications}" +RDEPENDS_task-qpe-applications = "\ + camera-assistant \ + cumulus \ + dviviewer \ + inkwp \ + iqnotes \ + justreader \ + keyring \ + klimt \ + kstars-embedded \ + ktimetrackerpi \ + mileage \ + militaryalphabet \ + notez \ + petitepainture \ + pocketcellar \ + poqetpresenter \ + portabase \ + qpdf2 \ + qpealarmclock \ + qpe-gaim \ + qpegps \ + qpenmapfe \ + qplot \ + resistorui \ + shopper \ + timesleuth \ + txdrug \ + tximage \ + ubahnnav \ + visiscript \ + zeecookbook \ + zbedic \ + zbench \ + zgscore \ + zipsc \ + zlapspeed \ + zroadmap \ + zshopi" -task-opie-decorations = "\ -opie-deco-flat \ -opie-deco-liquid \ -opie-deco-polished " -RDEPENDS_task-opie-decorations = "${task-opie-decorations}" -DEPENDS += " ${task-opie-decorations}" +RDEPENDS_task-opie-decorations = "\ + opie-deco-flat \ + opie-deco-liquid \ + opie-deco-polished" -task-qpe-games = "\ -aliens \ -aliens-qt \ -atomic \ -billiardz \ -brickout \ -checkers \ -crossword \ -fish \ -froot \ -gemdropx \ -glider \ -gnuz \ -hexatrolic \ -iaimaster \ -icebloxx \ -knights \ -labyrinth \ -mahjongg \ -maki \ -nmm \ -pairs \ -pdamaze \ -pipeman \ -powermanga \ -puzz-le \ -qfish2 \ -qpe-vexed \ -qmatrix \ -shisensho \ -sokoban \ -tickypip \ -tickypip-levels \ -tron \ -vectoroids \ -win4 \ -zauralign \ -zddice \ -ziq \ -zmerlin \ -zrally \ -zrev7 \ -zsubhunt \ -ztappy " -RDEPENDS_task-qpe-games = "${task-qpe-games}" -DEPENDS += " ${task-qpe-games}" +RDEPENDS_task-qpe-games = "\ + aliens \ + aliens-qt \ + atomic \ + billiardz \ + brickout \ + checkers \ + crossword \ + fish \ + froot \ + gemdropx \ + glider \ + gnuz \ + hexatrolic \ + iaimaster \ + icebloxx \ + knights \ + labyrinth \ + mahjongg \ + maki \ + nmm \ + pairs \ + pdamaze \ + pipeman \ + powermanga \ + puzz-le \ + qfish2 \ + qpe-vexed \ + qmatrix \ + shisensho \ + sokoban \ + tickypip \ + tickypip-levels \ + tron \ + vectoroids \ + win4 \ + zauralign \ + zddice \ + ziq \ + zmerlin \ + zrally \ + zrev7 \ + zsubhunt \ + ztappy" -task-qpe-inputmethods = "\ -custominput \ -flexis-zaurus \ -irk \ -irk-belkin \ -" -RDEPENDS_task-qpe-inputmethods = "${task-qpe-inputmethods}" -DEPENDS += " ${task-qpe-inputmethods}" +RDEPENDS_task-qpe-inputmethods = "\ + custominput \ + flexis-zaurus \ + irk \ + irk-belkin" -task-qpe-multimedia = "\ -mplayer \ -sidplayer \ -xmms-embedded " -RDEPENDS_task-qpe-multimedia = "${task-qpe-multimedia}" -DEPENDS += " ${task-qpe-multimedia}" +RDEPENDS_task-qpe-multimedia = "\ + mplayer \ + sidplayer \ + xmms-embedded" + +RDEPENDS_task-kdepim = "\ + kopi \ + kapi \ + kopi-applet" -task-kdepim = "\ -kopi \ -kapi \ -kopi-applet \ -" -RDEPENDS_task-kdepim = "${task-kdepim}" DEPENDS += " kdepimpi" -task-qpe-emulators = "\ -scummvm \ -snes9x-sdl-qpe \ -" -RDEPENDS_task-qpe-emulators = "${task-qpe-emulators}" -DEPENDS += " ${task-qpe-emulators}" +RDEPENDS_task-qpe-emulators = "\ + scummvm \ + snes9x-sdl-qpe" + task-qpe-fonts = "\ -qpf-bitstream-vera \ -qpf-bitstream-vera-sans-mono \ -qpf-dejavusans \ -qpf-dejavusanscondensed \ -qpf-dejavusansmono \ -qpf-dejavuserif \ -qpf-dejavuserifcondensed \ -qpf-freemono \ -qpf-freeserif \ -qpf-gentium \ -qpf-gentiumalt \ -qpf-hunkysans \ -qpf-hunkyserif \ -qpf-qte \ -qpf-helvetica \ -qpf-unifont \ -qpf-utopia \ -terminus \ -" + qpf-bitstream-vera \ + qpf-bitstream-vera-sans-mono \ + qpf-dejavusans \ + qpf-dejavusanscondensed \ + qpf-dejavusansmono \ + qpf-dejavuserif \ + qpf-dejavuserifcondensed \ + qpf-freemono \ + qpf-freeserif \ + qpf-gentium \ + qpf-gentiumalt \ + qpf-hunkysans \ + qpf-hunkyserif \ + qpf-qte \ + qpf-helvetica \ + qpf-unifont \ + qpf-utopia \ + terminus" +#FIXME Does this really want just a DEPENDS here? DEPENDS += " ${task-qpe-fonts}" -task-qpe-settings = "\ -qclockchange \ -" -RDEPENDS_task-qpe-settings += "${task-qpe-settings}" -DEPENDS += " ${task-qpe-settings}" +RDEPENDS_task-qpe-settings += "\ + qclockchange" + diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb index f82a69f367..30f3358d8f 100644 --- a/packages/meta/meta-opie.bb +++ b/packages/meta/meta-opie.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta-package for Opie" SECTION = "opie/base" ALLOW_EMPTY = 1 -PR = "r32" +PR = "r33" PACKAGE_ARCH = "all" LICENSE = "MIT" @@ -22,14 +22,14 @@ PACKAGES = "task-opie-applets task-opie-apps task-opie-base \ # for devices with >16M of flash # -DEPENDS = "irda-utils ntp timezones ttf-dejavu \ - bluez-utils-nodbus wireless-tools \ - opie-ttf-support libopieobex0 opie-examples-python \ - opie-freetype opie-help-en opie-i18n opie-login \ - opie-securityplugin-blueping opie-securityplugin-dummy \ - opie-securityplugin-notice opie-securityplugin-pin \ - opie-sh opie-symlinker opie-alarm openobex \ - konqueror-embedded qpdf2" +#DEPENDS = "irda-utils ntp timezones ttf-dejavu \ +# bluez-utils-nodbus wireless-tools \ +# opie-ttf-support libopieobex0 opie-examples-python \ +# opie-freetype opie-help-en opie-i18n opie-login \ +# opie-securityplugin-blueping opie-securityplugin-dummy \ +# opie-securityplugin-notice opie-securityplugin-pin \ +# opie-sh opie-symlinker opie-alarm openobex \ +# konqueror-embedded qpdf2" # # Dependencies to get the launcher up and running @@ -71,7 +71,8 @@ task-opie-base-apps = "opie-console opie-clock opie-citytime opie-backup opie-sy task-opie-base-settings = "opie-packagemanager opie-light-and-power opie-appearance \ opie-systemtime opie-networksettings opie-button-settings \ - opie-icon-reload opie-launcher-settings opie-security" + opie-icon-reload opie-launcher-settings opie-security \ + opie-securityplugin-pin" # # That settings can be removed and device will be still usable @@ -192,14 +193,9 @@ task-opie-extra-games = "opie-parashoot opie-mindbreaker opie-fifteen opie-ticta # Let's build DEPENDS and RDEPENDS now # -DEPENDS += "${task-opie-applets} ${task-opie-apps} \ - opie-qcop opie-qss opie-quicklauncher opie-taskbar opie-pics \ - opie-sounds opie-ttf-support ttf-dejavu \ - ${task-opie-bluetooth} ${task-opie-datebookplugins} \ - ${task-opie-decorations} ${task-opie-extra-settings} \ - ${task-opie-games} ${task-opie-inputmethods} ${task-opie-irda} \ - ${task-opie-multimedia} ${task-opie-todayplugins} ${task-opie-pim} \ - ${task-opie-settings} ${task-opie-styles} ${task-opie-wlan}" +## FIXME - these shouldn't be here +#DEPENDS += "opie-qcop opie-qss opie-quicklauncher opie-taskbar opie-pics \ +# opie-sounds opie-ttf-support ttf-dejavu" RDEPENDS_task-opie-applets = "${task-opie-applets}" RDEPENDS_task-opie-apps = "${task-opie-apps}" diff --git a/packages/meta/meta-sdl.bb b/packages/meta/meta-sdl.bb index c631fa44c1..76fa01f069 100644 --- a/packages/meta/meta-sdl.bb +++ b/packages/meta/meta-sdl.bb @@ -5,22 +5,12 @@ PR = "r1" ALLOW_EMPTY = 1 -# no need to add libsdl as all libsdl-* already (r)depend on it -task-sdl-libs = "libsdl-gfx libsdl-image libsdl-mixer libsdl-ttf libsdl-net" -task-sdl-base = "" +# no need to add libsdl as all libsdl-* already rdepend on it +RDEPENDS_task-sdl-libs = "libsdl-gfx libsdl-image libsdl-mixer libsdl-ttf libsdl-net" -task-sdl-games = "abuse freedroid lbreakout2 openttd prboom quake1 rott supertux xmame" -task-sdl-emulators = "dgen-sdl e-uae frodo snes9x" +RDEPENDS_task-sdl-base = "" +RDEPENDS_task-sdl-games = "abuse freedroid lbreakout2 openttd prboom quake1 rott supertux xmame" -RDEPENDS_task-sdl-libs = "${task-sdl-libs}" -DEPENDS += "${task-sdl-libs}" +RDEPENDS_task-sdl-emulators = "dgen-sdl e-uae frodo snes9x" -RDEPENDS_task-sdl-base = "${task-sdl-base}" -DEPENDS += "${task-sdl-base}" - -RDEPENDS_task-sdl-games = "${task-sdl-games}" -DEPENDS += "${task-sdl-games}" - -RDEPENDS_task-sdl-emulators = "${task-sdl-emulators}" -DEPENDS += "${task-sdl-emulators}" diff --git a/packages/meta/meta-sectest-gpe.bb b/packages/meta/meta-sectest-gpe.bb index db9d86cdd6..01bd572730 100644 --- a/packages/meta/meta-sectest-gpe.bb +++ b/packages/meta/meta-sectest-gpe.bb @@ -5,14 +5,11 @@ PR = "r5" ALLOW_EMPTY = "1" -gpe-base-depends = "\ +RDEPENDS_gpe-base-depends := "\ diet-x11 \ virtual/xserver" -RDEPENDS_gpe-base-depends := "${gpe-base-depends}" -DEPENDS += " ${gpe-base-depends}" - -gpe-task-base = "\ +RDEPENDS_gpe-task-base := "\ bluez-utils-dbus \ matchbox \ xcursor-transparent-theme \ @@ -30,22 +27,17 @@ gpe-task-base = "\ gpe-confd \ gpe-autostarter \ libgtkstylus \ - detect-stylus" - -RDEPENDS_gpe-task-base := "gdk-pixbuf-loader-png \ - gdk-pixbuf-loader-xpm \ - gdk-pixbuf-loader-jpeg \ - pango-module-basic-x \ - pango-module-basic-fc \ - ${gpe-task-base}" -DEPENDS += " ${gpe-task-base}" + detect-stylus \ + gdk-pixbuf-loader-png \ + gdk-pixbuf-loader-xpm \ + gdk-pixbuf-loader-jpeg \ + pango-module-basic-x \ + pango-module-basic-fc" -gpe-task-pim = "\ +RDEPENDS_gpe-task-pim := "\ figment" -RDEPENDS_gpe-task-pim := "${gpe-task-pim}" -DEPENDS += " ${gpe-task-pim}" -gpe-task-settings = "\ +RDEPENDS_gpe-task-settings := "\ matchbox-panel-manager \ gpe-bluetooth \ gpe-beam \ @@ -61,10 +53,7 @@ gpe-task-settings = "\ minilite \ xmonobut" -RDEPENDS_gpe-task-settings := "${gpe-task-settings}" -DEPENDS += " ${gpe-task-settings}" - -sectest-task-apps = "\ +RDEPENDS_sectest-task-apps := "\ gpe-edit \ gpe-calculator \ gpe-clock \ @@ -85,12 +74,9 @@ sectest-task-apps = "\ hydra \ thcrut \ driftnet \ - miniclipboard" - -RDEPENDS_sectest-task-apps := "${sectest-task-apps}" -DEPENDS += " ${sectest-task-apps}" - + miniclipboard" +# FIXME - we shouldn't need this. which packages don't set their dependencies correctly? DEPENDS += "matchbox-themes-extra gtk-industrial-engine" LICENSE = "MIT" diff --git a/packages/meta/nylon-image-base.bb b/packages/meta/nylon-image-base.bb index b706bca2d5..ce6c83d847 100644 --- a/packages/meta/nylon-image-base.bb +++ b/packages/meta/nylon-image-base.bb @@ -6,9 +6,6 @@ NYLON_BASE = "base-files base-passwd bash busybox \ nano ncurses netbase \ openssh sysvinit \ timezones tinylogin" - -DEPENDS = "virtual/kernel \ - ${NYLON_BASE} ${BOOTSTRAP_EXTRA_DEPENDS}" RDEPENDS = "kernel modutils-depmod modutils-modinfo \ ${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}" diff --git a/packages/meta/nylon-image-extra.bb b/packages/meta/nylon-image-extra.bb index b196a4276f..be20ddde78 100644 --- a/packages/meta/nylon-image-extra.bb +++ b/packages/meta/nylon-image-extra.bb @@ -2,14 +2,10 @@ include nylon-image-standard.bb export IMAGE_BASENAME = "nylon-extra" -NYLON_EXTRA = "\ - kismet \ - netperf \ - nylon-statistics \ - openvpn \ - " +RDEPENDS = "\ + kismet \ + netperf \ + nylon-statistics \ + openvpn" -DEPENDS += "${NYLON_EXTRA}" - -RDEPENDS += "${NYLON_EXTRA}" LICENSE = MIT diff --git a/packages/meta/nylon-image-mini.bb b/packages/meta/nylon-image-mini.bb index be61193c48..e3ac80720d 100644 --- a/packages/meta/nylon-image-mini.bb +++ b/packages/meta/nylon-image-mini.bb @@ -8,9 +8,6 @@ NYLON_BASE = "base-files base-passwd busybox \ netbase \ wireless-tools" -DEPENDS = "virtual/kernel modutils \ - ${NYLON_BASE} ${BOOTSTRAP_EXTRA_DEPENDS}" - RDEPENDS = "kernel \ ${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}" diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb index 6d3eb1d59d..421fe53ea0 100644 --- a/packages/meta/opie-image.bb +++ b/packages/meta/opie-image.bb @@ -9,6 +9,7 @@ LICENSE = "MIT" PR = "r19" DEPENDS = "task-bootstrap meta-opie" +RDEPENDS = "${INSTALL_PACKAGES}" extra_stuff := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles",d)}' diff --git a/packages/meta/task-bootstrap-unionroot.bb b/packages/meta/task-bootstrap-unionroot.bb index 8435388174..c800fca9f1 100644 --- a/packages/meta/task-bootstrap-unionroot.bb +++ b/packages/meta/task-bootstrap-unionroot.bb @@ -15,16 +15,6 @@ PACKAGES = "${PN}" MODUTILS ?= "24 26" -def bootstrap_modutils_depends(d): - import bb - m = bb.data.getVar('MODUTILS', d, 1) - r = [] - if '24' in m: - r.append('modutils') - if '26' in m: - r.append('module-init-tools') - return ' '.join(r) - def bootstrap_modutils_rdepends(d): import bb m = bb.data.getVar('MODUTILS', d, 1) @@ -37,18 +27,6 @@ def bootstrap_modutils_rdepends(d): HOTPLUG ?= "linux-hotplug" -DEPENDS = 'base-files base-passwd-3.5.7 \ - busybox dropbear initscripts modutils netbase \ - sysvinit tinylogin portmap \ - modutils-initscripts \ - ${HOTPLUG} \ - ${BOOTSTRAP_EXTRA_DEPENDS} \ - ${@bootstrap_modutils_depends(d)} \ - unionfs-modules \ - unionfs-utils \ - unionroot \ - unionroot-utils' - RDEPENDS = 'base-files base-passwd busybox \ initscripts \ netbase sysvinit sysvinit-pidof tinylogin \ diff --git a/packages/meta/task-bootstrap.bb b/packages/meta/task-bootstrap.bb index 31920135d4..ef76ec4345 100644 --- a/packages/meta/task-bootstrap.bb +++ b/packages/meta/task-bootstrap.bb @@ -11,16 +11,6 @@ PACKAGES = "${PN}" MODUTILS ?= "24 26" -def bootstrap_modutils_depends(d): - import bb - m = bb.data.getVar('MODUTILS', d, 1) - r = [] - if '24' in m: - r.append('modutils') - if '26' in m: - r.append('module-init-tools') - return ' '.join(r) - def bootstrap_modutils_rdepends(d): import bb m = bb.data.getVar('MODUTILS', d, 1) @@ -33,14 +23,6 @@ def bootstrap_modutils_rdepends(d): HOTPLUG ?= "linux-hotplug" -DEPENDS = 'base-files base-passwd-3.5.9 \ - busybox dropbear initscripts modutils netbase \ - sysvinit tinylogin portmap psmisc setserial\ - modutils-initscripts \ - ${HOTPLUG} \ - ${BOOTSTRAP_EXTRA_DEPENDS} \ - ${@bootstrap_modutils_depends(d)}' - RDEPENDS = 'base-files base-passwd busybox \ initscripts \ netbase sysvinit sysvinit-pidof tinylogin \ diff --git a/packages/meta/task-dvb.bb b/packages/meta/task-dvb.bb index 8be412611d..5a5c37a565 100644 --- a/packages/meta/task-dvb.bb +++ b/packages/meta/task-dvb.bb @@ -5,5 +5,5 @@ ALLOW_EMPTY = 1 PR = "r5" RDEPENDS = "dvbstream dvbtune xserver-xorg tda1004x-firmware mythtv lirc lirc-modules drm-module-via" -DEPENDS = "dvbstream dvbtune xserver-xorg tda1004x-firmware mythtv lirc lirc-modules drm-kernel" + LICENSE = MIT diff --git a/packages/meta/task-mythfront.bb b/packages/meta/task-mythfront.bb index 85aa7d6a80..a1532c1739 100644 --- a/packages/meta/task-mythfront.bb +++ b/packages/meta/task-mythfront.bb @@ -4,6 +4,6 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" ALLOW_EMPTY = 1 PR = "r6" -RDEPENDS = "xserver-xorg mythtv lirc lirc-modules drm-module-via ttf-bitstream-vera libfontconfig-utils setserial snes9x ntp mythfront-config gpe-dm mythfront-session bootlogd drm-module-drm" -DEPENDS = "xserver-xorg mythtv lirc lirc-modules drm-kernel ttf-bitstream-vera setserial snes9x ntp mythfront-config gpe-dm mythfront-session" +RDEPENDS = "xserver-xorg mythtv lirc lirc-modules drm-module-via ttf-bitstream-vera fontconfig-utils setserial snes9x ntp mythfront-config gpe-dm mythfront-session bootlogd drm-module-drm" + LICENSE = MIT diff --git a/packages/meta/task-pivotboot.bb b/packages/meta/task-pivotboot.bb index 4f95d28e27..091f70f459 100644 --- a/packages/meta/task-pivotboot.bb +++ b/packages/meta/task-pivotboot.bb @@ -11,16 +11,6 @@ PACKAGES = "${PN}" MODUTILS ?= "24 26" -def bootstrap_modutils_depends(d): - import bb - m = bb.data.getVar('MODUTILS', d, 1) - r = [] - if '24' in m: - r.append('modutils') - if '26' in m: - r.append('module-init-tools') - return ' '.join(r) - def bootstrap_modutils_rdepends(d): import bb m = bb.data.getVar('MODUTILS', d, 1) @@ -33,13 +23,6 @@ def bootstrap_modutils_rdepends(d): HOTPLUG ?= "linux-hotplug" -DEPENDS = 'base-files base-passwd-3.5.9 \ - busybox modutils netbase \ - modutils-initscripts \ - ${HOTPLUG} \ - ${PIVOTBOOT_EXTRA_DEPENDS} \ - ${@bootstrap_modutils_depends(d)}' - RDEPENDS = 'base-files base-passwd busybox \ netbase modutils-initscripts \ ${HOTPLUG} \ diff --git a/packages/meta/task-python-everything_1.0.0.bb b/packages/meta/task-python-everything_1.0.0.bb index 32e36b9f52..705074a876 100644 --- a/packages/meta/task-python-everything_1.0.0.bb +++ b/packages/meta/task-python-everything_1.0.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.vanille.de/projects/python.spy" LICENSE = "MIT" PR = "ml2" -DEPENDS = "\ +RDEPENDS = "\ python-ao \ python-pybluez \ python-constraint \ @@ -64,7 +64,7 @@ DEPENDS = "\ plone \ twisted \ zope" -RDEPENDS=${DEPENDS} + #fixme add python-pycap once libdnet is in again #fixme add python-pyx once kpathwhich-native is there diff --git a/packages/meta/task-python-sharprom_1.0.0.bb b/packages/meta/task-python-sharprom_1.0.0.bb index 89d155b51d..aa1fc348bd 100644 --- a/packages/meta/task-python-sharprom_1.0.0.bb +++ b/packages/meta/task-python-sharprom_1.0.0.bb @@ -14,7 +14,7 @@ NONWORKING = "\ python-sgmlop \ python-vorbis" -DEPENDS = "\ +RDEPENDS = "\ python-ao \ python-pybluez \ python-constraint \ @@ -61,7 +61,6 @@ DEPENDS = "\ plone \ twisted \ zope" -RDEPENDS=${DEPENDS} #fixme add python-pycap once libdnet is in again #fixme add python-pyx once kpathwhich-native is there diff --git a/packages/meta/task-xfce-base.bb b/packages/meta/task-xfce-base.bb index 2f565fd433..4c508ec7c5 100644 --- a/packages/meta/task-xfce-base.bb +++ b/packages/meta/task-xfce-base.bb @@ -7,9 +7,6 @@ ALLOW_EMPTY = 1 PACKAGES = "${PN}" PR = "r1" -DEPENDS = "xfce-mcs-manager xfce-mcs-plugins xfwm4 xfce4-panel \ - xfdesktop xfce-utils" - RDEPENDS= "xfce-mcs-manager xfwm4 xfwm4-theme-default xfce-utils xfdesktop \ xfce4-panel xfce4-panel-plugins xfce-mcs-plugins xfwm4-mcs-plugins \ xfce-utils-mcs-plugins xfce4-panel-mcs-plugins \ diff --git a/packages/meta/task-xterminal.bb b/packages/meta/task-xterminal.bb index 656daad1c1..77eb094caa 100644 --- a/packages/meta/task-xterminal.bb +++ b/packages/meta/task-xterminal.bb @@ -5,6 +5,5 @@ ALLOW_EMPTY = 1 PR = "r0" RDEPENDS = "xserver-kdrive-fbdev minicom lrzsz dropbear" -DEPENDS = "xserver-kdrive minicom lrzsz dropbear" LICENSE = MIT diff --git a/packages/meta/xbase-clients.bb b/packages/meta/xbase-clients.bb index dc53858b47..5e0e590daf 100644 --- a/packages/meta/xbase-clients.bb +++ b/packages/meta/xbase-clients.bb @@ -5,12 +5,6 @@ PR = "r1" ALLOW_EMPTY = 1 PACKAGES = "${PN}" -DEPENDS = 'xauth \ - xhost \ - xmodmap \ - xrdb \ - xset' - RDEPENDS = 'xauth \ xhost \ xmodmap \ diff --git a/packages/mileage/mileage_cvs.bb b/packages/mileage/mileage_cvs.bb index 16178768f0..88658eb0d1 100644 --- a/packages/mileage/mileage_cvs.bb +++ b/packages/mileage/mileage_cvs.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://mileage.sourceforge.net" SECTION = "opie/applications" PRIORITY = "optional" LICENSE = "GPL" -PV = "4.2.0-cvs-${CVSDATE}" +PV = "4.2.0+cvs${SRCDATE}" PR = "r1" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/mileage;module=mileage" diff --git a/packages/minisip/minisip-video_svn.bb b/packages/minisip/minisip-video_svn.bb index ff31906ba7..7c0216bff3 100644 --- a/packages/minisip/minisip-video_svn.bb +++ b/packages/minisip/minisip-video_svn.bb @@ -1,4 +1,4 @@ -PV = "0.6.2svn${CVSDATE}" +PV = "0.6.2+svn${SRCDATE}" LICENSE = "GPL" SECTION = "x11/utils" PR = "r0" @@ -6,7 +6,7 @@ MAINTAINER = "Johan Bilien <jobi@via.ecp.fr>" CONFLICTS = "minisip" DESCRIPTION = "SIP user agent, with focus on security - video support" -DEPENDS = "libsdl-x11 ffmpeg-0.4.9-pre1+cvs-${CVSDATE} libglademm libmsip0 libmikey0" +DEPENDS = "libsdl-x11 ffmpeg-0.4.9-pre1+cvs${SRCDATE} libglademm libmsip0 libmikey0" SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=minisip" S = ${WORKDIR}/minisip diff --git a/packages/minisip/minisip_svn.bb b/packages/minisip/minisip_svn.bb index 99660655d9..73541cc1da 100644 --- a/packages/minisip/minisip_svn.bb +++ b/packages/minisip/minisip_svn.bb @@ -1,4 +1,4 @@ -PV = "0.6.2svn${CVSDATE}" +PV = "0.6.2+svn${SRCDATE}" LICENSE = "GPL" SECTION = "x11/utils" PR = "r0" diff --git a/packages/mozilla/minimo_cvs.bb b/packages/mozilla/minimo_cvs.bb index 31430d2c61..b2a0c8db4e 100644 --- a/packages/mozilla/minimo_cvs.bb +++ b/packages/mozilla/minimo_cvs.bb @@ -8,7 +8,7 @@ S = "${WORKDIR}/mozilla" MAINTAINER = "Phil Blundell <pb@handhelds.org>" SECTION = "x11" PRIORITY = "optional" -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" FILES_${PN} += "${libdir}/mozilla-minimo" PR = "r8" LICENSE = "MPL/LGPL/GPL" diff --git a/packages/mozilla/mozilla-cvs.inc b/packages/mozilla/mozilla-cvs.inc index 9f92ae5b13..6e278aaaf5 100644 --- a/packages/mozilla/mozilla-cvs.inc +++ b/packages/mozilla/mozilla-cvs.inc @@ -1,12 +1,12 @@ do_fetch () { - export MOZ_CO_DATE="${CVSDATE}" + export MOZ_CO_DATE="${SRCDATE}" mkdir -p ${WORKDIR} cd ${WORKDIR} - if [ ! -f ${DL_DIR}/mozilla_cvs-mirror.mozilla.org__${CVSDATE}.tar.gz ]; then + if [ ! -f ${DL_DIR}/mozilla_cvs-mirror.mozilla.org__${SRCDATE}.tar.gz ]; then cvs $CVSCOOPTS -d :pserver:anonymous@cvs-mirror.mozilla.org/cvsroot co mozilla/client.mk cd mozilla oe_runmake -f client.mk checkout cd .. - tar czf ${DL_DIR}/mozilla_cvs-mirror.mozilla.org__${CVSDATE}.tar.gz mozilla + tar czf ${DL_DIR}/mozilla_cvs-mirror.mozilla.org__${SRCDATE}.tar.gz mozilla fi } diff --git a/packages/mpfr/mpfr_cvs.bb b/packages/mpfr/mpfr_cvs.bb index 9b715bc9ed..e8f0faeeeb 100644 --- a/packages/mpfr/mpfr_cvs.bb +++ b/packages/mpfr/mpfr_cvs.bb @@ -3,7 +3,7 @@ LICENSE = "LGPL" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "libs" DEPENDS = "gmp" -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" PR = "r1" SRC_URI = "cvs://cvs:@cvs-sop.inria.fr/CVS/spaces;module=mpfr;method=pserver" diff --git a/packages/mtd/mtd-utils_20050801.bb b/packages/mtd/mtd-utils_20050801.bb index ca7c471d6e..eb25309b36 100644 --- a/packages/mtd/mtd-utils_20050801.bb +++ b/packages/mtd/mtd-utils_20050801.bb @@ -4,7 +4,7 @@ DEPENDS = "zlib" HOMEPAGE = "http://www.linux-mtd.infradead.org/" LICENSE = "GPLv2" PR = "r0" -CVSDATE = "${PV}" +SRCDATE = "${PV}" SRC_URI = "cvs://anoncvs:anoncvs@cvs.infradead.org/home/cvs;module=mtd \ file://add-exclusion-to-mkfs-jffs2.patch;patch=1 \ diff --git a/packages/mystun-server/mystun-server_cvs.bb b/packages/mystun-server/mystun-server_cvs.bb index cc2a5b4298..7a4d8b015a 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 = "cvs${CVSDATE}" +PV = "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 002edfd5db..7290f4d56c 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 f791afd7a5..4098f17d2e 100644 --- a/packages/nylon/nylon-scripts_cvs.bb +++ b/packages/nylon/nylon-scripts_cvs.bb @@ -5,10 +5,10 @@ SECTION = "base" PRIORITY = "optional" MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" LICENSE = "GPLv2" -PV = "cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" PR = "r2" -SRC_URI = "http://meshcube.org/download/${PN}_${CVSDATE}.tgz" +SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz" S = "${WORKDIR}/${PN}" do_install() { diff --git a/packages/nylon/nylon-statistics.bb b/packages/nylon/nylon-statistics.bb index ba63d62671..0212df309d 100644 --- a/packages/nylon/nylon-statistics.bb +++ b/packages/nylon/nylon-statistics.bb @@ -4,10 +4,10 @@ SECTION = "base" PRIORITY = "optional" MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" LICENSE = "GPLv2" -PV = "cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" PR = "r1" -SRC_URI = "http://meshcube.org/download/${PN}_${CVSDATE}.tgz" +SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz" S = "${WORKDIR}/${PN}" do_install() { diff --git a/packages/nylon/yamonenv.bb b/packages/nylon/yamonenv.bb index 6853bd56ed..a11b1cd65e 100644 --- a/packages/nylon/yamonenv.bb +++ b/packages/nylon/yamonenv.bb @@ -3,9 +3,9 @@ SECTION = "base" PRIORITY = "optional" MAINTAINER = "Michael Stickel <michael.stickel@4g-systems.biz>" LICENSE = "GPL" -PV = "cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" -SRC_URI = "http://meshcube.org/download/${PN}_${CVSDATE}.tgz" +SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz" S = "${WORKDIR}/${PN}" do_install() { diff --git a/packages/olsrd/olsrd_cvs.bb b/packages/olsrd/olsrd_cvs.bb index 49f7e0a84b..27c433d4e9 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 = "cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" SRC_URI="cvs://anonymous@cvs.sourceforge.net/cvsroot/olsrd;module=olsrd-current \ file://init \ diff --git a/packages/opencvs/opencvs_cvs.bb b/packages/opencvs/opencvs_cvs.bb index e57e462b8d..d098821cc6 100644 --- a/packages/opencvs/opencvs_cvs.bb +++ b/packages/opencvs/opencvs_cvs.bb @@ -5,7 +5,7 @@ DESCRIPTION = "BSD-licensed equivalent of the popular versioning system CVS." LICENSE = "BSD" PRIORITY = "optional" SECTION = "console/network" -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" PR = "r1" SRC_URI = "cvs://anoncvs@anoncvs.ca.openbsd.org/cvs;method=ext;module=src/usr.bin/cvs \ diff --git a/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb b/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb index 9632bf4f0d..f242613c50 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 d16e6f41d3..309aedc55d 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 bf7139ebbd..c93125bf51 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 f66ce15dc5..eb50f5ab4d 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 b302e4ac5c..a31f2ab3eb 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 0b6492216b..dd4b17fbad 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 971177ff28..55b28db27f 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 767e6ee379..6ba16adde6 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 112a884bbf..aaf2af8950 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 f61e384c17..01f1daf94c 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 a092b795bf..97b2056a74 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 b912ef4430..765dc35d93 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 e782ee3992..513968608f 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 e613d5bfc4..42ea7f54eb 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 bee8baa0eb..01f6c96cb2 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 679eb2bd52..7102e405bf 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 7e6f8fd30c..c25796d83d 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 588b946cde..e33a0da77b 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 fee063f40c..8b78452789 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 84a63c1fdb..42e28331a5 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 ce8fdf7c50..afae32fb8e 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 0f51227ddf..d9255760cc 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 bf7139ebbd..c93125bf51 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 07672df68d..7e77ab149a 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 4c63f7c108..06b5814bc2 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 525cf98cf5..19567838c2 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 d8be3b0402..609b2a7f7c 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 ce322cd140..773d64833a 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 a2adfdc927..606915dff7 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 7fa7d88741..f7d353cd81 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 6228f1d8a2..b22d4b6664 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 88149e2b84..afb8cfad87 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 e1012e109f..36bfd6e5e1 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 5d1997afc7..e69f6128fd 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 5044136153..9b7fca26b7 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 b270838fc7..824f49eb23 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 e5d0281582..6652b7da1e 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 045d5bcb03..d13b22cbaa 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 d85f04eb50..b0ba81aea5 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 e4b0296d4e..dd0fc890d5 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 2216f14acb..9416c5721c 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 e4312a747f..6b87647a00 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 94a513e0ce..c9fc45a974 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/euroconv \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-examples-python/opie-examples-python.inc b/packages/opie-examples-python/opie-examples-python.inc index ae84c3dfd7..060f8b12c8 100644 --- a/packages/opie-examples-python/opie-examples-python.inc +++ b/packages/opie-examples-python/opie-examples-python.inc @@ -3,8 +3,9 @@ SECTION = "opie/base" PRIORITY = "optional" MAINTAINER = "Team Opie <opie@handhelds.org>" LICENSE = "GPL" -RDEPENDS = "python-pyqt opie-pyquicklauncher" +RDEPENDS = "python-pyqt opie-pyquicklaunchapplet" APPNAME = "python" +PACKAGE_ARCH = "all" S = "${WORKDIR}/${APPNAME}" @@ -22,6 +23,6 @@ do_install() { install -d ${D}${palmtopdir}/bin/python/ ${D}${palmtopdir}/apps/Python install -m 0755 *.py ${D}${palmtopdir}/bin/python/ install -m 0644 ${WORKDIR}/apps/Python/.directory ${D}${palmtopdir}/apps/Python/ - install -m 0644 ${WORKDIR}/apps/Python/*.desktop ${D}${palmtopdir}/apps/Python/ + install -m 0644 ${WORKDIR}/apps/Python/simple.desktop ${D}${palmtopdir}/apps/Python/ } diff --git a/packages/opie-examples-python/opie-examples-python_1.2.1.bb b/packages/opie-examples-python/opie-examples-python_1.2.1.bb index cc41ab54ee..3dd011c0b9 100644 --- a/packages/opie-examples-python/opie-examples-python_1.2.1.bb +++ b/packages/opie-examples-python/opie-examples-python_1.2.1.bb @@ -1,6 +1,6 @@ include ${PN}.inc - - + +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/examples/python \ ${HANDHELDS_CVS};tag=${TAG};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 5aaa9b797a..e561bf0be0 100644 --- a/packages/opie-examples-python/opie-examples-python_cvs.bb +++ b/packages/opie-examples-python/opie-examples-python_cvs.bb @@ -1,6 +1,7 @@ include ${PN}.inc - -PV = "1.2.1+cvs-${CVSDATE}" + +PV = "1.2.1+cvs${SRCDATE}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/examples/python \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-examples/opie-examples_cvs.bb b/packages/opie-examples/opie-examples_cvs.bb index 746bd166d5..2af54daeef 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 fafe5d4e4f..0a02210f82 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 57e2a65ad5..f533d68c82 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 6f8a544d7a..caca62089f 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 e881398d93..0384318f22 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 22d27c433c..d9380ad7f8 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 f5d1affd57..fe4033e8ac 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 5f510859e2..05187dc365 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 22ceabe5f3..c476a66243 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 2a6f4e4709..b1488be209 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 1da35289f0..3a9f76e508 100644 --- a/packages/opie-help-en/opie-help-en_cvs.bb +++ b/packages/opie-help-en/opie-help-en_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs-${CVSDATE}" +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 f63eab6eb8..ad29b882fc 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 43a9ec69ee..785cb0b329 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 0e694f2dd9..e1cce42445 100644 --- a/packages/opie-i18n/opie-i18n_cvs.bb +++ b/packages/opie-i18n/opie-i18n_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs-${CVSDATE}" +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 f2e3718a23..67a69dda20 100644 --- a/packages/opie-i18n/opie-lrelease-native_cvs.bb +++ b/packages/opie-i18n/opie-lrelease-native_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs-${CVSDATE}" +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 08ae8900b0..717d8a3769 100644 --- a/packages/opie-i18n/opie-lupdate-native_cvs.bb +++ b/packages/opie-i18n/opie-lupdate-native_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs-${CVSDATE}" +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_cvs.bb b/packages/opie-icon-reload/opie-icon-reload_cvs.bb index b2feb383cf..f8c47a5c4f 100644 --- a/packages/opie-icon-reload/opie-icon-reload_cvs.bb +++ b/packages/opie-icon-reload/opie-icon-reload_cvs.bb @@ -1,4 +1,4 @@ include ${PN}.inc -PV = "1.2.1+cvs-${CVSDATE}" +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 eba2a14276..63d0243d54 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 be475273c5..db6c62e7e9 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 632905e5b3..ed12b6f80d 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 26e56daf4c..cd8074bfff 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 7b85d1242c..13a1c4a493 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 c8d2f24319..400c29670a 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 62f6910c24..fd141e1b9c 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 7948e68e4d..4d9c11c529 100644 --- a/packages/opie-keytabs/opie-keytabs_cvs.bb +++ b/packages/opie-keytabs/opie-keytabs_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs-${CVSDATE}" +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 01147d5543..17249dde4c 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 2283e58c17..c3b8ad585f 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 fe1fa1e11f..976a7e0d3c 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 89e7455ff7..9cec4e7915 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 85b8709a3c..0ebac4c2aa 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 5e2ac04738..525301ee57 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 ca9bd0589c..f5eb7bed33 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 29521fc3cc..7f539b4f0b 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 cd25106712..e9911a76ee 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 6873dad2b2..8ef5777cbd 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 14d0988f0d..e0fa33633b 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 df2d757934..74120f4cd9 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 12c964376d..2b51e65298 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 f80676a50d..2f84c397cb 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 a753533f9d..75a87a2dbf 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 f80676a50d..2f84c397cb 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 afba47f3c7..ea0bb39217 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-${CVSDATE}" + +PV = "1.2.1+cvs${SRCDATE}" 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 18617efba3..caa4eb7992 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,7 @@ SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" MAINTAINER = "Team Opie <opie@handhelds.org>" -PV = "1.2.1+cvs-${CVSDATE}" +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 a2e6d87bfa..7e349f9e7b 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb @@ -3,7 +3,7 @@ SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" MAINTAINER = "Team Opie <opie@handhelds.org>" -PV = "1.2.1+cvs-${CVSDATE}" +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 fae1ef7ddd..3d5072a8a4 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb @@ -3,7 +3,7 @@ SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" MAINTAINER = "Team Opie <opie@handhelds.org>" -PV = "1.2.1+cvs-${CVSDATE}" +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 c4475385d1..8b648dd79e 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb @@ -3,7 +3,7 @@ SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" MAINTAINER = "Team Opie <opie@handhelds.org>" -PV = "1.2.1+cvs-${CVSDATE}" +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 8f9450842a..093aa74c1d 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs-${CVSDATE}" +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 f94a1c4727..1456365045 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 404b0b981d..1b1eadb6ac 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 94747d4cf8..22d538aaaa 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 722482f96e..961f3f536b 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 18cb187801..da8c6ce221 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 d11b191f73..76497ef7e9 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 6e3d6be2f6..45d1c75c19 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 f3c775f6c3..41fe8fead7 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/networksettings \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-notes/opie-notes_0.4.bb b/packages/opie-notes/opie-notes_0.4.bb index 319b58892d..55a5c51d49 100644 --- a/packages/opie-notes/opie-notes_0.4.bb +++ b/packages/opie-notes/opie-notes_0.4.bb @@ -1,6 +1,6 @@ include ${PN}.inc -CVSDATE = 20051027 +SRCDATE = 20051027 SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/notes \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-notes/opie-notes_cvs.bb b/packages/opie-notes/opie-notes_cvs.bb index 0d6b50a2b9..6d2cb27b8c 100644 --- a/packages/opie-notes/opie-notes_cvs.bb +++ b/packages/opie-notes/opie-notes_cvs.bb @@ -1,3 +1,3 @@ include ${PN}.inc -PV = "0.3+cvs-${CVSDATE}" +PV = "0.3+cvs${SRCDATE}" diff --git a/packages/opie-notesapplet/opie-notesapplet_cvs.bb b/packages/opie-notesapplet/opie-notesapplet_cvs.bb index 0989f9ff6c..8b67613ccd 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 1e963f15dd..d2b2fd25d9 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/odict \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-oxygen/opie-oxygen_1.0.0.bb b/packages/opie-oxygen/opie-oxygen_1.0.0.bb index 8f1460ee22..99beb12f10 100644 --- a/packages/opie-oxygen/opie-oxygen_1.0.0.bb +++ b/packages/opie-oxygen/opie-oxygen_1.0.0.bb @@ -7,7 +7,7 @@ APPNAME = "oxygen" PR = "r0" #cvsdate for 1.0.0 is 20050101 -CVSDATE = "20050101" +SRCDATE = "20050101" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-oxygen/opie-oxygen_cvs.bb b/packages/opie-oxygen/opie-oxygen_cvs.bb index f72ca64b11..198df08f1f 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 3fff161386..87e65aa9ca 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/oyatzee \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-packagemanager/opie-packagemanager_1.2.1.bb b/packages/opie-packagemanager/opie-packagemanager_1.2.1.bb index 23e6a1fabd..385ca61fdb 100644 --- a/packages/opie-packagemanager/opie-packagemanager_1.2.1.bb +++ b/packages/opie-packagemanager/opie-packagemanager_1.2.1.bb @@ -1,6 +1,6 @@ include ${PN}.inc -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/${APPNAME};cvsdate=${CVSDATE} \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics;cvsdate=${CVSDATE} \ +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/${APPNAME};cvsdate=${SRCDATE} \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics;cvsdate=${SRCDATE} \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-packagemanager/opie-packagemanager_cvs.bb b/packages/opie-packagemanager/opie-packagemanager_cvs.bb index 30fa536cdf..cacdb5541d 100644 --- a/packages/opie-packagemanager/opie-packagemanager_cvs.bb +++ b/packages/opie-packagemanager/opie-packagemanager_cvs.bb @@ -1,7 +1,7 @@ include ${PN}.inc -PV = "1.2.1+cvs-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" -SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/${APPNAME};cvsdate=${CVSDATE} \ - ${HANDHELDS_CVS};module=opie/pics;cvsdate=${CVSDATE} \ +SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/${APPNAME};cvsdate=${SRCDATE} \ + ${HANDHELDS_CVS};module=opie/pics;cvsdate=${SRCDATE} \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-parashoot/opie-parashoot_cvs.bb b/packages/opie-parashoot/opie-parashoot_cvs.bb index 32e64f389c..b7439af955 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 b5c913e29a..e329b2411a 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 a9bb6c9bd2..c3ee83e592 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/pickboard" diff --git a/packages/opie-pics/opie-pics.inc b/packages/opie-pics/opie-pics.inc index ceca75f943..fb0898297e 100644 --- a/packages/opie-pics/opie-pics.inc +++ b/packages/opie-pics/opie-pics.inc @@ -28,5 +28,5 @@ do_install() { } FILES_${PN} = "${palmtopdir}" -PACKAGE_ARCH = "${MACHINE}" +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/opie-pics/opie-pics_cvs.bb b/packages/opie-pics/opie-pics_cvs.bb index c1f3537ef4..5252da4c92 100644 --- a/packages/opie-pics/opie-pics_cvs.bb +++ b/packages/opie-pics/opie-pics_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs-${CVSDATE}" +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 4b35c87446..692420bbfc 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 3fc9b49253..a4b7f2122d 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 db20019c6c..a209c4864f 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 fb862bdf04..82730437d1 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 0cf361d974..be1ec45a67 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 4e21e5f94c..ac9cfc697f 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 30f21333a2..7ffd7a8ef2 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 22165ace9c..2112bede6b 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 d559971a11..bcac865f95 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 5546aabe61..3a6ec5ab44 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 2fd57bfaf0..6ef478950b 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 7a5324b787..ea233607f9 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 70418da4b2..ab7c5f676a 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 2ae1b1406c..7ebe4b0338 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 6b6c406420..35598cf81a 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 54f64162ab..84cdbc6c32 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 fdd1355d2e..6acae68910 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/osearch \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-security/opie-security.inc b/packages/opie-security/opie-security.inc index d3f6c00e35..d207399fee 100644 --- a/packages/opie-security/opie-security.inc +++ b/packages/opie-security/opie-security.inc @@ -3,10 +3,8 @@ SECTION = "opie/settings" PRIORITY = "optional" MAINTAINER = "Team Opie <opie@handhelds.org>" LICENSE = "GPL" -RRECOMMENDS = "opie-securityplugin-pin" APPNAME = "security" - S = "${WORKDIR}/${APPNAME}" inherit opie diff --git a/packages/opie-security/opie-security_1.2.1.bb b/packages/opie-security/opie-security_1.2.1.bb index 732c6c472e..7ebe6cf5a0 100644 --- a/packages/opie-security/opie-security_1.2.1.bb +++ b/packages/opie-security/opie-security_1.2.1.bb @@ -1,6 +1,6 @@ include ${PN}.inc - - + +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/security \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-security/opie-security_cvs.bb b/packages/opie-security/opie-security_cvs.bb index a9927e05ce..4aa9a1f255 100644 --- a/packages/opie-security/opie-security_cvs.bb +++ b/packages/opie-security/opie-security_cvs.bb @@ -1,6 +1,7 @@ include ${PN}.inc - -PV = "1.2.1+cvs-${CVSDATE}" + +PV = "1.2.1+cvs${SRCDATE}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/security \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb index 0eb90fc4a0..3d78f3757d 100644 --- a/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb +++ b/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb @@ -7,7 +7,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>" LICENSE = "GPL" I18N_FILES = "libmultiauthbluepingplugin.ts" RDEPENDS = "opie-security bluez-utils" -PV = "1.2.1+cvs-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" APPNAME = "multiauthbluepingplugin" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/blueping \ diff --git a/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb index 4088c88b37..93cf6ac712 100644 --- a/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb +++ b/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb @@ -7,7 +7,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>" LICENSE = "GPL" I18N_FILES = "libmultiauthdummyplugin.ts" RDEPENDS = "opie-security" -PV = "1.2.1+cvs-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" APPNAME = "multiauthdummyplugin" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/dummy \ diff --git a/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb index d82d7ce38b..34e79d78b5 100644 --- a/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb +++ b/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb @@ -6,7 +6,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>" LICENSE = "GPL" I18N_FILES = "libmultiauthnoticeplugin.ts" RDEPENDS = "opie-security" -PV = "1.2.1+cvs-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" APPNAME = "multiauthnoticeplugin" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/notice \ diff --git a/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb index e7fa0dc301..b85132b5e2 100644 --- a/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb +++ b/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb @@ -8,7 +8,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>" LICENSE = "GPL" I18N_FILES = "libmultiauthpinplugin.ts" RDEPENDS = "opie-security" -PV = "1.2.1+cvs-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" APPNAME = "multiauthpinplugin" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/pin \ diff --git a/packages/opie-securityplugins/opie-securityplugins_cvs.bb b/packages/opie-securityplugins/opie-securityplugins_cvs.bb index b2feb383cf..f8c47a5c4f 100644 --- a/packages/opie-securityplugins/opie-securityplugins_cvs.bb +++ b/packages/opie-securityplugins/opie-securityplugins_cvs.bb @@ -1,4 +1,4 @@ include ${PN}.inc -PV = "1.2.1+cvs-${CVSDATE}" +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 dbedeafac0..8b087d4f0b 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/sfcave \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-sh-snes/opie-sh-snes_cvs.bb b/packages/opie-sh-snes/opie-sh-snes_cvs.bb index b2feb383cf..f8c47a5c4f 100644 --- a/packages/opie-sh-snes/opie-sh-snes_cvs.bb +++ b/packages/opie-sh-snes/opie-sh-snes_cvs.bb @@ -1,4 +1,4 @@ include ${PN}.inc -PV = "1.2.1+cvs-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" diff --git a/packages/opie-sh/opie-sh.inc b/packages/opie-sh/opie-sh.inc index 8833caaa63..bac34ce714 100644 --- a/packages/opie-sh/opie-sh.inc +++ b/packages/opie-sh/opie-sh.inc @@ -3,7 +3,6 @@ SECTION = "opie/Shell" PRIORITY = "optional" MAINTAINER = "Team Opie <opie@handhelds.org>" LICENSE = "GPL" -RDEPENDS = "opie-sh" APPNAME = "opie-sh" APPTYPE = "binary" @@ -31,7 +30,21 @@ do_install() { PACKAGES = " opie-sh-microkbd opie-sh-diskfree opie-sh-fsmounter opie-sh-hostlist \ opie-sh-killproc opie-sh-launcher-refresh opie-sh-logviewer opie-sh-rsynchelper \ opie-sh-servicemanager opie-sh-ssh-askpass opie-sh-stowawayctrl opie-sh-usbnetctrl \ -opie-sh-wavelanchooser opie-sh" +opie-sh-wavelanchooser ${PN}" + +RDEPENDS_opie-sh-microkbd = "opie-sh" +RDEPENDS_opie-sh-diskfree = "opie-sh" +RDEPENDS_opie-sh-fsmounter = "opie-sh" +RDEPENDS_opie-sh-hostlist = "opie-sh" +RDEPENDS_opie-sh-killproc = "opie-sh" +RDEPENDS_opie-sh-launcher-refresh = "opie-sh" +RDEPENDS_opie-sh-logviewer = "opie-sh" +RDEPENDS_opie-sh-rsynchelper = "opie-sh" +RDEPENDS_opie-sh-servicemanager = "opie-sh" +RDEPENDS_opie-sh-ssh-askpass = "opie-sh" +RDEPENDS_opie-sh-stowawayctrl = "opie-sh" +RDEPENDS_opie-sh-usbnetctrl = "opie-sh" +RDEPENDS_opie-sh-wavelanchooser = "opie-sh" FILES_opie-sh-microkbd = " ${palmtopdir}/bin/microkbd.sh ${palmtopdir}/apps/Opie-SH/microkbd.desktop ${palmtopdir}/pics/opie-sh-scripts/keyz-cfg.png" FILES_opie-sh-diskfree = " ${palmtopdir}/bin/diskfree.sh ${palmtopdir}/apps/Opie-SH/diskfree.desktop ${palmtopdir}/pics/opie-sh-scripts/diskfree.png" diff --git a/packages/opie-sh/opie-sh_cvs.bb b/packages/opie-sh/opie-sh_cvs.bb index dad51d3eb5..782f06e4ba 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 28851e6a20..dbf3aa0825 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 ba8c2070fd..1c6b515278 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 c3d2c4b383..b5aae11de6 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 cea92cd989..9d58620165 100644 --- a/packages/opie-sounds/opie-sounds_cvs.bb +++ b/packages/opie-sounds/opie-sounds_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs-${CVSDATE}" +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 8830d09709..a6e7536f36 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/sshkeys \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-stumbler/opie-stumbler_cvs.bb b/packages/opie-stumbler/opie-stumbler_cvs.bb index f9d1ae539a..3bc3f32fca 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 2c68b64dbf..23f048b193 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 762f17e73f..53e7d08d6f 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 fedf09e850..0f62f0ce89 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 d35a3bc08f..46dd132960 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 5b162ec922..158e6ee471 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 a4bc74a778..3e16a97f49 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 e5eba1627d..09cf46c96e 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 cf9b741b71..be4d1d6fe5 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 fde9fa3126..3454154dc2 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 6bb494df56..30606d7926 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 4434dcce2a..d391539791 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 1ee882173c..f662b2f4aa 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 d985c54cf5..0dc932668d 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 f63eab6eb8..ad29b882fc 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 f94d3caffb..2e237fa95b 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-${CVSDATE}" + +PV = "1.2.1+cvs${SRCDATE}" 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 040d8a3ec4..a5e62a0566 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 3edc84e468..e166b9ad7f 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 eca8ca9ac5..3ffbf54318 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 ef042779f5..a13eb97a21 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 748617fe02..f9e3822561 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 9fef0fd332..3153a1a3fe 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 a541a9359b..07aacd9f09 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 9139b1143b..f1e301cdb9 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 e9446885ab..04d5635422 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 fa57d320c6..de4af163f9 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 0d08dc9791..f7a9db7bb5 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 52b08647e1..f02528c4b6 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 8573d2fffe..f9da0438ff 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 b676a3e8e2..b987644d1d 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 675fd15891..cc4118500e 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 5f2ac5d338..297433a108 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 259291d79f..e2a03712d5 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 137a4af69c..13c2d80b9c 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 5d2322d913..16ac12c510 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 fa26be1948..efb8c65d78 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 7e795a85d0..adc05e192e 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 bf7139ebbd..c93125bf51 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 6a4d7107d0..92ba1f3bd3 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 068b0d4231..c3ffa80d43 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 f25a047afe..88b3519bfc 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" 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 565a68e820..2b0e7adfae 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-${CVSDATE}" +PV = "1.2.1+cvs${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/zsame \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/oprofile/oprofile_cvs.bb b/packages/oprofile/oprofile_cvs.bb index 277c1835c2..905e78adc8 100644 --- a/packages/oprofile/oprofile_cvs.bb +++ b/packages/oprofile/oprofile_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.9.1+cvs${SRCDATE}" SECTION = "devel" DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \ of profiling all running code at low overhead." diff --git a/packages/orinoco/spectrum-fw.bb b/packages/orinoco/spectrum-fw.bb index 1d388332a5..dd76000ed1 100644 --- a/packages/orinoco/spectrum-fw.bb +++ b/packages/orinoco/spectrum-fw.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Firmware for Spectrum Wireless LAN cards" LICENSE = "unknown" PR = "r0" +PACKAGE_ARCH = "all" SRC_URI = "file://get_symbol_fw \ file://parse_symbol_fw" diff --git a/packages/pango/pango_1.10.0.bb b/packages/pango/pango_1.10.0.bb index 88d1b847d8..dda4df2fda 100644 --- a/packages/pango/pango_1.10.0.bb +++ b/packages/pango/pango_1.10.0.bb @@ -38,6 +38,8 @@ fi } +PACKAGES_DYNAMIC = "pango-module-*" + python populate_packages_prepend () { prologue = bb.data.getVar("postinst_prologue", d, 1) diff --git a/packages/pango/pango_1.10.2.bb b/packages/pango/pango_1.10.2.bb index 6977cbc5f1..0f2c8fdb7a 100644 --- a/packages/pango/pango_1.10.2.bb +++ b/packages/pango/pango_1.10.2.bb @@ -34,6 +34,8 @@ fi } +PACKAGES_DYNAMIC = "pango-module-*" + python populate_packages_prepend () { prologue = bb.data.getVar("postinst_prologue", d, 1) diff --git a/packages/pango/pango_1.2.5.bb b/packages/pango/pango_1.2.5.bb index c8a3e2b7d7..ed71f43370 100644 --- a/packages/pango/pango_1.2.5.bb +++ b/packages/pango/pango_1.2.5.bb @@ -27,6 +27,8 @@ do_stage () { install -m 0644 ${S}/pango/pango*.h ${STAGING_INCDIR}/pango/ } +PACKAGES_DYNAMIC = "pango-module-*" + python populate_packages_prepend () { modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d) diff --git a/packages/pango/pango_1.4.0.bb b/packages/pango/pango_1.4.0.bb index fc7bb8167b..93c8cc6d94 100644 --- a/packages/pango/pango_1.4.0.bb +++ b/packages/pango/pango_1.4.0.bb @@ -28,6 +28,8 @@ do_stage () { install -m 0644 ${S}/pango/pango*.h ${STAGING_INCDIR}/pango/ } +PACKAGES_DYNAMIC = "pango-module-*" + python populate_packages_prepend () { modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d) diff --git a/packages/pango/pango_1.4.1.bb b/packages/pango/pango_1.4.1.bb index 925eee2566..8cd251049c 100644 --- a/packages/pango/pango_1.4.1.bb +++ b/packages/pango/pango_1.4.1.bb @@ -27,6 +27,8 @@ do_stage () { install -m 0644 ${S}/pango/pango*.h ${STAGING_INCDIR}/pango/ } +PACKAGES_DYNAMIC = "pango-module-*" + python populate_packages_prepend () { modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d) diff --git a/packages/pango/pango_1.8.0.bb b/packages/pango/pango_1.8.0.bb index 8180710bac..1d2638f0ec 100644 --- a/packages/pango/pango_1.8.0.bb +++ b/packages/pango/pango_1.8.0.bb @@ -38,6 +38,8 @@ fi } +PACKAGES_DYNAMIC = "pango-module-*" + python populate_packages_prepend () { prologue = bb.data.getVar("postinst_prologue", d, 1) diff --git a/packages/pango/pango_1.8.1.bb b/packages/pango/pango_1.8.1.bb index 8180710bac..1d2638f0ec 100644 --- a/packages/pango/pango_1.8.1.bb +++ b/packages/pango/pango_1.8.1.bb @@ -38,6 +38,8 @@ fi } +PACKAGES_DYNAMIC = "pango-module-*" + python populate_packages_prepend () { prologue = bb.data.getVar("postinst_prologue", d, 1) diff --git a/packages/pango/pango_1.9.1.bb b/packages/pango/pango_1.9.1.bb index bc7698c592..e66b65f367 100644 --- a/packages/pango/pango_1.9.1.bb +++ b/packages/pango/pango_1.9.1.bb @@ -38,6 +38,8 @@ fi } +PACKAGES_DYNAMIC = "pango-module-*" + python populate_packages_prepend () { prologue = bb.data.getVar("postinst_prologue", d, 1) diff --git a/packages/panoramixext/panoramixext_cvs.bb b/packages/panoramixext/panoramixext_cvs.bb index 0fef9dbe83..5a7a67e32b 100644 --- a/packages/panoramixext/panoramixext_cvs.bb +++ b/packages/panoramixext/panoramixext_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE= "MIT" SECTION = "libs" PRIORITY = "optional" diff --git a/packages/perl/perl.inc b/packages/perl/perl.inc index 505249cd9e..12fffa1c33 100644 --- a/packages/perl/perl.inc +++ b/packages/perl/perl.inc @@ -54,6 +54,8 @@ do_stage() { install config.sh ${STAGING_DIR}/${HOST_SYS}/perl/ } +PACKAGES_DYNAMIC = "perl-module-*" + python populate_packages_prepend () { libdir = bb.data.expand('${libdir}/perl5/${PV}', d) archlibdir = bb.data.expand('${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}', d) diff --git a/packages/portaudio/portaudio_0.0.19.bb b/packages/portaudio/portaudio_0.0.19.bb index 98c49ef1d9..68809e7c41 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 = "v19-cvs-${CVSDATE}" +PV = "0.0.19+cvs${SRCDATE}" PR = "r1" SRC_URI = "http://www.portaudio.com/archives/pa_snapshot_v19.tar.gz" diff --git a/packages/prism3-support/prism3-support_1.0.0.bb b/packages/prism3-support/prism3-support_1.0.0.bb index 762bd01e61..12a8caea81 100644 --- a/packages/prism3-support/prism3-support_1.0.0.bb +++ b/packages/prism3-support/prism3-support_1.0.0.bb @@ -5,6 +5,7 @@ DEPENDS = "prism3-firmware hostap-utils" RDEPENDS = "prism3-firmware hostap-utils" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" PR = "r0" +PACKAGE_ARCH = "all" SRC_URI = "file://hostap-fw-load" diff --git a/packages/prism54/prism54-module_cvs.bb b/packages/prism54/prism54-module_cvs.bb index 308b7bfac6..e0d5b76a8b 100644 --- a/packages/prism54/prism54-module_cvs.bb +++ b/packages/prism54/prism54-module_cvs.bb @@ -1,5 +1,5 @@ SECTION = "base" -PV = "cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" include prism54-module_1.2.bb diff --git a/packages/putty/putty_svn.bb b/packages/putty/putty_svn.bb index e36b79dc30..b14d957a4d 100644 --- a/packages/putty/putty_svn.bb +++ b/packages/putty/putty_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "PuTTY is a free implementation of Telnet and SSH for Win32 and Unix platforms" SECTION = "console/network" LICENSE = "MIT" -PV = "0.58+cvs-${CVSDATE}" +PV = "0.58+cvs${SRCDATE}" SRC_URI = "svn://ixion.tartarus.org/main;module=putty \ file://lib.pro \ diff --git a/packages/python/python-cairo_cvs.bb b/packages/python/python-cairo_cvs.bb index cc870acbca..5e93a3019f 100644 --- a/packages/python/python-cairo_cvs.bb +++ b/packages/python/python-cairo_cvs.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" MAINTAINER = "Sandino 'Tigrux' Flores <tigrux@ximian.com>" DEPENDS = "python-pygtk cairo" SRCNAME = "pycairo" -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "LGPL MPL" inherit autotools diff --git a/packages/qpe-gaim/qpe-libgaim_1.5.0.bb b/packages/qpe-gaim/qpe-libgaim_1.5.0.bb index 824dee5c39..58fc4b93b5 100644 --- a/packages/qpe-gaim/qpe-libgaim_1.5.0.bb +++ b/packages/qpe-gaim/qpe-libgaim_1.5.0.bb @@ -42,6 +42,8 @@ do_stage() { done } +PACKAGES_DYNAMIC = "libgaim-protocol-*" + #FIXME: use do_packages to create individual packages for each of the plugins python populate_packages_prepend () { plugindir = bb.data.expand('${libdir}/gaim', d) diff --git a/packages/qplot/qplot_2.0.1+cvs20020420.bb b/packages/qplot/qplot_2.0.1+cvs20020420.bb index fecf1f746f..af257baa79 100644 --- a/packages/qplot/qplot_2.0.1+cvs20020420.bb +++ b/packages/qplot/qplot_2.0.1+cvs20020420.bb @@ -4,8 +4,8 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" HOMEPAGE = "http://qplot.sourceforge.net/" -CVSDATE = 20020420 -PV = "2.0.1-cvs-${CVSDATE}" +SRCDATE = 20020420 +PV = "2.0.1+cvs${SRCDATE}" PR = "r1" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/qplot;module=qplot \ diff --git a/packages/randrext/randrext_cvs.bb b/packages/randrext/randrext_cvs.bb index 1b3bbbd353..15b3768436 100644 --- a/packages/randrext/randrext_cvs.bb +++ b/packages/randrext/randrext_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" SECTION = "libs" MAINTAINER = "Greg Gilbert <greg@treke.net>" diff --git a/packages/rdesktop/rdesktop_cvs.bb b/packages/rdesktop/rdesktop_cvs.bb index 74d9d4cd81..0dabdf3f3b 100644 --- a/packages/rdesktop/rdesktop_cvs.bb +++ b/packages/rdesktop/rdesktop_cvs.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.rdesktop.org" SECTION = "x11/network" MAINTAINER = "Adrian Davey <ade@beth2.org>" LICENSE = "GPL" -PV = "1.3.1cvs${CVSDATE}" +PV = "1.3.1+cvs${SRCDATE}" PR = "r1" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/rdesktop;module=rdesktop" diff --git a/packages/recordext/recordext_cvs.bb b/packages/recordext/recordext_cvs.bb index b6e6ecf882..1c6bd0b931 100644 --- a/packages/recordext/recordext_cvs.bb +++ b/packages/recordext/recordext_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "BSD-X" SECTION = "libs" MAINTAINER = "Phil Blundell <pb@handhelds.org>" diff --git a/packages/renderext/renderext_cvs.bb b/packages/renderext/renderext_cvs.bb index 8fe39420ac..85a790a6e7 100644 --- a/packages/renderext/renderext_cvs.bb +++ b/packages/renderext/renderext_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT-X" SECTION = "libs" MAINTAINER = "Greg Gilbert <greg@treke.net>" diff --git a/packages/resourceext/resourceext_cvs.bb b/packages/resourceext/resourceext_cvs.bb index 9f37d6f369..b2cbfd7592 100644 --- a/packages/resourceext/resourceext_cvs.bb +++ b/packages/resourceext/resourceext_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" SECTION = "libs" LICENSE = "Xorg" MAINTAINER = "Greg Gilbert <greg@treke.net>" diff --git a/packages/roadster/roadster_cvs.bb b/packages/roadster/roadster_cvs.bb index a1f39086f1..8f2a2b71a4 100644 --- a/packages/roadster/roadster_cvs.bb +++ b/packages/roadster/roadster_cvs.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Roadster aims to be easy-to-use and open-source mapping software. LICENSE = "GPL" HOMEPAGE = "http://linuxadvocate.org/projects/roadster/" MAINTAINER = "Koen Kooi <koen@handhelds.org>" -PV = "0.0+cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" DEPENDS = "tcp-wrappers mysql gpsd gtk+ cairo libxml2 libgnomeui libglade" RDEPENDS = "gpsd gtk+ cairo libxml2" diff --git a/packages/rosetta/rosetta_cvs.bb b/packages/rosetta/rosetta_cvs.bb index c7a6eca505..b634315335 100644 --- a/packages/rosetta/rosetta_cvs.bb +++ b/packages/rosetta/rosetta_cvs.bb @@ -1,5 +1,5 @@ SECTION = "x11/utils" -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" DEPENDS = "gtk+ libgpewidget x11 libxrandr libxft xtst xext xau \ virtual/libintl" DESCRIPTION = "Multistroke / full word handwriting recognition for X" diff --git a/packages/sparse/sparse_snapshot.bb b/packages/sparse/sparse_snapshot.bb index d3a522b1b7..9e17dbc151 100644 --- a/packages/sparse/sparse_snapshot.bb +++ b/packages/sparse/sparse_snapshot.bb @@ -1,19 +1,19 @@ SECTION = "devel" def get_snapshot_date(d): import bb - cvsdate = bb.data.getVar('CVSDATE', d, 1) - if not cvsdate: + srcdate = bb.data.getVar('SRCDATE', d, 1) + if not srcdate: return "" - y = cvsdate[0:4] - m = cvsdate[4:6] - d = cvsdate[6:8] + y = srcdate[0:4] + m = srcdate[4:6] + d = srcdate[6:8] return "%s-%s-%s" % (y, m, d) DESCRIPTION = "Sparse is a semantic parser of source files: it's neither a \ compiler (although it could be used as a front-end for one) nor is it a \ preprocessor (although it contains as a part of it a preprocessing phase)." MAINTAINER = "Chris Larson <kergoth@handhelds.org>" -PV = "0.0${CVSDATE}" +PV = "0.0+${SRCDATE}" LICENSE = "OSL" SRC_URI = "http://www.codemonkey.org.uk/projects/git-snapshots/sparse/sparse-${@get_snapshot_date(d)}.tar.gz \ file://compile.patch;patch=1 \ diff --git a/packages/timezones/timezones_1.2.0.bb b/packages/timezones/timezones_1.2.0.bb index c9283b23db..4a36fc3abd 100644 --- a/packages/timezones/timezones_1.2.0.bb +++ b/packages/timezones/timezones_1.2.0.bb @@ -14,9 +14,11 @@ do_install() { find ${D}${datadir} -name "CVS"|xargs rm -rf } +PACKAGES_DYNAMIC = "timezone-*" + python populate_packages_prepend() { pkgregex = "^(.*)" - pkgpattern = "timezones-%s" + pkgpattern = "timezone-%s" pkgdescription = "Timezone for %s" do_split_packages(d, root=bb.data.expand('${datadir}/zoneinfo/', d), file_regex=pkgregex, output_pattern=pkgpattern, diff --git a/packages/tremor/tremor_20041119.bb b/packages/tremor/tremor_20041119.bb index 00145120e0..63de7a4239 100644 --- a/packages/tremor/tremor_20041119.bb +++ b/packages/tremor/tremor_20041119.bb @@ -4,7 +4,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>" DEPENDS = "libogg" DESCRIPTION = "tremor is a fixed point implementation of the vorbis codec." LICENSE = "BSD" -CVSDATE = "${PV}" +SRCDATE = "${PV}" PR = "r1" SRC_URI = "svn://svn.xiph.org/trunk;module=Tremor;rev=4573;proto=http" diff --git a/packages/tremor/tremor_svn.bb b/packages/tremor/tremor_svn.bb index b7e1576ea2..8b9d538f92 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 = "svn-${CVSDATE}" +PV = "0.0+svn${SRCDATE}" LICENSE = "BSD" DEFAULT_PREFERENCE = "-1" diff --git a/packages/tslib/tslib-maemo_0.0.1-15.bb b/packages/tslib/tslib-maemo_0.0.1-15.bb index 6bc844e8dd..1c91485ed0 100644 --- a/packages/tslib/tslib-maemo_0.0.1-15.bb +++ b/packages/tslib/tslib-maemo_0.0.1-15.bb @@ -5,7 +5,7 @@ PR = "r1" PROVIDES = "tslib" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" -PACKAGE_ARCH_tslib-conf = "${MACHINE}" +PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/t/tslib/tslib_${PV}.tar.gz \ file://ts.conf \ diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb index c6c30a33de..cd2d65f515 100644 --- a/packages/tslib/tslib_cvs.bb +++ b/packages/tslib/tslib_cvs.bb @@ -1,11 +1,11 @@ SECTION = "base" DESCRIPTION = "tslib is a touchscreen access library." -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" PR = "r32" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" -PACKAGE_ARCH_tslib-conf = "${MACHINE}" -PACKAGE_ARCH_mnci = "${MACHINE}" +PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" +PACKAGE_ARCH_mnci = "${MACHINE_ARCH}" SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \ file://ts.conf \ diff --git a/packages/ttf-fonts/ttf.inc b/packages/ttf-fonts/ttf.inc index 38cc9b78c0..3f0eca3d5d 100644 --- a/packages/ttf-fonts/ttf.inc +++ b/packages/ttf-fonts/ttf.inc @@ -2,7 +2,7 @@ SECTION = "x11/fonts" PRIORITY = "optional" PACKAGE_ARCH = "all" #DEPENDS = "fontconfig opie-ttf-support" -#RSUGGESTS = "libfontconfig-utils opie-ttf-support" +#RSUGGESTS = "fontconfig-utils opie-ttf-support" # I dont want TTF fonts to depend on fontconfig on device # as those fonts are used not only in X11 enviroment diff --git a/packages/uboot/uboot_cvs.bb b/packages/uboot/uboot_cvs.bb index d8a489714d..5ff012555e 100644 --- a/packages/uboot/uboot_cvs.bb +++ b/packages/uboot/uboot_cvs.bb @@ -3,7 +3,7 @@ SECTION = "bootloader" MAINTAINER = "Cliff Brake <cliff.brake@gmail.com>" PRIORITY = "optional" LICENSE = "GPL" -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" PR = "r2" PROVIDES = "virtual/bootloader" diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb index 0eafa820bd..473cd48be2 100644 --- a/packages/uclibc/uclibc_svn.bb +++ b/packages/uclibc/uclibc_svn.bb @@ -4,10 +4,10 @@ # try removing it # # UCLIBC_BASE can be set in a distro file, but whether this works depends -# on whether the base patches apply to the selected (CVSDATE) svn release. +# on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.28" -PV = "${UCLIBC_BASE}+svn${CVSDATE}" +PV = "${UCLIBC_BASE}+svn${SRCDATE}" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take # precedence. diff --git a/packages/usbutils/usbutils_cvs.bb b/packages/usbutils/usbutils_cvs.bb index 9a863b2fd0..0c9d303256 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${CVSDATE}" +PV = "0.70+cvs${SRCDATE}" PR = "r3" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/linux-usb;module=usbutils" diff --git a/packages/vera-fonts/ttf-bitstream-vera_1.10.bb b/packages/vera-fonts/ttf-bitstream-vera_1.10.bb index b756c99e4c..a6f4cd62fb 100644 --- a/packages/vera-fonts/ttf-bitstream-vera_1.10.bb +++ b/packages/vera-fonts/ttf-bitstream-vera_1.10.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "Bitstream Vera" PACKAGE_ARCH = "all" PR = "r3" -RDEPENDS = "libfontconfig-utils" +RDEPENDS = "fontconfig-utils" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2" diff --git a/packages/waimea/waimea_cvs.bb b/packages/waimea/waimea_cvs.bb index 96c2d58dc4..3d35dfffab 100644 --- a/packages/waimea/waimea_cvs.bb +++ b/packages/waimea/waimea_cvs.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Waimea is a highly customizable window manager for the X Window \ system conforming to the latest EWMH specification." MAINTAINER = "Chris Larson <kergoth@handhelds.org>" DEPENDS = "cairo libpng xrandr libsvg-cairo xext" -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "GPL" SRC_URI = "cvs://anoncvs:@cvs.waimea.org/cvs/waimea;module=waimea;method=pserver" S = "${WORKDIR}/waimea" diff --git a/packages/wpa-supplicant/wpa-supplicant_cvs.bb b/packages/wpa-supplicant/wpa-supplicant_cvs.bb index c558d4e834..fd93eb8e54 100644 --- a/packages/wpa-supplicant/wpa-supplicant_cvs.bb +++ b/packages/wpa-supplicant/wpa-supplicant_cvs.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" MAINTAINER = "Holger Schurig" HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" DEPENDS = "openssl" -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" PR = "r2" SRC_URI = "cvs://anonymous@hostap.epitest.fi/cvs;module=hostap \ diff --git a/packages/x11/x11_20050226.bb b/packages/x11/x11_20050226.bb index 38c96cf9ad..b8206c29df 100644 --- a/packages/x11/x11_20050226.bb +++ b/packages/x11/x11_20050226.bb @@ -1,4 +1,4 @@ -CVSDATE = "20050226" +SRCDATE = "20050226" include x11_cvs.bb diff --git a/packages/x11/x11_cvs.bb b/packages/x11/x11_cvs.bb index 3f394df062..04da584b44 100644 --- a/packages/x11/x11_cvs.bb +++ b/packages/x11/x11_cvs.bb @@ -1,4 +1,4 @@ -PV = "6.2.1cvs${CVSDATE}" +PV = "6.2.1+cvs${SRCDATE}" LICENSE = "XFree86" PR = "r5" SECTION = "x11/libs" diff --git a/packages/xau/xau_cvs.bb b/packages/xau/xau_cvs.bb index ca44359076..58c47dd62f 100644 --- a/packages/xau/xau_cvs.bb +++ b/packages/xau/xau_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE= "MIT" PR = "r1" SECTION = "x11/libs" diff --git a/packages/xauth/xauth_cvs.bb b/packages/xauth/xauth_cvs.bb index ff615a500d..358da9bd35 100644 --- a/packages/xauth/xauth_cvs.bb +++ b/packages/xauth/xauth_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" DEPENDS = "x11 xau xmu xext" DESCRIPTION = "X authority file utility" diff --git a/packages/xaw/xaw_cvs.bb b/packages/xaw/xaw_cvs.bb index 4410372b26..ade2156cef 100644 --- a/packages/xaw/xaw_cvs.bb +++ b/packages/xaw/xaw_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" SECTION = "x11/libs" PRIORITY = "optional" diff --git a/packages/xcalibrate/xcalibrate_cvs.bb b/packages/xcalibrate/xcalibrate_cvs.bb index 5436bf26b7..f28e0edf42 100644 --- a/packages/xcalibrate/xcalibrate_cvs.bb +++ b/packages/xcalibrate/xcalibrate_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "BSD-X" SECTION = "x11/libs" PRIORITY = "optional" diff --git a/packages/xcalibrateext/xcalibrateext_cvs.bb b/packages/xcalibrateext/xcalibrateext_cvs.bb index 33cda47f39..e242564233 100644 --- a/packages/xcalibrateext/xcalibrateext_cvs.bb +++ b/packages/xcalibrateext/xcalibrateext_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" SECTION = "x11/libs" LICENSE = "BSD-X" MAINTAINER = "Phil Blundell <pb@handhelds.org>" diff --git a/packages/xcompmgr/xcompmgr_cvs.bb b/packages/xcompmgr/xcompmgr_cvs.bb index 809f70492a..3be8b3ed1b 100644 --- a/packages/xcompmgr/xcompmgr_cvs.bb +++ b/packages/xcompmgr/xcompmgr_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "BSD-X" SECTION = "x11" PRIORITY = "optional" diff --git a/packages/xcomposite/xcomposite_cvs.bb b/packages/xcomposite/xcomposite_cvs.bb index 8782dcb42c..e0a7e2b647 100644 --- a/packages/xcomposite/xcomposite_cvs.bb +++ b/packages/xcomposite/xcomposite_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" SECTION = "x11/libs" DEPENDS = "x11 compositeext xextensions libxfixes" diff --git a/packages/xdamage/xdamage_cvs.bb b/packages/xdamage/xdamage_cvs.bb index f66188351b..80c120b9bc 100644 --- a/packages/xdamage/xdamage_cvs.bb +++ b/packages/xdamage/xdamage_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" SECTION = "x11/libs" DEPENDS = "x11 damageext libxfixes xproto" diff --git a/packages/xdmcp/libxdmcp_cvs.bb b/packages/xdmcp/libxdmcp_cvs.bb index 51aa252cf5..befda49965 100644 --- a/packages/xdmcp/libxdmcp_cvs.bb +++ b/packages/xdmcp/libxdmcp_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE= "MIT" PR = "r1" SECTION = "x11/libs" diff --git a/packages/xdpyinfo/xdpyinfo_cvs.bb b/packages/xdpyinfo/xdpyinfo_cvs.bb index 6a72d61a77..6b0a4242f5 100644 --- a/packages/xdpyinfo/xdpyinfo_cvs.bb +++ b/packages/xdpyinfo/xdpyinfo_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" DEPENDS = "x11 xext xtst" DESCRIPTION = "X display information utility" diff --git a/packages/xev/xev_cvs.bb b/packages/xev/xev_cvs.bb index 7dccdaad3c..035e63c855 100644 --- a/packages/xev/xev_cvs.bb +++ b/packages/xev/xev_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" DESCRIPTION = "X Event Viewer" HOMEPAGE = "http://freedesktop.org/wiki/Software_2fxapps" LICENSE = "MIT" diff --git a/packages/xext/xext_cvs.bb b/packages/xext/xext_cvs.bb index e9f330120f..d397a1b39f 100644 --- a/packages/xext/xext_cvs.bb +++ b/packages/xext/xext_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" PR = "r1" LICENSE= "MIT" DESCRIPTION = "X Server Extension library" diff --git a/packages/xextensions/xextensions_20050610.bb b/packages/xextensions/xextensions_20050610.bb index ded1379938..06b8144a0f 100644 --- a/packages/xextensions/xextensions_20050610.bb +++ b/packages/xextensions/xextensions_20050610.bb @@ -1,12 +1,12 @@ -PV = "1.0.3+cvs${FIXEDCVSDATE}" -FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +PV = "1.0.3+cvs${FIXEDSRCDATE}" +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" LICENSE= "BSD-X" SECTION = "x11/libs" MAINTAINER = "Greg Gilbert <greg@treke.net>" DESCRIPTION = "various extension headers." -SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XExtensions;date=${FIXEDCVSDATE}" +SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XExtensions;date=${FIXEDSRCDATE}" S = "${WORKDIR}/XExtensions" inherit autotools pkgconfig diff --git a/packages/xextensions/xextensions_cvs.bb b/packages/xextensions/xextensions_cvs.bb index 3fde3cd338..0970cebb0e 100644 --- a/packages/xextensions/xextensions_cvs.bb +++ b/packages/xextensions/xextensions_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" SECTION = "x11/libs" MAINTAINER = "Greg Gilbert <greg@treke.net>" diff --git a/packages/xfont/xfont_cvs.bb b/packages/xfont/xfont_cvs.bb index dac69e2e2c..74576a9da6 100644 --- a/packages/xfont/xfont_cvs.bb +++ b/packages/xfont/xfont_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "BSD-X" SECTION = "x11/libs" PRIORITY = "optional" diff --git a/packages/xfwm4-themes/xfwm4-themes.inc b/packages/xfwm4-themes/xfwm4-themes.inc index aebf1fedc2..c60edc5b83 100644 --- a/packages/xfwm4-themes/xfwm4-themes.inc +++ b/packages/xfwm4-themes/xfwm4-themes.inc @@ -10,6 +10,8 @@ inherit xfce # No ${PN} for this one PACKAGES="" +PACKAGES_DYNAMIC = "xfwm4-theme-*" + python populate_packages_prepend () { themedir = bb.data.expand('${datadir}/xfwm4/themes', d) do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) diff --git a/packages/xfwm4-themes/xfwm4-themes_4.2.0.bb b/packages/xfwm4-themes/xfwm4-themes_4.2.0.bb index aebf1fedc2..c60edc5b83 100644 --- a/packages/xfwm4-themes/xfwm4-themes_4.2.0.bb +++ b/packages/xfwm4-themes/xfwm4-themes_4.2.0.bb @@ -10,6 +10,8 @@ inherit xfce # No ${PN} for this one PACKAGES="" +PACKAGES_DYNAMIC = "xfwm4-theme-*" + python populate_packages_prepend () { themedir = bb.data.expand('${datadir}/xfwm4/themes', d) do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) diff --git a/packages/xfwm4/xfwm4.inc b/packages/xfwm4/xfwm4.inc index 64fe2efa8e..5364466f5a 100644 --- a/packages/xfwm4/xfwm4.inc +++ b/packages/xfwm4/xfwm4.inc @@ -13,6 +13,8 @@ DEPENDS="startup-notification x11 xpm libxfce4util libxfcegui4 libxfce4mcs xfce- EXTRA_OECONF += " --enable-startup-notification" +PACKAGES_DYNAMIC = "xfwm4-theme-*" + python populate_packages_prepend () { themedir = bb.data.expand('${datadir}/themes', d) do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) diff --git a/packages/xfwm4/xfwm4_4.2.0.bb b/packages/xfwm4/xfwm4_4.2.0.bb index 675162577f..0fdfd136be 100644 --- a/packages/xfwm4/xfwm4_4.2.0.bb +++ b/packages/xfwm4/xfwm4_4.2.0.bb @@ -14,6 +14,8 @@ DEPENDS="startup-notification x11 xpm libxfce4util libxfcegui4 libxfce4mcs xfce- EXTRA_OECONF += " --enable-startup-notification" +PACKAGES_DYNAMIC = "xfwm4-theme-*" + python populate_packages_prepend () { themedir = bb.data.expand('${datadir}/themes', d) do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) diff --git a/packages/xhost/xhost_20040413.bb b/packages/xhost/xhost_20040413.bb index 7245e7164e..d25560493c 100644 --- a/packages/xhost/xhost_20040413.bb +++ b/packages/xhost/xhost_20040413.bb @@ -1,13 +1,13 @@ -FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" LICENSE = "MIT" -PV = "0.0cvs${FIXEDCVSDATE}" +PV = "0.0+cvs${FIXEDSRCDATE}" DEPENDS = "x11 xext xmu" DESCRIPTION = "server access control program for X" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "x11/base" PR = "r2" -SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xhost;date=${FIXEDCVSDATE} \ +SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xhost;date=${FIXEDSRCDATE} \ file://autofoo.patch;patch=1" S = "${WORKDIR}/xhost" diff --git a/packages/xinerama/xinerama_cvs.bb b/packages/xinerama/xinerama_cvs.bb index 6846a38600..d55b29983a 100644 --- a/packages/xinerama/xinerama_cvs.bb +++ b/packages/xinerama/xinerama_cvs.bb @@ -4,7 +4,7 @@ SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" DEPENDS = "panoramixext xproto x11 xext" -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xinerama" S = "${WORKDIR}/Xinerama" diff --git a/packages/xmodmap/xmodmap_cvs.bb b/packages/xmodmap/xmodmap_cvs.bb index 890e70d956..6c00f069c9 100644 --- a/packages/xmodmap/xmodmap_cvs.bb +++ b/packages/xmodmap/xmodmap_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X" MAINTAINER = "Rene Wagner <rw@handhelds.org>" diff --git a/packages/xmu/xmu_cvs.bb b/packages/xmu/xmu_cvs.bb index c7e5f84617..7cf267dbb8 100644 --- a/packages/xmu/xmu_cvs.bb +++ b/packages/xmu/xmu_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" SECTION = "x11/libs" PRIORITY = "optional" diff --git a/packages/xpm/xpm_cvs.bb b/packages/xpm/xpm_cvs.bb index 342fdfaa92..e23928023a 100644 --- a/packages/xpm/xpm_cvs.bb +++ b/packages/xpm/xpm_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "X-BSD" SECTION = "x11/libs" PRIORITY = "optional" diff --git a/packages/xprop/xprop_cvs.bb b/packages/xprop/xprop_cvs.bb index 04be770116..895a36fa82 100644 --- a/packages/xprop/xprop_cvs.bb +++ b/packages/xprop/xprop_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" DEPENDS = "x11 xmu xext" DESCRIPTION = "property displayer for X" diff --git a/packages/xproto/xproto_cvs.bb b/packages/xproto/xproto_cvs.bb index 00bfb15d5b..3d625387b1 100644 --- a/packages/xproto/xproto_cvs.bb +++ b/packages/xproto/xproto_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE= "MIT" SECTION = "x11/libs" MAINTAINER = "Greg Gilbert <greg@treke.net>" diff --git a/packages/xqt/xqt_0.0.9.bb b/packages/xqt/xqt_0.0.9.bb index dae436fa47..2888dd9511 100644 --- a/packages/xqt/xqt_0.0.9.bb +++ b/packages/xqt/xqt_0.0.9.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" SECTION = "x11/base" -CVSDATE = "20041111" +SRCDATE = "20041111" DEPENDS = "freetype libxi xmu flex-2.5.4-native virtual/libqte2 libqpe-opie" SRC_URI = "cvs://anonymous@cvs.sourceforge.jp/cvsroot/xqt;module=xc;method=pserver \ diff --git a/packages/xrandr/xrandr_cvs.bb b/packages/xrandr/xrandr_cvs.bb index 36613de988..ea6c71c6ab 100644 --- a/packages/xrandr/xrandr_cvs.bb +++ b/packages/xrandr/xrandr_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" DEPENDS = "libxrandr x11 xext" DESCRIPTION = "X Resize and Rotate extension command." diff --git a/packages/xrdb/xrdb_cvs.bb b/packages/xrdb/xrdb_cvs.bb index d5c954b0f3..daa896874f 100644 --- a/packages/xrdb/xrdb_cvs.bb +++ b/packages/xrdb/xrdb_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" DEPENDS = "x11 xmu xext" DESCRIPTION = "X server resource database utility" MAINTAINER = "Rene Wagner <rw@handhelds.org>" diff --git a/packages/xres/xres_cvs.bb b/packages/xres/xres_cvs.bb index c5fe3b0131..d8a64eb457 100644 --- a/packages/xres/xres_cvs.bb +++ b/packages/xres/xres_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" SECTION = "x11/libs" MAINTAINER = "Greg Gilbert <greg@treke.net>" DEPENDS = "x11 xextensions xext resourceext" diff --git a/packages/xscreensaver/xscreensaver_4.16.bb b/packages/xscreensaver/xscreensaver_4.16.bb index 3caa8cb70f..6db40ab4bc 100644 --- a/packages/xscreensaver/xscreensaver_4.16.bb +++ b/packages/xscreensaver/xscreensaver_4.16.bb @@ -51,6 +51,8 @@ do_install() { install -m 0644 ${WORKDIR}/XScreenSaver ${D}/usr/X11R6/lib/X11/app-defaults } +PACKAGES_DYNAMIC = "xscreensaver-hack-*" + python populate_packages_prepend () { hackdir = bb.data.expand('${libdir}/xscreensaver', d) do_split_packages(d, hackdir, '^(.*)', 'xscreensaver-hack-%s', 'XScreensaver hack %s') diff --git a/packages/xscreensaver/xscreensaver_4.22.bb b/packages/xscreensaver/xscreensaver_4.22.bb index e4ca0acc3a..df4c45fb1c 100644 --- a/packages/xscreensaver/xscreensaver_4.22.bb +++ b/packages/xscreensaver/xscreensaver_4.22.bb @@ -52,6 +52,8 @@ do_install() { install -m 0644 ${WORKDIR}/XScreenSaver ${D}/usr/X11R6/lib/X11/app-defaults } +PACKAGES_DYNAMIC = "xscreensaver-hack-*" + python populate_packages_prepend () { hackdir = bb.data.expand('${libexecdir}/xscreensaver', d) do_split_packages(d, hackdir, '^(.*)', 'xscreensaver-hack-%s', 'XScreensaver hack %s') diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xserver/xserver-kdrive_20050207.bb index 2980e7762f..6ebbd2ce40 100644 --- a/packages/xserver/xserver-kdrive_20050207.bb +++ b/packages/xserver/xserver-kdrive_20050207.bb @@ -1,5 +1,5 @@ -PV = "0.0cvs${FIXEDCVSDATE}" -FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +PV = "0.0+cvs${FIXEDSRCDATE}" +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" DEFAULT_PREFERENCE = "1" LICENSE = "MIT" @@ -33,12 +33,12 @@ FILES_xserver-kdrive-i810 = "${bindir}/Xi810" FILES_xserver-kdrive-epson = "${bindir}/Xepson" FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" -SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDCVSDATE} \ +SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDSRCDATE} \ file://kmode.patch;patch=1 \ file://disable-apm.patch;patch=1 \ file://fbdev-not-fix.patch;patch=1 " -SRC_URI_h3600 = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDCVSDATE} \ +SRC_URI_h3600 = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDSRCDATE} \ file://kmode.patch;patch=1 \ file://faster-rotated.patch;patch=1 \ file://fbdev-not-fix.patch;patch=1 " diff --git a/packages/xserver/xserver-kdrive_20050624.bb b/packages/xserver/xserver-kdrive_20050624.bb index 78e77a23a5..7c8949a896 100644 --- a/packages/xserver/xserver-kdrive_20050624.bb +++ b/packages/xserver/xserver-kdrive_20050624.bb @@ -1,5 +1,5 @@ -PV = "0.0cvs${FIXEDCVSDATE}" -FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +PV = "0.0+cvs${FIXEDSRCDATE}" +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" LICENSE = "MIT" DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext" @@ -32,7 +32,7 @@ FILES_xserver-kdrive-i810 = "${bindir}/Xi810" FILES_xserver-kdrive-epson = "${bindir}/Xepson" FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" -SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDCVSDATE} \ +SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDSRCDATE} \ file://kmode.patch;patch=1 \ file://no-serial-probing.patch;patch=1 \ file://fbdev-not-fix.patch;patch=1" diff --git a/packages/xserver/xserver-kdrive_cvs.bb b/packages/xserver/xserver-kdrive_cvs.bb index dfdbdc4511..241f17565a 100644 --- a/packages/xserver/xserver-kdrive_cvs.bb +++ b/packages/xserver/xserver-kdrive_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" DEFAULT_PREFERENCE = "-2" LICENSE = "MIT" diff --git a/packages/xserver/xserver-xorg_cvs.bb b/packages/xserver/xserver-xorg_cvs.bb index 3f7f8afe0e..9c52864bef 100644 --- a/packages/xserver/xserver-xorg_cvs.bb +++ b/packages/xserver/xserver-xorg_cvs.bb @@ -3,7 +3,7 @@ LICENSE = "Xorg" RPROVIDES = "virtual/xserver" PROVIDES = "virtual/xserver" PR = "r3" -PV = "6.8.1+cvs${CVSDATE}" +PV = "6.8.1+cvs${SRCDATE}" DEPENDS = "fontconfig freetype libxi xmu flex-2.5.4-native" diff --git a/packages/xset/xset_20040817.bb b/packages/xset/xset_20040817.bb index 65986e3dc6..201b963515 100644 --- a/packages/xset/xset_20040817.bb +++ b/packages/xset/xset_20040817.bb @@ -1,8 +1,8 @@ DESCRIPTION = "user preference utility for X" LICENSE = "MIT" MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" -FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" -PV = "0.0cvs${FIXEDCVSDATE}" +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +PV = "0.0+cvs${FIXEDSRCDATE}" PR = "r1" DEPENDS = "x11 xext xextensions xmu" @@ -11,7 +11,7 @@ CFLAGS += "-D_GNU_SOURCE" SECTION = "x11/base" -SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xset;date=${FIXEDCVSDATE} \ +SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xset;date=${FIXEDSRCDATE} \ file://autofoo.patch;patch=1" S = "${WORKDIR}/xset" diff --git a/packages/xstroke/xstroke_cvs.bb b/packages/xstroke/xstroke_cvs.bb index 43efdf2965..d19b7d0d45 100644 --- a/packages/xstroke/xstroke_cvs.bb +++ b/packages/xstroke/xstroke_cvs.bb @@ -4,7 +4,7 @@ SECTION = "x11" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" DEPENDS = "x11 xft xtst xpm" -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" PR = "r1" SRC_URI = "cvs://anoncvs:anoncvs@xstroke.org/cvs/xstroke;module=xstroke" diff --git a/packages/xt/xt_cvs.bb b/packages/xt/xt_cvs.bb index 6b611c3c9f..f3fb6e1790 100644 --- a/packages/xt/xt_cvs.bb +++ b/packages/xt/xt_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" diff --git a/packages/xtrans/xtrans_cvs.bb b/packages/xtrans/xtrans_cvs.bb index fbad3f023c..6cb21a6692 100644 --- a/packages/xtrans/xtrans_cvs.bb +++ b/packages/xtrans/xtrans_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" SECTION = "x11/libs" MAINTAINER = "Greg Gilbert <greg@treke.net>" diff --git a/packages/xtst/xtst_cvs.bb b/packages/xtst/xtst_cvs.bb index 29119dfe8e..22f09037a7 100644 --- a/packages/xtst/xtst_cvs.bb +++ b/packages/xtst/xtst_cvs.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" diff --git a/packages/xxf86dgaext/xxf86dgaext_cvs.bb b/packages/xxf86dgaext/xxf86dgaext_cvs.bb index 1e69cfab0f..4d8eafff85 100644 --- a/packages/xxf86dgaext/xxf86dgaext_cvs.bb +++ b/packages/xxf86dgaext/xxf86dgaext_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "Xorg" SECTION = "x11/libs" MAINTAINER = "Phil Blundell <pb@handhelds.org>" diff --git a/packages/xxf86vmext/xxf86vmext_cvs.bb b/packages/xxf86vmext/xxf86vmext_cvs.bb index 17048b344f..a413bac1b2 100644 --- a/packages/xxf86vmext/xxf86vmext_cvs.bb +++ b/packages/xxf86vmext/xxf86vmext_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" SECTION = "x11/libs" MAINTAINER = "Phil Blundell <pb@handhelds.org>" diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb index 7707e48eeb..42e80c4ab7 100644 --- a/packages/zaurus-updater/zaurus-updater.bb +++ b/packages/zaurus-updater/zaurus-updater.bb @@ -3,6 +3,9 @@ DEPENDS = "encdec-updater-native" LICENSE = "zaurus-updater" PR = "r2" +PACKAGES = "" +PACKAGE_ARCH = "${MACHINE_ARCH}" + SRC_URI = "file://updater.sh \ file://gnu-tar.gz" S = "${WORKDIR}" |