diff options
42 files changed, 30 insertions, 28 deletions
diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index d67be1d738..681e70db9f 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -80,3 +80,4 @@ require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" +require conf/distro/include/preferred-xorg-versions-X11R7.4.inc diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 1f3b55424d..7fec4e9147 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -79,7 +79,7 @@ SRCREV_pn-matchbox-keyboard ?= "1910" SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910" SRCREV_pn-matchbox-panel-2 ?= "1626" SRCREV_pn-matchbox-stroke ?= "1820" -SRCREV_pn-mickeyterm ?= "7b91951addfd51850a23c23ad8ba7f853c4d3416;hb=7b91951addfd51850a23c23ad8ba7f853c4d3416" +SRCREV_pn-mickeyterm ?= "af7c48d424f9c03f7aa8979f1c06e3b2c70acdff" SRCREV_pn-moko-gtk-engine ?= "3612" SRCREV_pn-mpd-alsa ?= "6952" SRCREV_pn-mplayer ?= "27047" @@ -164,10 +164,10 @@ SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5" SRCREV_pn-psplash ?= "249" SRCREV_pn-pty-forward-native ?= "4214" SRCREV_pn-python-etk ?= "8b51535150cbc88467e3d8b578e54df27eac643" -SRCREV_pn-python-odeviced ?= "2f02576532b52732251b3c530a09e4c08685a911" -SRCREV_pn-python-oeventd ?= "d9646ee640fe6eabd023b82a7a0b8ed529cf07b7" -SRCREV_pn-python-ophoned ?= "8bb89a912163c8a846be7a14b2a6e2f832f91bd6" -SRCREV_pn-python-ousaged ?= "c7f83c3f696b6e72f3cab244af4e88dc4851018e" +SRCREV_pn-python-odeviced ?= "fcf6f975b18d478ce618284c0dcc2f28f5c43cc1" +SRCREV_pn-python-oeventd ?= "9053e5be847d694681c3664664ed669543a0a777" +SRCREV_pn-python-ophoned ?= "82c318b8592588bc7ce8bccdfc090e59cfc9b98c" +SRCREV_pn-python-ousaged ?= "836c091405eea3e29efdba3e1351befd1c96267b" SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141" SRCREV_pn-pylgrim ?= "20" SRCREV_pn-pyneod ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a" @@ -175,7 +175,7 @@ SRCREV_pn-pyneog ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a" SRCREV_pn-python-formencode = "3148" SRCREV_pn-python-gsmd = "148" SRCREV_pn-python-lightmediascanner = "68" -SRCREV_pn-python-pyrtc = "4b7fd8841ab62d81fa78509ef7f9b14d2118dcae" +SRCREV_pn-python-pyrtc = "af7c48d424f9c03f7aa8979f1c06e3b2c70acdff" SRCREV_pn-s3c24xx-gpio ?= "4130" SRCREV_pn-serial-forward ?= "4214" SRCREV_pn-settings-daemon ?= "2006" @@ -193,4 +193,4 @@ SRCREV_pn-wlan-ng-modules ?= "1859" SRCREV_pn-wlan-ng-utils ?= "1859" SRCREV_pn-xoo ?= "1971" SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f" -SRCREV_pn-zhone ?= "c1b73d7b4bc3a1abacc871a30cd8c0fb44a5d38b" +SRCREV_pn-zhone ?= "900105c27bd176fdca4e8f896b2c8221181491de" diff --git a/packages/dfu-util/dfu-util-native_svn.bb b/packages/dfu-util/dfu-util-native_svn.bb index 457094df9e..6304fad55b 100644 --- a/packages/dfu-util/dfu-util-native_svn.bb +++ b/packages/dfu-util/dfu-util-native_svn.bb @@ -6,12 +6,12 @@ DEPENDS = "libusb-native usbpath-native" do_stage() { install -d ${STAGING_BINDIR_NATIVE} - install -m 0755 src/dfu-util ${STAGING_BINDIR_NATIVE}/ + install -m 0755 src/dfu-util ${STAGING_BINDIR_NATIVE}/dfu-util-${PV} } do_deploy() { - install -d ${DEPLOY_DIR_IMAGE} - install -m 0755 src/dfu-util_static ${DEPLOY_DIR_IMAGE}/dfu-util + install -d ${DEPLOY_DIR_TOOLS} + install -m 0755 src/dfu-util_static ${DEPLOY_DIR_TOOLS}/dfu-util-${PV} } addtask deploy before do_package after do_install diff --git a/packages/dfu-util/dfu-util_svn.bb b/packages/dfu-util/dfu-util_svn.bb index 1f34a5bc24..2e1afd55b1 100644 --- a/packages/dfu-util/dfu-util_svn.bb +++ b/packages/dfu-util/dfu-util_svn.bb @@ -1,9 +1,9 @@ DESCRIPTION = "USB Device Firmware Upgrade utility" SECTION = "devel" -AUTHOR = "Harald Welte" +AUTHOR = "Harald Welte <laforge@openmoko.org>" LICENSE = "GPL" PV = "0.1+svnr${SRCREV}" -PR = "r0" +PR = "r1" DEPENDS = "libusb usbpath" diff --git a/packages/linux/linux-amsdelta-2.6-2.6.16-omap2/.mtn2git_empty b/packages/linux/linux-amsdelta-2.6-2.6.16-omap2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-amsdelta-2.6-2.6.16-omap2/.mtn2git_empty diff --git a/packages/linux/linux-h6300-omap1-2.6.12-rc5/.mtn2git_empty b/packages/linux/linux-h6300-omap1-2.6.12-rc5/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-h6300-omap1-2.6.12-rc5/.mtn2git_empty diff --git a/packages/linux/linux-h6300-omap1-2.6.14.3/.mtn2git_empty b/packages/linux/linux-h6300-omap1-2.6.14.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-h6300-omap1-2.6.14.3/.mtn2git_empty diff --git a/packages/linux/linux-h6300-omap1-2.6.16.16/.mtn2git_empty b/packages/linux/linux-h6300-omap1-2.6.16.16/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-h6300-omap1-2.6.16.16/.mtn2git_empty diff --git a/packages/linux/linux-omap-2.6-2.6.9-omap1/.mtn2git_empty b/packages/linux/linux-omap-2.6-2.6.9-omap1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-omap-2.6-2.6.9-omap1/.mtn2git_empty diff --git a/packages/linux/linux-omap-2.6-2.6.9-omap1/omap1610h2/.mtn2git_empty b/packages/linux/linux-omap-2.6-2.6.9-omap1/omap1610h2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-omap-2.6-2.6.9-omap1/omap1610h2/.mtn2git_empty diff --git a/packages/linux/linux-omap-2.6-2.6.9-omap1/omap5912osk/.mtn2git_empty b/packages/linux/linux-omap-2.6-2.6.9-omap1/omap5912osk/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-omap-2.6-2.6.9-omap1/omap5912osk/.mtn2git_empty diff --git a/packages/linux/linux-omap1-2.6.12-rc2/.mtn2git_empty b/packages/linux/linux-omap1-2.6.12-rc2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-omap1-2.6.12-rc2/.mtn2git_empty diff --git a/packages/linux/linux-omap1-2.6.12-rc2/nokia770/.mtn2git_empty b/packages/linux/linux-omap1-2.6.12-rc2/nokia770/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-omap1-2.6.12-rc2/nokia770/.mtn2git_empty diff --git a/packages/linux/linux-omap1-2.6.12-rc2/omap5912osk/.mtn2git_empty b/packages/linux/linux-omap1-2.6.12-rc2/omap5912osk/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-omap1-2.6.12-rc2/omap5912osk/.mtn2git_empty diff --git a/packages/linux/linux-omap1-2.6.18+git/.mtn2git_empty b/packages/linux/linux-omap1-2.6.18+git/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-omap1-2.6.18+git/.mtn2git_empty diff --git a/packages/linux/linux-omap1-2.6.18-omap1/.mtn2git_empty b/packages/linux/linux-omap1-2.6.18-omap1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-omap1-2.6.18-omap1/.mtn2git_empty diff --git a/packages/linux/linux-omap1-2.6.19-omap1/.mtn2git_empty b/packages/linux/linux-omap1-2.6.19-omap1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-omap1-2.6.19-omap1/.mtn2git_empty diff --git a/packages/linux/linux-omap1-2.6.20-omap1/.mtn2git_empty b/packages/linux/linux-omap1-2.6.20-omap1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-omap1-2.6.20-omap1/.mtn2git_empty diff --git a/packages/linux/linux-omap1-2.6.22-omap1/.mtn2git_empty b/packages/linux/linux-omap1-2.6.22-omap1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-omap1-2.6.22-omap1/.mtn2git_empty diff --git a/packages/linux/linux-omap1-2.6.23-omap1/.mtn2git_empty b/packages/linux/linux-omap1-2.6.23-omap1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-omap1-2.6.23-omap1/.mtn2git_empty diff --git a/packages/linux/linux-omap1-2.6.24-omap1/.mtn2git_empty b/packages/linux/linux-omap1-2.6.24-omap1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-omap1-2.6.24-omap1/.mtn2git_empty diff --git a/packages/linux/linux-omap1-2.6.25-omap1/.mtn2git_empty b/packages/linux/linux-omap1-2.6.25-omap1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-omap1-2.6.25-omap1/.mtn2git_empty diff --git a/packages/linux/linux-omap1-2.6.x+git/.mtn2git_empty b/packages/linux/linux-omap1-2.6.x+git/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-omap1-2.6.x+git/.mtn2git_empty diff --git a/packages/linux/linux-omap1-git/.mtn2git_empty b/packages/linux/linux-omap1-git/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-omap1-git/.mtn2git_empty diff --git a/packages/linux/linux-omap1-git/omap1710h3/.mtn2git_empty b/packages/linux/linux-omap1-git/omap1710h3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-omap1-git/omap1710h3/.mtn2git_empty diff --git a/packages/linux/linux-omap1-git/omap5912osk/.mtn2git_empty b/packages/linux/linux-omap1-git/omap5912osk/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-omap1-git/omap5912osk/.mtn2git_empty diff --git a/packages/linux/linux-omap2-git/.mtn2git_empty b/packages/linux/linux-omap2-git/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-omap2-git/.mtn2git_empty diff --git a/packages/linux/linux-omap2-git/beagleboard/.mtn2git_empty b/packages/linux/linux-omap2-git/beagleboard/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/.mtn2git_empty diff --git a/packages/linux/linux-omap2-git/omap2420h4/.mtn2git_empty b/packages/linux/linux-omap2-git/omap2420h4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-omap2-git/omap2420h4/.mtn2git_empty diff --git a/packages/linux/linux-omap2-git/omap2430sdp/.mtn2git_empty b/packages/linux/linux-omap2-git/omap2430sdp/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-omap2-git/omap2430sdp/.mtn2git_empty diff --git a/packages/linux/linux-omap2-git/omap3evm/.mtn2git_empty b/packages/linux/linux-omap2-git/omap3evm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-omap2-git/omap3evm/.mtn2git_empty diff --git a/packages/linux/linux-palm-omap1-2.6.22-omap1/.mtn2git_empty b/packages/linux/linux-palm-omap1-2.6.22-omap1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-palm-omap1-2.6.22-omap1/.mtn2git_empty diff --git a/packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt/.mtn2git_empty b/packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt/.mtn2git_empty diff --git a/packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt2/.mtn2git_empty b/packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt2/.mtn2git_empty diff --git a/packages/linux/linux-palm-omap1-2.6.22-omap1/palmz71/.mtn2git_empty b/packages/linux/linux-palm-omap1-2.6.22-omap1/palmz71/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-palm-omap1-2.6.22-omap1/palmz71/.mtn2git_empty diff --git a/packages/linux/linux-tornado-omap2/.mtn2git_empty b/packages/linux/linux-tornado-omap2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-tornado-omap2/.mtn2git_empty diff --git a/packages/linux/linux-tornado-omap2/htctornado/.mtn2git_empty b/packages/linux/linux-tornado-omap2/htctornado/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-tornado-omap2/htctornado/.mtn2git_empty diff --git a/packages/openocd/openocd-native_svn.bb b/packages/openocd/openocd-native_svn.bb index 4ab1d37fe2..3ca688b5c3 100644 --- a/packages/openocd/openocd-native_svn.bb +++ b/packages/openocd/openocd-native_svn.bb @@ -10,8 +10,8 @@ do_stage() { } do_deploy() { - install -d ${DEPLOY_DIR_IMAGE} - install -m 0755 src/openocd ${DEPLOY_DIR_IMAGE}/openocd + install -d ${DEPLOY_DIR_TOOLS} + install -m 0755 src/openocd ${DEPLOY_DIR_TOOLS}/openocd-${PV} } addtask deploy before do_package after do_install diff --git a/packages/openocd/openocd_svn.bb b/packages/openocd/openocd_svn.bb index d5c5ba05cd..6823eabb98 100644 --- a/packages/openocd/openocd_svn.bb +++ b/packages/openocd/openocd_svn.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing" HOMEPAGE = "http://openocd.berlios.de/" LICENSE = "GPL" -PV = "0.0+r${SRCREV}" -PR = "r2" +PV = "0.0+svnr${SRCREV}" +PR = "r3" inherit autotools @@ -11,4 +11,4 @@ SRC_URI = "svn://svn.berlios.de/openocd;module=trunk \ S = "${WORKDIR}/trunk" DEPENDS = "libftdi" -EXTRA_OECONF = " --enable-ft2232_libftdi --disable-ftdi2232 --disable-ftd2xx" +EXTRA_OECONF = " --enable-ft2232_libftdi --disable-ftdi2232 --disable-ftd2xx" diff --git a/packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb b/packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb index 671606c201..675d07c910 100644 --- a/packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb +++ b/packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb @@ -1,10 +1,10 @@ DESCRIPTION = "Boots a S3C2410 device with a user supplied kernel zImage" DEPENDS = "libusb-native" SECTION = "devel" -AUTHOR = "Harald Welte" +AUTHOR = "Harald Welte <laforge@openmoko.org>" LICENSE = "GPL" -PV = "0.1.0+svn${SRCREV}" -PR = "r0" +PV = "0.1.0+svnr${SRCREV}" +PR = "r1" SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=s3c2410_boot_usb;proto=https" S = "${WORKDIR}/s3c2410_boot_usb" @@ -16,8 +16,8 @@ do_compile() { } do_deploy() { - install -d ${DEPLOY_DIR_IMAGE} - install -m 0755 s3c2410-boot-usb ${DEPLOY_DIR_IMAGE} + install -d ${DEPLOY_DIR_TOOLS} + install -m 0755 s3c2410-boot-usb ${DEPLOY_DIR_TOOLS}/s3c2410-boot-usb-${PV} } do_stage() { diff --git a/packages/s3c24xx-utils/s3c24xx-gpio_svn.bb b/packages/s3c24xx-utils/s3c24xx-gpio_svn.bb index 516fbb0c3a..0a57d2c0e6 100644 --- a/packages/s3c24xx-utils/s3c24xx-gpio_svn.bb +++ b/packages/s3c24xx-utils/s3c24xx-gpio_svn.bb @@ -1,8 +1,9 @@ DESCRIPTION = "A user-space tool to show and modify the state of GPIOs on the S3c24xx platform" SECTION = "console/utils" +AUTHOR = "Werner Almesberger <werner@openmoko.org>" LICENSE = "GPL" -PV = "1.0+svn${SRCREV}" -PR = "r1" +PV = "1.0+svnr${SRCREV}" +PR = "r2" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;proto=http" S = "${WORKDIR}/gpio" diff --git a/packages/s3c24xx-utils/sjf2410-linux-native_svn.bb b/packages/s3c24xx-utils/sjf2410-linux-native_svn.bb index bead6039f8..fcfbba923d 100644 --- a/packages/s3c24xx-utils/sjf2410-linux-native_svn.bb +++ b/packages/s3c24xx-utils/sjf2410-linux-native_svn.bb @@ -1,8 +1,8 @@ DESCRIPTION = "JTAG utility to interface w/ a S3C2410 device" SECTION = "devel" -AUTHOR = "Harald Welte" +AUTHOR = "Harald Welte <laforge@openmoko.org>" LICENSE = "GPL" -PV = "0.1+svn${SRCREV}" +PV = "0.1+svnr${SRCREV}" PR = "r0" SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=sjf2410-linux;proto=https" @@ -17,8 +17,8 @@ do_compile() { } do_deploy() { - install -d ${DEPLOY_DIR_IMAGE} - install -m 0755 sjf2410 ${DEPLOY_DIR_IMAGE}/sjf2410 + install -d ${DEPLOY_DIR_TOOLS} + install -m 0755 sjf2410 ${DEPLOY_DIR_TOOLS}/sjf2410-${PV} } do_stage() { |