From 39d23ddf0d552ab715914be1755a0e819bff9bec Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 12 Dec 2008 22:43:49 +0100 Subject: openzaurus-pxa: this kernel is for sharprom compatibility only - not for c7x0 - close #4784 --- packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc index 7e7548491f..7b20b4fa99 100644 --- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc +++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc @@ -89,7 +89,7 @@ EXTRA_OEMAKE = " EMBEDIXRELEASE=-${DISTRO_VERSION}" KERNEL_CCSUFFIX = "-2.95" KERNEL_LDSUFFIX = "-2.11.2" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = '(c7x0|corgi|husky|shepherd|poodle|poodle255)' +COMPATIBLE_MACHINE = '(corgi|husky|shepherd|poodle|poodle255)' PARALLEL_MAKE = "" # -- cgit v1.2.3 From 6f5a32e6349846aa761d02552f40fcae6f6fb121 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Fri, 12 Dec 2008 23:44:00 +0100 Subject: wpa-supplicant: Ship dbus conf and service files. Bump PR. --- packages/wpa-supplicant/wpa-supplicant-0.6.inc | 9 ++++++++- packages/wpa-supplicant/wpa-supplicant_0.6.0.bb | 2 +- packages/wpa-supplicant/wpa-supplicant_0.6.3.bb | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/wpa-supplicant/wpa-supplicant-0.6.inc b/packages/wpa-supplicant/wpa-supplicant-0.6.inc index 6198958cd5..779bee7487 100644 --- a/packages/wpa-supplicant/wpa-supplicant-0.6.inc +++ b/packages/wpa-supplicant/wpa-supplicant-0.6.inc @@ -59,7 +59,14 @@ do_install () { install -d ${D}${sysconfdir}/wpa_supplicant install -m 755 ${WORKDIR}/ifupdown.sh ${D}${sysconfdir}/wpa_supplicant/ install -m 755 ${WORKDIR}/functions.sh ${D}${sysconfdir}/wpa_supplicant - + + install -d ${D}/${sysconfdir}/dbus-1/system.d + install -m 644 ${S}/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d + install -d ${D}/${datadir}/dbus-1/system-services + install -m 644 ${S}/dbus-wpa_supplicant.service ${D}/${datadir}/dbus-1/system-services + ln -s /etc/wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-pre-up.d/wpasupplicant ln -s /etc/wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-post-down.d/wpasupplicant } + +FILES_${PN} += "${datadir}/dbus-1/system-services/*" diff --git a/packages/wpa-supplicant/wpa-supplicant_0.6.0.bb b/packages/wpa-supplicant/wpa-supplicant_0.6.0.bb index d20ccaa9fe..11fc774a18 100644 --- a/packages/wpa-supplicant/wpa-supplicant_0.6.0.bb +++ b/packages/wpa-supplicant/wpa-supplicant_0.6.0.bb @@ -1,3 +1,3 @@ require wpa-supplicant-0.6.inc -PR = "r1" +PR = "r2" diff --git a/packages/wpa-supplicant/wpa-supplicant_0.6.3.bb b/packages/wpa-supplicant/wpa-supplicant_0.6.3.bb index d20ccaa9fe..11fc774a18 100644 --- a/packages/wpa-supplicant/wpa-supplicant_0.6.3.bb +++ b/packages/wpa-supplicant/wpa-supplicant_0.6.3.bb @@ -1,3 +1,3 @@ require wpa-supplicant-0.6.inc -PR = "r1" +PR = "r2" -- cgit v1.2.3 From 6a9fca4399f9feb469980f8b6d2ef451470b0cde Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Fri, 12 Dec 2008 23:55:45 +0100 Subject: sane-srcrevs.inc: Bump linux-eten to get a version with working audio and fixed GPS pm --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index a94e5ba40b..9e008a36be 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -91,7 +91,7 @@ SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "1084" SRCREV_pn-linux-openmoko ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7" SRCREV_pn-linux-openmoko-devel ?= "75e0b08ee55b32b996d491809ce60b63287dadf5" -SRCREV_pn-linux-eten ?= "bb4b5f4bb55736259216a957a14a1e0d33dbc232" +SRCREV_pn-linux-eten ?= "ab2d414f4f13816af0ec0401b608133ca946624a" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" SRCREV_pn-maemo-mapper ?= "118" -- cgit v1.2.3 From ecf8387be0135dc8a64c2e6c28cd26e039334de9 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Fri, 12 Dec 2008 23:57:54 +0100 Subject: linux-eten: Add ro to CMDLINE to work around a strange bug that the SD gets not mounted --- packages/linux/linux-eten_2.6.28-rc4+git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux/linux-eten_2.6.28-rc4+git.bb b/packages/linux/linux-eten_2.6.28-rc4+git.bb index f38a7d4fd8..0d3dac86c6 100644 --- a/packages/linux/linux-eten_2.6.28-rc4+git.bb +++ b/packages/linux/linux-eten_2.6.28-rc4+git.bb @@ -18,4 +18,4 @@ SRC_URI = "\ " S = "${WORKDIR}/git" -CMDLINE = "root=/dev/mmcblk0p1 rootdelay=5" +CMDLINE = "root=/dev/mmcblk0p1 rootdelay=5 ro" -- cgit v1.2.3 From 909cc96b1e38e171b4ca63913a604274ae2ea2bc Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Sat, 13 Dec 2008 01:12:29 +0100 Subject: netbase: Add a network config for the eten-m800 --- packages/netbase/netbase/eten-m800/interfaces | 28 +++++++++++++++++++++++++++ packages/netbase/netbase_4.21.bb | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 packages/netbase/netbase/eten-m800/interfaces diff --git a/packages/netbase/netbase/eten-m800/interfaces b/packages/netbase/netbase/eten-m800/interfaces new file mode 100644 index 0000000000..090c18aa07 --- /dev/null +++ b/packages/netbase/netbase/eten-m800/interfaces @@ -0,0 +1,28 @@ +# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) + +# The loopback interface +auto lo +iface lo inet loopback + +# Wireless interfaces +iface wlan0 inet dhcp +wireless_mode managed +wireless_essid any +iface atml0 inet dhcp + +# Wired or wireless interfaces +iface eth0 inet dhcp +iface eth1 inet dhcp + +# Ethernet/RNDIS gadget (g_ether) +# ... or on host side, usbnet and random hwaddr +auto usb0 +iface usb0 inet static + address 192.168.0.202 + netmask 255.255.255.0 + network 192.168.0.0 + gateway 192.168.0.200 + +# Bluetooth networking +iface bnep0 inet dhcp + diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb index 2fc352f547..a0baa81658 100644 --- a/packages/netbase/netbase_4.21.bb +++ b/packages/netbase/netbase_4.21.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." SECTION = "base" LICENSE = "GPL" -PR = "r28" +PR = "r29" inherit update-rc.d -- cgit v1.2.3 From 498f0cd6374188ab6c0850d32a434da12ae962fe Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Sat, 13 Dec 2008 01:14:42 +0100 Subject: linux-eten: Update defconfig to compile with new srcrev --- packages/linux/linux-eten/defconfig | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/packages/linux/linux-eten/defconfig b/packages/linux/linux-eten/defconfig index 538117f7dc..0daa6c670e 100644 --- a/packages/linux/linux-eten/defconfig +++ b/packages/linux/linux-eten/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.28-rc3 -# Wed Nov 19 04:39:03 2008 +# Linux kernel version: 2.6.28-rc4 +# Fri Dec 12 16:46:44 2008 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -172,8 +172,9 @@ CONFIG_S3C2410_CLOCK=y CONFIG_CPU_S3C244X=y CONFIG_S3C24XX_PWM=y CONFIG_S3C2410_DMA=y -# CONFIG_S3C2410_DMA_DEBUG is not set +CONFIG_S3C2410_DMA_DEBUG=y CONFIG_MACH_SMDK=y +CONFIG_MACH_NEO1973=y CONFIG_PLAT_S3C=y CONFIG_CPU_LLSERIAL_S3C2410=y CONFIG_CPU_LLSERIAL_S3C2440=y @@ -183,6 +184,7 @@ CONFIG_CPU_LLSERIAL_S3C2440=y # # CONFIG_S3C_BOOT_WATCHDOG is not set # CONFIG_S3C_BOOT_ERROR_RESET is not set +CONFIG_S3C_BOOT_UART_FORCE_FIFO=y # # Power management @@ -315,7 +317,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/mmcblk0p1 rootdelay=5" +CONFIG_CMDLINE="root=/dev/mmcblk0p1 rootdelay=5 ro" # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y CONFIG_ATAGS_PROC=y @@ -576,7 +578,9 @@ CONFIG_WIRELESS_EXT=y CONFIG_WIRELESS_EXT_SYSFS=y # CONFIG_MAC80211 is not set # CONFIG_IEEE80211 is not set -# CONFIG_RFKILL is not set +CONFIG_RFKILL=y +CONFIG_RFKILL_INPUT=y +CONFIG_RFKILL_LEDS=y # CONFIG_NET_9P is not set # @@ -812,6 +816,7 @@ CONFIG_USB_ARMLINUX=y CONFIG_USB_EPSON2888=y CONFIG_USB_KC2190=y CONFIG_USB_NET_ZAURUS=m +# CONFIG_USB_HSO is not set # CONFIG_WAN is not set CONFIG_PPP=m CONFIG_PPP_MULTILINK=y @@ -859,6 +864,7 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_NEWTON is not set CONFIG_KEYBOARD_STOWAWAY=m CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_NEO1973=y CONFIG_KEYBOARD_M800=y # CONFIG_KEYBOARD_QT2410 is not set CONFIG_INPUT_MOUSE=y @@ -872,6 +878,7 @@ CONFIG_INPUT_MOUSE=y # CONFIG_INPUT_TABLET is not set CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_FILTER=y +CONFIG_TOUCHSCREEN_FILTER_GROUP=y CONFIG_TOUCHSCREEN_FILTER_MEDIAN=y CONFIG_TOUCHSCREEN_FILTER_MEAN=y # CONFIG_TOUCHSCREEN_ADS7846 is not set @@ -1128,6 +1135,7 @@ CONFIG_FB_S3C2410=y # CONFIG_FB_S3C2410_DEBUG is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=y # CONFIG_LCD_LTV350QV is not set @@ -1192,8 +1200,11 @@ CONFIG_SND_USB=y # CONFIG_SND_USB_CAIAQ is not set CONFIG_SND_SOC=m CONFIG_SND_S3C24XX_SOC=m +CONFIG_SND_S3C24XX_SOC_I2S=m # CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set +CONFIG_SND_S3C24XX_SOC_GFISH_AK4641=m # CONFIG_SND_SOC_ALL_CODECS is not set +CONFIG_SND_SOC_AK4641=m # CONFIG_SOUND_PRIME is not set CONFIG_HID_SUPPORT=y CONFIG_HID=y @@ -1438,7 +1449,7 @@ CONFIG_SDIO_UART=m # # MMC/SD/SDIO Host Controller Drivers # -CONFIG_MMC_SDHCI=y +# CONFIG_MMC_SDHCI is not set # CONFIG_MMC_SPI is not set CONFIG_MMC_S3C=y # CONFIG_MEMSTICK is not set @@ -1453,6 +1464,7 @@ CONFIG_LEDS_S3C24XX=m # CONFIG_LEDS_PCA9532 is not set # CONFIG_LEDS_GPIO is not set # CONFIG_LEDS_PCA955X is not set +# CONFIG_LEDS_NEO1973_VIBRATOR is not set # # LED Triggers @@ -1542,10 +1554,6 @@ CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_POLYNOMIAL=0x11d # CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set CONFIG_ANDROID_TIMED_GPIO=y CONFIG_ANDROID_PARANOID_NETWORK=y - -# -# Voltage and Current regulators -# CONFIG_REGULATOR=y CONFIG_REGULATOR_DEBUG=y # CONFIG_REGULATOR_FIXED_VOLTAGE is not set -- cgit v1.2.3 From 667aa1957eb2074a6c3c5be88dca097572c68ce3 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Sat, 13 Dec 2008 01:19:35 +0100 Subject: pointercal: Ship pointercal file for eten-m800. Bump PR. --- packages/pointercal/files/eten-m800/pointercal | 1 + packages/pointercal/pointercal_0.0.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 packages/pointercal/files/eten-m800/pointercal diff --git a/packages/pointercal/files/eten-m800/pointercal b/packages/pointercal/files/eten-m800/pointercal new file mode 100644 index 0000000000..2fc5007a7d --- /dev/null +++ b/packages/pointercal/files/eten-m800/pointercal @@ -0,0 +1 @@ +-39200 1057 36888216 180 -57378 55366888 65536 diff --git a/packages/pointercal/pointercal_0.0.bb b/packages/pointercal/pointercal_0.0.bb index a3d1df7e2a..b22735c6be 100644 --- a/packages/pointercal/pointercal_0.0.bb +++ b/packages/pointercal/pointercal_0.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Touchscreen calibration data" SECTION = "base" -PR = "r9" +PR = "r10" SRC_URI = "file://pointercal" S = "${WORKDIR}" -- cgit v1.2.3 From fe1957fead2fe09057e8285f3954df728ae31b35 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Fri, 12 Dec 2008 19:33:29 -0600 Subject: dsmg600-image.bbclass: use correct kernel file when assembling the bin image --- classes/dsmg600-image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/dsmg600-image.bbclass b/classes/dsmg600-image.bbclass index 5ccf49267b..4e4550f5b7 100644 --- a/classes/dsmg600-image.bbclass +++ b/classes/dsmg600-image.bbclass @@ -1,6 +1,6 @@ dsmg600_pack_image () { install -d ${DEPLOY_DIR_IMAGE}/firmupgrade - install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-dsmg600${SITEINFO_ENDIANESS} \ + install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-nslu2${SITEINFO_ENDIANESS}.bin \ ${DEPLOY_DIR_IMAGE}/firmupgrade/ip-ramdisk install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ ${DEPLOY_DIR_IMAGE}/firmupgrade/rootfs.gz -- cgit v1.2.3 From 988cc7aae4f6488c7033e63b64082dedcd4ca6be Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 12 Dec 2008 19:30:47 -0800 Subject: eglibc_2.9: Add recipes for eglibc 2.9 release eglibc_svn: use AUTOREV for SRCREV and add EGLIBC_BRANCH --- packages/eglibc/eglibc-initial_2.9.bb | 6 +++ packages/eglibc/eglibc_2.9.bb | 98 +++++++++++++++++++++++++++++++++++ packages/eglibc/eglibc_svn.bb | 10 ++-- 3 files changed, 110 insertions(+), 4 deletions(-) create mode 100644 packages/eglibc/eglibc-initial_2.9.bb create mode 100644 packages/eglibc/eglibc_2.9.bb diff --git a/packages/eglibc/eglibc-initial_2.9.bb b/packages/eglibc/eglibc-initial_2.9.bb new file mode 100644 index 0000000000..787c762609 --- /dev/null +++ b/packages/eglibc/eglibc-initial_2.9.bb @@ -0,0 +1,6 @@ +require eglibc_${PV}.bb +require eglibc-initial.inc + +do_configure_prepend () { + unset CFLAGS +} diff --git a/packages/eglibc/eglibc_2.9.bb b/packages/eglibc/eglibc_2.9.bb new file mode 100644 index 0000000000..207c73a9aa --- /dev/null +++ b/packages/eglibc/eglibc_2.9.bb @@ -0,0 +1,98 @@ +require eglibc.inc + +DEFAULT_PREFERENCE = "1" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" +PV = "2.9" +PR = "r0" +SVN_REV="7430" +EGLIBC_BRANCH="eglibc-2_9" +SRC_URI = "svn://svn.eglibc.org/branches;module=eglibc-2_9;rev=${SVN_REV};proto=svn \ + file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \ + file://etc/ld.so.conf \ + file://generate-supported.mk" +S = "${WORKDIR}/${EGLIBC_BRANCH}/libc" +B = "${WORKDIR}/build-${TARGET_SYS}" + +PACKAGES_DYNAMIC = "libc6*" +RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" +PROVIDES_${PN}-dbg = "glibc-dbg" + +# the -isystem in bitbake.conf screws up glibc do_stage +BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" +TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" + +GLIBC_ADDONS ?= "ports,nptl,libidn" + +GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN" + +# +# For now, we will skip building of a gcc package if it is a uclibc one +# and our build is not a uclibc one, and we skip a glibc one if our build +# is a uclibc build. +# +# See the note in gcc/gcc_3.4.0.oe +# + +python __anonymous () { + import bb, re + uc_os = (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None) + if uc_os: + raise bb.parse.SkipPackage("incompatible with target %s" % + bb.data.getVar('TARGET_OS', d, 1)) +} + +EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ + --without-cvs --disable-profile --disable-debug --without-gd \ + --enable-clocale=gnu \ + --enable-add-ons=${GLIBC_ADDONS},ports \ + --with-headers=${STAGING_INCDIR} \ + --without-selinux \ + ${GLIBC_EXTRA_OECONF}" + +EXTRA_OECONF += "${@get_eglibc_fpu_setting(bb, d)}" + +do_unpack_append() { + bb.build.exec_func('do_move_ports', d) +} + +do_move_ports() { + if test -d ${WORKDIR}/${EGLIBC_BRANCH}/ports ; then + rm -rf ${S}/ports + mv ${WORKDIR}/${EGLIBC_BRANCH}/ports ${S}/ + fi +} + +do_configure () { +# override this function to avoid the autoconf/automake/aclocal/autoheader +# calls for now +# don't pass CPPFLAGS into configure, since it upsets the kernel-headers +# version check and doesn't really help with anything + if [ -z "`which rpcgen`" ]; then + echo "rpcgen not found. Install glibc-devel." + exit 1 + fi + (cd ${S} && gnu-configize) || die "failure in running gnu-configize" + find ${S} -name "configure" | xargs touch + CPPFLAGS="" oe_runconf +} + +rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \ + yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \ + rusers.x spray.x nfs_prot.x rquota.x key_prot.x" + +do_compile () { + # -Wl,-rpath-link /lib in LDFLAGS can cause breakage if another glibc is in staging + unset LDFLAGS + base_do_compile + ( + cd ${S}/sunrpc/rpcsvc + for r in ${rpcsvc}; do + h=`echo $r|sed -e's,\.x$,.h,'` + rpcgen -h $r -o $h || oewarn "unable to generate header for $r" + done + ) +} + +require eglibc-stage.inc + +require eglibc-package.bbclass diff --git a/packages/eglibc/eglibc_svn.bb b/packages/eglibc/eglibc_svn.bb index d3bd7c1f99..69b430cd47 100644 --- a/packages/eglibc/eglibc_svn.bb +++ b/packages/eglibc/eglibc_svn.bb @@ -1,14 +1,16 @@ require eglibc.inc +SRCREV = "${AUTOREV}" # DEFAULT_PREFERENCE = "-1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" PV = "2.9+svnr${SRCREV}" PR = "r0" +EGLIBC_BRANCH="trunk" SRC_URI = "svn://svn.eglibc.org;module=trunk \ file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \ file://etc/ld.so.conf \ file://generate-supported.mk" -S = "${WORKDIR}/trunk/libc" +S = "${WORKDIR}/${EGLIBC_BRANCH}/libc" B = "${WORKDIR}/build-${TARGET_SYS}" PACKAGES_DYNAMIC = "libc6*" @@ -54,10 +56,10 @@ do_unpack_append() { } do_move_ports() { - if test -d ${WORKDIR}/trunk/ports ; then + if test -d ${WORKDIR}/${EGLIBC_BRANCH}/ports ; then rm -rf ${S}/ports - mv ${WORKDIR}/trunk/ports ${S}/ - fi + mv ${WORKDIR}/${EGLIBC_BRANCH}/ports ${S}/ + fi } do_configure () { -- cgit v1.2.3 From 6d54269f6753caa9e2958947d8ea75389f236a62 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 12 Dec 2008 19:39:33 -0800 Subject: angstrom-2008.1.conf: Update uclibc PREFERRED_VERSION to 0.9.30 angstrom-2008-preferred-versions.inc: Delete uclibc PREFERRED_VERSION --- conf/distro/angstrom-2008.1.conf | 6 +++--- conf/distro/include/angstrom-2008-preferred-versions.inc | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 49fc4ac034..7a052ab4b9 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -71,11 +71,11 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20" #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against PREFERRED_VERSION_linux-libc-headers = "2.6.23" -#Prefer glibc 2.6 and uclibc 0.9.29, these have had the most testing. +#Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing. PREFERRED_VERSION_glibc ?= "2.6.1" PREFERRED_VERSION_glibc-initial ?= "2.6.1" -PREFERRED_VERSION_uclibc ?= "0.9.29" -PREFERRED_VERSION_uclibc-initial ?= "0.9.29" +PREFERRED_VERSION_uclibc ?= "0.9.30" +PREFERRED_VERSION_uclibc-initial ?= "0.9.30" PREFERRED_PROVIDER_avahi = "avahi" diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index f6afab61e9..bc5785343f 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -25,7 +25,5 @@ PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.10" PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" -PREFERRED_VERSION_uclibc-initial = "0.9.30" -PREFERRED_VERSION_uclibc = "0.9.30" PREFERRED_VERSION_udev = "124" PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" -- cgit v1.2.3 From 8d45c65d9684f53af354ddc001cd0011e95a5060 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sat, 13 Dec 2008 01:18:31 -0600 Subject: sane-srcrevs.inc: ixp4xx kernel - bump up to fetch latest 2.6.27 patches --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 9e008a36be..7c659cd3f2 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -88,7 +88,7 @@ SRCREV_pn-libxosd ?= "627" SRCREV_pn-lightmediascanner ?= "68" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" -SRCREV_pn-linux-ixp4xx ?= "1084" +SRCREV_pn-linux-ixp4xx ?= "1085" SRCREV_pn-linux-openmoko ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7" SRCREV_pn-linux-openmoko-devel ?= "75e0b08ee55b32b996d491809ce60b63287dadf5" SRCREV_pn-linux-eten ?= "ab2d414f4f13816af0ec0401b608133ca946624a" -- cgit v1.2.3 From 7f7e34c9f5f7c10b63c07aa9a0a0f652b02bcfd8 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Fri, 12 Dec 2008 21:31:04 +0100 Subject: python 2.6.1: ship generic module in python-core, get rid of individual subpackage revision --- contrib/python/generate-manifest-2.6.py | 354 ++++++++++++++++++++++++++++++++ packages/python/python-2.6-manifest.inc | 64 +----- packages/python/python.inc | 2 +- 3 files changed, 356 insertions(+), 64 deletions(-) create mode 100755 contrib/python/generate-manifest-2.6.py diff --git a/contrib/python/generate-manifest-2.6.py b/contrib/python/generate-manifest-2.6.py new file mode 100755 index 0000000000..01e4527dcb --- /dev/null +++ b/contrib/python/generate-manifest-2.6.py @@ -0,0 +1,354 @@ +#!/usr/bin/env python + +# generate Python Manifest for the OpenEmbedded build system +# (C) 2002-2008 Michael 'Mickey' Lauer +# (C) 2007 Jeremy Laine +# licensed under MIT, see COPYING.MIT + +import os +import sys +import time + +VERSION = "2.6.1" +BASEREV = 0 + +__author__ = "Michael 'Mickey' Lauer " +__version__ = "20081209" + +class MakefileMaker: + + def __init__( self, outfile ): + """initialize""" + self.packages = {} + self.targetPrefix = "${libdir}/python%s/" % VERSION[:3] + self.output = outfile + self.out( """ +# WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file. +# Generator: '%s' Version %s (C) 2002-2008 Michael 'Mickey' Lauer +# Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy +""" % ( sys.argv[0], __version__ ) ) + + # + # helper functions + # + + def out( self, data ): + """print a line to the output file""" + self.output.write( "%s\n" % data ) + + def setPrefix( self, targetPrefix ): + """set a file prefix for addPackage files""" + self.targetPrefix = targetPrefix + + def doProlog( self ): + self.out( """ """ ) + self.out( "" ) + + def addPackage( self, name, description, dependencies, filenames ): + """add a package to the Makefile""" + if type( filenames ) == type( "" ): + filenames = filenames.split() + fullFilenames = [] + for filename in filenames: + if filename[0] != "$": + fullFilenames.append( "%s%s" % ( self.targetPrefix, filename ) ) + else: + fullFilenames.append( filename ) + self.packages[name] = description, dependencies, fullFilenames + + def doBody( self ): + """generate body of Makefile""" + + global VERSION + + # + # generate provides line + # + + provideLine = 'PROVIDES+="' + for name in self.packages: + provideLine += "%s " % name + provideLine += '"' + + self.out( provideLine ) + self.out( "" ) + + # + # generate package line + # + + packageLine = 'PACKAGES="' + for name in self.packages: + packageLine += "%s " % name + packageLine += ' python-modules"' + + self.out( packageLine ) + self.out( "" ) + + # + # generate package variables + # + + for name, data in self.packages.iteritems(): + desc, deps, files = data + + # + # write out the description, revision and dependencies + # + self.out( 'DESCRIPTION_%s="%s"' % ( name, desc ) ) + self.out( 'RDEPENDS_%s="%s"' % ( name, deps ) ) + + line = 'FILES_%s="' % name + + # + # check which directories to make in the temporary directory + # + + dirset = {} # if python had a set-datatype this would be sufficient. for now, we're using a dict instead. + for target in files: + dirset[os.path.dirname( target )] = True + + # + # generate which files to copy for the target (-dfR because whole directories are also allowed) + # + + for target in files: + line += "%s " % target + + line += '"' + self.out( line ) + self.out( "" ) + + self.out( 'DESCRIPTION_python-modules="All Python modules"' ) + line = 'RDEPENDS_python-modules="' + + for name, data in self.packages.iteritems(): + if name != 'python-core-dbg': + line += "%s " % name + + self.out( "%s \"" % line ) + self.out( 'ALLOW_EMPTY_python-modules = "1"' ) + + def doEpilog( self ): + self.out( """""" ) + self.out( "" ) + + def make( self ): + self.doProlog() + self.doBody() + self.doEpilog() + +if __name__ == "__main__": + + if len( sys.argv ) > 1: + os.popen( "rm -f ./%s" % sys.argv[1] ) + outfile = file( sys.argv[1], "w" ) + else: + outfile = sys.stdout + + m = MakefileMaker( outfile ) + + # Add packages here. Only specify dlopen-style library dependencies here, no ldd-style dependencies! + # Parameters: revision, name, description, dependencies, filenames + # + + m.addPackage( "python-core", "Python Interpreter and core modules (needed!)", "", + "__future__.* copy.* copy_reg.* ConfigParser.* " + + "genericpath.* getopt.* linecache.* new.* " + + "os.* posixpath.* struct.* " + + "warnings.* site.* stat.* " + + "UserDict.* UserList.* UserString.* " + + "lib-dynload/binascii.so lib-dynload/_struct.so lib-dynload/time.so " + + "lib-dynload/xreadlines.so types.* ${bindir}/python*" ) + + m.addPackage( "python-core-dbg", "Python core module debug information", "python-core", + "lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug" ) + + m.addPackage( "python-devel", "Python Development Package", "python-core", + "${includedir} config" ) # package + + m.addPackage( "python-idle", "Python Integrated Development Environment", "python-core python-tkinter", + "${bindir}/idle idlelib" ) # package + + m.addPackage( "python-pydoc", "Python Interactive Help Support", "python-core python-lang python-stringold python-re", + "${bindir}/pydoc pydoc.*" ) + + m.addPackage( "python-smtpd", "Python Simple Mail Transport Daemon", "python-core python-netserver python-email python-mime", + "${bindir}/smtpd.*" ) + + m.addPackage( "python-audio", "Python Audio Handling", "python-core", + "wave.* chunk.* sndhdr.* lib-dynload/ossaudiodev.so lib-dynload/audioop.so" ) + + m.addPackage( "python-bsddb", "Python Berkeley Database Bindings", "python-core", + "bsddb lib-dynload/_bsddb.so" ) # package + + m.addPackage( "python-codecs", "Python Codecs, Encodings & i18n Support", "python-core python-lang", + "codecs.* encodings gettext.* locale.* lib-dynload/_locale.so lib-dynload/unicodedata.so stringprep.* xdrlib.*" ) + + m.addPackage( "python-compile", "Python Bytecode Compilation Support", "python-core", + "py_compile.* compileall.*" ) + + m.addPackage( "python-compiler", "Python Compiler Support", "python-core", + "compiler" ) # package + + m.addPackage( "python-compression", "Python High Level Compression Support", "python-core python-zlib", + "gzip.* zipfile.* tarfile.*" ) + + m.addPackage( "python-crypt", "Python Basic Cryptographic and Hashing Support", "python-core", + "hashlib.* md5.* sha.* lib-dynload/crypt.so lib-dynload/_hashlib.so lib-dynload/_sha256.so lib-dynload/_sha512.so" ) + + m.addPackage( "python-textutils", "Python Option Parsing, Text Wrapping and Comma-Separated-Value Support", "python-core python-io python-re python-stringold", + "lib-dynload/_csv.so csv.* optparse.* textwrap.*" ) + + m.addPackage( "python-curses", "Python Curses Support", "python-core", + "curses lib-dynload/_curses.so lib-dynload/_curses_panel.so" ) # directory + low level module + + m.addPackage( "python-ctypes", "Python C Types Support", "python-core", + "ctypes lib-dynload/_ctypes.so" ) # directory + low level module + + m.addPackage( "python-datetime", "Python Calendar and Time support", "python-core python-codecs", + "_strptime.* calendar.* lib-dynload/datetime.so" ) + + m.addPackage( "python-db", "Python File-Based Database Support", "python-core", + "anydbm.* dumbdbm.* whichdb.* " ) + + m.addPackage( "python-debugger", "Python Debugger", "python-core python-io python-lang python-re python-stringold python-shell python-pprint", + "bdb.* pdb.*" ) + + m.addPackage( "python-difflib", "Python helpers for computing deltas between objects.", "python-lang python-re", + "difflib.*" ) + + m.addPackage( "python-distutils", "Python Distribution Utilities", "python-core", + "config distutils" ) # package + + m.addPackage( "python-doctest", "Python framework for running examples in docstrings.", "python-core python-lang python-io python-re python-unittest python-debugger python-difflib", + "doctest.*" ) + + m.addPackage( "python-email", "Python Email Support", "python-core python-io python-re python-mime python-audio python-image", + "email" ) # package + + m.addPackage( "python-fcntl", "Python's fcntl Interface", "python-core", + "lib-dynload/fcntl.so" ) + + m.addPackage( "python-hotshot", "Python Hotshot Profiler", "python-core", + "hotshot lib-dynload/_hotshot.so" ) + + m.addPackage( "python-html", "Python HTML Processing", "python-core", + "formatter.* htmlentitydefs.* htmllib.* markupbase.* sgmllib.* " ) + + m.addPackage( "python-gdbm", "Python GNU Database Support", "python-core", + "lib-dynload/gdbm.so" ) + + m.addPackage( "python-image", "Python Graphical Image Handling", "python-core", + "colorsys.* imghdr.* lib-dynload/imageop.so lib-dynload/rgbimg.so" ) + + m.addPackage( "python-io", "Python Low-Level I/O", "python-core python-math", + "lib-dynload/_socket.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so " + "pipes.* socket.* tempfile.* StringIO.* " ) + + m.addPackage( "python-lang", "Python Low-Level Language Support", "python-core", + "lib-dynload/array.so lib-dynload/parser.so lib-dynload/operator.so lib-dynload/_weakref.so " + + "lib-dynload/itertools.so lib-dynload/collections.so lib-dynload/_bisect.so lib-dynload/_heapq.so " + + "atexit.* bisect.* code.* codeop.* dis.* heapq.* inspect.* keyword.* opcode.* symbol.* repr.* token.* " + + " tokenize.* traceback.* linecache.* weakref.*" ) + + m.addPackage( "python-logging", "Python Logging Support", "python-core python-io python-lang python-pickle python-stringold", + "logging" ) # package + + m.addPackage( "python-tkinter", "Python Tcl/Tk Bindings", "python-core", + "lib-dynload/_tkinter.so lib-tk" ) # package + + m.addPackage( "python-math", "Python Math Support", "python-core", + "lib-dynload/cmath.so lib-dynload/math.so lib-dynload/_random.so random.* sets.*" ) + + m.addPackage( "python-mime", "Python MIME Handling APIs", "python-core python-io", + "mimetools.* uu.* quopri.* rfc822.*" ) + + m.addPackage( "python-mmap", "Python Memory-Mapped-File Support", "python-core python-io", + "lib-dynload/mmap.so " ) + + m.addPackage( "python-unixadmin", "Python Unix Administration Support", "python-core", + "lib-dynload/nis.so lib-dynload/grp.so lib-dynload/pwd.so getpass.*" ) + + m.addPackage( "python-netclient", "Python Internet Protocol Clients", "python-core python-crypt python-datetime python-io python-lang python-logging python-mime", + "*Cookie*.* " + + "base64.* cookielib.* ftplib.* gopherlib.* hmac.* httplib.* mimetypes.* nntplib.* poplib.* smtplib.* telnetlib.* urllib.* urllib2.* urlparse.* uuid.*" ) + + m.addPackage( "python-netserver", "Python Internet Protocol Servers", "python-core python-netclient", + "cgi.* BaseHTTPServer.* SimpleHTTPServer.* SocketServer.*" ) + + m.addPackage( "python-pickle", "Python Persistence Support", "python-core python-codecs python-io python-re", + "pickle.* shelve.* lib-dynload/cPickle.so" ) + + m.addPackage( "python-pkgutil", "Python Package Extension Utility Support", "python-core", + "pkgutil.*") + + m.addPackage( "python-pprint", "Python Pretty-Print Support", "python-core", + "pprint.*" ) + + m.addPackage( "python-profile", "Python Basic Profiling Support", "python-core python-textutils", + "profile.* pstats.* cProfile.* lib-dynload/_lsprof.so" ) + + m.addPackage( "python-re", "Python Regular Expression APIs", "python-core", + "re.* sre.* sre_compile.* sre_constants* sre_parse.*" ) # _sre is builtin + + m.addPackage( "python-readline", "Python Readline Support", "python-core", + "lib-dynload/readline.so rlcompleter.*" ) + + m.addPackage( "python-resource", "Python Resource Control Interface", "python-core", + "lib-dynload/resource.so" ) + + m.addPackage( "python-shell", "Python Shell-Like Functionality", "python-core python-re", + "cmd.* commands.* dircache.* fnmatch.* glob.* popen2.* shlex.* shutil.*" ) + + m.addPackage( "python-robotparser", "Python robots.txt parser", "python-core python-netclient", + "robotparser.*") + + m.addPackage( "python-subprocess", "Python Subprocess Support", "python-core python-io python-re python-fcntl python-pickle", + "subprocess.*" ) + + m.addPackage( "python-sqlite3", "Python Sqlite3 Database Support", "python-core python-datetime python-lang python-crypt python-io python-threading python-zlib", + "lib-dynload/_sqlite3.so sqlite3/dbapi2.* sqlite3/__init__.*" ) + + m.addPackage( "python-sqlite3-tests", "Python Sqlite3 Database Support Tests", "python-core python-sqlite3", + "sqlite3/test" ) + + m.addPackage( "python-stringold", "Python String APIs [deprecated]", "python-core python-re", + "lib-dynload/strop.so string.*" ) + + m.addPackage( "python-syslog", "Python's Syslog Interface", "python-core", + "lib-dynload/syslog.so" ) + + m.addPackage( "python-terminal", "Python Terminal Controlling Support", "python-core python-io", + "pty.* tty.*" ) + + m.addPackage( "python-tests", "Python Tests", "python-core", + "test" ) # package + + m.addPackage( "python-threading", "Python Threading & Synchronization Support", "python-core python-lang", + "_threading_local.* dummy_thread.* dummy_threading.* mutex.* threading.* Queue.*" ) + + m.addPackage( "python-unittest", "Python Unit Testing Framework", "python-core python-stringold python-lang", + "unittest.*" ) + + m.addPackage( "python-xml", "Python basic XML support.", "python-core python-re", + "lib-dynload/pyexpat.so xml xmllib.*" ) # package + + m.addPackage( "python-xmlrpc", "Python XMLRPC Support", "python-core python-xml python-netserver python-lang", + "xmlrpclib.* SimpleXMLRPCServer.*" ) + + m.addPackage( "python-zlib", "Python zlib Support.", "python-core", + "lib-dynload/zlib.so" ) + + m.addPackage( "python-mailbox", "Python Mailbox Format Support", "python-core python-mime", + "mailbox.*" ) + + # FIXME consider adding to python-compression + m.addPackage( "python-bzip2", "Python bzip2 support", "python-core", + "lib-dynload/bz2.so" ) + + # FIXME consider adding to some higher level package + m.addPackage( "python-elementtree", "Python elementree", "python-core", + "lib-dynload/_elementtree.so" ) + + m.make() diff --git a/packages/python/python-2.6-manifest.inc b/packages/python/python-2.6-manifest.inc index 50f57b74a2..3b6a7b7c8f 100644 --- a/packages/python/python-2.6-manifest.inc +++ b/packages/python/python-2.6-manifest.inc @@ -9,312 +9,250 @@ PROVIDES+="python-profile python-threading python-distutils python-doctest pytho PACKAGES="python-profile python-threading python-distutils python-doctest python-codecs python-ctypes python-pickle python-bzip2 python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-difflib python-math python-syslog python-hotshot python-unixadmin python-textutils python-tkinter python-gdbm python-elementtree python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-compile python-debugger python-pkgutil python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-modules" DESCRIPTION_python-profile="Python Basic Profiling Support" -PR_python-profile="ml0" RDEPENDS_python-profile="python-core python-textutils" FILES_python-profile="${libdir}/python2.6/profile.* ${libdir}/python2.6/pstats.* ${libdir}/python2.6/cProfile.* ${libdir}/python2.6/lib-dynload/_lsprof.so " DESCRIPTION_python-threading="Python Threading & Synchronization Support" -PR_python-threading="ml0" RDEPENDS_python-threading="python-core python-lang" FILES_python-threading="${libdir}/python2.6/_threading_local.* ${libdir}/python2.6/dummy_thread.* ${libdir}/python2.6/dummy_threading.* ${libdir}/python2.6/mutex.* ${libdir}/python2.6/threading.* ${libdir}/python2.6/Queue.* " DESCRIPTION_python-distutils="Python Distribution Utilities" -PR_python-distutils="ml0" RDEPENDS_python-distutils="python-core" FILES_python-distutils="${libdir}/python2.6/config ${libdir}/python2.6/distutils " DESCRIPTION_python-doctest="Python framework for running examples in docstrings." -PR_python-doctest="ml0" RDEPENDS_python-doctest="python-core python-lang python-io python-re python-unittest python-debugger python-difflib" FILES_python-doctest="${libdir}/python2.6/doctest.* " DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support" -PR_python-codecs="ml0" RDEPENDS_python-codecs="python-core python-lang" FILES_python-codecs="${libdir}/python2.6/codecs.* ${libdir}/python2.6/encodings ${libdir}/python2.6/gettext.* ${libdir}/python2.6/locale.* ${libdir}/python2.6/lib-dynload/_locale.so ${libdir}/python2.6/lib-dynload/unicodedata.so ${libdir}/python2.6/stringprep.* ${libdir}/python2.6/xdrlib.* " DESCRIPTION_python-ctypes="Python C Types Support" -PR_python-ctypes="ml0" RDEPENDS_python-ctypes="python-core" FILES_python-ctypes="${libdir}/python2.6/ctypes ${libdir}/python2.6/lib-dynload/_ctypes.so " DESCRIPTION_python-pickle="Python Persistence Support" -PR_python-pickle="ml0" RDEPENDS_python-pickle="python-core python-codecs python-io python-re" FILES_python-pickle="${libdir}/python2.6/pickle.* ${libdir}/python2.6/shelve.* ${libdir}/python2.6/lib-dynload/cPickle.so " DESCRIPTION_python-bzip2="Python bzip2 support" -PR_python-bzip2="ml0" RDEPENDS_python-bzip2="python-core" FILES_python-bzip2="${libdir}/python2.6/lib-dynload/bz2.so " DESCRIPTION_python-datetime="Python Calendar and Time support" -PR_python-datetime="ml0" RDEPENDS_python-datetime="python-core python-codecs" FILES_python-datetime="${libdir}/python2.6/_strptime.* ${libdir}/python2.6/calendar.* ${libdir}/python2.6/lib-dynload/datetime.so " DESCRIPTION_python-core="Python Interpreter and core modules (needed!)" -PR_python-core="ml0" RDEPENDS_python-core="" -FILES_python-core="${libdir}/python2.6/__future__.* ${libdir}/python2.6/copy.* ${libdir}/python2.6/copy_reg.* ${libdir}/python2.6/ConfigParser.* ${libdir}/python2.6/getopt.* ${libdir}/python2.6/linecache.* ${libdir}/python2.6/new.* ${libdir}/python2.6/os.* ${libdir}/python2.6/posixpath.* ${libdir}/python2.6/struct.* ${libdir}/python2.6/warnings.* ${libdir}/python2.6/site.* ${libdir}/python2.6/stat.* ${libdir}/python2.6/UserDict.* ${libdir}/python2.6/UserList.* ${libdir}/python2.6/UserString.* ${libdir}/python2.6/lib-dynload/binascii.so ${libdir}/python2.6/lib-dynload/_struct.so ${libdir}/python2.6/lib-dynload/time.so ${libdir}/python2.6/lib-dynload/xreadlines.so ${libdir}/python2.6/types.* ${bindir}/python* " +FILES_python-core="${libdir}/python2.6/__future__.* ${libdir}/python2.6/copy.* ${libdir}/python2.6/copy_reg.* ${libdir}/python2.6/ConfigParser.* ${libdir}/python2.6/genericpath.* ${libdir}/python2.6/getopt.* ${libdir}/python2.6/linecache.* ${libdir}/python2.6/new.* ${libdir}/python2.6/os.* ${libdir}/python2.6/posixpath.* ${libdir}/python2.6/struct.* ${libdir}/python2.6/warnings.* ${libdir}/python2.6/site.* ${libdir}/python2.6/stat.* ${libdir}/python2.6/UserDict.* ${libdir}/python2.6/UserList.* ${libdir}/python2.6/UserString.* ${libdir}/python2.6/lib-dynload/binascii.so ${libdir}/python2.6/lib-dynload/_struct.so ${libdir}/python2.6/lib-dynload/time.so ${libdir}/python2.6/lib-dynload/xreadlines.so ${libdir}/python2.6/types.* ${bindir}/python* " DESCRIPTION_python-io="Python Low-Level I/O" -PR_python-io="ml0" RDEPENDS_python-io="python-core python-math" FILES_python-io="${libdir}/python2.6/lib-dynload/_socket.so ${libdir}/python2.6/lib-dynload/_ssl.so ${libdir}/python2.6/lib-dynload/select.so ${libdir}/python2.6/lib-dynload/termios.so ${libdir}/python2.6/lib-dynload/cStringIO.so ${libdir}/python2.6/pipes.* ${libdir}/python2.6/socket.* ${libdir}/python2.6/tempfile.* ${libdir}/python2.6/StringIO.* " DESCRIPTION_python-compiler="Python Compiler Support" -PR_python-compiler="ml0" RDEPENDS_python-compiler="python-core" FILES_python-compiler="${libdir}/python2.6/compiler " DESCRIPTION_python-compression="Python High Level Compression Support" -PR_python-compression="ml0" RDEPENDS_python-compression="python-core python-zlib" FILES_python-compression="${libdir}/python2.6/gzip.* ${libdir}/python2.6/zipfile.* ${libdir}/python2.6/tarfile.* " DESCRIPTION_python-re="Python Regular Expression APIs" -PR_python-re="ml0" RDEPENDS_python-re="python-core" FILES_python-re="${libdir}/python2.6/re.* ${libdir}/python2.6/sre.* ${libdir}/python2.6/sre_compile.* ${libdir}/python2.6/sre_constants* ${libdir}/python2.6/sre_parse.* " DESCRIPTION_python-xmlrpc="Python XMLRPC Support" -PR_python-xmlrpc="ml0" RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang" FILES_python-xmlrpc="${libdir}/python2.6/xmlrpclib.* ${libdir}/python2.6/SimpleXMLRPCServer.* " DESCRIPTION_python-terminal="Python Terminal Controlling Support" -PR_python-terminal="ml0" RDEPENDS_python-terminal="python-core python-io" FILES_python-terminal="${libdir}/python2.6/pty.* ${libdir}/python2.6/tty.* " DESCRIPTION_python-email="Python Email Support" -PR_python-email="ml0" RDEPENDS_python-email="python-core python-io python-re python-mime python-audio python-image" FILES_python-email="${libdir}/python2.6/email " DESCRIPTION_python-image="Python Graphical Image Handling" -PR_python-image="ml0" RDEPENDS_python-image="python-core" FILES_python-image="${libdir}/python2.6/colorsys.* ${libdir}/python2.6/imghdr.* ${libdir}/python2.6/lib-dynload/imageop.so ${libdir}/python2.6/lib-dynload/rgbimg.so " DESCRIPTION_python-tests="Python Tests" -PR_python-tests="ml0" RDEPENDS_python-tests="python-core" FILES_python-tests="${libdir}/python2.6/test " DESCRIPTION_python-core-dbg="Python core module debug information" -PR_python-core-dbg="ml0" RDEPENDS_python-core-dbg="python-core" FILES_python-core-dbg="${libdir}/python2.6/lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug " DESCRIPTION_python-resource="Python Resource Control Interface" -PR_python-resource="ml0" RDEPENDS_python-resource="python-core" FILES_python-resource="${libdir}/python2.6/lib-dynload/resource.so " DESCRIPTION_python-devel="Python Development Package" -PR_python-devel="ml0" RDEPENDS_python-devel="python-core" FILES_python-devel="${includedir} ${libdir}/python2.6/config " DESCRIPTION_python-difflib="Python helpers for computing deltas between objects." -PR_python-difflib="ml0" RDEPENDS_python-difflib="python-lang python-re" FILES_python-difflib="${libdir}/python2.6/difflib.* " DESCRIPTION_python-math="Python Math Support" -PR_python-math="ml0" RDEPENDS_python-math="python-core" FILES_python-math="${libdir}/python2.6/lib-dynload/cmath.so ${libdir}/python2.6/lib-dynload/math.so ${libdir}/python2.6/lib-dynload/_random.so ${libdir}/python2.6/random.* ${libdir}/python2.6/sets.* " DESCRIPTION_python-syslog="Python's Syslog Interface" -PR_python-syslog="ml0" RDEPENDS_python-syslog="python-core" FILES_python-syslog="${libdir}/python2.6/lib-dynload/syslog.so " DESCRIPTION_python-hotshot="Python Hotshot Profiler" -PR_python-hotshot="ml0" RDEPENDS_python-hotshot="python-core" FILES_python-hotshot="${libdir}/python2.6/hotshot ${libdir}/python2.6/lib-dynload/_hotshot.so " DESCRIPTION_python-unixadmin="Python Unix Administration Support" -PR_python-unixadmin="ml0" RDEPENDS_python-unixadmin="python-core" FILES_python-unixadmin="${libdir}/python2.6/lib-dynload/nis.so ${libdir}/python2.6/lib-dynload/grp.so ${libdir}/python2.6/lib-dynload/pwd.so ${libdir}/python2.6/getpass.* " DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support" -PR_python-textutils="ml0" RDEPENDS_python-textutils="python-core python-io python-re python-stringold" FILES_python-textutils="${libdir}/python2.6/lib-dynload/_csv.so ${libdir}/python2.6/csv.* ${libdir}/python2.6/optparse.* ${libdir}/python2.6/textwrap.* " DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings" -PR_python-tkinter="ml0" RDEPENDS_python-tkinter="python-core" FILES_python-tkinter="${libdir}/python2.6/lib-dynload/_tkinter.so ${libdir}/python2.6/lib-tk " DESCRIPTION_python-gdbm="Python GNU Database Support" -PR_python-gdbm="ml0" RDEPENDS_python-gdbm="python-core" FILES_python-gdbm="${libdir}/python2.6/lib-dynload/gdbm.so " DESCRIPTION_python-elementtree="Python elementree" -PR_python-elementtree="ml0" RDEPENDS_python-elementtree="python-core" FILES_python-elementtree="${libdir}/python2.6/lib-dynload/_elementtree.so " DESCRIPTION_python-fcntl="Python's fcntl Interface" -PR_python-fcntl="ml0" RDEPENDS_python-fcntl="python-core" FILES_python-fcntl="${libdir}/python2.6/lib-dynload/fcntl.so " DESCRIPTION_python-netclient="Python Internet Protocol Clients" -PR_python-netclient="ml0" RDEPENDS_python-netclient="python-core python-crypt python-datetime python-io python-lang python-logging python-mime" FILES_python-netclient="${libdir}/python2.6/*Cookie*.* ${libdir}/python2.6/base64.* ${libdir}/python2.6/cookielib.* ${libdir}/python2.6/ftplib.* ${libdir}/python2.6/gopherlib.* ${libdir}/python2.6/hmac.* ${libdir}/python2.6/httplib.* ${libdir}/python2.6/mimetypes.* ${libdir}/python2.6/nntplib.* ${libdir}/python2.6/poplib.* ${libdir}/python2.6/smtplib.* ${libdir}/python2.6/telnetlib.* ${libdir}/python2.6/urllib.* ${libdir}/python2.6/urllib2.* ${libdir}/python2.6/urlparse.* ${libdir}/python2.6/uuid.* " DESCRIPTION_python-pprint="Python Pretty-Print Support" -PR_python-pprint="ml0" RDEPENDS_python-pprint="python-core" FILES_python-pprint="${libdir}/python2.6/pprint.* " DESCRIPTION_python-netserver="Python Internet Protocol Servers" -PR_python-netserver="ml0" RDEPENDS_python-netserver="python-core python-netclient" FILES_python-netserver="${libdir}/python2.6/cgi.* ${libdir}/python2.6/BaseHTTPServer.* ${libdir}/python2.6/SimpleHTTPServer.* ${libdir}/python2.6/SocketServer.* " DESCRIPTION_python-curses="Python Curses Support" -PR_python-curses="ml0" RDEPENDS_python-curses="python-core" FILES_python-curses="${libdir}/python2.6/curses ${libdir}/python2.6/lib-dynload/_curses.so ${libdir}/python2.6/lib-dynload/_curses_panel.so " DESCRIPTION_python-smtpd="Python Simple Mail Transport Daemon" -PR_python-smtpd="ml0" RDEPENDS_python-smtpd="python-core python-netserver python-email python-mime" FILES_python-smtpd="${bindir}/smtpd.* " DESCRIPTION_python-html="Python HTML Processing" -PR_python-html="ml0" RDEPENDS_python-html="python-core" FILES_python-html="${libdir}/python2.6/formatter.* ${libdir}/python2.6/htmlentitydefs.* ${libdir}/python2.6/htmllib.* ${libdir}/python2.6/markupbase.* ${libdir}/python2.6/sgmllib.* " DESCRIPTION_python-readline="Python Readline Support" -PR_python-readline="ml0" RDEPENDS_python-readline="python-core" FILES_python-readline="${libdir}/python2.6/lib-dynload/readline.so ${libdir}/python2.6/rlcompleter.* " DESCRIPTION_python-subprocess="Python Subprocess Support" -PR_python-subprocess="ml0" RDEPENDS_python-subprocess="python-core python-io python-re python-fcntl python-pickle" FILES_python-subprocess="${libdir}/python2.6/subprocess.* " DESCRIPTION_python-pydoc="Python Interactive Help Support" -PR_python-pydoc="ml0" RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re" FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.6/pydoc.* " DESCRIPTION_python-logging="Python Logging Support" -PR_python-logging="ml0" RDEPENDS_python-logging="python-core python-io python-lang python-pickle python-stringold" FILES_python-logging="${libdir}/python2.6/logging " DESCRIPTION_python-mailbox="Python Mailbox Format Support" -PR_python-mailbox="ml0" RDEPENDS_python-mailbox="python-core python-mime" FILES_python-mailbox="${libdir}/python2.6/mailbox.* " DESCRIPTION_python-xml="Python basic XML support." -PR_python-xml="ml0" RDEPENDS_python-xml="python-core python-re" FILES_python-xml="${libdir}/python2.6/lib-dynload/pyexpat.so ${libdir}/python2.6/xml ${libdir}/python2.6/xmllib.* " DESCRIPTION_python-mime="Python MIME Handling APIs" -PR_python-mime="ml0" RDEPENDS_python-mime="python-core python-io" FILES_python-mime="${libdir}/python2.6/mimetools.* ${libdir}/python2.6/uu.* ${libdir}/python2.6/quopri.* ${libdir}/python2.6/rfc822.* " DESCRIPTION_python-sqlite3="Python Sqlite3 Database Support" -PR_python-sqlite3="ml0" RDEPENDS_python-sqlite3="python-core python-datetime python-lang python-crypt python-io python-threading python-zlib" FILES_python-sqlite3="${libdir}/python2.6/lib-dynload/_sqlite3.so ${libdir}/python2.6/sqlite3/dbapi2.* ${libdir}/python2.6/sqlite3/__init__.* " DESCRIPTION_python-sqlite3-tests="Python Sqlite3 Database Support Tests" -PR_python-sqlite3-tests="ml0" RDEPENDS_python-sqlite3-tests="python-core python-sqlite3" FILES_python-sqlite3-tests="${libdir}/python2.6/sqlite3/test " DESCRIPTION_python-unittest="Python Unit Testing Framework" -PR_python-unittest="ml0" RDEPENDS_python-unittest="python-core python-stringold python-lang" FILES_python-unittest="${libdir}/python2.6/unittest.* " DESCRIPTION_python-stringold="Python String APIs [deprecated]" -PR_python-stringold="ml0" RDEPENDS_python-stringold="python-core python-re" FILES_python-stringold="${libdir}/python2.6/lib-dynload/strop.so ${libdir}/python2.6/string.* " DESCRIPTION_python-robotparser="Python robots.txt parser" -PR_python-robotparser="ml0" RDEPENDS_python-robotparser="python-core python-netclient" FILES_python-robotparser="${libdir}/python2.6/robotparser.* " DESCRIPTION_python-compile="Python Bytecode Compilation Support" -PR_python-compile="ml0" RDEPENDS_python-compile="python-core" FILES_python-compile="${libdir}/python2.6/py_compile.* ${libdir}/python2.6/compileall.* " DESCRIPTION_python-debugger="Python Debugger" -PR_python-debugger="ml0" RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell python-pprint" FILES_python-debugger="${libdir}/python2.6/bdb.* ${libdir}/python2.6/pdb.* " DESCRIPTION_python-pkgutil="Python Package Extension Utility Support" -PR_python-pkgutil="ml0" RDEPENDS_python-pkgutil="python-core" FILES_python-pkgutil="${libdir}/python2.6/pkgutil.* " DESCRIPTION_python-shell="Python Shell-Like Functionality" -PR_python-shell="ml0" RDEPENDS_python-shell="python-core python-re" FILES_python-shell="${libdir}/python2.6/cmd.* ${libdir}/python2.6/commands.* ${libdir}/python2.6/dircache.* ${libdir}/python2.6/fnmatch.* ${libdir}/python2.6/glob.* ${libdir}/python2.6/popen2.* ${libdir}/python2.6/shlex.* ${libdir}/python2.6/shutil.* " DESCRIPTION_python-bsddb="Python Berkeley Database Bindings" -PR_python-bsddb="ml0" RDEPENDS_python-bsddb="python-core" FILES_python-bsddb="${libdir}/python2.6/bsddb ${libdir}/python2.6/lib-dynload/_bsddb.so " DESCRIPTION_python-mmap="Python Memory-Mapped-File Support" -PR_python-mmap="ml0" RDEPENDS_python-mmap="python-core python-io" FILES_python-mmap="${libdir}/python2.6/lib-dynload/mmap.so " DESCRIPTION_python-zlib="Python zlib Support." -PR_python-zlib="ml0" RDEPENDS_python-zlib="python-core" FILES_python-zlib="${libdir}/python2.6/lib-dynload/zlib.so " DESCRIPTION_python-db="Python File-Based Database Support" -PR_python-db="ml0" RDEPENDS_python-db="python-core" FILES_python-db="${libdir}/python2.6/anydbm.* ${libdir}/python2.6/dumbdbm.* ${libdir}/python2.6/whichdb.* " DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support" -PR_python-crypt="ml0" RDEPENDS_python-crypt="python-core" FILES_python-crypt="${libdir}/python2.6/hashlib.* ${libdir}/python2.6/md5.* ${libdir}/python2.6/sha.* ${libdir}/python2.6/lib-dynload/crypt.so ${libdir}/python2.6/lib-dynload/_hashlib.so ${libdir}/python2.6/lib-dynload/_sha256.so ${libdir}/python2.6/lib-dynload/_sha512.so " DESCRIPTION_python-idle="Python Integrated Development Environment" -PR_python-idle="ml0" RDEPENDS_python-idle="python-core python-tkinter" FILES_python-idle="${bindir}/idle ${libdir}/python2.6/idlelib " DESCRIPTION_python-lang="Python Low-Level Language Support" -PR_python-lang="ml0" RDEPENDS_python-lang="python-core" FILES_python-lang="${libdir}/python2.6/lib-dynload/array.so ${libdir}/python2.6/lib-dynload/parser.so ${libdir}/python2.6/lib-dynload/operator.so ${libdir}/python2.6/lib-dynload/_weakref.so ${libdir}/python2.6/lib-dynload/itertools.so ${libdir}/python2.6/lib-dynload/collections.so ${libdir}/python2.6/lib-dynload/_bisect.so ${libdir}/python2.6/lib-dynload/_heapq.so ${libdir}/python2.6/atexit.* ${libdir}/python2.6/bisect.* ${libdir}/python2.6/code.* ${libdir}/python2.6/codeop.* ${libdir}/python2.6/dis.* ${libdir}/python2.6/heapq.* ${libdir}/python2.6/inspect.* ${libdir}/python2.6/keyword.* ${libdir}/python2.6/opcode.* ${libdir}/python2.6/symbol.* ${libdir}/python2.6/repr.* ${libdir}/python2.6/token.* ${libdir}/python2.6/tokenize.* ${libdir}/python2.6/traceback.* ${libdir}/python2.6/linecache.* ${libdir}/python2.6/weakref.* " DESCRIPTION_python-audio="Python Audio Handling" -PR_python-audio="ml0" RDEPENDS_python-audio="python-core" FILES_python-audio="${libdir}/python2.6/wave.* ${libdir}/python2.6/chunk.* ${libdir}/python2.6/sndhdr.* ${libdir}/python2.6/lib-dynload/ossaudiodev.so ${libdir}/python2.6/lib-dynload/audioop.so " diff --git a/packages/python/python.inc b/packages/python/python.inc index 6ee63607f0..9b73e3ff35 100644 --- a/packages/python/python.inc +++ b/packages/python/python.inc @@ -4,7 +4,7 @@ LICENSE = "PSF" SECTION = "devel/python" PRIORITY = "optional" # bump this on every change in contrib/python/generate-manifest-2.6.py -PR = "ml0" +PR = "ml1" DEFAULT_PREFERENCE = "-26" -- cgit v1.2.3 From 529aa9b7b391a3b90f30fce6be45b0124b5904d9 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Sat, 13 Dec 2008 09:59:24 +0100 Subject: ezx-boot-usb-native: 0.3.0 --- conf/distro/include/sane-srcrevs.inc | 2 +- packages/ezx/ezx-boot-usb-native_svn.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 7c659cd3f2..94869fa11e 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -39,7 +39,7 @@ SRCREV_pn-essential-dialer ?= "60" SRCREV_pn-exalt ?= "79" SRCREV_pn-exalt-daemon ?= "78" SRCREV_pn-exalt-module ?= "78" -SRCREV_pn-ezx-boot-usb-native ?= "2367" +SRCREV_pn-ezx-boot-usb-native ?= "2371" SRCREV_pn-ezxd ?= "2074" SRCREV_pn-elf2flt ?= "1786" SRCREV_pn-epiphany ?= "7837" diff --git a/packages/ezx/ezx-boot-usb-native_svn.bb b/packages/ezx/ezx-boot-usb-native_svn.bb index a0a8affdc0..426ad4a555 100644 --- a/packages/ezx/ezx-boot-usb-native_svn.bb +++ b/packages/ezx/ezx-boot-usb-native_svn.bb @@ -1,9 +1,9 @@ -DESCRIPTION = "Boots a Motorola EZX device with a user supplied kernel zImage" +DESCRIPTION = "Boot a Motorola EZX device with a user supplied kernel" DEPENDS = "libusb-native virtual/kernel" SECTION = "devel" AUTHOR = "Team OpenEZX " LICENSE = "GPL" -PV = "0.2.0+svnr${SRCREV}" +PV = "0.3.0+svnr${SRCREV}" SRC_URI = "svn://svn.openezx.org/trunk/src/host;module=boot_usb;proto=http" S = "${WORKDIR}/boot_usb" -- cgit v1.2.3 From aeba92774e27b75f03cec622837334a19479b774 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 13 Dec 2008 10:54:38 +0100 Subject: angstrom feed sorter: add omap3-pandora machine --- contrib/angstrom/sort.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh index 01b2fa3a10..7008f64107 100755 --- a/contrib/angstrom/sort.sh +++ b/contrib/angstrom/sort.sh @@ -58,7 +58,7 @@ case "$arch" in "armv7") machines="" ;; "armv7a") - machines="beagleboard omap3evm " ;; + machines="beagleboard omap3evm omap3-pandora" ;; "avr32") machines="atngw100 at32stk1000" ;; "bfin") -- cgit v1.2.3 From a05f5583421e0f925bdb52f1fc8517c6492f4cba Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 13 Dec 2008 13:58:37 +0100 Subject: xserver-kdrive: add 1.5.3 --- .../disable-xf86-dga-xorgcfg.patch | 39 ++++++++++++++++ .../xorg-xserver/xserver-kdrive-1.5.3/drmfix.patch | 13 ++++++ .../xserver-kdrive-1.5.3/enable-tslib.patch | 24 ++++++++++ .../keyboard-resume-workaround.patch | 16 +++++++ .../linux-keyboard-mediumraw.patch | 44 ++++++++++++++++++ .../xorg-xserver/xserver-kdrive-1.5.3/no_xkb.patch | 12 +++++ .../xserver-kdrive-1.5.3/w100-autofoo.patch | 54 ++++++++++++++++++++++ packages/xorg-xserver/xserver-kdrive_1.5.3.bb | 29 ++++++++++++ 8 files changed, 231 insertions(+) create mode 100644 packages/xorg-xserver/xserver-kdrive-1.5.3/disable-xf86-dga-xorgcfg.patch create mode 100644 packages/xorg-xserver/xserver-kdrive-1.5.3/drmfix.patch create mode 100644 packages/xorg-xserver/xserver-kdrive-1.5.3/enable-tslib.patch create mode 100644 packages/xorg-xserver/xserver-kdrive-1.5.3/keyboard-resume-workaround.patch create mode 100644 packages/xorg-xserver/xserver-kdrive-1.5.3/linux-keyboard-mediumraw.patch create mode 100644 packages/xorg-xserver/xserver-kdrive-1.5.3/no_xkb.patch create mode 100644 packages/xorg-xserver/xserver-kdrive-1.5.3/w100-autofoo.patch create mode 100644 packages/xorg-xserver/xserver-kdrive_1.5.3.bb diff --git a/packages/xorg-xserver/xserver-kdrive-1.5.3/disable-xf86-dga-xorgcfg.patch b/packages/xorg-xserver/xserver-kdrive-1.5.3/disable-xf86-dga-xorgcfg.patch new file mode 100644 index 0000000000..ccc19139c8 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.5.3/disable-xf86-dga-xorgcfg.patch @@ -0,0 +1,39 @@ +Index: xorg-server-1.3.0.0/configure.ac +=================================================================== +--- xorg-server-1.3.0.0.orig/configure.ac 2007-04-20 03:23:40.000000000 +0200 ++++ xorg-server-1.3.0.0/configure.ac 2007-05-09 16:51:34.000000000 +0200 +@@ -520,7 +520,11 @@ + XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' + + dnl Core modules for most extensions, et al. ++if test "$KDRIVE" = yes; then ++REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]" ++else + REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]" ++fi + REQUIRED_LIBS="xfont xau fontenc" + + AM_CONDITIONAL(XV, [test "x$XV" = xyes]) +@@ -1603,7 +1607,9 @@ + AC_SUBST(XKB_COMPILED_DIR) + + dnl and the rest of these are generic, so they're in config.h ++if test ! x"$KDRIVE" = xyes; then + AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) ++fi + AC_DEFINE(XResExtension, 1, [Build XRes extension]) + + AC_TRY_COMPILE([ +@@ -1616,10 +1622,12 @@ + + AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) + ++if test ! "x$KDRIVE" = xyes ; then + dnl xorgconfig CLI configuration utility + PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) + AC_SUBST(XORGCONFIG_DEP_CFLAGS) + AC_SUBST(XORGCONFIG_DEP_LIBS) ++fi + + dnl xorgcfg GUI configuration utility + AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], diff --git a/packages/xorg-xserver/xserver-kdrive-1.5.3/drmfix.patch b/packages/xorg-xserver/xserver-kdrive-1.5.3/drmfix.patch new file mode 100644 index 0000000000..e0f633bc24 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.5.3/drmfix.patch @@ -0,0 +1,13 @@ +Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am +=================================================================== +--- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am 2008-09-23 19:24:59.000000000 +0100 ++++ xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am 2008-10-27 13:27:40.000000000 +0000 +@@ -40,7 +40,7 @@ + + AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES) + +-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack ++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS) + + # FIXME: These need to be added to the build + LNX_EXTRA_SRCS = \ diff --git a/packages/xorg-xserver/xserver-kdrive-1.5.3/enable-tslib.patch b/packages/xorg-xserver/xserver-kdrive-1.5.3/enable-tslib.patch new file mode 100644 index 0000000000..0519b3093a --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.5.3/enable-tslib.patch @@ -0,0 +1,24 @@ +--- /tmp/configure.ac 2008-04-16 10:52:15.016442542 +0200 ++++ xorg-server-1.4.99.901/configure.ac 2008-04-16 10:54:23.786428934 +0200 +@@ -1925,7 +1925,7 @@ + AC_CHECK_LIB([rt], [nanosleep], XEPHYR_LIBS="$XEPHYR_LIBS -lrt")) + + if test "x$TSLIB" = xyes; then +- PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"]) ++ PKG_CHECK_MODULES([TSLIB], [tslib-1.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"]) + if test "x$HAVE_TSLIB" = xno; then + AC_MSG_ERROR([tslib must be installed to build the tslib driver. See http://tslib.berlios.de/]) + fi +@@ -1949,10 +1949,10 @@ + ;; + esac + KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a' +- KDRIVE_LOCAL_LIBS="$TSLIB_LIBS $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB" ++ KDRIVE_LOCAL_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB" + KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS" + KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB" +- KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS" ++ KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS" + + # check if we can build Xephyr + PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"]) diff --git a/packages/xorg-xserver/xserver-kdrive-1.5.3/keyboard-resume-workaround.patch b/packages/xorg-xserver/xserver-kdrive-1.5.3/keyboard-resume-workaround.patch new file mode 100644 index 0000000000..4964ff5479 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.5.3/keyboard-resume-workaround.patch @@ -0,0 +1,16 @@ +Index: xorg-server-1.4/hw/kdrive/linux/keyboard.c +=================================================================== +--- xorg-server-1.4.orig/hw/kdrive/linux/keyboard.c 20