From 5a362b4bb805986fbb4a5e0aee08d23b62d84b05 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 20 Feb 2008 20:12:18 +0000 Subject: glibc 2.5|2.6.1 actually apply the local-dynamic-resolvconf.patch instead of just unpacking it into debian/patches... ~lart debian... --- .../files/glibc-2.5-local-dynamic-resolvconf.patch | 83 +++++++++++----------- packages/glibc/glibc_2.5.bb | 4 +- packages/glibc/glibc_2.6.1.bb | 4 +- 3 files changed, 44 insertions(+), 47 deletions(-) (limited to 'packages') diff --git a/packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch b/packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch index bab3747b1a..e137287dd1 100644 --- a/packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch +++ b/packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch @@ -1,44 +1,41 @@ ---- glibc-2.5.orig/debian/patches/any/local-dynamic-resolvconf.diff -+++ glibc-2.5/debian/patches/any/local-dynamic-resolvconf.diff -@@ -0,0 +1,41 @@ -+# All lines beginning with `# DP:' are a description of the patch. -+# DP: Description: allow dynamic long-running processes to -+# DP: re-read a dynamically updated resolv.conf on the fly -+# DP: Dpatch author: Adam Conrad -+# DP: Patch author: Thorsten Kukuk -+# DP: Upstream status: Ubuntu-Specific -+# DP: Date: 2006-01-13 08:14:21 UTC +# All lines beginning with `# DP:' are a description of the patch. +# DP: Description: allow dynamic long-running processes to +# DP: re-read a dynamically updated resolv.conf on the fly +# DP: Dpatch author: Adam Conrad +# DP: Patch author: Thorsten Kukuk +# DP: Upstream status: Ubuntu-Specific +# DP: Date: 2006-01-13 08:14:21 UTC + +Index: resolv/res_libc.c +=================================================================== +--- resolv/res_libc.c.orig ++++ resolv/res_libc.c +@@ -22,7 +22,7 @@ + #include + #include + #include +- ++#include + + /* The following bit is copied from res_data.c (where it is #ifdef'ed + out) since res_init() should go into libc.so but the rest of that +@@ -94,8 +94,17 @@ + int + __res_maybe_init (res_state resp, int preinit) + { +- if (resp->options & RES_INIT) { +- if (__res_initstamp != resp->_u._ext.initstamp) { ++ static time_t last_mtime; ++ struct stat statbuf; ++ int ret; + -+Index: resolv/res_libc.c -+=================================================================== -+--- resolv/res_libc.c.orig -++++ resolv/res_libc.c -+@@ -22,7 +22,7 @@ -+ #include -+ #include -+ #include -+- -++#include -+ -+ /* The following bit is copied from res_data.c (where it is #ifdef'ed -+ out) since res_init() should go into libc.so but the rest of that -+@@ -94,8 +94,17 @@ -+ int -+ __res_maybe_init (res_state resp, int preinit) -+ { -+- if (resp->options & RES_INIT) { -+- if (__res_initstamp != resp->_u._ext.initstamp) { -++ static time_t last_mtime; -++ struct stat statbuf; -++ int ret; -++ -++ -++ if (resp->options & RES_INIT) { -++ ret = stat (_PATH_RESCONF, &statbuf); -++ if (__res_initstamp != resp->_u._ext.initstamp -++ || (ret == 0) && (last_mtime != statbuf.st_mtime)) -++ { -++ last_mtime = statbuf.st_mtime; -+ if (resp->nscount > 0) { -+ __res_iclose (resp, true); -+ return __res_vinit (resp, 1); ++ ++ if (resp->options & RES_INIT) { ++ ret = stat (_PATH_RESCONF, &statbuf); ++ if (__res_initstamp != resp->_u._ext.initstamp ++ || (ret == 0) && (last_mtime != statbuf.st_mtime)) ++ { ++ last_mtime = statbuf.st_mtime; + if (resp->nscount > 0) { + __res_iclose (resp, true); + return __res_vinit (resp, 1); diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb index f50c85b1d0..0dc1c41070 100644 --- a/packages/glibc/glibc_2.5.bb +++ b/packages/glibc/glibc_2.5.bb @@ -1,5 +1,5 @@ require glibc.inc -PR = "r9" +PR = "r10" ARM_INSTRUCTION_SET = "arm" @@ -44,7 +44,7 @@ SRC_URI = "\ file://dl-cache-libcmp.patch;patch=1 \ file://ldsocache-varrun.patch;patch=1 \ file://nptl-crosscompile.patch;patch=1 \ - file://glibc-2.5-local-dynamic-resolvconf.patch;patch=1 \ + file://glibc-2.5-local-dynamic-resolvconf.patch;patch=1;pnum=0 \ file://glibc-check_pf.patch;patch=1;pnum=0 \ file://zecke-sane-readelf.patch;patch=1 \ file://ldd-unbash.patch;patch=1 \ diff --git a/packages/glibc/glibc_2.6.1.bb b/packages/glibc/glibc_2.6.1.bb index 705fab6715..4c59bbdc13 100644 --- a/packages/glibc/glibc_2.6.1.bb +++ b/packages/glibc/glibc_2.6.1.bb @@ -1,5 +1,5 @@ require glibc.inc -PR = "r2" +PR = "r3" ARM_INSTRUCTION_SET = "arm" @@ -45,7 +45,7 @@ SRC_URI = "\ file://dl-cache-libcmp.patch;patch=1 \ file://ldsocache-varrun.patch;patch=1 \ file://nptl-crosscompile.patch;patch=1 \ - file://glibc-2.5-local-dynamic-resolvconf.patch;patch=1 \ + file://glibc-2.5-local-dynamic-resolvconf.patch;patch=1;pnum=0 \ file://glibc-check_pf.patch;patch=1;pnum=0 \ file://zecke-sane-readelf.patch;patch=1 \ file://ldd-unbash.patch;patch=1 \ -- cgit v1.2.3 From 64eb8308d57862983828fbadedf85e7bb59e36c7 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Mon, 25 Feb 2008 23:18:04 +0000 Subject: Export PATH in udev network.sh. * udevd does clearenv(). Without PATH, ifup/ifdown does not work properly. * Exporting default shell PATH fixes it. --- packages/udev/files/network.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'packages') diff --git a/packages/udev/files/network.sh b/packages/udev/files/network.sh index 5016328df4..182c26d86a 100644 --- a/packages/udev/files/network.sh +++ b/packages/udev/files/network.sh @@ -1,5 +1,8 @@ #!/bin/sh +# udevd does clearenv(). Export shell PATH to children. +export PATH + # Do not run when pcmcia-cs is installed test -x /sbin/cardctl && exit 0 -- cgit v1.2.3 From 602390def86f581928680f00814cb8f2bd7ac5b9 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 26 Feb 2008 12:36:51 +0000 Subject: s3c2410-utils: rename to s3c24xx-utils --- packages/s3c2410-utils/.mtn2git_empty | 0 .../s3c2410-utils/s3c2410-boot-usb-native_svn.bb | 31 --------------------- packages/s3c2410-utils/sjf2410-linux-native_svn.bb | 32 ---------------------- packages/s3c24xx-utils/.mtn2git_empty | 0 .../s3c24xx-utils/s3c2410-boot-usb-native_svn.bb | 31 +++++++++++++++++++++ packages/s3c24xx-utils/sjf2410-linux-native_svn.bb | 32 ++++++++++++++++++++++ 6 files changed, 63 insertions(+), 63 deletions(-) delete mode 100644 packages/s3c2410-utils/.mtn2git_empty delete mode 100644 packages/s3c2410-utils/s3c2410-boot-usb-native_svn.bb delete mode 100644 packages/s3c2410-utils/sjf2410-linux-native_svn.bb create mode 100644 packages/s3c24xx-utils/.mtn2git_empty create mode 100644 packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb create mode 100644 packages/s3c24xx-utils/sjf2410-linux-native_svn.bb (limited to 'packages') diff --git a/packages/s3c2410-utils/.mtn2git_empty b/packages/s3c2410-utils/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/s3c2410-utils/s3c2410-boot-usb-native_svn.bb b/packages/s3c2410-utils/s3c2410-boot-usb-native_svn.bb deleted file mode 100644 index c7b89647f5..0000000000 --- a/packages/s3c2410-utils/s3c2410-boot-usb-native_svn.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "Boots a S3C2410 device with a user supplied kernel zImage" -DEPENDS = "libusb-native" -SECTION = "devel" -AUTHOR = "Harald Welte" -LICENSE = "GPL" -PV = "0.1.0+svn${SRCDATE}" -PR = "r0" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=s3c2410_boot_usb;proto=https" -S = "${WORKDIR}/s3c2410_boot_usb" - -inherit native - -do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} -lusb -o s3c2410-boot-usb boot_usb.c -} - -do_deploy() { - install -d ${DEPLOY_DIR_IMAGE} - install -m 0755 s3c2410-boot-usb ${DEPLOY_DIR_IMAGE} -} - -do_stage() { - : -} - -do_install() { - : -} - -addtask deploy before do_build after do_compile diff --git a/packages/s3c2410-utils/sjf2410-linux-native_svn.bb b/packages/s3c2410-utils/sjf2410-linux-native_svn.bb deleted file mode 100644 index 60cce4a3e2..0000000000 --- a/packages/s3c2410-utils/sjf2410-linux-native_svn.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "JTAG utility to interface w/ a S3C2410 device" -SECTION = "devel" -AUTHOR = "Harald Welte" -LICENSE = "GPL" -PV = "0.1+svn${SRCDATE}" -PR = "r0" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=sjf2410-linux;proto=https" -S = "${WORKDIR}/sjf2410-linux" - -inherit native - -CFLAGS += "-DLINUX_PPDEV" - -do_compile() { - oe_runmake -} - -do_deploy() { - install -d ${DEPLOY_DIR_IMAGE} - install -m 0755 sjf2410 ${DEPLOY_DIR_IMAGE}/sjf2410 -} - -do_stage() { - : -} - -do_install() { - : -} - -addtask deploy before do_package after do_install diff --git a/packages/s3c24xx-utils/.mtn2git_empty b/packages/s3c24xx-utils/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb b/packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb new file mode 100644 index 0000000000..c7b89647f5 --- /dev/null +++ b/packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "Boots a S3C2410 device with a user supplied kernel zImage" +DEPENDS = "libusb-native" +SECTION = "devel" +AUTHOR = "Harald Welte" +LICENSE = "GPL" +PV = "0.1.0+svn${SRCDATE}" +PR = "r0" + +SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=s3c2410_boot_usb;proto=https" +S = "${WORKDIR}/s3c2410_boot_usb" + +inherit native + +do_compile() { + ${CC} ${CFLAGS} ${LDFLAGS} -lusb -o s3c2410-boot-usb boot_usb.c +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0755 s3c2410-boot-usb ${DEPLOY_DIR_IMAGE} +} + +do_stage() { + : +} + +do_install() { + : +} + +addtask deploy before do_build after do_compile diff --git a/packages/s3c24xx-utils/sjf2410-linux-native_svn.bb b/packages/s3c24xx-utils/sjf2410-linux-native_svn.bb new file mode 100644 index 0000000000..60cce4a3e2 --- /dev/null +++ b/packages/s3c24xx-utils/sjf2410-linux-native_svn.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "JTAG utility to interface w/ a S3C2410 device" +SECTION = "devel" +AUTHOR = "Harald Welte" +LICENSE = "GPL" +PV = "0.1+svn${SRCDATE}" +PR = "r0" + +SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=sjf2410-linux;proto=https" +S = "${WORKDIR}/sjf2410-linux" + +inherit native + +CFLAGS += "-DLINUX_PPDEV" + +do_compile() { + oe_runmake +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0755 sjf2410 ${DEPLOY_DIR_IMAGE}/sjf2410 +} + +do_stage() { + : +} + +do_install() { + : +} + +addtask deploy before do_package after do_install -- cgit v1.2.3 From cf20be0e809f4452b6098ad028635c4b3c70a089 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 26 Feb 2008 12:52:34 +0000 Subject: add gpio, a userspace utility to tweak the GPIOs on the s3c24xx platform --- packages/s3c24xx-utils/gpio_svn.bb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 packages/s3c24xx-utils/gpio_svn.bb (limited to 'packages') diff --git a/packages/s3c24xx-utils/gpio_svn.bb b/packages/s3c24xx-utils/gpio_svn.bb new file mode 100644 index 0000000000..263161aa5d --- /dev/null +++ b/packages/s3c24xx-utils/gpio_svn.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "A user-space tool to show and modify the state of GPIOs on the S3c24xx platform" +SECTION = "console/utils" +LICENSE = "GPL" +PV = "1.0+svn${SRCDATE}" +PR = "r1" + +SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;proto=http" +S = "${WORKDIR}/gpio" + +do_compile() { + ${CC} ${CFLAGS} ${LDFLAGS} -static -o gpio gpio.c +} + +do_install() { + install -d ${D}${sbindir} + install -m 0755 gpio ${D}${sbindir} +} -- cgit v1.2.3 From 999226341f32a3237d4efe6b74cebbb779d3e43e Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 26 Feb 2008 13:21:59 +0000 Subject: python-dbus: add dependency to dbus-glib (thanks Emdete) --- packages/python/python-dbus_0.82.4.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/python/python-dbus_0.82.4.bb b/packages/python/python-dbus_0.82.4.bb index 9f00c64701..c17f1c766b 100644 --- a/packages/python/python-dbus_0.82.4.bb +++ b/packages/python/python-dbus_0.82.4.bb @@ -2,9 +2,9 @@ DESCRIPTION = "Python bindings for DBus, a socket-based message bus system for i SECTION = "devel/python" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" LICENSE = "MIT" -DEPENDS = "expat glib-2.0 virtual/libintl python-pyrex-native python" -RDEPENDS = "dbus python-threading python-io python-stringold python-logging" -PR = "ml0" +DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native" +RDEPENDS = "python-threading python-io python-stringold python-logging" +PR = "ml1" SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz" S = "${WORKDIR}/dbus-python-${PV}" -- cgit v1.2.3 From 742fc8adde250d069d21bac9c663c25b1629444b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 26 Feb 2008 14:50:00 +0000 Subject: naming tweaks for gpio on s3c24xx --- packages/s3c24xx-utils/gpio_svn.bb | 17 ----------------- packages/s3c24xx-utils/s3c24xx-gpio_svn.bb | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 packages/s3c24xx-utils/gpio_svn.bb create mode 100644 packages/s3c24xx-utils/s3c24xx-gpio_svn.bb (limited to 'packages') diff --git a/packages/s3c24xx-utils/gpio_svn.bb b/packages/s3c24xx-utils/gpio_svn.bb deleted file mode 100644 index 263161aa5d..0000000000 --- a/packages/s3c24xx-utils/gpio_svn.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "A user-space tool to show and modify the state of GPIOs on the S3c24xx platform" -SECTION = "console/utils" -LICENSE = "GPL" -PV = "1.0+svn${SRCDATE}" -PR = "r1" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;proto=http" -S = "${WORKDIR}/gpio" - -do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} -static -o gpio gpio.c -} - -do_install() { - install -d ${D}${sbindir} - install -m 0755 gpio ${D}${sbindir} -} diff --git a/packages/s3c24xx-utils/s3c24xx-gpio_svn.bb b/packages/s3c24xx-utils/s3c24xx-gpio_svn.bb new file mode 100644 index 0000000000..085339a9c1 --- /dev/null +++ b/packages/s3c24xx-utils/s3c24xx-gpio_svn.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "A user-space tool to show and modify the state of GPIOs on the S3c24xx platform" +SECTION = "console/utils" +LICENSE = "GPL" +PV = "1.0+svn${SRCDATE}" +PR = "r0" + +SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;proto=http" +S = "${WORKDIR}/gpio" + +do_compile() { + ${CC} ${CFLAGS} ${LDFLAGS} -static -o ${PN} gpio.c +} + +do_install() { + install -d ${D}${sbindir} + install -m 0755 ${PN} ${D}${sbindir} +} -- cgit v1.2.3 From 271935c586a9af040c2fa1ecaacf54c9fcd5e0a2 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Tue, 26 Feb 2008 16:17:30 +0000 Subject: u-boot-openmoko_1.3.1+git+svn.bb : update svn and make it generate gta02v5 u-boots --- packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'packages') diff --git a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb index 7a9800f94a..737cf8ef0c 100644 --- a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb +++ b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb @@ -4,12 +4,12 @@ LICENSE = "GPL" SECTION = "bootloader" PRIORITY = "optional" -UBOOT_UPSTREAM_REV = "0ec595243dc99edcd248bbcfbfd5a1dc860bde89" -UBOOT_OPENMOKO_REV = "3817" -UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4" +UBOOT_UPSTREAM_REV = "10bbb38a402a2faf18858c451bcdc63d45888e6e" +UBOOT_OPENMOKO_REV = "4118" +UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4 gta02v5" LOCALVERSION = "+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_REV}" PV = "1.3.1${LOCALVERSION}" -PR = "r1" +PR = "r3" PROVIDES = "virtual/bootloader" S = "${WORKDIR}/git" @@ -18,11 +18,11 @@ SRC_URI = "\ git://www.denx.de/git/u-boot.git;protocol=git;tag=${UBOOT_UPSTREAM_REV} \ svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;rev=${UBOOT_OPENMOKO_REV};proto=http \ file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \ - file://makefile-no-dirafter.patch;patch=1 \ - file://fix-data-abort-from-sd-ombug799.patch;patch=1 \ +# file://makefile-no-dirafter.patch;patch=1 \ +# file://fix-data-abort-from-sd-ombug799.patch;patch=1 \ " -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" +EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" TARGET_LDFLAGS = "" do_quilt() { -- cgit v1.2.3 From bda2ee570244a833a9fa5981b5ab936eb1f7fd26 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Tue, 26 Feb 2008 17:06:14 +0000 Subject: gsmd : flip an extra bit on gta02 machines that stops hideous noise in sound system --- packages/gsm/files/default | 1 + packages/gsm/files/gsmd | 2 ++ packages/gsm/gsmd.inc | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gsm/files/default b/packages/gsm/files/default index 467bd339eb..cf36460fac 100644 --- a/packages/gsm/files/default +++ b/packages/gsm/files/default @@ -13,6 +13,7 @@ case `machine_id` in GSM_RES="/sys/bus/platform/devices/neo1973-pm-gsm.0/reset" fi GSM_DEV="/dev/ttySAC0" + GSM_DL="/sys/devices/platform/neo1973-pm-gsm.0/download" ;; "htc_apache"|"htc_blueangel"|"htc_universal") GSMD_OPTS="-s 115200 -F" diff --git a/packages/gsm/files/gsmd b/packages/gsm/files/gsmd index 9257b901ad..72f66a17ad 100644 --- a/packages/gsm/files/gsmd +++ b/packages/gsm/files/gsmd @@ -13,6 +13,8 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin case "$1" in start) + [ -n "$GSM_DL" ] && echo "1" >$GSM_DL; + [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 ) [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 ) [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 ) diff --git a/packages/gsm/gsmd.inc b/packages/gsm/gsmd.inc index a6b6fb7a6a..5e47847d74 100644 --- a/packages/gsm/gsmd.inc +++ b/packages/gsm/gsmd.inc @@ -5,7 +5,7 @@ SECTION = "libs/gsm" PROVIDES += "gsmd" RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel" PV = "0.1+svnr${SRCREV}" -PR = "r41" +PR = "r42" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://gsmd \ -- cgit v1.2.3 From 56ad5ad7fe0c432cbdbcfaed2b4331ce9738fb9f Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Tue, 26 Feb 2008 17:58:17 +0000 Subject: pulseaudio* : fix the adding of pulse to audio group, busybox does this arse about tit. --- packages/pulseaudio/pulse.inc | 2 +- packages/pulseaudio/pulseaudio_0.9.6.bb | 2 +- packages/pulseaudio/pulseaudio_0.9.9.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/pulseaudio/pulse.inc b/packages/pulseaudio/pulse.inc index 7f7f205613..4b13980cc4 100644 --- a/packages/pulseaudio/pulse.inc +++ b/packages/pulseaudio/pulse.inc @@ -84,7 +84,7 @@ pkg_postinst_${PN}-server() { grep -q pulse: /etc/passwd || \ adduser --disabled-password --home=/var/run/pulse --system \ --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse - adduser pulse audio + addgroup pulse audio /etc/init.d/populate-volatile.sh update } diff --git a/packages/pulseaudio/pulseaudio_0.9.6.bb b/packages/pulseaudio/pulseaudio_0.9.6.bb index aa07afe6fe..56b717aac7 100644 --- a/packages/pulseaudio/pulseaudio_0.9.6.bb +++ b/packages/pulseaudio/pulseaudio_0.9.6.bb @@ -1,4 +1,4 @@ require pulse.inc -PR = "r6" +PR = "r7" diff --git a/packages/pulseaudio/pulseaudio_0.9.9.bb b/packages/pulseaudio/pulseaudio_0.9.9.bb index b884c27dd6..7e63b61eb3 100644 --- a/packages/pulseaudio/pulseaudio_0.9.9.bb +++ b/packages/pulseaudio/pulseaudio_0.9.9.bb @@ -8,7 +8,7 @@ SRC_URI += "\ file://fix-dbus-without-hal.patch;patch=1 \ " -PR = "r2" +PR = "r3" # problems w/ pulseaudio 0.9.9 atm: # 1.) needs libltdl >= 1.5.24 (yes, any older version will NOT work at runtime) -- cgit v1.2.3 From 71828c40ca752f56d0300862de3af91b0696eda1 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Tue, 26 Feb 2008 20:02:30 +0000 Subject: libzvbi: inherit from pkgconfig so that .pc is staged. --- packages/libzvbi/libzvbi_0.2.22.bb | 3 ++- packages/libzvbi/libzvbi_0.2.25.bb | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/libzvbi/libzvbi_0.2.22.bb b/packages/libzvbi/libzvbi_0.2.22.bb index 74e16c6239..a4ce1e55d5 100644 --- a/packages/libzvbi/libzvbi_0.2.22.bb +++ b/packages/libzvbi/libzvbi_0.2.22.bb @@ -5,11 +5,12 @@ HOMEPAGE = "http://zapping.sourceforge.net/ZVBI/index.html" LICENSE = "GPL" SECTION = "libs/multimedia" DEPENDS = "libpng" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/zapping/zvbi-${PV}.tar.bz2" S = "${WORKDIR}/zvbi-${PV}" -inherit autotools +inherit autotools pkgconfig do_stage() { autotools_stage_all diff --git a/packages/libzvbi/libzvbi_0.2.25.bb b/packages/libzvbi/libzvbi_0.2.25.bb index fe9fd1495c..9be7a7d42e 100644 --- a/packages/libzvbi/libzvbi_0.2.25.bb +++ b/packages/libzvbi/libzvbi_0.2.25.bb @@ -5,17 +5,16 @@ HOMEPAGE = "http://zapping.sourceforge.net/ZVBI/index.html" LICENSE = "GPL" SECTION = "libs/multimedia" DEPENDS = "libpng" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/zapping/zvbi-${PV}.tar.bz2" S = "${WORKDIR}/zvbi-${PV}" EXTRA_OECONF = "--without-x" -inherit autotools +inherit autotools pkgconfig do_stage() { autotools_stage_all } - -- cgit v1.2.3 From 49a21b86f243cd6010ba8bf0d0b40aaf359984dc Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 27 Feb 2008 00:52:30 +0000 Subject: libmrss: document the acceptance of better-parse-url-r0.patch into upstream cvs --- packages/libmrss/files/better-parse-url-r0.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/libmrss/files/better-parse-url-r0.patch b/packages/libmrss/files/better-parse-url-r0.patch index 72fa3688a7..b365819008 100644 --- a/packages/libmrss/files/better-parse-url-r0.patch +++ b/packages/libmrss/files/better-parse-url-r0.patch @@ -1,5 +1,5 @@ upstream: mailed to bakunin_at_autistici_dot_org by Laibsch -status: pending +status: committed in upstream CVS on Feb 26th 2008 comment: API addition to not manually setup the CURL connection and still be able to get the transfered feed and save it to secondary storage. done by zecke for the OpenMoko RSS reader. -- cgit v1.2.3 From d1998c1536b649e9a787f3f1970974a27a2d2713 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Wed, 27 Feb 2008 09:11:21 +0000 Subject: xserver-kdrive_1.3.0.0.bb : remove glamo from xserver-kdrive, next commit will create new recipe for it. --- .../xserver-kdrive-1.3.0.0/build-glamo.patch | 91 - .../xserver-kdrive-1.3.0.0/smedia-glamo.patch | 3702 -------------------- packages/xorg-xserver/xserver-kdrive-common.inc | 4 - .../xserver-kdrive/00-xglamo-logs.patch | 386 -- .../01-xglamo-scrolling-artifact-fix.patch | 15 - .../xserver-kdrive/02-xglamo-no-dri.patch | 438 --- .../xserver-kdrive/03-xglamo-no-vesa.patch | 141 - packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb | 9 +- 8 files changed, 2 insertions(+), 4784 deletions(-) delete mode 100644 packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch delete mode 100644 packages/xorg-xserver/xserver-kdrive-1.3.0.0/smedia-glamo.patch delete mode 100644 packages/xorg-xserver/xserver-kdrive/00-xglamo-logs.patch delete mode 100644 packages/xorg-xserver/xserver-kdrive/01-xglamo-scrolling-artifact-fix.patch delete mode 100644 packages/xorg-xserver/xserver-kdrive/02-xglamo-no-dri.patch delete mode 100644 packages/xorg-xserver/xserver-kdrive/03-xglamo-no-vesa.patch (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch deleted file mode 100644 index 208e599ee1..0000000000 --- a/packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch +++ /dev/null @@ -1,91 +0,0 @@ -Index: xorg-server-1.3.0.0/configure.ac -=================================================================== ---- xorg-server-1.3.0.0.orig/configure.ac 2007-11-22 17:40:34.000000000 +0800 -+++ xorg-server-1.3.0.0/configure.ac 2007-11-22 17:59:56.000000000 +0800 -@@ -1576,6 +1576,7 @@ - AM_CONDITIONAL(H3600_TS, false) - AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes]) - AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes]) -+AM_CONDITIONAL(KDRIVEGLAMO, [test x"$ac_cv_header_sys_vm86_h" = xyes -o x"$ac_cv_header_linux_fb_h" = xyes]) - - # Xephyr needs nanosleep() which is in librt on Solaris - AC_CHECK_FUNC([nanosleep], [], -@@ -1824,6 +1825,7 @@ - hw/kdrive/chips/Makefile - hw/kdrive/ephyr/Makefile - hw/kdrive/epson/Makefile -+hw/kdrive/glamo/Makefile - hw/kdrive/fake/Makefile - hw/kdrive/fbdev/Makefile - hw/kdrive/w100/Makefile -Index: xorg-server-1.3.0.0/hw/kdrive/Makefile.am -=================================================================== ---- xorg-server-1.3.0.0.orig/hw/kdrive/Makefile.am 2007-11-22 17:40:34.000000000 +0800 -+++ xorg-server-1.3.0.0/hw/kdrive/Makefile.am 2007-11-22 17:54:54.000000000 +0800 -@@ -7,6 +7,10 @@ - FBDEV_SUBDIRS = fbdev epson - endif - -+if KDRIVEGLAMO -+GLAMO_SUBDIRS = glamo -+endif -+ - if KDRIVEW100 - W100_SUBDIRS = w100 - endif -@@ -30,8 +34,9 @@ - $(FBDEV_SUBDIRS) \ - $(W100_SUBDIRS) \ - $(VESA_SUBDIRS) \ -+ $(GLAMO_SUBDIRS) \ - $(XEPHYR_SUBDIRS) \ - fake - - DIST_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \ -- smi via fbdev sdl ephyr src linux fake sis300 -+ smi via fbdev sdl ephyr src linux fake sis300 glamo -Index: xorg-server-1.3.0.0/hw/kdrive/glamo/Makefile.am -=================================================================== ---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/Makefile.am 2007-11-22 17:40:34.000000000 +0800 -+++ xorg-server-1.3.0.0/hw/kdrive/glamo/Makefile.am 2007-11-22 17:40:35.000000000 +0800 -@@ -41,11 +41,14 @@ - - Xglamo_LDADD = \ - $(GLAMO_LIBS) \ -- @KDRIVE_LIBS@ -+ @KDRIVE_LIBS@ \ -+ @XSERVER_LIBS@ - - Xglamo_DEPENDENCIES = \ - libglamo.a \ -- @KDRIVE_LOCAL_LIBS@ -+ $(FBDEV_LIBS) \ -+ $(VESA_LIBS) \ -+ $(DRI_LIBS) - - relink: - rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) -Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_stub.c -=================================================================== ---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo_stub.c 2007-11-22 17:40:34.000000000 +0800 -+++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_stub.c 2007-11-22 17:40:35.000000000 +0800 -@@ -49,16 +49,10 @@ - void - InitInput(int argc, char **argv) - { -- KdKeyboardInfo *ki; -- -- KdAddKeyboardDriver(&LinuxKeyboardDriver); -- KdAddPointerDriver(&LinuxMouseDriver); --#ifdef TSLIB -- KdAddPointerDriver(&TsDriver); -+ KdInitInput (&LinuxEvdevMouseFuncs, &LinuxEvdevKeyboardFuncs); -+#ifdef TOUCHSCREEN -+ KdAddMouseDriver (&TsFuncs); - #endif -- -- ki = KdParseKeyboard("keybd"); -- KdAddKeyboard(ki); - } - - void diff --git a/packages/xorg-xserver/xserver-kdrive-1.3.0.0/smedia-glamo.patch b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/smedia-glamo.patch deleted file mode 100644 index 4ad3573c95..0000000000 --- a/packages/xorg-xserver/xserver-kdrive-1.3.0.0/smedia-glamo.patch +++ /dev/null @@ -1,3702 +0,0 @@ -Index: xserver/hw/kdrive/glamo/Makefile.am -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xserver/hw/kdrive/glamo/Makefile.am 2007-09-25 19:32:10.000000000 +0800 -@@ -0,0 +1,51 @@ -+if KDRIVEFBDEV -+FBDEV_INCLUDES =-I$(top_srcdir)/hw/kdrive/fbdev -+FBDEV_LIBS = $(top_builddir)/hw/kdrive/fbdev/libfbdev.a -+endif -+ -+if KDRIVEVESA -+VESA_INCLUDES = -I$(top_srcdir)/hw/kdrive/vesa -+VESA_LIBS = $(top_builddir)/hw/kdrive/vesa/libvesa.a -+endif -+ -+INCLUDES = \ -+ @KDRIVE_INCS@ \ -+ $(DRI_INCLUDES) \ -+ $(FBDEV_INCLUDES) \ -+ $(VESA_INCLUDES) \ -+ @KDRIVE_CFLAGS@ -+ -+bin_PROGRAMS = Xglamo -+ -+noinst_LIBRARIES = libglamo.a -+ -+libglamo_a_SOURCES = \ -+ glamo_dma.c \ -+ glamo_dma.h \ -+ glamo_draw.c \ -+ glamo_draw.h \ -+ glamo.c \ -+ glamo.h \ -+ glamo-regs.h \ -+ glamo_video.c -+ -+Xglamo_SOURCES = \ -+ glamo_stub.c -+ -+GLAMO_LIBS = \ -+ libglamo.a \ -+ $(FBDEV_LIBS) \ -+ $(VESA_LIBS) \ -+ $(DRI_LIBS) \ -+ @KDRIVE_LIBS@ -+ -+Xglamo_LDADD = \ -+ $(GLAMO_LIBS) \ -+ @KDRIVE_LIBS@ -+ -+Xglamo_DEPENDENCIES = \ -+ libglamo.a \ -+ @KDRIVE_LOCAL_LIBS@ -+ -+relink: -+ rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) -Index: xserver/hw/kdrive/glamo/glamo-regs.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xserver/hw/kdrive/glamo/glamo-regs.h 2007-09-25 19:00:20.000000000 +0800 -@@ -0,0 +1,685 @@ -+#ifndef _GLAMO_REGS_H -+#define _GLAMO_REGS_H -+ -+/* Smedia Glamo 336x/337x driver -+ * -+ * (C) 2007 by OpenMoko, Inc. -+ * Author: Harald Welte -+ * All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+enum glamo_regster_offsets { -+ GLAMO_REGOFS_GENERIC = 0x0000, -+ GLAMO_REGOFS_HOSTBUS = 0x0200, -+ GLAMO_REGOFS_MEMORY = 0x0300, -+ GLAMO_REGOFS_VIDCAP = 0x0400, -+ GLAMO_REGOFS_ISP = 0x0500, -+ GLAMO_REGOFS_JPEG = 0x0800, -+ GLAMO_REGOFS_MPEG = 0x0c00, -+ GLAMO_REGOFS_LCD = 0x1100, -+ GLAMO_REGOFS_MMC = 0x1400, -+ GLAMO_REGOFS_MPROC0 = 0x1500, -+ GLAMO_REGOFS_MPROC1 = 0x1580, -+ GLAMO_REGOFS_CMDQUEUE = 0x1600, -+ GLAMO_REGOFS_RISC = 0x1680, -+ GLAMO_REGOFS_2D = 0x1700, -+ GLAMO_REGOFS_3D = 0x1b00, -+}; -+ -+ -+enum glamo_register_generic { -+ GLAMO_REG_GCONF1 = 0x0000, -+ GLAMO_REG_GCONF2 = 0x0002, -+#define GLAMO_REG_DEVICE_ID GLAMO_REG_GCONF2 -+ GLAMO_REG_GCONF3 = 0x0004, -+#define GLAMO_REG_REVISION_ID GLAMO_REG_GCONF3 -+ GLAMO_REG_IRQ_GEN1 = 0x0006, -+#define GLAMO_REG_IRQ_ENABLE GLAMO_REG_IRQ_GEN1 -+ GLAMO_REG_IRQ_GEN2 = 0x0008, -+#define GLAMO_REG_IRQ_SET GLAMO_REG_IRQ_GEN2 -+ GLAMO_REG_IRQ_GEN3 = 0x000a, -+#define GLAMO_REG_IRQ_CLEAR GLAMO_REG_IRQ_GEN3 -+ GLAMO_REG_IRQ_GEN4 = 0x000c, -+#define GLAMO_REG_IRQ_STATUS GLAMO_REG_IRQ_GEN4 -+ GLAMO_REG_CLOCK_HOST = 0x0010, -+ GLAMO_REG_CLOCK_MEMORY = 0x0012, -+ GLAMO_REG_CLOCK_LCD = 0x0014, -+ GLAMO_REG_CLOCK_MMC = 0x0016, -+ GLAMO_REG_CLOCK_ISP = 0x0018, -+ GLAMO_REG_CLOCK_JPEG = 0x001a, -+ GLAMO_REG_CLOCK_3D = 0x001c, -+ GLAMO_REG_CLOCK_2D = 0x001e, -+ GLAMO_REG_CLOCK_RISC1 = 0x0020, /* 3365 only? */ -+ GLAMO_REG_CLOCK_RISC2 = 0x0022, /* 3365 only? */ -+ GLAMO_REG_CLOCK_MPEG = 0x0024, -+ GLAMO_REG_CLOCK_MPROC = 0x0026, -+ -+ GLAMO_REG_CLOCK_GEN5_1 = 0x0030, -+ GLAMO_REG_CLOCK_GEN5_2 = 0x0032, -+ GLAMO_REG_CLOCK_GEN6 = 0x0034, -+ GLAMO_REG_CLOCK_GEN7 = 0x0036, -+ GLAMO_REG_CLOCK_GEN8 = 0x0038, -+ GLAMO_REG_CLOCK_GEN9 = 0x003a, -+ GLAMO_REG_CLOCK_GEN10 = 0x003c, -+ GLAMO_REG_CLOCK_GEN11 = 0x003e, -+ GLAMO_REG_PLL_GEN1 = 0x0040, -+ GLAMO_REG_PLL_GEN2 = 0x0042, -+ GLAMO_REG_PLL_GEN3 = 0x0044, -+ GLAMO_REG_PLL_GEN4 = 0x0046, -+ GLAMO_REG_PLL_GEN5 = 0x0048, -+ GLAMO_REG_GPIO_GEN1 = 0x0050, -+ GLAMO_REG_GPIO_GEN2 = 0x0052, -+ GLAMO_REG_GPIO_GEN3 = 0x0054, -+ GLAMO_REG_GPIO_GEN4 = 0x0056, -+ GLAMO_REG_GPIO_GEN5 = 0x0058, -+ GLAMO_REG_GPIO_GEN6 = 0x005a, -+ GLAMO_REG_GPIO_GEN7 = 0x005c, -+ GLAMO_REG_GPIO_GEN8 = 0x005e, -+ GLAMO_REG_GPIO_GEN9 = 0x0060, -+ GLAMO_REG_GPIO_GEN10 = 0x0062, -+ GLAMO_REG_DFT_GEN1 = 0x0070, -+ GLAMO_REG_DFT_GEN2 = 0x0072, -+ GLAMO_REG_DFT_GEN3 = 0x0074, -+ GLAMO_REG_DFT_GEN4 = 0x0076, -+ -+ GLAMO_REG_DFT_GEN5 = 0x01e0, -+ GLAMO_REG_DFT_GEN6 = 0x01f0, -+}; -+ -+#define GLAMO_REG_HOSTBUS(x) (GLAMO_REGOFS_HOSTBUS-2+(x*2)) -+ -+#define REG_MEM(x) (GLAMO_REGOFS_MEMORY+(x)) -+#define GLAMO_REG_MEM_TIMING(x) (GLAMO_REG_MEM_TIMING1-2+(x*2)) -+ -+enum glamo_register_mem { -+ GLAMO_REG_MEM_TYPE = REG_MEM(0x00), -+ GLAMO_REG_MEM_GEN = REG_MEM(0x02), -+ GLAMO_REG_MEM_TIMING1 = REG_MEM(0x04), -+ GLAMO_REG_MEM_TIMING2 = REG_MEM(0x06), -+ GLAMO_REG_MEM_TIMING3 = REG_MEM(0x08), -+ GLAMO_REG_MEM_TIMING4 = REG_MEM(0x0a), -+ GLAMO_REG_MEM_TIMING5 = REG_MEM(0x0c), -+ GLAMO_REG_MEM_TIMING6 = REG_MEM(0x0e), -+ GLAMO_REG_MEM_TIMING7 = REG_MEM(0x10), -+ GLAMO_REG_MEM_TIMING8 = REG_MEM(0x12), -+ GLAMO_REG_MEM_TIMING9 = REG_MEM(0x14), -+ GLAMO_REG_MEM_TIMING10 = REG_MEM(0x16), -+ GLAMO_REG_MEM_TIMING11 = REG_MEM(0x18), -+ GLAMO_REG_MEM_POWER1 = REG_MEM(0x1a), -+ GLAMO_REG_MEM_POWER2 = REG_MEM(0x1c), -+ GLAMO_REG_MEM_LCD_BUF1 = REG_MEM(0x1e), -+ GLAMO_REG_MEM_LCD_BUF2 = REG_MEM(0x20), -+ GLAMO_REG_MEM_LCD_BUF3 = REG_MEM(0x22), -+ GLAMO_REG_MEM_LCD_BUF4 = REG_MEM(0x24), -+ GLAMO_REG_MEM_BIST1 = REG_MEM(0x26), -+ GLAMO_REG_MEM_BIST2 = REG_MEM(0x28), -+ GLAMO_REG_MEM_BIST3 = REG_MEM(0x2a), -+ GLAMO_REG_MEM_BIST4 = REG_MEM(0x2c), -+ GLAMO_REG_MEM_BIST5 = REG_MEM(0x2e), -+ GLAMO_REG_MEM_MAH1 = REG_MEM(0x30), -+ GLAMO_REG_MEM_MAH2 = REG_MEM(0x32), -+ GLAMO_REG_MEM_DRAM1 = REG_MEM(0x34), -+ GLAMO_REG_MEM_DRAM2 = REG_MEM(0x36), -+ GLAMO_REG_MEM_CRC = REG_MEM(0x38), -+}; -+ -+#define GLAMO_MEM_TYPE_MASK 0x03 -+ -+enum glamo_reg_mem_dram1 { -+ GLAMO_MEM_DRAM1_EN_SDRAM_CLK = (1 << 11), -+ GLAMO_MEM_DRAM1_SELF_REFRESH = (1 << 12), -+}; -+ -+enum glamo_reg_mem_dram2 { -+ GLAMO_MEM_DRAM2_DEEP_PWRDOWN = (1 << 12), -+}; -+ -+enum glamo_irq { -+ GLAMO_IRQ_HOSTBUS = 0x0001, -+ GLAMO_IRQ_JPEG = 0x0002, -+ GLAMO_IRQ_MPEG = 0x0004, -+ GLAMO_IRQ_MPROC1 = 0x0008, -+ GLAMO_IRQ_MPROC0 = 0x0010, -+ GLAMO_IRQ_CMDQUEUE = 0x0020, -+ GLAMO_IRQ_2D = 0x0040, -+ GLAMO_IRQ_MMC = 0x0080, -+ GLAMO_IRQ_RISC = 0x0100, -+}; -+ -+enum glamo_reg_clock_host { -+ GLAMO_CLOCK_HOST_DG_BCLK = 0x0001, -+ GLAMO_CLOCK_HOST_DG_M0CLK = 0x0004, -+ GLAMO_CLOCK_HOST_RESET = 0x1000, -+}; -+ -+enum glamo_reg_clock_mem { -+ GLAMO_CLOCK_MEM_DG_M1CLK = 0x0001, -+ GLAMO_CLOCK_MEM_EN_M1CLK = 0x0002, -+ GLAMO_CLOCK_MEM_DG_MOCACLK = 0x0004, -+ GLAMO_CLOCK_MEM_EN_MOCACLK = 0x0008, -+ GLAMO_CLOCK_MEM_RESET = 0x1000, -+ GLAMO_CLOCK_MOCA_RESET = 0x2000, -+}; -+ -+enum glamo_reg_clock_lcd { -+ GLAMO_CLOCK_LCD_DG_DCLK = 0x0001, -+ GLAMO_CLOCK_LCD_EN_DCLK = 0x0002, -+ GLAMO_CLOCK_LCD_DG_DMCLK = 0x0004, -+ GLAMO_CLOCK_LCD_EN_DMCLK = 0x0008, -+ // -+ GLAMO_CLOCK_LCD_EN_DHCLK = 0x0020, -+ GLAMO_CLOCK_LCD_DG_M5CLK = 0x0040, -+ GLAMO_CLOCK_LCD_EN_M5CLK = 0x0080, -+ GLAMO_CLOCK_LCD_RESET = 0x1000, -+}; -+ -+enum glamo_reg_clock_mmc { -+ GLAMO_CLOCK_MMC_DG_TCLK = 0x0001, -+ GLAMO_CLOCK_MMC_EN_TCLK = 0x0002, -+ GLAMO_CLOCK_MMC_DG_M9CLK = 0x0004, -+ GLAMO_CLOCK_MMC_EN_M9CLK = 0x0008, -+ GLAMO_CLOCK_MMC_RESET = 0x1000, -+}; -+ -+enum glamo_reg_clock_isp { -+ GLAMO_CLOCK_ISP_DG_I1CLK = 0x0001, -+ GLAMO_CLOCK_ISP_EN_I1CLK = 0x0002, -+ GLAMO_CLOCK_ISP_DG_CCLK = 0x0004, -+ GLAMO_CLOCK_ISP_EN_CCLK = 0x0008, -+ // -+ GLAMO_CLOCK_ISP_EN_SCLK = 0x0020, -+ GLAMO_CLOCK_ISP_DG_M2CLK = 0x0040, -+ GLAMO_CLOCK_ISP_EN_M2CLK = 0x0080, -+ GLAMO_CLOCK_ISP_DG_M15CLK = 0x0100, -+ GLAMO_CLOCK_ISP_EN_M15CLK = 0x0200, -+ GLAMO_CLOCK_ISP1_RESET = 0x1000, -+ GLAMO_CLOCK_ISP2_RESET = 0x2000, -+}; -+ -+enum glamo_reg_clock_jpeg { -+ GLAMO_CLOCK_JPEG_DG_JCLK = 0x0001, -+ GLAMO_CLOCK_JPEG_EN_JCLK = 0x0002, -+ GLAMO_CLOCK_JPEG_DG_M3CLK = 0x0004, -+ GLAMO_CLOCK_JPEG_EN_M3CLK = 0x0008, -+ GLAMO_CLOCK_JPEG_RESET = 0x1000, -+}; -+ -+enum glamo_reg_clock_2d { -+ GLAMO_CLOCK_2D_DG_GCLK = 0x0001, -+ GLAMO_CLOCK_2D_EN_GCLK = 0x0002, -+ GLAMO_CLOCK_2D_DG_M7CLK = 0x0004, -+ GLAMO_CLOCK_2D_EN_M7CLK = 0x0008, -+ GLAMO_CLOCK_2D_DG_M6CLK = 0x0010, -+ GLAMO_CLOCK_2D_EN_M6CLK = 0x0020, -+ GLAMO_CLOCK_2D_RESET = 0x1000, -+ GLAMO_CLOCK_2D_CQ_RESET = 0x2000, -+}; -+ -+enum glamo_reg_clock_3d { -+ GLAMO_CLOCK_3D_DG_ECLK = 0x0001, -+ GLAMO_CLOCK_3D_EN_ECLK = 0x0002, -+ GLAMO_CLOCK_3D_DG_RCLK = 0x0004, -+ GLAMO_CLOCK_3D_EN_RCLK = 0x0008, -+ GLAMO_CLOCK_3D_DG_M8CLK = 0x0010, -+ GLAMO_CLOCK_3D_EN_M8CLK = 0x0020, -+ GLAMO_CLOCK_3D_BACK_RESET = 0x1000, -+ GLAMO_CLOCK_3D_FRONT_RESET = 0x2000, -+}; -+ -+enum glamo_reg_clock_mpeg { -+ GLAMO_CLOCK_MPEG_DG_X0CLK = 0x0001, -+ GLAMO_CLOCK_MPEG_EN_X0CLK = 0x0002, -+ GLAMO_CLOCK_MPEG_DG_X1CLK = 0x0004, -+ GLAMO_CLOCK_MPEG_EN_X1CLK = 0x0008, -+ GLAMO_CLOCK_MPEG_DG_X2CLK = 0x0010, -+ GLAMO_CLOCK_MPEG_EN_X2CLK = 0x0020, -+ GLAMO_CLOCK_MPEG_DG_X3CLK = 0x0040, -+ GLAMO_CLOCK_MPEG_EN_X3CLK = 0x0080, -+ GLAMO_CLOCK_MPEG_DG_X4CLK = 0x0100, -+ GLAMO_CLOCK_MPEG_EN_X4CLK = 0x0200, -+ GLAMO_CLOCK_MPEG_DG_X6CLK = 0x0400, -+ GLAMO_CLOCK_MPEG_EN_X6CLK = 0x0800, -+ GLAMO_CLOCK_MPEG_ENC_RESET = 0x1000, -+ GLAMO_CLOCK_MPEG_DEC_RESET = 0x2000, -+}; -+ -+enum glamo_reg_clock51 { -+ GLAMO_CLOCK_GEN51_EN_DIV_MCLK = 0x0001, -+ GLAMO_CLOCK_GEN51_EN_DIV_SCLK = 0x0002, -+ GLAMO_CLOCK_GEN51_EN_DIV_JCLK = 0x0004, -+ GLAMO_CLOCK_GEN51_EN_DIV_DCLK = 0x0008, -+ GLAMO_CLOCK_GEN51_EN_DIV_DMCLK = 0x0010, -+ GLAMO_CLOCK_GEN51_EN_DIV_DHCLK = 0x0020, -+ GLAMO_CLOCK_GEN51_EN_DIV_GCLK = 0x0040, -+ GLAMO_CLOCK_GEN51_EN_DIV_TCLK = 0x0080, -+ /* FIXME: higher bits */ -+}; -+ -+enum glamo_reg_clock52 { -+ GLAMO_CLOCK_GEN52_EN_DIV_ACLK = 0x0001, -+ GLAMO_CLOCK_GEN52_EN_DIV_AMCLK = 0x0002, -+ GLAMO_CLOCK_GEN52_EN_DIV_OCLK = 0x0004, -+ GLAMO_CLOCK_GEN52_EN_DIV_ZCLK = 0x0008, -+ GLAMO_CLOCK_GEN52_EN_DIV_ICLK = 0x0010, -+ /* FIXME: higher bits */ -+}; -+ -+enum glamo_reg_hostbus2 { -+ GLAMO_HOSTBUS2_MMIO_EN_ISP = 0x0001, -+ GLAMO_HOSTBUS2_MMIO_EN_JPEG = 0x0002, -+ GLAMO_HOSTBUS2_MMIO_EN_MPEG = 0x0004, -+ GLAMO_HOSTBUS2_MMIO_EN_LCD = 0x0008, -+ GLAMO_HOSTBUS2_MMIO_EN_MMC = 0x0010, -+ GLAMO_HOSTBUS2_MMIO_EN_MICROP0 = 0x0020, -+ GLAMO_HOSTBUS2_MMIO_EN_MICROP1 = 0x0040, -+ GLAMO_HOSTBUS2_MMIO_EN_CQ = 0x0080, -+ GLAMO_HOSTBUS2_MMIO_EN_RISC = 0x0100, -+ GLAMO_HOSTBUS2_MMIO_EN_2D = 0x0200, -+ GLAMO_HOSTBUS2_MMIO_EN_3D = 0x0400, -+}; -+ -+/* LCD Controller */ -+ -+#define REG_LCD(x) (x) -+enum glamo_reg_lcd { -+ GLAMO_REG_LCD_MODE1 = REG_LCD(0x00), -+ GLAMO_REG_LCD_MODE2 = REG_LCD(0x02), -+ GLAMO_REG_LCD_MODE3 = REG_LCD(0x04), -+ GLAMO_REG_LCD_WIDTH = REG_LCD(0x06), -+ GLAMO_REG_LCD_HEIGHT = REG_LCD(0x08), -+ GLAMO_REG_LCD_POLARITY = REG_LCD(0x0a), -+ GLAMO_REG_LCD_A_BASE1 = REG_LCD(0x0c), -+ GLAMO_REG_LCD_A_BASE2 = REG_LCD(0x0e), -+ GLAMO_REG_LCD_B_BASE1 = REG_LCD(0x10), -+ GLAMO_REG_LCD_B_BASE2 = REG_LCD(0x12), -+ GLAMO_REG_LCD_C_BASE1 = REG_LCD(0x14), -+ GLAMO_REG_LCD_C_BASE2 = REG_LCD(0x16), -+ GLAMO_REG_LCD_PITCH = REG_LCD(0x18), -+ /* RES */ -+ GLAMO_REG_LCD_HORIZ_TOTAL = REG_LCD(0x1c), -+ /* RES */ -+ GLAMO_REG_LCD_HORIZ_RETR_START = REG_LCD(0x20), -+ /* RES */ -+ GLAMO_REG_LCD_HORIZ_RETR_END = REG_LCD(0x24), -+ /* RES */ -+ GLAMO_REG_LCD_HORIZ_DISP_START = REG_LCD(0x28), -+ /* RES */ -+ GLAMO_REG_LCD_HORIZ_DISP_END = REG_LCD(0x2c), -+ /* RES */ -+ GLAMO_REG_LCD_VERT_TOTAL = REG_LCD(0x30), -+ /* RES */ -+ GLAMO_REG_LCD_VERT_RETR_START = REG_LCD(0x34), -+ /* RES */ -+ GLAMO_REG_LCD_VERT_RETR_END = REG_LCD(0x38), -+ /* RES */ -+ GLAMO_REG_LCD_VERT_DISP_START = REG_LCD(0x3c), -+ /* RES */ -+ GLAMO_REG_LCD_VERT_DISP_END = REG_LCD(0x40), -+ /* RES */ -+ GLAMO_REG_LCD_POL = REG_LCD(0x44), -+ GLAMO_REG_LCD_DATA_START = REG_LCD(0x46), -+ GLAMO_REG_LCD_FRATE_CONTRO = REG_LCD(0x48), -+ GLAMO_REG_LCD_DATA_CMD_HDR = REG_LCD(0x4a), -+ GLAMO_REG_LCD_SP_START = REG_LCD(0x4c), -+ GLAMO_REG_LCD_SP_END = REG_LCD(0x4e), -+ GLAMO_REG_LCD_CURSOR_BASE1 = REG_LCD(0x50), -+ GLAMO_REG_LCD_CURSOR_BASE2 = REG_LCD(0x52), -+ GLAMO_REG_LCD_CURSOR_PITCH = REG_LCD(0x54), -+ GLAMO_REG_LCD_CURSOR_X_SIZE = REG_LCD(0x56), -+ GLAMO_REG_LCD_CURSOR_Y_SIZE = REG_LCD(0x58), -+ GLAMO_REG_LCD_CURSOR_X_POS = REG_LCD(0x5a), -+ GLAMO_REG_LCD_CURSOR_Y_POS = REG_LCD(0x5c), -+ GLAMO_REG_LCD_CURSOR_PRESET = REG_LCD(0x5e), -+ GLAMO_REG_LCD_CURSOR_FG_COLOR = REG_LCD(0x60), -+ /* RES */ -+ GLAMO_REG_LCD_CURSOR_BG_COLOR = REG_LCD(0x64), -+ /* RES */ -+ GLAMO_REG_LCD_CURSOR_DST_COLOR = REG_LCD(0x68), -+ /* RES */ -+ GLAMO_REG_LCD_STATUS1 = REG_LCD(0x80), -+ GLAMO_REG_LCD_STATUS2 = REG_LCD(0x82), -+ GLAMO_REG_LCD_STATUS3 = REG_LCD(0x84), -+ GLAMO_REG_LCD_STATUS4 = REG_LCD(0x86), -+ /* RES */ -+ GLAMO_REG_LCD_COMMAND1 = REG_LCD(0xa0), -+ GLAMO_REG_LCD_COMMAND2 = REG_LCD(0xa2), -+ /* RES */ -+ GLAMO_REG_LCD_WFORM_DELAY1 = REG_LCD(0xb0), -+ GLAMO_REG_LCD_WFORM_DELAY2 = REG_LCD(0xb2), -+ /* RES */ -+ GLAMO_REG_LCD_GAMMA_CORR = REG_LCD(0x100), -+ /* RES */ -+ GLAMO_REG_LCD_GAMMA_R_ENTRY01 = REG_LCD(0x110), -+ GLAMO_REG_LCD_GAMMA_R_ENTRY23 = REG_LCD(0x112), -+ GLAMO_REG_LCD_GAMMA_R_ENTRY45 = REG_LCD(0x114), -+ GLAMO_REG_LCD_GAMMA_R_ENTRY67 = REG_LCD(0x116), -+ GLAMO_REG_LCD_GAMMA_R_ENTRY8 = REG_LCD(0x118), -+ /* RES */ -+ GLAMO_REG_LCD_GAMMA_G_ENTRY01 = REG_LCD(0x130), -+ GLAMO_REG_LCD_GAMMA_G_ENTRY23 = REG_LCD(0x132), -+ GLAMO_REG_LCD_GAMMA_G_ENTRY45 = REG_LCD(0x134), -+ GLAMO_REG_LCD_GAMMA_G_ENTRY67 = REG_LCD(0x136), -+ GLAMO_REG_LCD_GAMMA_G_ENTRY8 = REG_LCD(0x138), -+ /* RES */ -+ GLAMO_REG_LCD_GAMMA_B_ENTRY01 = REG_LCD(0x150), -+ GLAMO_REG_LCD_GAMMA_B_ENTRY23 = REG_LCD(0x152), -+ GLAMO_REG_LCD_GAMMA_B_ENTRY45 = REG_LCD(0x154), -+ GLAMO_REG_LCD_GAMMA_B_ENTRY67 = REG_LCD(0x156), -+ GLAMO_REG_LCD_GAMMA_B_ENTRY8 = REG_LCD(0x158), -+ /* RES */ -+ GLAMO_REG_LCD_SRAM_DRIVING1 = REG_LCD(0x160), -+ GLAMO_REG_LCD_SRAM_DRIVING2 = REG_LCD(0x162), -+ GLAMO_REG_LCD_SRAM_DRIVING3 = REG_LCD(0x164), -+}; -+ -+enum glamo_reg_lcd_mode1 { -+ GLAMO_LCD_MODE1_PWRSAVE = 0x0001, -+ GLAMO_LCD_MODE1_PARTIAL_PRT = 0x0002, -+ GLAMO_LCD_MODE1_HWFLIP = 0x0004, -+ GLAMO_LCD_MODE1_LCD2 = 0x0008, -+ /* RES */ -+ GLAMO_LCD_MODE1_PARTIAL_MODE = 0x0020, -+ GLAMO_LCD_MODE1_CURSOR_DSTCOLOR = 0x0040, -+ GLAMO_LCD_MODE1_PARTIAL_ENABLE = 0x0080, -+ GLAMO_LCD_MODE1_TVCLK_IN_ENABLE = 0x0100, -+ GLAMO_LCD_MODE1_HSYNC_HIGH_ACT = 0x0200, -+ GLAMO_LCD_MODE1_VSYNC_HIGH_ACT = 0x0400, -+ GLAMO_LCD_MODE1_HSYNC_FLIP = 0x0800, -+ GLAMO_LCD_MODE1_GAMMA_COR_EN = 0x1000, -+ GLAMO_LCD_MODE1_DITHER_EN = 0x2000, -+ GLAMO_LCD_MODE1_CURSOR_EN = 0x4000, -+ GLAMO_LCD_MODE1_ROTATE_EN = 0x8000, -+}; -+ -+enum glamo_reg_lcd_mode2 { -+ GLAMO_LCD_MODE2_CRC_CHECK_EN = 0x0001, -+ GLAMO_LCD_MODE2_DCMD_PER_LINE = 0x0002, -+ GLAMO_LCD_MODE2_NOUSE_BDEF = 0x0004, -+ GLAMO_LCD_MODE2_OUT_POS_MODE = 0x0008, -+ GLAMO_LCD_MODE2_FRATE_CTRL_EN = 0x0010, -+ GLAMO_LCD_MODE2_SINGLE_BUFFER = 0x0020, -+ GLAMO_LCD_MODE2_SER_LSB_TO_MSB = 0x0040, -+ /* FIXME */ -+}; -+ -+enum glamo_reg_lcd_mode3 { -+ /* LCD color source data format */ -+ GLAMO_LCD_SRC_RGB565 = 0x0000, -+ GLAMO_LCD_SRC_ARGB1555 = 0x4000, -+ GLAMO_LCD_SRC_ARGB4444 = 0x8000, -+ /* interface type */ -+ GLAMO_LCD_MODE3_LCD = 0x1000, -+ GLAMO_LCD_MODE3_RGB = 0x0800, -+ GLAMO_LCD_MODE3_CPU = 0x0000, -+ /* mode */ -+ GLAMO_LCD_MODE3_RGB332 = 0x0000, -+ GLAMO_LCD_MODE3_RGB444 = 0x0100, -+ GLAMO_LCD_MODE3_RGB565 = 0x0200, -+ GLAMO_LCD_MODE3_RGB666 = 0x0300, -+ /* depth */ -+ GLAMO_LCD_MODE3_6BITS = 0x0000, -+ GLAMO_LCD_MODE3_8BITS = 0x0010, -+ GLAMO_LCD_MODE3_9BITS = 0x0020, -+ GLAMO_LCD_MODE3_16BITS = 0x0030, -+ GLAMO_LCD_MODE3_18BITS = 0x0040, -+}; -+ -+enum glamo_lcd_cmd_type { -+ GLAMO_LCD_CMD_TYPE_DISP = 0x0000, -+ GLAMO_LCD_CMD_TYPE_PARALLEL = 0x4000, -+ GLAMO_LCD_CMD_TYPE_SERIAL = 0x8000, -+ GLAMO_LCD_CMD_TYPE_SERIAL_DIRECT= 0xc000, -+}; -+#define GLAMO_LCD_CMD_TYPE_MASK 0xc000 -+ -+enum glamo_lcd_cmds { -+ GLAMO_LCD_CMD_DATA_DISP_FIRE = 0x00, -+ GLAMO_LCD_CMD_DATA_DISP_SYNC = 0x01, /* RGB only */ -+ /* switch to command mode, no display */ -+ GLAMO_LCD_CMD_DATA_FIRE_NO_DISP = 0x02, -+ /* display until VSYNC, switch to command */ -+ GLAMO_LCD_CMD_DATA_FIRE_VSYNC = 0x11, -+ /* display until HSYNC, switch to command */ -+ GLAMO_LCD_CMD_DATA_FIRE_HSYNC = 0x12, -+ /* display until VSYNC, 1 black frame, VSYNC, switch to command */ -+ GLAMO_LCD_CMD_DATA_FIRE_VSYNC_B = 0x13, -+ /* don't care about display and switch to command */ -+ GLAMO_LCD_CMD_DATA_FIRE_FREE = 0x14, /* RGB only */ -+ /* don't care about display, keep data display but disable data, -+ * and switch to command */ -+ GLAMO_LCD_CMD_DATA_FIRE_FREE_D = 0x15, /* RGB only */ -+}; -+ -+enum glamo_core_revisions { -+ GLAMO_CORE_REV_A0 = 0x0000, -+ GLAMO_CORE_REV_A1 = 0x0001, -+ GLAMO_CORE_REV_A2 = 0x0002, -+ GLAMO_CORE_REV_A3 = 0x0003, -+}; -+ -+#define REG_ISP(x) (GLAMO_REGOFS_ISP+(x)) -+ -+enum glamo_register_isp { -+ GLAMO_REG_ISP_EN1 = REG_ISP(0x00), -+ GLAMO_REG_ISP_EN2 = REG_ISP(0x02), -+ GLAMO_REG_ISP_EN3 = REG_ISP(0x04), -+ GLAMO_REG_ISP_EN4 = REG_ISP(0x06), -+ GLAMO_REG_ISP_CAP_0_ADDRL = REG_ISP(0x08), -+ GLAMO_REG_ISP_CAP_0_ADDRH = REG_ISP(0x0a), -+ GLAMO_REG_ISP_CAP_1_ADDRL = REG_ISP(0x0c), -+ GLAMO_REG_ISP_CAP_1_ADDRH = REG_ISP(0x0e), -+ GLAMO_REG_ISP_DEC_Y_ADDRL = REG_ISP(0x10), -+ GLAMO_REG_ISP_DEC_Y_ADDRH = REG_ISP(0x12), -+ GLAMO_REG_ISP_DEC_U_ADDRL = REG_ISP(0x14), -+ GLAMO_REG_ISP_DEC_U_ADDRH = REG_ISP(0x16), -+ GLAMO_REG_ISP_DEC_V_ADDRL = REG_ISP(0x18), -+ GLAMO_REG_ISP_DEC_V_ADDRH = REG_ISP(0x1a), -+ GLAMO_REG_ISP_CAP_SEG_HEIGHT = REG_ISP(0x1c), -+ GLAMO_REG_ISP_CAP_PITCH = REG_ISP(0x1e), -+ GLAMO_REG_ISP_CAP_HEIGHT = REG_ISP(0x20), -+ GLAMO_REG_ISP_CAP_WIDTH = REG_ISP(0x22), -+ GLAMO_REG_ISP_DEC_PITCH_Y = REG_ISP(0x24), -+ GLAMO_REG_ISP_DEC_PITCH_UV = REG_ISP(0x26), -+ GLAMO_REG_ISP_DEC_HEIGHT = REG_ISP(0x28), -+ GLAMO_REG_ISP_DEC_WIDTH = REG_ISP(0x2a), -+ GLAMO_REG_ISP_ONFLY_MODE1 = REG_ISP(0x2c), -+ GLAMO_REG_ISP_ONFLY_MODE2 = REG_ISP(0x2e), -+ GLAMO_REG_ISP_ONFLY_MODE3 = REG_ISP(0x30), -+ GLAMO_REG_ISP_ONFLY_MODE4 = REG_ISP(0x32), -+ GLAMO_REG_ISP_ONFLY_MODE5 = REG_ISP(0x34), -+ // -+ GLAMO_REG_ISP_YUV2RGB_11 = REG_ISP(0x50), -+ GLAMO_REG_ISP_YUV2RGB_21 = REG_ISP(0x52), -+ GLAMO_REG_ISP_YUV2RGB_32 = REG_ISP(0x54), -+ GLAMO_REG_ISP_YUV2RGB_33 = REG_ISP(0x56), -+ GLAMO_REG_ISP_YUV2RGB_RG = REG_ISP(0x58), -+ GLAMO_REG_ISP_YUV2RGB_B = REG_ISP(0x5a), -+ // -+ GLAMO_REG_ISP_PORT1_SCALEH = REG_ISP(0x76), -+ GLAMO_REG_ISP_PORT1_SCALEV = REG_ISP(0x78), -+ GLAMO_REG_ISP_PORT2_SCALEH = REG_ISP(0x7a), -+ GLAMO_REG_ISP_PORT2_SCALEV = REG_ISP(0x7c), -+ GLAMO_REG_ISP_DEC_SCALEH = REG_ISP(0x7e), -+ GLAMO_REG_ISP_DEC_SCALEV = REG_ISP(0x80), -+ GLAMO_REG_ISP_TURBO = REG_ISP(0x82), -+ GLAMO_REG_ISP_PORT1_CAP_EN = REG_ISP(0x84), -+ GLAMO_REG_ISP_PORT1_CAP_0_ADDRL = REG_ISP(0x86), -+ GLAMO_REG_ISP_PORT1_CAP_0_ADDRH = REG_ISP(0x88), -+ GLAMO_REG_ISP_PORT1_CAP_1_ADDRL = REG_ISP(0x8a), -+ GLAMO_REG_ISP_PORT1_CAP_1_ADDRH = REG_ISP(0x8c), -+ GLAMO_REG_ISP_PORT1_CAP_WIDTH = REG_ISP(0x8e), -+ GLAMO_REG_ISP_PORT1_CAP_HEIGHT = REG_ISP(0x90), -+ GLAMO_REG_ISP_PORT1_CAP_PITCH = REG_ISP(0x92), -+ GLAMO_REG_ISP_PORT1_CAP_CLIP_L = REG_ISP(0x94), -+ GLAMO_REG_ISP_PORT1_CAP_CLIP_R = REG_ISP(0x96), -+ GLAMO_REG_ISP_PORT1_CAP_CLIP_T = REG_ISP(0x98), -+ GLAMO_REG_ISP_PORT1_CAP_CLIP_B = REG_ISP(0x9a), -+ GLAMO_REG_ISP_PORT1_DEC_EN = REG_ISP(0x9c), -+ GLAMO_REG_ISP_PORT1_DEC_0_ADDRL = REG_ISP(0x9e), -+ GLAMO_REG_ISP_PORT1_DEC_0_ADDRH = REG_ISP(0xa0), -+ GLAMO_REG_ISP_PORT1_DEC_1_ADDRL = REG_ISP(0xa2), -+ GLAMO_REG_ISP_PORT1_DEC_1_ADDRH = REG_ISP(0xa4), -+ GLAMO_REG_ISP_PORT1_DEC_WIDTH = REG_ISP(0xa6), -+ GLAMO_REG_ISP_PORT1_DEC_HEIGHT = REG_ISP(0xa8), -+ GLAMO_REG_ISP_PORT1_DEC_PITCH = REG_ISP(0xaa), -+ GLAMO_REG_ISP_PORT1_DEC_CLIP_L = REG_ISP(0xac), -+ GLAMO_REG_ISP_PORT1_DEC_CLIP_R = REG_ISP(0xae), -+ GLAMO_REG_ISP_PORT1_DEC_CLIP_T = REG_ISP(0xb0), -+ GLAMO_REG_ISP_PORT1_DEC_CLIP_B = REG_ISP(0xb2), -+ GLAMO_REG_ISP_PORT2_EN = REG_ISP(0xb4), -+ GLAMO_REG_ISP_PORT2_0_Y_ADDRL = REG_ISP(0xb6), -+ GLAMO_REG_ISP_PORT2_0_Y_ADDRH = REG_ISP(0xb8), -+ GLAMO_REG_ISP_PORT2_0_U_ADDRL = REG_ISP(0xba), -+ GLAMO_REG_ISP_PORT2_0_U_ADDRH = REG_ISP(0xbc), -+ GLAMO_REG_ISP_PORT2_0_V_ADDRL = REG_ISP(0xbe), -+ GLAMO_REG_ISP_PORT2_0_V_ADDRH = REG_ISP(0xc0), -+ GLAMO_REG_ISP_PORT2_1_Y_ADDRL = REG_ISP(0xc2), -+ GLAMO_REG_ISP_PORT2_1_Y_ADDRH = REG_ISP(0xc4), -+ GLAMO_REG_ISP_PORT2_1_U_ADDRL = REG_ISP(0xc6), -+ GLAMO_REG_ISP_PORT2_1_U_ADDRH = REG_ISP(0xc8), -+ GLAMO_REG_ISP_PORT2_1_V_ADDRL = REG_ISP(0xca), -+ GLAMO_REG_ISP_PORT2_1_V_ADDRH = REG_ISP(0xcc), -+ GLAMO_REG_ISP_PORT2_2_Y_ADDRL = REG_ISP(0xce), -+ GLAMO_REG_ISP_PORT2_2_Y_ADDRH = REG_ISP(0xd0), -+ GLAMO_REG_ISP_PORT2_2_U_ADDRL = REG_ISP(0xd2), -+ GLAMO_REG_ISP_PORT2_2_U_ADDRH = REG_ISP(0xd4), -+ GLAMO_REG_ISP_PORT2_2_V_ADDRL = REG_ISP(0xd6), -+ GLAMO_REG_ISP_PORT2_2_V_ADDRH = REG_ISP(0xd8), -+ GLAMO_REG_ISP_PORT2_WIDTH = REG_ISP(0xda), -+ GLAMO_REG_ISP_PORT2_HEIGHT = REG_ISP(0xdc), -+ GLAMO_REG_ISP_PORT2_Y_PITCH = REG_ISP(0xde), -+ GLAMO_REG_ISP_PORT2_UV_PITCH = REG_ISP(0xe0), -+ // -+ GLAMO_REG_ISP_RGB2YUV_11_12 = REG_ISP(0xf6), -+ GLAMO_REG_ISP_RGB2YUV_13_21 = REG_ISP(0xf8), -+ GLAMO_REG_ISP_RGB2YUV_22_23 = REG_ISP(0xfa), -+ GLAMO_REG_ISP_RGB2YUV_31_32 = REG_ISP(0xfc), -+ GLAMO_REG_ISP_RGB2YUV_33 = REG_ISP(0xfe), -+ // -+ GLAMO_REG_ISP_PORT1_SCALEH_MATRIX = REG_ISP(0x10c), -+ // -+ GLAMO_REG_ISP_PORT1_SCALEV_MATRIX = REG_ISP(0x120), -+ // -+ GLAMO_REG_ISP_PORT2_SCALEH_MATRIX = REG_ISP(0x134), -+ // -+ GLAMO_REG_ISP_PORT2_SCALEV_MATRIX = REG_ISP(0x148), -+ // -+ GLAMO_REG_ISP_DEC_SCALEH_MATRIX = REG_ISP(0x15c), -+ // -+ GLAMO_REG_ISP_DEC_SCALEV_MATRIX = REG_ISP(0x170), -+ // -+ GLAMO_REG_ISP_STATUS = REG_ISP(0x184), -+}; -+ -+enum glamo_reg_isp_en1 { -+ GLAMO_ISP_EN1_FIRE_ISP = 0x0001, -+ GLAMO_ISP_EN1_FIRE_CAP = 0x0002, -+ GLAMO_ISP_EN1_VIDEO_CONF = 0x0004, -+ GLAMO_ISP_EN1_BAYER_SRC = 0x0008, -+ // -+ GLAMO_ISP_EN1_YUV_PACK = 0x0040, -+ GLAMO_ISP_EN1_PLANE_MODE = 0x0080, -+ GLAMO_ISP_EN1_YUV_INPUT = 0x0100, -+ GLAMO_ISP_EN1_YUV420 = 0x0200, -+ // -+}; -+ -+enum glamo_reg_isp_en3 { -+ // -+ GLAMO_ISP_EN3_SCALE_IMPROVE = 0x0040, -+ GLAMO_ISP_EN3_PLANE_MODE = 0x0080, -+ GLAMO_ISP_EN3_YUV_INPUT = 0x0100, -+ GLAMO_ISP_EN3_YUV420 = 0x0200, -+ // -+}; -+ -+enum glamo_reg_isp_port1_en { -+ GLAMO_ISP_PORT1_EN_OUTPUT = 0x0001, -+// GLAMO_ISP_PORT1_EN_SCALE = 0x0002, -+ GLAMO_ISP_PORT1_EN_CLIP = 0x0004, -+ GLAMO_ISP_PORT1_EN_CLIP_OUT = 0x0008, -+ GLAMO_ISP_PORT1_EN_DUAL_BUF = 0x0010, -+}; -+ -+enum glamo_reg_isp_port2_en { -+ GLAMO_ISP_PORT2_EN_OUTPUT = 0x0001, -+ GLAMO_ISP_PORT2_EN_SCALE = 0x0002, -+ GLAMO_ISP_PORT2_EN_JPEG = 0x0010, -+ GLAMO_ISP_PORT2_EN_MPEG = 0x0020, -+ GLAMO_ISP_PORT2_EN_ENCODE = 0x0040, -+ GLAMO_ISP_PORT2_EN_DECODE = 0x0080, -+}; -+ -+#define REG_CQ(x) (GLAMO_REGOFS_CMDQUEUE+(x)) -+ -+enum glamo_register_cq { -+ GLAMO_REG_CQ_BASE_ADDRL = REG_CQ(0x00), -+ GLAMO_REG_CQ_BASE_ADDRH = REG_CQ(0x02), -+ GLAMO_REG_CQ_LEN = REG_CQ(0x04), -+ GLAMO_REG_CQ_WRITE_ADDRL = REG_CQ(0x06), -+ GLAMO_REG_CQ_WRITE_ADDRH = REG_CQ(0x08), -+ GLAMO_REG_CQ_FLIP = REG_CQ(0x0a), -+ GLAMO_REG_CQ_CONTROL = REG_CQ(0x0c), -+ GLAMO_REG_CQ_READ_ADDRL = REG_CQ(0x0e), -+ GLAMO_REG_CQ_READ_ADDRH = REG_CQ(0x10), -+ GLAMO_REG_CQ_STATUS = REG_CQ(0x12), -+}; -+ -+#define REG_2D(x) (GLAMO_REGOFS_2D+(x)) -+ -+enum glamo_register_2d { -+ GLAMO_REG_2D_SRC_ADDRL = REG_2D(0x00), -+ GLAMO_REG_2D_SRC_ADDRH = REG_2D(0x02), -+ GLAMO_REG_2D_SRC_PITCH = REG_2D(0x04), -+ GLAMO_REG_2D_SRC_X = REG_2D(0x06), -+ GLAMO_REG_2D_SRC_Y = REG_2D(0x08), -+ GLAMO_REG_2D_DST_X = REG_2D(0x0a), -+ GLAMO_REG_2D_DST_Y = REG_2D(0x0c), -+ GLAMO_REG_2D_DST_ADDRL = REG_2D(0x0e), -+ GLAMO_REG_2D_DST_ADDRH = REG_2D(0x10), -+ GLAMO_REG_2D_DST_PITCH = REG_2D(0x12), -+ GLAMO_REG_2D_DST_HEIGHT = REG_2D(0x14), -+ GLAMO_REG_2D_RECT_WIDTH = REG_2D(0x16), -+ GLAMO_REG_2D_RECT_HEIGHT = REG_2D(0x18), -+ GLAMO_REG_2D_PAT_ADDRL = REG_2D(0x1a), -+ GLAMO_REG_2D_PAT_ADDRH = REG_2D(0x1c), -+ GLAMO_REG_2D_PAT_FG = REG_2D(0x1e), -+ GLAMO_REG_2D_PAT_BG = REG_2D(0x20), -+ GLAMO_REG_2D_SRC_FG = REG_2D(0x22), -+ GLAMO_REG_2D_SRC_BG = REG_2D(0x24), -+ GLAMO_REG_2D_MASK1 = REG_2D(0x26), -+ GLAMO_REG_2D_MASK2 = REG_2D(0x28), -+ GLAMO_REG_2D_MASK3 = REG_2D(0x2a), -+ GLAMO_REG_2D_MASK4 = REG_2D(0x2c), -+ GLAMO_REG_2D_ROT_X = REG_2D(0x2e), -+ GLAMO_REG_2D_ROT_Y = REG_2D(0x30), -+ GLAMO_REG_2D_LEFT_CLIP = REG_2D(0x32), -+ GLAMO_REG_2D_TOP_CLIP = REG_2D(0x34), -+ GLAMO_REG_2D_RIGHT_CLIP = REG_2D(0x36), -+ GLAMO_REG_2D_BOTTOM_CLIP = REG_2D(0x38), -+ GLAMO_REG_2D_COMMAND1 = REG_2D(0x3A), -+ GLAMO_REG_2D_COMMAND2 = REG_2D(0x3C), -+ GLAMO_REG_2D_COMMAND3 = REG_2D(0x3E), -+ GLAMO_REG_2D_SAFE = REG_2D(0x40), -+ GLAMO_REG_2D_STATUS = REG_2D(0x42), -+ GLAMO_REG_2D_ID1 = REG_2D(0x44), -+ GLAMO_REG_2D_ID2 = REG_2D(0x46), -+ GLAMO_REG_2D_ID3 = REG_2D(0x48), -+}; -+ -+#endif /* _GLAMO_REGS_H */ -Index: xserver/hw/kdrive/glamo/glamo.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xserver/hw/kdrive/glamo/glamo.c 2007-09-26 17:44:47.000000000 +0800 -@@ -0,0 +1,498 @@ -+/* -+ * Copyright © 2007 OpenMoko, Inc. -+ * -+ * This driver is based on Xati, -+ * Copyright © 2003 Eric Anholt -+ * -+ * Permission to use, copy, modify, distribute, and sell this software and its -+ * documentation for any purpose is hereby granted without fee, provided that -+ * the above copyright notice appear in all copies and that both that copyright -+ * notice and this permission notice appear in supporting documentation, and -+ * that the name of the copyright holders not be used in advertising or -+ * publicity pertaining to distribution of the software without specific, -+ * written prior permission. The copyright holders make no representations -+ * about the suitability of this software for any purpose. It is provided "as -+ * is" without express or implied warranty. -+ * -+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE -+ * OF THIS SOFTWARE. -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+#include "glamo.h" -+#if defined(USE_DRI) && defined(GLXEXT) -+#include "glamo_sarea.h" -+#endif -+ -+static Bool -+GLAMOCardInit(KdCardInfo *card) -+{ -+ GLAMOCardInfo *glamoc; -+ Bool initialized = FALSE; -+ -+ glamoc = xcalloc(sizeof(GLAMOCardInfo), 1); -+ if (glamoc == NULL) -+ return FALSE; -+ -+#ifdef KDRIVEFBDEV -+ if (!initialized && fbdevInitialize(card, &glamoc->backend_priv.fbdev)) { -+ glamoc->use_fbdev = TRUE; -+ initialized = TRUE; -+ glamoc->backend_funcs.cardfini = fbdevCardFini; -+ glamoc->backend_funcs.scrfini = fbdevScreenFini; -+ glamoc->backend_funcs.initScreen = fbdevInitScreen; -+ glamoc->backend_funcs.finishInitScreen = fbdevFinishInitScreen; -+ glamoc->backend_funcs.createRes = fbdevCreateResources; -+ glamoc->backend_funcs.preserve = fbdevPreserve; -+ glamoc->backend_funcs.restore = fbdevRestore; -+ glamoc->backend_funcs.dpms = fbdevDPMS; -+ glamoc->backend_funcs.enable = fbdevEnable; -+ glamoc->backend_funcs.disable = fbdevDisable; -+ glamoc->backend_funcs.getColors = fbdevGetColors; -+ glamoc->backend_funcs.putColors = fbdevPutColors; -+#ifdef RANDR -+ glamoc->backend_funcs.randrSetConfig = fbdevRandRSetConfig; -+#endif -+ } -+#endif -+#ifdef KDRIVEVESA -+ if (!initialized && vesaInitialize(card, &glamoc->backend_priv.vesa)) { -+ glamoc->use_vesa = TRUE; -+ initialized = TRUE; -+ glamoc->backend_funcs.cardfini = vesaCardFini; -+ glamoc->backend_funcs.scrfini = vesaScreenFini; -+ glamoc->backend_funcs.initScreen = vesaInitScreen; -+ glamoc->backend_funcs.finishInitScreen = vesaFinishInitScreen; -+ glamoc->backend_funcs.createRes = vesaCreateResources; -+ glamoc->backend_funcs.preserve = vesaPreserve; -+ glamoc->backend_funcs.restore = vesaRestore; -+ glamoc->backend_funcs.dpms = vesaDPMS; -+ glamoc->backend_funcs.enable = vesaEnable; -+ glamoc->backend_funcs.disable = vesaDisable; -+ glamoc->backend_funcs.getColors = vesaGetColors; -+ glamoc->backend_funcs.putColors = vesaPutColors; -+#ifdef RANDR -+ glamoc->backend_funcs.randrSetConfig = vesaRandRSetConfig; -+#endif -+ } -+#endif -+ -+ if (!initialized || !GLAMOMapReg(card, glamoc)) { -+ xfree(glamoc); -+ return FALSE; -+ } -+ -+#ifdef USE_DRI -+ /* We demand identification by busid, not driver name */ -+ glamoc->drmFd = drmOpen(NULL, glamoc->busid); -+ if (glamoc->drmFd < 0) -+ ErrorF("Failed to open DRM, DRI disabled.\n"); -+#endif /* USE_DRI */ -+ -+ card->driver = glamoc; -+ -+ glamoc->is_3362 = TRUE; -+ ErrorF("Using GLAMO 3362 card\n"); -+ -+ return TRUE; -+} -+ -+static void -+GLAMOCardFini(KdCardInfo *card) -+{ -+ GLAMOCardInfo *glamoc = (GLAMOCardInfo *)card->driver; -+ -+ GLAMOUnmapReg(card, glamoc); -+ glamoc->backend_funcs.cardfini(card); -+} -+ -+/* -+ * Once screen->off_screen_base is set, this function -+ * allocates the remaining memory appropriately -+ */ -+ -+static void -+GLAMOSetOffscreen (KdScreenInfo *screen) -+{ -+ GLAMOCardInfo(screen); -+#if defined(USE_DRI) && defined(GLXEXT) -+ GLAMOScreenInfo *glamos = (GLAMOScreenInfo *)screen->driver; -+ int l; -+#endif -+ int screen_size; -+ char *mmio = glamoc->reg_base; -+ -+ /* check (and adjust) pitch */ -+ if (mmio) -+ { -+ int byteStride = screen->fb[0].byteStride; -+ int bitStride; -+ int pixelStride; -+ int bpp = screen->fb[0].bitsPerPixel; -+ -+ /* -+ * Ensure frame buffer is correctly aligned -+ */ -+ if (byteStride & 0x3f) -+ { -+ byteStride = (byteStride + 0x3f) & ~0x3f; -+ bitStride = byteStride * 8; -+ pixelStride = bitStride / bpp; -+ -+ screen->fb[0].byteStride = byteStride; -+ screen->fb[0].pixelStride = pixelStride; -+ } -+ } -+ -+ screen_size = screen->fb[0].byteStride * screen->height; -+ -+ screen->off_screen_base = screen_size; -+ -+#if defined(USE_DRI) && defined(GLXEXT) -+ /* Reserve a static area for the back buffer the same size as the -+ * visible screen. XXX: This would be better initialized in glamo_dri.c -+ * when GLX is set up, but the offscreen memory manager's allocations -+ * don't last through VT switches, while the kernel's understanding of -+ * offscreen locations does. -+ */ -+ glamos->frontOffset = 0; -+ glamos->frontPitch = screen->fb[0].byteStride; -+ -+ if (screen->off_screen_base + screen_size <= screen->memory_size) { -+ glamos->backOffset = screen->off_screen_base; -+ glamos->backPitch = screen->fb[0].byteStride; -+ screen->off_screen_base += screen_size; -+ } -+ -+ /* Reserve the depth span for Rage 128 */ -+ if (!glamoc->is_3362 && screen->off_screen_base + -+ screen->fb[0].byteStride <= screen->memory_size) { -+ glamos->spanOffset = screen->off_screen_base; -+ screen->off_screen_base += screen->fb[0].byteStride; -+ } -+ -+ /* Reserve the static depth buffer, which happens to be the same -+ * bitsPerPixel as the screen. -+ */ -+ if (screen->off_screen_base + screen_size <= screen->memory_size) { -+ glamos->depthOffset = screen->off_screen_base; -+ glamos->depthPitch = screen->fb[0].byteStride; -+ screen->off_screen_base += screen_size; -+ } -+ -+ /* Reserve approx. half of remaining offscreen memory for local -+ * textures. Round down to a whole number of texture regions. -+ */ -+ glamos->textureSize = (screen->memory_size - screen->off_screen_base) / 2; -+ l = GLAMOLog2(glamos->textureSize / GLAMO_NR_TEX_REGIONS); -+ if (l < GLAMO_LOG_TEX_GRANULARITY) -+ l = GLAMO_LOG_TEX_GRANULARITY; -+ glamos->textureSize = (glamos->textureSize >> l) << l; -+ if (glamos->textureSize >= 512 * 1024) { -+ glamos->textureOffset = screen->off_screen_base; -+ screen->off_screen_base += glamos->textureSize; -+ } else { -+ /* Minimum texture size is for 2 256x256x32bpp textures */ -+ glamos->textureSize = 0; -+ } -+#endif /* USE_DRI && GLXEXT */ -+} -+ -+static Bool -+GLAMOScreenInit(KdScreenInfo *screen) -+{ -+ GLAMOScreenInfo *glamos; -+ GLAMOCardInfo(screen); -+ Bool success = FALSE; -+ -+ glamos = xcalloc(sizeof(GLAMOScreenInfo), 1); -+ if (glamos == NULL) -+ return FALSE; -+ -+ glamos->glamoc = glamoc; -+ glamos->screen = screen; -+ screen->driver = glamos; -+ -+ if (screen->fb[0].depth == 0) -+ screen->fb[0].depth = 16; -+#ifdef KDRIVEFBDEV -+ if (glamoc->use_fbdev) { -+ success = fbdevScreenInitialize(screen, -+ &glamos->backend_priv.fbdev); -+ } -+#endif -+#ifdef KDRIVEVESA -+ if (glamoc->use_vesa) { -+ success = vesaScreenInitialize(screen, -+ &glamos->backend_priv.vesa); -+ } -+#endif -+ -+ if (!success) { -+ screen->driver = NULL; -+ xfree(glamos); -+ return FALSE; -+ } -+ -+ GLAMOSetOffscreen (screen); -+ -+ return TRUE; -+} -+ -+#ifdef RANDR -+static Bool -+GLAMORandRSetConfig (ScreenPtr pScreen, -+ Rotation randr, -+ int rate, -+ RRScreenSizePtr pSize) -+{ -+ KdScreenPriv(pScreen); -+ KdScreenInfo *screen = pScreenPriv->screen; -+ GLAMOCardInfo *glamoc = screen->card->driver; -+ Bool ret; -+ -+ GLAMODrawDisable (pScreen); -+ ret = glamoc->backend_funcs.randrSetConfig(pScreen, randr, rate, pSize); -+ GLAMOSetOffscreen (screen); -+ /* -+ * Set frame buffer mapping -+ */ -+ (*pScreen->ModifyPixmapHeader) (fbGetScreenPixmap (pScreen), -+ pScreen->width, -+ pScreen->height, -+ screen->fb[0].depth, -+ screen->fb[0].bitsPerPixel, -+ screen->fb[0].byteStride, -+ screen->fb[0].frameBuffer); -+ -+ GLAMODrawEnable (pScreen); -+ return ret; -+} -+ -+static Bool -+GLAMORandRInit (ScreenPtr pScreen) -+{ -+ rrScrPrivPtr pScrPriv; -+ -+ pScrPriv = rrGetScrPriv(pScreen); -+ pScrPriv->rrSetConfig = GLAMORandRSetConfig; -+ return TRUE; -+} -+#endif -+ -+static void -+GLAMOScreenFini(KdScreenInfo *screen) -+{ -+ GLAMOScreenInfo *glamos = (GLAMOScreenInfo *)screen->driver; -+ GLAMOCardInfo *glamoc = screen->card->driver; -+ -+#ifdef XV -+ GLAMOFiniVideo(screen->pScreen); -+#endif -+ -+ glamoc->backend_funcs.scrfini(screen); -+ xfree(glamos); -+ screen->driver = 0; -+} -+ -+Bool -+GLAMOMapReg(KdCardInfo *card, GLAMOCardInfo *glamoc) -+{ -+ glamoc->reg_base = (char *)KdMapDevice(GLAMO_REG_BASE(card), -+ GLAMO_REG_SIZE(card)); -+ -+ if (glamoc->reg_base == NULL) -+ return FALSE; -+ -+ KdSetMappedMode(GLAMO_REG_BASE(card), GLAMO_REG_SIZE(card), -+ KD_MAPPED_MODE_REGISTERS); -+ -+ return TRUE; -+} -+ -+void -+GLAMOUnmapReg(KdCardInfo *card, GLAMOCardInfo *glamoc) -+{ -+ if (glamoc->reg_base) { -+ KdResetMappedMode(GLAMO_REG_BASE(card), GLAMO_REG_SIZE(card), -+ KD_MAPPED_MODE_REGISTERS); -+ KdUnmapDevice((void *)glamoc->reg_base, GLAMO_REG_SIZE(card)); -+ glamoc->reg_base = 0; -+ } -+} -+ -+static Bool -+GLAMOInitScreen(ScreenPtr pScreen) -+{ -+ KdScreenPriv(pScreen); -+ GLAMOCardInfo(pScreenPriv); -+ -+#ifdef XV -+ GLAMOInitVideo(pScreen); -+#endif -+ return glamoc->backend_funcs.initScreen(pScreen); -+} -+ -+static Bool -+GLAMOFinishInitScreen(ScreenPtr pScreen) -+{ -+ KdScreenPriv(pScreen); -+ GLAMOCardInfo(pScreenPriv); -+ -+ if (!glamoc->backend_funcs.finishInitScreen(pScreen)) -+ return FALSE; -+#ifdef RANDR -+ if (!GLAMORandRInit (pScreen)) -+ return FALSE; -+#endif -+ return TRUE; -+} -+ -+static Bool -+GLAMOCreateResources(ScreenPtr pScreen) -+{ -+ KdScreenPriv(pScreen); -+ GLAMOCardInfo(pScreenPriv); -+ -+ return glamoc->backend_funcs.createRes(pScreen); -+} -+ -+static void -+GLAMOPreserve(KdCardInfo *card) -+{ -+ GLAMOCardInfo *glamoc = card->driver; -+ -+ glamoc->backend_funcs.preserve(card); -+} -+ -+static void -+GLAMORestore(KdCardInfo *card) -+{ -+ GLAMOCardInfo *glamoc = card->driver; -+ -+ GLAMOUnmapReg(card, glamoc); -+ -+ glamoc->backend_funcs.restore(card); -+} -+ -+static Bool -+GLAMODPMS(ScreenPtr pScreen, int mode) -+{ -+ KdScreenPriv(pScreen); -+ GLAMOCardInfo(pScreenPriv); -+ -+ return glamoc->backend_funcs.dpms(pScreen, mode); -+} -+ -+static Bool -+GLAMOEnable(ScreenPtr pScreen) -+{ -+ KdScreenPriv(pScreen); -+ GLAMOCardInfo(pScreenPriv); -+ -+ if (!glamoc->backend_funcs.enable(pScreen)) -+ return FALSE; -+ -+ if ((glamoc->reg_base == NULL) && !GLAMOMapReg(pScreenPriv->screen->card, -+ glamoc)) -+ return FALSE; -+ -+ GLAMOSetOffscreen (pScreenPriv->screen); -+ -+ return TRUE; -+} -+ -+static void -+GLAMODisable(ScreenPtr pScreen) -+{ -+ KdScreenPriv(pScreen); -+#if defined(USE_DRI) && defined(GLXEXT) -+ GLAMOScreenInfo(pScreenPriv); -+#endif /* USE_DRI && GLXEXT */ -+ GLAMOCardInfo(pScreenPriv); -+ -+ GLAMOUnmapReg(pScreenPriv->card, glamoc); -+ -+ glamoc->backend_funcs.disable(pScreen); -+} -+ -+static void -+GLAMOGetColors(ScreenPtr pScreen, int fb, int n, xColorItem *pdefs) -+{ -+ KdScreenPriv(pScreen); -+ GLAMOCardInfo(pScreenPriv); -+ -+ glamoc->backend_funcs.getColors(pScreen, fb, n, pdefs); -+} -+ -+static void -+GLAMOPutColors(ScreenPtr pScreen, int fb, int n, xColorItem *pdefs) -+{ -+ KdScreenPriv(pScreen); -+ GLAMOCardInfo(pScreenPriv); -+ -+ glamoc->backend_funcs.putColors(pScreen, fb, n, pdefs); -+} -+ -+/* Compute log base 2 of val. */ -+int -+GLAMOLog2(int val) -+{ -+ int bits; -+ -+ for (bits = 0; val != 0; val >>= 1, ++bits) -+ ; -+ return bits - 1; -+} -+ -+KdCardFuncs GLAMOFuncs = { -+ GLAMOCardInit, /* cardinit */ -+ GLAMOScreenInit, /* scrinit */ -+ GLAMOInitScreen, /* initScreen */ -+ GLAMOFinishInitScreen, /* finishInitScreen */ -+ GLAMOCreateResources, /* createRes */ -+ GLAMOPreserve, /* preserve */ -+ GLAMOEnable, /* enable */ -+ GLAMODPMS, /* dpms */ -+ GLAMODisable, /* disable */ -+ GLAMORestore, /* restore */ -+ GLAMOScreenFini, /* scrfini */ -+ GLAMOCardFini, /* cardfini */ -+ -+#if 0 -+ GLAMOCursorInit, /* initCursor */ -+ GLAMOCursorEnable, /* enableCursor */ -+ GLAMOCursorDisable, /* disableCursor */ -+ GLAMOCursorFini, /* finiCursor */ -+ GLAMORecolorCursor, /* recolorCursor */ -+#else -+ 0, /* initCursor */ -+ 0, /* enableCursor */ -+ 0, /* disableCursor */ -+ 0, /* finiCursor */ -+ 0, /* recolorCursor */ -+#endif -+ -+ -+#if 1 -+ GLAMODrawInit, /* initAccel */ -+ GLAMODrawEnable, /* enableAccel */ -+ GLAMODrawDisable, /* disableAccel */ -+ GLAMODrawFini, /* finiAccel */ -+#else -+ 0, /* initAccel */ -+ 0, /* enableAccel */ -+ 0, /* disableAccel */ -+ 0, /* finiAccel */ -+#endif -+ -+ GLAMOGetColors, /* getColors */ -+ GLAMOPutColors, /* putColors */ -+}; -Index: xserver/hw/kdrive/glamo/glamo.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xserver/hw/kdrive/glamo/glamo.h 2007-09-26 17:45:48.000000000 +0800 -@@ -0,0 +1,386 @@ -+/* -+ * Copyright © 2007 OpenMoko, Inc. -+ * -+ * This driver is based on Xati, -+ * Copyright © 2003 Eric Anholt -+ * -+ * Permission to use, copy, modify, distribute, and sell this software and its -+ * documentation for any purpose is hereby granted without fee, provided that -+ * the above copyright notice appear in all copies and that both that copyright -+ * notice and this permission notice appear in supporting documentation, and -+ * that the name of the copyright holders not be used in advertising or -+ * publicity pertaining to distribution of the software without specific, -+ * written prior permission. The copyright holders make no representations -+ * about the suitability of this software for any purpose. It is provided "as -+ * is" without express or implied warranty. -+ * -+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE -+ * OF THIS SOFTWARE. -+ */ -+ -+#ifndef _GLAMO_H_ -+#define _GLAMO_H_ -+ -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ -+#ifdef KDRIVEFBDEV -+#include -+#endif -+#ifdef KDRIVEVESA -+#include -+#endif -+ -+#include "kxv.h" -+ -+#undef XF86DRI -+#ifdef XF86DRI -+#define USE_DRI -+#include "xf86drm.h" -+#include "dri.h" -+#ifdef GLXEXT -+#include "GL/glxint.h" -+#include "GL/glxtokens.h" -+#include "glamo_dripriv.h" -+#endif -+#endif -+ -+#define GLAMO_REG_BASE(c) ((c)->attr.address[0]) -+#define GLAMO_REG_SIZE(c) (0x2400) -+ -+#ifdef __powerpc__ -+ -+static __inline__ void -+MMIO_OUT16(__volatile__ void *base, const unsigned long offset, -+ const unsigned int val) -+{ -+ __asm__ __volatile__( -+ "stwbrx %1,%2,%3\n\t" -+ "eieio" -+ : "=m" (*((volatile unsigned char *)base+offset)) -+ : "r" (val), "b" (base), "r" (offset)); -+} -+ -+static __inline__ CARD32 -+MMIO_IN16(__volatile__ void *base, const unsigned long offset) -+{ -+ register unsigned int val; -+ __asm__ __volatile__( -+ "lwbrx %0,%1,%2\n\t" -+ "eieio" -+ : "=r" (val) -+ : "b" (base), "r" (offset), -+ "m" (*((volatile unsigned char *)base+offset))); -+ return val; -+} -+ -+#else -+ -+#define MMIO_OUT16(mmio, a, v) (*(VOL16 *)((mmio) + (a)) = (v)) -+#define MMIO_IN16(mmio, a) (*(VOL16 *)((mmio) + (a))) -+ -+#endif -+ -+typedef volatile CARD8 VOL8; -+typedef volatile CARD16 VOL16; -+typedef volatile CARD32 VOL32; -+ -+struct backend_funcs { -+ void (*cardfini)(KdCardInfo *); -+ void (*scrfini)(KdScreenInfo *); -+ Bool (*initScreen)(ScreenPtr); -+ Bool (*finishInitScreen)(ScreenPtr pScreen); -+ Bool (*createRes)(ScreenPtr); -+ void (*preserve)(KdCardInfo *); -+ void (*restore)(KdCardInfo *); -+ Bool (*dpms)(ScreenPtr, int); -+ Bool (*enable)(ScreenPtr); -+ void (*disable)(ScreenPtr); -+ void (*getColors)(ScreenPtr, int, int, xColorItem *); -+ void (*putColors)(ScreenPtr, int, int, xColorItem *); -+#ifdef RANDR -+ Bool (*randrSetConfig) (ScreenPtr, Rotation, int, RRScreenSizePtr); -+#endif -+}; -+ -+typedef struct _GLAMOCardInfo { -+ union { -+#ifdef KDRIVEFBDEV -+ FbdevPriv fbdev; -+#endif -+#ifdef KDRIVEVESA -+ VesaCardPrivRec vesa; -+#endif -+ } backend_priv; -+ struct backend_funcs backend_funcs; -+ -+ char *reg_base; -+ Bool is_3362; -+ CARD32 crtc_pitch; -+ CARD32 crtc2_pitch; -+#ifdef USE_DRI -+ int drmFd; -+#endif /* USE_DRI */ -+ Bool use_fbdev, use_vesa; -+} GLAMOCardInfo; -+ -+#define getGLAMOCardInfo(kd) ((GLAMOCardInfo *) ((kd)->card->driver)) -+#define GLAMOCardInfo(kd) GLAMOCardInfo *glamoc = getGLAMOCardInfo(kd) -+ -+typedef struct _GLAMOCursor { -+ int width, height; -+ int xhot, yhot; -+ -+ Bool has_cursor; -+ CursorPtr pCursor; -+ Pixel source, mask; -+ KdOffscreenArea *area; -+} GLAMOCursor; -+ -+typedef struct _GLAMOPortPriv { -+ int brightness; -+ int saturation; -+ RegionRec clip; -+ CARD32 size; -+ KdOffscreenArea *off_screen; -+ DrawablePtr pDraw; -+ PixmapPtr pPixmap; -+ -+ CARD32 src_offset; -+ CARD32 src_pitch; -+ CARD8 *src_addr; -+ -+ int id; -+ int src_x1, src_y1, src_x2, src_y2; -+ int dst_x1, dst_y1, dst_x2, dst_y2; -+ int src_w, src_h, dst_w, dst_h; -+} GLAMOPortPrivRec, *GLAMOPortPrivPtr; -+ -+typedef struct _dmaBuf { -+ int size; -+ int used; -+ void *address; -+#ifdef USE_DRI -+ drmBufPtr drmBuf; -+#endif -+} dmaBuf; -+ -+typedef struct _GLAMOScreenInfo { -+ union { -+#ifdef KDRIVEFBDEV -+ FbdevScrPriv fbdev; -+#endif -+#ifdef KDRIVEVESA -+ VesaScreenPrivRec vesa; -+#endif -+ } backend_priv; -+ KaaScreenInfoRec kaa; -+ -+ GLAMOCardInfo *glamoc; -+ KdScreenInfo *screen; -+ -+ int scratch_offset; -+ int scratch_next; -+ KdOffscreenArea *scratch_area; -+ -+ GLAMOCursor cursor; -+ -+ KdVideoAdaptorPtr pAdaptor; -+ int num_texture_ports; -+ -+ Bool using_dri; /* If we use the DRM for DMA. */ -+ -+ KdOffscreenArea *dma_space; /* For "DMA" from framebuffer. */ -+ CARD16 *ring_addr; /* Beginning of ring buffer. */ -+ int ring_write; /* Index of write ptr in ring. */ -+ int ring_read; /* Index of read ptr in ring. */ -+ int ring_len; -+ -+ dmaBuf *indirectBuffer; -+ int indirectStart; -+ -+#ifdef USE_DRI -+ Bool dma_started; -+ -+ drmSize registerSize; -+ drmHandle registerHandle; -+ drmHandle fbHandle; -+ -+ drmSize gartSize; -+ drmHandle agpMemHandle; /* Handle from drmAgpAlloc */ -+ unsigned long gartOffset; -+ unsigned char *AGP; /* Map */ -+ int agpMode; -+ drmSize pciSize; -+ drmHandle pciMemHandle; -+ -+ /* ring buffer data */ -+ unsigned long ringStart; /* Offset into AGP space */ -+ drmHandle ringHandle; /* Handle from drmAddMap */ -+ drmSize ringMapSize; /* Size of map */ -+ int ringSize; /* Size of ring (MB) */ -+ unsigned char *ring; /* Map */ -+ -+ unsigned long ringReadOffset; /* Offset into AGP space */ -+ drmHandle ringReadPtrHandle; /* Handle from drmAddMap */ -+ drmSize ringReadMapSize; /* Size of map */ -+ unsigned char *ringReadPtr; /* Map */ -+ -+ /* vertex/indirect buffer data */ -+ unsigned long bufStart; /* Offset into AGP space */ -+ drmHandle bufHandle; /* Handle from drmAddMap */ -+ drmSize bufMapSize; /* Size of map */ -+ int bufSize; /* Size of buffers (MB) */ -+ unsigned char *buf; /* Map */ -+ int bufNumBufs; /* Number of buffers */ -+ drmBufMapPtr buffers; /* Buffer map */ -+ -+ /* AGP Texture data */ -+ unsigned long gartTexStart; /* Offset into AGP space */ -+ drmHandle gartTexHandle; /* Handle from drmAddMap */ -+ drmSize gartTexMapSize; /* Size of map */ -+ int gartTexSize; /* Size of AGP tex space (MB) */ -+ unsigned char *gartTex; /* Map */ -+ int log2GARTTexGran; -+ -+ int DMAusecTimeout; /* CCE timeout in usecs */ -+ -+ /* DRI screen private data */ -+ int frontOffset; -+ int frontPitch; -+ int backOffset; -+ int backPitch; -+ int depthOffset; -+ int depthPitch; -+ int spanOffset; -+ int textureOffset; -+ int textureSize; -+ int log2TexGran; -+ -+ int irqEnabled; -+ -+ int serverContext; -+ -+ DRIInfoPtr pDRIInfo; -+#ifdef GLXEXT -+ int numVisualConfigs; -+ __GLXvisualConfig *pVisualConfigs; -+ GLAMOConfigPrivPtr pVisualConfigsPriv; -+#endif /* GLXEXT */ -+#endif /* USE_DRI */ -+} GLAMOScreenInfo; -+ -+#define getGLAMOScreenInfo(kd) ((GLAMOScreenInfo *) ((kd)->screen->driver)) -+#define GLAMOScreenInfo(kd) GLAMOScreenInfo *glamos = getGLAMOScreenInfo(kd) -+ -+typedef union { float f; CARD32 i; } fi_type; -+ -+/* Surely there's a better way to go about this */ -+static inline CARD32 -+GLAMOFloatAsInt(float val) -+{ -+ fi_type fi; -+ -+ fi.f = val; -+ return fi.i; -+} -+ -+#define GET_FLOAT_BITS(x) GLAMOFloatAsInt(x) -+ -+static inline void -+MMIOSetBitMask(char *mmio, CARD32 reg, CARD16 mask, CARD16 val) -+{ -+ CARD16 tmp; -+ -+ val &= mask; -+ -+ tmp = MMIO_IN16(mmio, reg); -+ tmp &= ~mask; -+ tmp |= val; -+ -+ MMIO_OUT16(mmio, reg, tmp); -+} -+ -+/* glamo.c */ -+Bool -+GLAMOMapReg(KdCardInfo *card, GLAMOCardInfo *glamoc); -+ -+void -+GLAMOUnmapReg(KdCardInfo *card, GLAMOCardInfo *glamoc); -+ -+/* glamo_draw.c */ -+void -+GLAMODrawSetup(ScreenPtr pScreen); -+ -+Bool -+GLAMODrawInit(ScreenPtr pScreen); -+ -+void -+GLAMODrawEnable(ScreenPtr pScreen); -+ -+void -+GLAMODrawDisable(ScreenPtr pScreen); -+ -+void -+GLAMODrawFini(ScreenPtr pScreen); -+ -+/* glamo_dri.c */ -+#ifdef USE_DRI -+Bool -+GLAMODRIScreenInit(ScreenPtr pScreen); -+ -+void -+GLAMODRICloseScreen(ScreenPtr pScreen); -+ -+void -+GLAMODRIDMAStart(GLAMOScreenInfo *glamos); -+ -+void -+GLAMODRIDMAStop(GLAMOScreenInfo *glamos); -+ -+void -+GLAMODRIDMAReset(GLAMOScreenInfo *glamos); -+ -+void -+GLAMODRIDispatchIndirect(GLAMOScreenInfo *glamos, Bool discard); -+ -+drmBufPtr -+GLAMODRIGetBuffer(GLAMOScreenInfo *glamos); -+ -+#endif /* USE_DRI */ -+ -+/* glamo_cursor.c */ -+Bool -+GLAMOCursorInit(ScreenPtr pScreen); -+ -+void -+GLAMOCursorEnable(ScreenPtr pScreen); -+ -+void -+GLAMOCursorDisable(ScreenPtr pScreen); -+ -+void -+GLAMOCursorFini(ScreenPtr pScreen); -+ -+void -+GLAMORecolorCursor(ScreenPtr pScreen, int ndef, xColorItem *pdef); -+ -+int -+GLAMOLog2(int val); -+ -+/* glamo_video.c */ -+Bool -+GLAMOInitVideo(ScreenPtr pScreen); -+ -+void -+GLAMOFiniVideo(ScreenPtr pScreen); -+ -+extern KdCardFuncs GLAMOFuncs; -+ -+#endif /* _GLAMO_H_ */ -Index: xserver/hw/kdrive/glamo/glamo_dma.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xserver/hw/kdrive/glamo/glamo_dma.c 2007-09-26 17:45:16.000000000 +0800 -@@ -0,0 +1,410 @@ -+/* -+ * Copyright © 2007 OpenMoko, Inc. -+ * -+ * This driver is based on Xati, -+ * Copyright © 2004 Eric Anholt -+ * -+ * Permission to use, copy, modify, distribute, and sell this software and its -+ * documentation for any purpose is hereby granted without fee, provided that -+ * the above copyright notice appear in all copies and that both that copyright -+ * notice and this permission notice appear in supporting documentation, and -+ * that the name of the copyright holders not be used in advertising or -+ * publicity pertaining to distribution of the software without specific, -+ * written prior permission. The copyright holders make no representations -+ * about the suitability of this software for any purpose. It is provided "as -+ * is" without express or implied warranty. -+ * -+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE -+ * OF THIS SOFTWARE. -+ */ -+ -+#include -+ -+#include "glamo.h" -+#include "glamo-regs.h" -+#include "glamo_dma.h" -+#include "glamo_draw.h" -+ -+#ifdef USE_DRI -+#include "radeon_common.h" -+#include "glamo_sarea.h" -+#endif /* USE_DRI */ -+ -+#define DEBUG_FIFO 1 -+ -+#if DEBUG_FIFO -+static void -+GLAMODebugFifo(GLAMOScreenInfo *glamos) -+{ -+ GLAMOCardInfo *glamoc = glamos->glamoc; -+ char *mmio = glamoc->reg_base; -+ CARD32 offset; -+ -+ ErrorF("GLAMO_REG_CQ_STATUS: 0x%04x\n", -+ MMIO_IN16(mmio, GLAMO_REG_CQ_STATUS)); -+ -+ offset = MMIO_IN16(mmio, GLAMO_REG_CQ_WRITE_ADDRL); -+ offset |= (MMIO_IN16(mmio, GLAMO_REG_CQ_WRITE_ADDRH) << 16) & 0x7; -+ ErrorF("GLAMO_REG_CQ_WRITE_ADDR: 0x%08x\n", (unsigned int) offset); -+ -+ offset = MMIO_IN16(mmio, GLAMO_REG_CQ_READ_ADDRL); -+ offset |= (MMIO_IN16(mmio, GLAMO_REG_CQ_READ_ADDRH) << 16) & 0x7; -+ ErrorF("GLAMO_REG_CQ_READ_ADDR: 0x%08x\n", (unsigned int) offset); -+} -+#endif -+ -+void -+GLAMOEngineReset(ScreenPtr pScreen, enum glamo_engine engine) -+{ -+ KdScreenPriv(pScreen); -+ GLAMOCardInfo(pScreenPriv); -+ CARD32 reg; -+ CARD16 mask; -+ char *mmio = glamoc->reg_base; -+ -+ if (!mmio) -+ return; -+ -+ switch (engine) { -+ case GLAMO_ENGINE_ISP: -+ reg = GLAMO_REG_CLOCK_ISP; -+ mask = GLAMO_CLOCK_ISP2_RESET; -+ break; -+ case GLAMO_ENGINE_CQ: -+ reg = GLAMO_REG_CLOCK_2D; -+ mask = GLAMO_CLOCK_2D_CQ_RESET; -+ break; -+ case GLAMO_ENGINE_2D: -+ reg = GLAMO_REG_CLOCK_2D; -+ mask = GLAMO_CLOCK_2D_RESET; -+ break; -+ } -+ -+ MMIOSetBitMask(mmio, reg, mask, 0xffff); -+ usleep(1000); -+ MMIOSetBitMask(mmio, reg, mask, 0); -+ usleep(1000); -+} -+ -+void -+GLAMOEngineDisable(ScreenPtr pScreen, enum glamo_engine engine) -+{ -+ KdScreenPriv(pScreen); -+ GLAMOCardInfo(pScreenPriv); -+ char *mmio = glamoc->reg_base; -+ -+ if (!mmio) -+ return; -+ -+ return; -+} -+ -+void -+GLAMOEngineEnable(ScreenPtr pScreen, enum glamo_engine engine) -+{ -+ KdScreenPriv(pScreen); -+ GLAMOCardInfo(pScreenPriv); -+ char *mmio = glamoc->reg_base; -+ -+ if (!mmio) -+ return; -+ -+ switch (engine) { -+ case GLAMO_ENGINE_ISP: -+ MMIOSetBitMask(mmio, GLAMO_REG_CLOCK_ISP, -+ GLAMO_CLOCK_ISP_EN_M2CLK | -+ GLAMO_CLOCK_ISP_EN_I1CLK, -+ 0xffff); -+ MMIOSetBitMask(mmio, GLAMO_REG_CLOCK_GEN5_2, -+ GLAMO_CLOCK_GEN52_EN_DIV_ICLK, -+ 0xffff); -+ MMIOSetBitMask(mmio, GLAMO_REG_CLOCK_GEN5_1, -+ GLAMO_CLOCK_GEN51_EN_DIV_JCLK, -+ 0xffff); -+ MMIOSetBitMask(mmio, GLAMO_REG_HOSTBUS(2), -+ GLAMO_HOSTBUS2_MMIO_EN_ISP, -+ 0xffff); -+ break; -+ case GLAMO_ENGINE_CQ: -+ MMIOSetBitMask(mmio, GLAMO_REG_CLOCK_2D, -+ GLAMO_CLOCK_2D_EN_M6CLK, -+ 0xffff); -+ MMIOSetBitMask(mmio, GLAMO_REG_HOSTBUS(2), -+ GLAMO_HOSTBUS2_MMIO_EN_CQ, -+ 0xffff); -+ MMIOSetBitMask(mmio, GLAMO_REG_CLOCK_GEN5_1, -+ GLAMO_CLOCK_GEN51_EN_DIV_MCLK, -+ 0xffff); -+ break; -+ case GLAMO_ENGINE_2D: -+ MMIOSetBitMask(mmio, GLAMO_REG_CLOCK_2D, -+ GLAMO_CLOCK_2D_EN_M7CLK | -+ GLAMO_CLOCK_2D_EN_GCLK | -+ GLAMO_CLOCK_2D_DG_M7CLK | -+ GLAMO_CLOCK_2D_DG_GCLK, -+ 0xffff); -+ MMIOSetBitMask(mmio, GLAMO_REG_HOSTBUS(2), -+ GLAMO_HOSTBUS2_MMIO_EN_2D, -+ 0xffff); -+ MMIOSetBitMask(mmio, GLAMO_REG_CLOCK_GEN5_1, -+ GLAMO_CLOCK_GEN51_EN_DIV_GCLK, -+ 0xffff); -+ break; -+ } -+} -+ -+void -+GLAMOWaitIdle(GLAMOScreenInfo *glamos) -+{ -+ GLAMOCardInfo *glamoc = glamos->glamoc; -+ char *mmio = glamoc->reg_base; -+ CARD16 status; -+ TIMEOUT_LOCALS; -+ -+ if (glamos->indirectBuffer != NULL) -+ GLAMOFlushIndirect(glamos, 0); -+ -+#ifdef USE_DRI -+ if (glamos->using_dri) { -+ int ret = 0; -+ int cmd = (glamoc->is_3362 ? DRM_RADEON_CP_IDLE : -+ DRM_R128_CCE_IDLE); -+ WHILE_NOT_TIMEOUT(2) { -+ ret = drmCommandNone(glamoc->drmFd, cmd); -+ if (ret != -EBUSY) -+ break; -+ } -+ if (TIMEDOUT()) { -+ GLAMODebugFifo(glamos); -+ FatalError("Timed out idling CCE (card hung)\n"); -+ } -+ if (ret != 0) -+ ErrorF("Failed to idle DMA, returned %d\n", ret); -+ return; -+ } -+#endif -+ -+ WHILE_NOT_TIMEOUT(.5) { -+ status = MMIO_IN16(mmio, GLAMO_REG_CQ_STATUS); -+ if ((status & (1 << 2)) && !(status & (1 << 8))) -+ break; -+ } -+ if (TIMEDOUT()) { -+ ErrorF("Timeout idling accelerator, resetting...\n"); -+ GLAMOEngineReset(glamos->screen->pScreen, GLAMO_ENGINE_CQ); -+ GLAMODrawSetup(glamos->screen->pScreen); -+ } -+ -+#if DEBUG_FIFO -+ ErrorF("Idle?\n"); -+ GLAMODebugFifo(glamos); -+#endif -+} -+ -+dmaBuf * -+GLAMOGetDMABuffer(GLAMOScreenInfo *glamos) -+{ -+ dmaBuf *buf; -+ -+ buf = (dmaBuf *)xalloc(sizeof(dmaBuf)); -+ if (buf == NULL) -+ return NULL; -+ -+#ifdef USE_DRI -+ if (glamos->using_dri) { -+ buf->drmBuf = GLAMODRIGetBuffer(glamos); -+ if (buf->drmBuf == NULL) { -+ xfree(buf); -+ return NULL; -+ } -+ buf->size = buf->drmBuf->total; -+ buf->used = buf->drmBuf->used; -+ buf->address = buf->drmBuf->address; -+ return buf; -+ } -+#endif /* USE_DRI */ -+ -+ buf->size = glamos->ring_len / 2; -+ buf->address = xalloc(buf->size); -+ if (buf->address == NULL) { -+ xfree(buf); -+ return NULL; -+ } -+ buf->used = 0; -+ -+ return buf; -+} -+ -+static void -+GLAMODispatchIndirectDMA(GLAMOScreenInfo *glamos) -+{ -+ GLAMOCardInfo *glamoc = glamos->glamoc; -+ dmaBuf *buf = glamos->indirectBuffer; -+ char *mmio = glamoc->reg_base; -+ CARD16 *addr; -+ int count, ring_count; -+ TIMEOUT_LOCALS; -+ -+ addr = (CARD16 *)((char *)buf->address + glamos->indirectStart); -+ count = (buf->used - glamos->indirectStart) / 2; -+ ring_count = glamos->ring_len / 2; -+ -+ WHILE_NOT_TIMEOUT(.5) { -+ if (count <= 0) -+ break; -+ -+ glamos->ring_addr[glamos->ring_write++] = *addr++; -+ if (glamos->ring_write >= ring_count) -+ glamos->ring_write = 0; -+ -+ while (glamos->ring_write == glamos->ring_read) -+ { -+ glamos->ring_read = -+ MMIO_IN16(mmio, GLAMO_REG_CQ_READ_ADDRL); -+ glamos->ring_read |= -+ (MMIO_IN16(mmio, GLAMO_REG_CQ_READ_ADDRH) & 0x7) << 16; -+ } -+ -+ count--; -+ } -+ if (TIMEDOUT()) { -+ ErrorF("Timeout submitting packets, resetting...\n"); -+ GLAMOEngineReset(glamos->screen->pScreen, GLAMO_ENGINE_CQ); -+ GLAMODrawSetup(glamos->screen->pScreen); -+ } -+ -+ MMIO_OUT16(mmio, GLAMO_REG_CQ_WRITE_ADDRH, -+ (glamos->ring_write >> 15) & 0x7); -+ MMIO_OUT16(mmio, GLAMO_REG_CQ_WRITE_ADDRL, -+ (glamos->ring_write << 1) & 0xffff); -+} -+ -+void -+GLAMOFlushIndirect(GLAMOScreenInfo *glamos, Bool discard) -+{ -+ dmaBuf *buf = glamos->indirectBuffer; -+ -+ if ((glamos->indirectStart == buf->used) && !discard) -+ return; -+ -+#if DEBUG_FIFO -+ ErrorF("Dispatching %d DWORDS\n", (buf->used - glamos->indirectStart) / -+ 4); -+#endif -+ -+#ifdef USE_DRI -+ if (glamos->using_dri) { -+ buf->drmBuf->used = buf->used; -+ GLAMODRIDispatchIndirect(glamos, discard); -+ if (discard) { -+ buf->drmBuf = GLAMODRIGetBuffer(glamos); -+ buf->size = buf->drmBuf->total; -+ buf->used = buf->drmBuf->used; -+ buf->address = buf->drmBuf->address; -+ glamos->indirectStart = 0; -+ } else { -+ /* Start on a double word boundary */ -+ glamos->indirectStart = buf->used = (buf->used + 7) & ~7; -+ } -+ return; -+ } -+#endif /* USE_DRI */ -+ -+ GLAMODispatchIndirectDMA(glamos); -+ -+ buf->used = 0; -+ glamos->indirectStart = 0; -+} -+ -+static Bool -+GLAMODMAInit(ScreenPtr pScreen) -+{ -+ KdScreenPriv(pScreen); -+ GLAMOScreenInfo(pScreenPriv); -+ GLAMOCardInfo(pScreenPriv); -+ char *mmio = glamoc->reg_base; -+ int cq_len = 63; -+ -+ glamos->ring_len = (cq_len + 1) * 1024; -+ -+ glamos->dma_space = KdOffscreenAlloc(pScreen, glamos->ring_len + 4, -+ 16, TRUE, NULL, NULL); -+ if (!glamos->dma_space) -+ return FALSE; -+ -+ glamos->ring_addr = (CARD16 *) (pScreenPriv->screen->memory_base + -+ glamos->dma_space->offset); -+ glamos->ring_read = 0; -+ glamos->ring_write = 0; -+ -+ /* make the decoder happy? */ -+ glamos->ring_addr[glamos->ring_len / 2] = 0x0; -+ glamos->ring_addr[glamos->ring_len / 2 + 1] = 0x0; -+ -+ GLAMOEngineEnable(glamos->screen->pScreen, GLAMO_ENGINE_CQ); -+ GLAMOEngineReset(glamos->screen->pScreen, GLAMO_ENGINE_CQ); -+ -+ MMIO_OUT16(mmio, GLAMO_REG_CQ_BASE_ADDRL, -+ glamos->dma_space->offset & 0xffff); -+ MMIO_OUT16(mmio, GLAMO_REG_CQ_BASE_ADDRH, -+ (glamos->dma_space->offset >> 16) & 0x7f); -+ MMIO_OUT16(mmio, GLAMO_REG_CQ_LEN, cq_len); -+ -+ MMIO_OUT16(mmio, GLAMO_REG_CQ_WRITE_ADDRH, 0); -+ MMIO_OUT16(mmio, GLAMO_REG_CQ_WRITE_ADDRL, 0); -+ MMIO_OUT16(mmio, GLAMO_REG_CQ_READ_ADDRH, 0); -+ MMIO_OUT16(mmio, GLAMO_REG_CQ_READ_ADDRL, 0); -+ MMIO_OUT16(mmio, GLAMO_REG_CQ_CONTROL, -+ 1 << 12 | -+ 5 << 8 | -+ 8 << 4); -+ -+ return TRUE; -+} -+ -+void -+GLAMODMASetup(ScreenPtr pScreen) -+{ -+ KdScreenPriv(pScreen); -+ GLAMOScreenInfo(pScreenPriv); -+ -+#ifdef USE_DRI -+ if (glamos->using_dri) -+ GLAMODRIDMAStart(glamos); -+#endif /* USE_DRI */ -+ -+ if (!glamos->using_dri) -+ GLAMODMAInit(pScreen); -+ -+ glamos->indirectBuffer = GLAMOGetDMABuffer(glamos); -+ if (glamos->indirectBuffer == FALSE) -+ FatalError("Failed to allocate DMA buffer.\n"); -+ -+ if (glamos->using_dri) -+ ErrorF("Initialized DRI DMA\n"); -+ else -+ ErrorF("Initialized DMA\n"); -+} -+ -+void -+GLAMODMATeardown(ScreenPtr pScreen) -+{ -+ KdScreenPriv(pScreen); -+ GLAMOScreenInfo(pScreenPriv); -+ -+ GLAMOWaitIdle(glamos); -+ -+#ifdef USE_DRI -+ if (glamos->using_dri) -+ GLAMODRIDMAStop(glamos); -+#endif /* USE_DRI */ -+ -+ xfree(glamos->indirectBuffer->address); -+ xfree(glamos->indirectBuffer); -+ glamos->indirectBuffer = NULL; -+} -Index: xserver/hw/kdrive/glamo/glamo_dma.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xserver/hw/kdrive/glamo/glamo_dma.h 2007-09-25 19:17:53.000000000 +0800 -@@ -0,0 +1,159 @@ -+/* -+ * Copyright © 2007 OpenMoko, Inc. -+ * -+ * This driver is based on Xati, -+ * Copyright © 2004 Eric Anholt -+ * -+ * Permission to use, copy, modify, distribute, and sell this software and its -+ * documentation for any purpose is hereby granted without fee, provided that -+ * the above copyright notice appear in all copies and that both that copyright -+ * notice and this permission notice appear in supporting documentation, and -+ * that the name of the copyright holders not be used in advertising or -+ * publicity pertaining to distribution of the software without specific, -+ * written prior permission. The copyright holders make no representations -+ * about the suitability of this software for any purpose. It is provided "as -+ * is" without express or implied warranty. -+ * -+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE -+ * OF THIS SOFTWARE. -+ */ -+ -+#ifndef _GLAMO_DMA_H_ -+#define _GLAMO_DMA_H_ -+ -+#define CCE_DEBUG 1 -+ -+#if !CCE_DEBUG -+#define DMA_PACKET0(reg, count) \ -+ (reg) -+#else -+#define DMA_PACKET0(reg, count) \ -+ (__packet0count = (count), __reg = (reg), \ -+ (reg)) -+#endif -+#define DMA_PACKET1(reg1, reg2) \ -+ (GLAMO_CCE_PACKET1 | \ -+ (((reg2) >> 2) << GLAMO_CCE_PACKET1_REG_2_SHIFT) | ((reg1) >> 2)) -+#define DMA_PACKET3(type, count) \ -+ ((type) | (((count) - 1) << 16)) -+ -+#if !CCE_DEBUG -+ -+#define RING_LOCALS CARD16 *__head; int __count -+#define BEGIN_DMA(n) \ -+do { \ -+ if ((glamos->indirectBuffer->used + 2 * (n)) > \ -+ glamos->indirectBuffer->size) { \ -+ GLAMOFlushIndirect(glamos, 1); \ -+ } \ -+ __head = (CARD16 *)((char *)glamos->indirectBuffer->address + \ -+ glamos->indirectBuffer->used); \ -+ __count = 0; \ -+} while (0) -+#define END_DMA() do { \ -+ glamos->indirectBuffer->used += __count * 2; \ -+} while (0) -+ -+#else -+ -+#define RING_LOCALS \ -+ CARD16 *__head; int __count, __total, __reg, __packet0count -+#define BEGIN_DMA(n) \ -+do { \ -+ if ((glamos->indirectBuffer->used + 2 * (n)) > \ -+ glamos->indirectBuffer->size) { \ -+ GLAMOFlushIndirect(glamos, 1); \ -+ } \ -+ __head = (CARD16 *)((char *)glamos->indirectBuffer->address + \ -+ glamos->indirectBuffer->used); \ -+ __count = 0; \ -+ __total = n; \ -+ __reg = 0; \ -+ __packet0count = 0; \ -+} while (0) -+#define END_DMA() do { \ -+ if (__count != __total) \ -+ FatalError("count != total (%d vs %d) at %s:%d\n", \ -+ __count, __total, __FILE__, __LINE__); \ -+ glamos->indirectBuffer->used += __count * 2; \ -+} while (0) -+ -+#endif -+ -+#define OUT_RING(val) do { \ -+ __head[__count++] = (val); \ -+} while (0) -+ -+#define OUT_RING_REG(reg, val) do { \ -+ if (__reg != reg) \ -+ FatalError("unexpected reg (0x%x vs 0x%x) at %s:%d\n", \ -+ reg, __reg, __FILE__, __LINE__); \ -+ if (__packet0count-- <= 0) \ -+ FatalError("overrun of packet0 at %s:%d\n", \ -+ __FILE__, __LINE__); \ -+ __head[__count++] = (val); \ -+ __reg += 4; \ -+} while (0) -+ -+#define OUT_RING_F(x) OUT_RING(GET_FLOAT_BITS(x)) -+ -+#define OUT_REG(reg, val) \ -+do { \ -+ OUT_RING(DMA_PACKET0(reg, 1)); \ -+ OUT_RING(val); \ -+} while (0) -+ -+#define TIMEOUT_LOCALS struct timeval _target, _curtime -+ -+static inline Bool -+tv_le(struct timeval *tv1, struct timeval *tv2) -+{ -+ if (tv1->tv_sec < tv2->tv_sec || -+ (tv1->tv_sec == tv2->tv_sec && tv1->tv_usec < tv2->tv_usec)) -+ return TRUE; -+ else -+ return FALSE; -+} -+ -+#define WHILE_NOT_TIMEOUT(_timeout) \ -+ gettimeofday(&_target, NULL); \ -+ _target.tv_usec += ((_timeout) * 1000000); \ -+ _target.tv_sec += _target.tv_usec / 1000000; \ -+ _target.tv_usec = _target.tv_usec % 1000000; \ -+ while (gettimeofday(&_curtime, NULL), tv_le(&_curtime, &_target)) -+ -+#define TIMEDOUT() (!tv_le(&_curtime, &_target)) -+ -+dmaBuf * -+GLAMOGetDMABuffer(GLAMOScreenInfo *glamos); -+ -+void -+GLAMOFlushIndirect(GLAMOScreenInfo *glamos, Bool discard); -+ -+void -+GLAMODMASetup(ScreenPtr pScreen); -+ -+void -+GLAMODMATeardown(ScreenPtr pScreen); -+ -+enum glamo_engine { -+ GLAMO_ENGINE_ISP, -+ GLAMO_ENGINE_CQ, -+ GLAMO_ENGINE_2D, -+}; -+ -+void -+GLAMOEngineEnable(ScreenPtr pScreen, enum glamo_engine engine); -+ -+void -+GLAMOEngineDisable(ScreenPtr pScreen, enum glamo_engine engine); -+ -+void -+GLAMOEngineReset(ScreenPtr pScreen, enum glamo_engine engine); -+ -+#endif /* _GLAMO_DMA_H_ */ -Index: xserver/hw/kdrive/glamo/glamo_draw.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xserver/hw/kdrive/glamo/glamo_draw.c 2007-09-26 17:46:30.000000000 +0800 -@@ -0,0 +1,522 @@ -+/* -+ * Copyright © 2007 OpenMoko, Inc. -+ * -+ * This driver is based on Xati, -+ * Copyright © 2003 Eric Anholt -+ * -+ * Permission to use, copy, modify, distribute, and sell this software and its -+ * documentation for any purpose is hereby granted without fee, provided that -+ * the above copyright notice appear in all copies and that both that copyright -+ * notice and this permission notice appear in supporting documentation, and -+ * that the name of the copyright holders not be used in advertising or -+ * publicity pertaining to distribution of the software without specific, -+ * written prior permission. The copyright holders make no representations -+ * about the suitability of this software for any purpose. It is provided "as -+ * is" without express or implied warranty. -+ * -+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE -+ * OF THIS SOFTWARE. -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+#include "glamo.h" -+#include "glamo-regs.h" -+#include "glamo_dma.h" -+#include "glamo_draw.h" -+#include "kaa.h" -+ -+static const CARD8 GLAMOSolidRop[16] = { -+ /* GXclear */ 0x00, /* 0 */ -+ /* GXand */ 0xa0, /* src AND dst */ -+ /* GXandReverse */ 0x50, /* src AND NOT dst */ -+ /* GXcopy */ 0xf0, /* src */ -+ /* GXandInverted*/ 0x0a, /* NOT src AND dst */ -+ /* GXnoop */ 0xaa, /* dst */ -+ /* GXxor */ 0x5a, /* src XOR dst */ -+ /* GXor */ 0xfa, /* src OR dst */ -+ /* GXnor */ 0x05, /* NOT src AND NOT dst */ -+ /* GXequiv */ 0xa5, /* NOT src XOR dst */ -+ /* GXinvert */ 0x55, /* NOT dst */ -+ /* GXorReverse */ 0xf5, /* src OR NOT dst */ -+ /* GXcopyInverted*/ 0x0f, /* NOT src */ -+ /* GXorInverted */ 0xaf, /* NOT src OR dst */ -+ /* GXnand */ 0x5f, /* NOT src OR NOT dst */ -+ /* GXset */ 0xff, /* 1 */ -+}; -+ -+static const CARD8 GLAMOBltRop[16] = { -+ /* GXclear */ 0x00, /* 0 */ -+ /* GXand */ 0x88, /* src AND dst */ -+ /* GXandReverse */ 0x44, /* src AND NOT dst */ -+ /* GXcopy */ 0xcc, /* src */ -+ /* GXandInverted*/ 0x22, /* NOT src AND dst */ -+ /* GXnoop */ 0xaa, /* dst */ -+ /* GXxor */ 0x66, /* src XOR dst */ -+ /* GXor */ 0xee, /* src OR dst */ -+ /* GXnor */ 0x11, /* NOT src AND NOT dst */ -+ /* GXequiv */ 0x99, /* NOT src XOR dst */ -+ /* GXinvert */ 0x55, /* NOT dst */ -+ /* GXorReverse */ 0xdd, /* src OR NOT dst */ -+ /* GXcopyInverted*/ 0x33, /* NOT src */ -+ /* GXorInverted */ 0xbb, /* NOT src OR dst */ -+ /* GXnand */ 0x77, /* NOT src OR NOT dst */ -+ /* GXset */ 0xff, /* 1 */ -+}; -+ -+GLAMOScreenInfo *accel_glamos; -+CARD32 settings, color, src_pitch_offset, dst_pitch_offset; -+ -+int sample_count; -+float sample_offsets_x[255]; -+float sample_offsets_y[255]; -+ -+void -+GLAMODrawSetup(ScreenPtr pScreen) -+{ -+ GLAMOEngineEnable(pScreen, GLAMO_ENGINE_2D); -+ GLAMOEngineReset(pScreen, GLAMO_ENGINE_2D); -+} -+ -+static void -+GLAMOWaitMarker(ScreenPtr pScreen, int marker) -+{ -+ KdScreenPriv(pScreen); -+ GLAMOScreenInfo(pScreenPriv); -+ -+ ENTER_DRAW(0); -+ GLAMOWaitIdle(glamos); -+ LEAVE_DRAW(0); -+} -+ -+#if GLAMO_TRACE_DRAW -+void -+GLAMOEnterDraw (PixmapPtr pPix, const char *function) -+{ -+ if (pPix != NULL) { -+ KdScreenPriv(pPix->drawable.pScreen); -+ CARD32 offset; -+ -+ offset = ((CARD8 *)pPix->devPrivate.ptr - -+ pScreenPriv->screen->memory_base); -+ -+ ErrorF ("Enter %s 0x%x (%dx%dx%d/%d)\n", function, (unsigned int) offset, -+ pPix->drawable.width, pPix->drawable.height, pPix->drawable.depth, -+ (unsigned int) pPix->drawable.bitsPerPixel); -+ } else -+ ErrorF ("Enter %s\n", function); -+} -+ -+void -+GLAMOLeaveDraw (PixmapPtr pPix, const char *function) -+{ -+ if (pPix != NULL) { -+ KdScreenPriv(pPix->drawable.pScreen); -+ CARD32 offset; -+ -+ offset = ((CARD8 *)pPix->devPrivate.ptr - -+ pScreenPriv->screen->memory_base); -+ -+ ErrorF ("Leave %s 0x%x\n", function, (unsigned int) offset); -+ } else -+ ErrorF ("Leave %s\n", function); -+} -+#endif -+ -+static Bool -+GLAMOPrepareSolid(PixmapPtr pPix, int alu, Pixel pm, Pixel fg) -+{ -+ KdScreenPriv(pPix->drawable.pScreen); -+ GLAMOScreenInfo(pScreenPriv); -+ CARD32 offset, pitch; -+ FbBits mask; -+ RING_LOCALS; -+ -+ if (pPix->drawable.bitsPerPixel != 16) -+ GLAMO_FALLBACK(("Only 16bpp is supported\n")); -+ -+ mask = FbFullMask(16); -+ if ((pm & mask) != mask) -+ GLAMO_FALLBACK(("Can't do planemask 0x%08x\n", (unsigned int) pm)); -+ -+ accel_glamos = glamos; -+ -+ settings = GLAMOSolidRop[alu] << 8; -+ offset = ((CARD8 *) pPix->devPrivate.ptr - -+ pScreenPriv->screen->memory_base); -+ pitch = pPix->devKind; -+ -+ ENTER_DRAW(pPix); -+ -+ BEGIN_DMA(12); -+ OUT_REG(GLAMO_REG_2D_DST_ADDRL, offset & 0xffff); -+ OUT_REG(GLAMO_REG_2D_DST_ADDRH, (offset >> 16) & 0x7f); -+ OUT_REG(GLAMO_REG_2D_DST_PITCH, pitch); -+ OUT_REG(GLAMO_REG_2D_DST_HEIGHT, pPix->drawable.height); -+ OUT_REG(GLAMO_REG_2D_PAT_FG, fg); -+ OUT_REG(GLAMO_REG_2D_COMMAND2, settings); -+ END_DMA(); -+ -+ LEAVE_DRAW(pPix); -+ -+ return TRUE; -+} -+ -+static void -+GLAMOSolid(int x1, int y1, int x2, int y2) -+{ -+ ENTER_DRAW(0); -+ GLAMOScreenInfo *glamos = accel_glamos; -+ RING_LOCALS; -+ -+ BEGIN_DMA(14); -+ OUT_REG(GLAMO_REG_2D_DST_X, x1); -+ OUT_REG(GLAMO_REG_2D_DST_Y, y1); -+ OUT_REG(GLAMO_REG_2D_RECT_WIDTH, x2 - x1); -+ OUT_REG(GLAMO_REG_2D_RECT_HEIGHT, y2 - y1); -+ OUT_REG(GLAMO_REG_2D_COMMAND3, 0); -+ OUT_REG(GLAMO_REG_2D_ID1, 0); -+ OUT_REG(GLAMO_REG_2D_ID2, 0); -+ END_DMA(); -+ LEAVE_DRAW(0); -+} -+ -+static void -+GLAMODoneSolid(void) -+{ -+ ENTER_DRAW(0); -+ LEAVE_DRAW(0); -+} -+ -+static Bool -+GLAMOPrepareCopy(PixmapPtr pSrc, PixmapPtr pDst, int dx, int dy, int alu, Pixel pm) -+{ -+ KdScreenPriv(pDst->drawable.pScreen); -+ GLAMOScreenInfo(pScreenPriv); -+ CARD32 src_offset, src_pitch; -+ CARD32 dst_offset, dst_pitch; -+ FbBits mask; -+ RING_LOCALS; -+ -+ if (pSrc->drawable.bitsPerPixel != 16 || -+ pDst->drawable.bitsPerPixel != 16) -+ GLAMO_FALLBACK(("Only 16bpp is supported")); -+ -+ mask = FbFullMask(16); -+ if ((pm & mask) != mask) -+ GLAMO_FALLBACK(("Can't do planemask 0x%08x", (unsigned int) pm)); -+ -+ accel_glamos = glamos; -+ -+ src_offset = ((CARD8 *) pSrc->devPrivate.ptr - -+ pScreenPriv->screen->memory_base); -+ src_pitch = pSrc->devKind; -+ -+ dst_offset = ((CARD8 *) pDst->devPrivate.ptr - -+ pScreenPriv->screen->memory_base); -+ dst_pitch = pDst->devKind; -+ -+ settings = GLAMOBltRop[alu] << 8; -+ -+ ENTER_DRAW (pDst); -+ -+ BEGIN_DMA(16); -+ -+ OUT_REG(GLAMO_REG_2D_SRC_ADDRL, src_offset & 0xffff); -+ OUT_REG(GLAMO_REG_2D_SRC_ADDRH, (src_offset >> 16) & 0x7f); -+ OUT_REG(GLAMO_REG_2D_SRC_PITCH, src_pitch); -+ -+ OUT_REG(GLAMO_REG_2D_DST_ADDRL, dst_offset & 0xffff); -+ OUT_REG(GLAMO_REG_2D_DST_ADDRH, (dst_offset >> 16) & 0x7f); -+ OUT_REG(GLAMO_REG_2D_DST_PITCH, dst_pitch); -+ OUT_REG(GLAMO_REG_2D_DST_HEIGHT, pDst->drawable.height); -+ -+ OUT_REG(GLAMO_REG_2D_COMMAND2, settings); -+ -+ END_DMA(); -+ -+ LEAVE_DRAW(pDst); -+ -+ return TRUE; -+} -+ -+static void -+GLAMOCopy(int srcX, int srcY, int dstX, int dstY, int w, int h) -+{ -+ GLAMOScreenInfo *glamos = accel_glamos; -+ RING_LOCALS; -+ -+ BEGIN_DMA(18); -+ OUT_REG(GLAMO_REG_2D_SRC_X, srcX); -+ OUT_REG(GLAMO_REG_2D_SRC_Y, srcY); -+ OUT_REG(GLAMO_REG_2D_DST_X, dstX); -+ OUT_REG(GLAMO_REG_2D_DST_Y, dstY); -+ OUT_REG(GLAMO_REG_2D_RECT_WIDTH, w); -+ OUT_REG(GLAMO_REG_2D_RECT_HEIGHT, h); -+ OUT_REG(GLAMO_REG_2D_COMMAND3, 0); -+ OUT_REG(GLAMO_REG_2D_ID1, 0); -+ OUT_REG(GLAMO_REG_2D_ID2, 0); -+ END_DMA(); -+} -+ -+static void -+GLAMODoneCopy(void) -+{ -+ ENTER_DRAW(0); -+ LEAVE_DRAW(0); -+} -+ -+static Bool -+GLAMOUploadToScreen(PixmapPtr pDst, char *src, int src_pitch) -+{ -+ int width, height, bpp, i; -+ CARD8 *dst_offset; -+ int dst_pitch; -+ -+ dst_offset = (CARD8 *)pDst->devPrivate.ptr; -+ dst_pitch = pDst->devKind; -+ width = pDst->drawable.width; -+ height = pDst->drawable.height; -+ bpp = pDst->drawable.bitsPerPixel; -+ bpp /= 8; -+ -+ for (i = 0; i < height; i++) -+ { -+ memcpy(dst_offset, src, width * bpp); -+ -+ dst_offset += dst_pitch; -+ src += src_pitch; -+ } -+ -+ ErrorF("hostdata upload %d,%d %dbpp\n", width, height, bpp); -+ -+ return TRUE; -+} -+ -+ -+#if 0 -+static Bool -+GLAMOUploadToScratch(PixmapPtr pSrc, PixmapPtr pDst) -+{ -+ KdScreenPriv(pSrc->drawable.pScreen); -+ GLAMOCardInfo(pScreenPriv); -+ GLAMOScreenInfo(pScreenPriv); -+ int dst_pitch, src_pitch, w, i, size, bytes; -+ unsigned char *dst, *src; -+ RING_LOCALS; -+ -+ ENTER_DRAW(pSrc); -+ /* Align width to log 2, useful for R128 composite. This should be a -+ * KAA flag we check for (and supported in kaa.c in general) since many -+ * older bits of hardware are going to want POT pitches. -+ */ -+ w = pSrc->drawable.width; -+ if (glamos->kaa.flags & KAA_OFFSCREEN_ALIGN_POT) -+ w = 1 << (GLAMOLog2(w - 1) + 1); -+ dst_pitch = (w * pSrc->drawable.bitsPerPixel / 8 + -+ glamos->kaa.pitchAlign - 1) & ~(glamos->kaa.pitchAlign - 1); -+ -+ size = dst_pitch * pSrc->drawable.height; -+ if (size > glamos->scratch_area->size) -+ GLAMO_FALLBACK(("Pixmap too large for scratch (%d,%d)\n", -+ pSrc->drawable.width, pSrc->drawable.height)); -+ -+ glamos->scratch_next = (glamos->scratch_next + glamos->kaa.offsetAlign - 1) & -+ ~(glamos->kaa.offsetAlign - 1); -+ if (glamos->scratch_next + size > glamos->scratch_area->offset + -+ glamos->scratch_area->size) { -+ /* Only sync when we've used all of the scratch area. */ -+ kaaWaitSync(pSrc->drawable.pScreen); -+ glamos->scratch_next = glamos->scratch_area->offset; -+ } -+ memcpy(pDst, pSrc, sizeof(*pDst)); -+ pDst->devKind = dst_pitch; -+ pDst->devPrivate.ptr = pScreenPriv->screen->memory_base + -+ glamos->scratch_next; -+ glamos->scratch_next += size; -+ -+ src = pSrc->devPrivate.ptr; -+ src_pitch = pSrc->devKind; -+ dst = pDst->devPrivate.ptr; -+ bytes = src_pitch < dst_pitch ? src_pitch : dst_pitch; -+ -+ i = pSrc->drawable.height; -+ while (i--) { -+ memcpy(dst, src, bytes); -+ dst += dst_pitch; -+ src += src_pitch; -+ } -+ -+ /* Flush the pixel cache */ -+ if (glamoc->is_3362) { -+ BEGIN_DMA(4); -+ OUT_REG(RADEON_REG_RB3D_DSTCACHE_CTLSTAT, -+ RADEON_RB3D_DC_FLUSH_ALL); -+ OUT_REG(GLAMO_REG_WAIT_UNTIL, RADEON_WAIT_HOST_IDLECLEAN); -+ END_DMA(); -+ } else { -+ BEGIN_DMA(2); -+ OUT_REG(R128_REG_PC_GUI_CTLSTAT, R128_PC_FLUSH_ALL); -+ END_DMA(); -+ } -+ -+ LEAVE_DRAW(pSrc); -+ return TRUE; -+} -+#endif -+ -+static void -+GLAMOBlockHandler(pointer blockData, OSTimePtr timeout, pointer readmask) -+{ -+ ScreenPtr pScreen = (ScreenPtr) blockData; -+ KdScreenPriv(pScreen); -+ GLAMOScreenInfo(pScreenPriv); -+ -+ /* When the server is going to sleep, make sure that all DMA data has -+ * been flushed. -+ */ -+ if (glamos->indirectBuffer) -+ GLAMOFlushIndirect(glamos, 1); -+} -+ -+static void -+GLAMOWakeupHandler(pointer blockData, int result, pointer readmask) -+{ -+} -+ -+Bool -+GLAMODrawInit(ScreenPtr pScreen) -+{ -+ KdScreenPriv(pScreen); -+ GLAMOScreenInfo(pScreenPriv); -+ -+ ErrorF("Screen: %d/%d depth/bpp\n", pScreenPriv->screen->fb[0].depth, -+ pScreenPriv->screen->fb[0].bitsPerPixel); -+ -+ RegisterBlockAndWakeupHandlers(GLAMOBlockHandler, GLAMOWakeupHandler, -+ pScreen); -+ -+ glamos->using_dri = FALSE; -+#ifdef USE_DRI -+ glamos->using_dri = GLAMODRIScreenInit(pScreen); -+#endif /* USE_DRI */ -+ -+ memset(&glamos->kaa, 0, sizeof(KaaScreenInfoRec)); -+ glamos->kaa.waitMarker = GLAMOWaitMarker; -+ glamos->kaa.PrepareSolid = GLAMOPrepareSolid; -+ glamos->kaa.Solid = GLAMOSolid; -+ glamos->kaa.DoneSolid = GLAMODoneSolid; -+ glamos->kaa.PrepareCopy = GLAMOPrepareCopy; -+ glamos->kaa.Copy = GLAMOCopy; -+ glamos->kaa.DoneCopy = GLAMODoneCopy; -+ /* Other acceleration will be hooked in in DrawEnable depending on -+ * what type of DMA gets initialized. -+ */ -+ -+ glamos->kaa.flags = KAA_OFFSCREEN_PIXMAPS; -+ glamos->kaa.offsetAlign = 2; -+ glamos->kaa.pitchAlign = 2; -+ -+ kaaInitTrapOffsets(8, sample_offsets_x, sample_offsets_y, 0.0, 0.0); -+ sample_count = (1 << 8) - 1; -+ -+ if (!kaaDrawInit(pScreen, &glamos->kaa)) -+ return FALSE; -+ -+ return TRUE; -+} -+ -+#if 0 -+static void -+GLAMOScratchSave(ScreenPtr pScreen, KdOffscreenArea *area) -+{ -+ KdScreenPriv(pScreen); -+ GLAMOScreenInfo(pScreenPriv); -+ -+ glamos->scratch_area = NULL; -+} -+#endif -+ -+void -+GLAMODrawEnable(ScreenPtr pScreen) -+{ -+ KdScreenPriv(pScreen); -+ GLAMOScreenInfo(pScreenPriv); -+ -+ GLAMODMASetup(pScreen); -+ GLAMODrawSetup(pScreen); -+ -+ glamos->scratch_area = NULL; -+ glamos->kaa.PrepareBlend = NULL; -+ glamos->kaa.Blend = NULL; -+ glamos->kaa.DoneBlend = NULL; -+ glamos->kaa.CheckComposite = NULL; -+ glamos->kaa.PrepareComposite = NULL; -+ glamos->kaa.Composite = NULL; -+ glamos->kaa.DoneComposite = NULL; -+ glamos->kaa.UploadToScreen = NULL; -+ glamos->kaa.UploadToScratch = NULL; -+ -+#ifdef USE_DRI -+ if (glamos->using_dri) { -+ if (!glamoc->is_3362) { -+ /*glamos->kaa.PrepareTrapezoids = R128PrepareTrapezoids; -+ glamos->kaa.Trapezoids = R128Trapezoids; -+ glamos->kaa.DoneTrapezoids = R128DoneTrapezoids;*/ -+ } else if (glamoc->is_r100 || glamoc->is_r200) { -+ glamos->kaa.PrepareTrapezoids = RadeonPrepareTrapezoids; -+ glamos->kaa.Trapezoids = RadeonTrapezoids; -+ glamos->kaa.DoneTrapezoids = RadeonDoneTrapezoids; -+ } -+ } -+#endif /* USE_DRI */ -+ -+ glamos->kaa.UploadToScreen = GLAMOUploadToScreen; -+ -+ /* Reserve a scratch area. It'll be used for storing glyph data during -+ * Composite operations, because glyphs aren't in real pixmaps and thus -+ * can't be migrated. -+ */ -+#if 0 -+ glamos->scratch_area = KdOffscreenAlloc(pScreen, 131072, -+ glamos->kaa.offsetAlign, TRUE, GLAMOScratchSave, glamos); -+ if (glamos->scratch_area != NULL) { -+ glamos->scratch_next = glamos->scratch_area->offset; -+ glamos->kaa.UploadToScratch = GLAMOUploadToScratch; -+ } -+#endif -+ -+ kaaMarkSync(pScreen); -+} -+ -+void -+GLAMODrawDisable(ScreenPtr pScreen) -+{ -+ kaaWaitSync(pScreen); -+ GLAMODMATeardown(pScreen); -+} -+ -+void -+GLAMODrawFini(ScreenPtr pScreen) -+{ -+#ifdef USE_DRI -+ KdScreenPriv(pScreen); -+ GLAMOScreenInfo(pScreenPriv); -+ if (glamos->using_dri) { -+ GLAMODRICloseScreen(pScreen); -+ glamos->using_dri = FALSE; -+ } -+#endif /* USE_DRI */ -+ -+ RemoveBlockAndWakeupHandlers(GLAMOBlockHandler, GLAMOWakeupHandler, -+ pScreen); -+ -+ kaaDrawFini(pScreen); -+} -+ -Index: xserver/hw/kdrive/glamo/glamo_draw.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xserver/hw/kdrive/glamo/glamo_draw.h 2007-09-25 19:02:01.000000000 +0800 -@@ -0,0 +1,59 @@ -+/* -+ * Copyright © 2007 OpenMoko, Inc. -+ * -+ * This driver is based on Xati, -+ * Copyright © 2004 Eric Anholt -+ * -+ * Permission to use, copy, modify, distribute, and sell this software and its -+ * documentation for any purpose is hereby granted without fee, provided that -+ * the above copyright notice appear in all copies and that both that copyright -+ * notice and this permission notice appear in supporting documentation, and -+ * that the name of the copyright holders not be used in advertising or -+ * publicity pertaining to distribution of the software without specific, -+ * written prior permission. The copyright holders make no representations -+ * about the suitability of this software for any purpose. It is provided "as -+ * is" without express or implied warranty. -+ * -+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE -+ * OF THIS SOFTWARE. -+ */ -+ -+#ifndef _GLAMO_DRAW_H_ -+#define _GLAMO_DRAW_H_ -+ -+void GLAMOWaitIdle(GLAMOScreenInfo *glamos); -+ -+#define GLAMO_TRACE_FALL 1 -+#define GLAMO_TRACE_DRAW 1 -+ -+#if GLAMO_TRACE_FALL -+#define GLAMO_FALLBACK(x) \ -+do { \ -+ ErrorF("%s: ", __FUNCTION__); \ -+ ErrorF x; \ -+ return FALSE; \ -+} while (0) -+#else -+#define GLAMO_FALLBACK(x) return FALSE -+#endif -+ -+#if GLAMO_TRACE_DRAW -+#define ENTER_DRAW(pix) GLAMOEnterDraw(pix, __FUNCTION__) -+#define LEAVE_DRAW(pix) GLAMOLeaveDraw(pix, __FUNCTION__) -+ -+void -+GLAMOEnterDraw (PixmapPtr pPixmap, const char *function); -+ -+void -+GLAMOLeaveDraw (PixmapPtr pPixmap, const char *function); -+#else /* GLAMO_TRACE */ -+#define ENTER_DRAW(pix) -+#define LEAVE_DRAW(pix) -+#endif /* !GLAMO_TRACE */ -+ -+#endif /* _GLAMO_DRAW_H_ */ -Index: xserver/hw/kdrive/glamo/glamo_stub.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xserver/hw/kdrive/glamo/glamo_stub.c 2007-09-26 17:45:27.000000000 +0800 -@@ -0,0 +1,84 @@ -+/* -+ * Copyright © 2007 OpenMoko, Inc. -+ * -+ * This driver is based on Xati, -+ * Copyright © 2003 Eric Anholt -+ * -+ * Permission to use, copy, modify, distribute, and sell this software and its -+ * documentation for any purpose is hereby granted without fee, provided that -+ * the above copyright notice appear in all copies and that both that copyright -+ * notice and this permission notice appear in supporting documentation, and -+ * that the name of the copyright holders not be used in advertising or -+ * publicity pertaining to distribution of the software without specific, -+ * written prior permission. The copyright holders make no representations -+ * about the suitability of this software for any purpose. It is provided "as -+ * is" without express or implied warranty. -+ * -+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE -+ * OF THIS SOFTWARE. -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+#include "glamo.h" -+#include "klinux.h" -+ -+void -+InitCard(char *name) -+{ -+ KdCardAttr attr; -+ -+ attr.io = 0; -+ attr.address[0] = 0x8000000; -+ attr.naddr = 1; -+ KdCardInfoAdd(&GLAMOFuncs, &attr, 0); -+} -+ -+void -+InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) -+{ -+ KdInitOutput(pScreenInfo, argc, argv); -+} -+ -+void -+InitInput(int argc, char **argv) -+{ -+ KdKeyboardInfo *ki; -+ -+ KdAddKeyboardDriver(&LinuxKeyboardDriver); -+ KdAddPointerDriver(&LinuxMouseDriver); -+#ifdef TSLIB -+ KdAddPointerDriver(&TsDriver); -+#endif -+ -+ ki = KdParseKeyboard("keybd"); -+ KdAddKeyboard(ki); -+} -+ -+void -+ddxUseMsg (void) -+{ -+ KdUseMsg(); -+#ifdef KDRIVEVESA -+ vesaUseMsg(); -+#endif -+} -+ -+int -+ddxProcessArgument(int argc, char **argv, int i) -+{ -+ int ret; -+ -+#ifdef KDRIVEVESA -+ if (!(ret = vesaProcessArgument (argc, argv, i))) -+#endif -+ ret = KdProcessArgument(argc, argv, i); -+ -+ return ret; -+} -Index: xserver/hw/kdrive/glamo/glamo_video.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xserver/hw/kdrive/glamo/glamo_video.c 2007-09-26 17:47:55.000000000 +0800 -@@ -0,0 +1,798 @@ -+/* -+ * Copyright © 2007 OpenMoko, Inc. -+ * -+ * This driver is based on Xati, -+ * Copyright © 2004 Keith Packard -+ * Copyright © 2005 Eric Anholt -+ * -+ * Permission to use, copy, modify, distribute, and sell this software and its -+ * documentation for any purpose is hereby granted without fee, provided that -+ * the above copyright notice appear in all copies and that both that copyright -+ * notice and this permission notice appear in supporting documentation, and -+ * that the name of the copyright holders not be used in advertising or -+ * publicity pertaining to distribution of the software without specific, -+ * written prior permission. The copyright holders make no representations -+ * about the suitability of this software for any purpose. It is provided "as -+ * is" without express or implied warranty. -+ * -+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE -+ * OF THIS SOFTWARE. -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+#include "glamo.h" -+#include "glamo_dma.h" -+#include "glamo_draw.h" -+#include "glamo-regs.h" -+#include "kaa.h" -+ -+#include -+#include "fourcc.h" -+ -+#define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE) -+ -+static Atom xvBrightness, xvSaturation; -+ -+#define IMAGE_MAX_WIDTH 2048 -+#define IMAGE_MAX_HEIGHT 2048 -+ -+static void -+GLAMOStopVideo(KdScreenInfo *screen, pointer data, Bool exit) -+{ -+ ScreenPtr pScreen = screen->pScreen; -+ GLAMOPortPrivPtr pPortPriv = (GLAMOPortPrivPtr)data; -+ -+ REGION_EMPTY(screen->pScreen, &pPortPriv->clip); -+ -+ if (pPortPriv->off_screen) { -+ KdOffscreenFree (pScreen, pPortPriv->off_screen); -+ pPortPriv->off_screen = 0; -+ } -+} -+ -+static int -+GLAMOSetPortAttribute(KdScreenInfo *screen, Atom attribute, int value, -+ pointer data) -+{ -+ return BadMatch; -+} -+ -+static int -+GLAMOGetPortAttribute(KdScreenInfo *screen, Atom attribute, int *value, -+ pointer data) -+{ -+ return BadMatch; -+} -+ -+static void -+GLAMOQueryBestSize(KdScreenInfo *screen, Bool motion, short vid_w, short vid_h, -+ short drw_w, short drw_h, unsigned int *p_w, unsigned int *p_h, -+ pointer data) -+{ -+ *p_w = drw_w; -+ *p_h = drw_h; -+} -+ -+/* GLAMOClipVideo - -+ -+ Takes the dst box in standard X BoxRec form (top and left -+ edges inclusive, bottom and right exclusive). The new dst -+ box is returned. The source boundaries are given (x1, y1 -+ inclusive, x2, y2 exclusive) and returned are the new source -+ boundaries in 16.16 fixed point. -+*/ -+ -+static void -+GLAMOClipVideo(BoxPtr dst, INT32 *x1, INT32 *x2, INT32 *y1, INT32 *y2, -+ BoxPtr extents, INT32 width, INT32 height) -+{ -+ INT32 vscale, hscale, delta; -+ int diff; -+ -+ hscale = ((*x2 - *x1) << 16) / (dst->x2 - dst->x1); -+ vscale = ((*y2 - *y1) << 16) / (dst->y2 - dst->y1); -+ -+ *x1 <<= 16; *x2 <<= 16; -+ *y1 <<= 16; *y2 <<= 16; -+ -+ diff = extents->x1 - dst->x1; -+ if (diff > 0) { -+ dst->x1 = extents->x1; -+ *x1 += diff * hscale; -+ } -+ diff = dst->x2 - extents->x2; -+ if (diff > 0) { -+ dst->x2 = extents->x2; -+ *x2 -= diff * hscale; -+ } -+ diff = extents->y1 - dst->y1; -+ if (diff > 0) { -+ dst->y1 = extents->y1; -+ *y1 += diff * vscale; -+ } -+ diff = dst->y2 - extents->y2; -+ if (diff > 0) { -+ dst->y2 = extents->y2; -+ *y2 -= diff * vscale; -+ } -+ -+ if (*x1 < 0) { -+ diff = (- *x1 + hscale - 1)/ hscale; -+ dst->x1 += diff; -+ *x1 += diff * hscale; -+ } -+ delta = *x2 - (width << 16); -+ if (delta > 0) { -+ diff = (delta + hscale - 1)/ hscale; -+ dst->x2 -= diff; -+ *x2 -= diff * hscale; -+ } -+ if (*y1 < 0) { -+ diff = (- *y1 + vscale - 1)/ vscale; -+ dst->y1 += diff; -+ *y1 += diff * vscale; -+ } -+ delta = *y2 - (height << 16); -+ if (delta > 0) { -+ diff = (delta + vscale - 1)/ vscale; -+ dst->y2 -= diff; -+ *y2 -= diff * vscale; -+ } -+} -+ -+static void -+GlamoDisplayVideo(KdScreenInfo *screen, GLAMOPortPrivPtr pPortPriv) -+{ -+ ScreenPtr pScreen = screen->pScreen; -+ KdScreenPriv(pScreen); -+ GLAMOScreenInfo(pScreenPriv); -+ PixmapPtr pPixmap = pPortPriv->pPixmap; -+ CARD32 dst_offset, dst_pitch; -+ int dstxoff, dstyoff, srcDatatype; -+ RING_LOCALS; -+ -+ BoxPtr pBox = REGION_RECTS(&pPortPriv->clip); -+ int nBox = REGION_NUM_RECTS(&pPortPriv->clip); -+ -+ dst_offset = ((CARD8 *)pPixmap->devPrivate.ptr - -+ pScreenPriv->screen->memory_base); -+ dst_pitch = pPixmap->devKind; -+ -+#ifdef COMPOSITE -+ dstxoff = -pPixmap->screen_x + pPixmap->drawable.x; -+ dstyoff = -pPixmap->screen_y + pPixmap->drawable.y; -+#else -+ dstxoff = 0; -+ dstyoff = 0; -+#endif -+ -+ BEGIN_DMA(14); -+ OUT_REG(GLAMO_REG_ISP_YUV2RGB_11, 0x0167); -+ OUT_REG(GLAMO_REG_ISP_YUV2RGB_21, 0x01c5); -+ OUT_REG(GLAMO_REG_ISP_YUV2RGB_32, 0x00b6); -+ OUT_REG(GLAMO_REG_ISP_YUV2RGB_33, 0x0058); -+ OUT_REG(GLAMO_REG_ISP_YUV2RGB_RG, 0xb3 << 8 | 0x89); -+ OUT_REG(GLAMO_REG_ISP_YUV2RGB_B, 0xe2); -+ -+ /* TODO weight matrix */ -+ -+ OUT_REG(GLAMO_REG_ISP_PORT2_EN, GLAMO_ISP_PORT2_EN_DECODE); -+ -+ END_DMA(); -+ -+ if (pPortPriv->id == FOURCC_UYVY) -+ srcDatatype = 3; -+ else -+ srcDatatype = 1; -+ -+ BEGIN_DMA(8); -+#if 0 -+ OUT_REG(GLAMO_REG_ISP_EN3, GLAMO_ISP_EN3_SCALE_IMPROVE | -+ GLAMO_ISP_EN3_PLANE_MODE | -+ GLAMO_ISP_EN3_YUV_INPUT | -+ GLAMO_ISP_EN3_YUV420); -+ OUT_REG(GLAMO_REG_ISP_PORT1_DEC_EN, GLAMO_ISP_PORT1_EN_OUTPUT); -+ -+ OUT_REG(GLAMO_REG_ISP_DEC_SCALEH, 1 << 11); -+ OUT_REG(GLAMO_REG_ISP_DEC_SCALEV, 1 << 11); -+ -+ { -+ struct { -+ int src_block_y; -+ int src_block_x; -+ int src_block_h; -+ int src_block_w; -+ int jpeg_out_y; -+ int jpeg_out_x; -+ int fifo_full_cnt; -+ int in_length; -+ int fifo_data_cnt; -+ int in_height; -+ } onfly; -+ -+ onfly.src_block_y = 32; -+ onfly.src_block_x = 32; -+ onfly.src_block_h = 36; -+ onfly.src_block_w = 35; -+ onfly.jpeg_out_y = 32; -+ onfly.jpeg_out_x = 32; -+ onfly.fifo_full_cnt = 0; -+ onfly.in_length = onfly.jpeg_out_x + 3; -+ onfly.fifo_data_cnt = onfly.src_block_w * onfly.src_block_h / 2; -+ onfly.in_height = onfly.jpeg_out_y + 2; -+ -+ OUT_REG(GLAMO_REG_ISP_ONFLY_MODE1, onfly.src_block_y << 10 | onfly.src_block_x << 2); -+ OUT_REG(GLAMO_REG_ISP_ONFLY_MODE2, onfly.src_block_h << 8 | onfly.src_block_w); -+ OUT_REG(GLAMO_REG_ISP_ONFLY_MODE3, onfly.jpeg_out_y << 8 | onfly.jpeg_out_x); -+ OUT_REG(GLAMO_REG_ISP_ONFLY_MODE4, onfly.fifo_full_cnt << 8 | onfly.in_length); -+ OUT_REG(GLAMO_REG_ISP_ONFLY_MODE5, onfly.fifo_data_cnt << 6 | onfly.in_height); -+ } -+#endif -+ -+ OUT_REG(GLAMO_REG_ISP_EN1, -+ GLAMO_ISP_EN1_YUV420 | -+ GLAMO_ISP_EN1_YUV_INPUT | -+ GLAMO_ISP_EN1_YUV_PACK | -+ ((srcDatatype << 4) & 0x7)); -+ -+ OUT_REG(GLAMO_REG_ISP_PORT1_CAP_EN, -+ GLAMO_ISP_PORT1_EN_OUTPUT); -+ -+ OUT_REG(GLAMO_REG_ISP_CAP_PITCH, pPortPriv->src_pitch); -+ OUT_REG(GLAMO_REG_ISP_PORT1_CAP_PITCH, dst_pitch); -+ -+ END_DMA(); -+ -+ while (nBox--) { -+ int srcX, srcY, dstX, dstY, srcw, srch, dstw, dsth; -+ CARD32 srcO, dstO; -+ -+ dstX = pBox->x1 + dstxoff; -+ dstY = pBox->y1 + dstyoff; -+ dstw = pBox->x2 - pBox->x1; -+ dsth = pBox->y2 - pBox->y1; -+ srcX = (pBox->x1 - pPortPriv->dst_x1) * -+ pPortPriv->src_w / pPortPriv->dst_w; -+ srcY = (pBox->y1 - pPortPriv->dst_y1) * -+ pPortPriv->src_h / pPortPriv->dst_h; -+ srcw = pPortPriv->src_w - srcX; /* XXX */ -+ srch = pPortPriv->src_h - srcY; /* XXX */ -+ -+ srcO = pPortPriv->src_offset + srcY * pPortPriv->src_pitch + srcX * 2; -+ dstO = dst_offset + dstY * dst_pitch + dstX * 2; -+ -+ BEGIN_DMA(18); -+ -+ OUT_REG(GLAMO_REG_ISP_CAP_0_ADDRL, srcO & 0xffff); -+ OUT_REG(GLAMO_REG_ISP_CAP_0_ADDRH, (srcO >> 16) & 0x7f); -+ OUT_REG(GLAMO_REG_ISP_CAP_HEIGHT, srch); -+ OUT_REG(GLAMO_REG_ISP_CAP_WIDTH, srcw); -+ -+ OUT_REG(GLAMO_REG_ISP_PORT1_CAP_0_ADDRL, dstO & 0xffff); -+ OUT_REG(GLAMO_REG_ISP_PORT1_CAP_0_ADDRH, (dstO >> 16) & 0x7f); -+ OUT_REG(GLAMO_REG_ISP_PORT1_CAP_WIDTH, dstw); -+ OUT_REG(GLAMO_REG_ISP_PORT1_CAP_HEIGHT, dsth); -+ -+ /* fire */ -+ OUT_REG(GLAMO_REG_ISP_EN1, GLAMO_ISP_EN1_FIRE_ISP); -+ OUT_REG(GLAMO_REG_ISP_EN1, 0); -+ -+ END_DMA(); -+ -+ GLAMOWaitIdle(glamos); -+ -+ pBox++; -+ } -+#ifdef DAMAGEEXT -+ /* XXX: Shouldn't this be in kxv.c instead? */ -+ DamageDamageRegion(pPortPriv->pDraw, &pPortPriv->clip); -+#endif -+ kaaMarkSync(pScreen); -+} -+ -+static void -+GLAMOVideoSave(ScreenPtr pScreen, KdOffscreenArea *area) -+{ -+ KdScreenPriv(pScreen); -+ GLAMOScreenInfo(pScreenPriv); -+ GLAMOPortPrivPtr pPortPriv = glamos->pAdaptor->pPortPrivates[0].ptr; -+ -+ if (pPortPriv->off_screen == area) -+ pPortPriv->off_screen = 0; -+} -+ -+static int -+GLAMOPutImage(KdScreenInfo *screen, DrawablePtr pDraw, -+ short src_x, short src_y, -+ short drw_x, short drw_y, -+ short src_w, short src_h, -+ short drw_w, short drw_h, -+ int id, -+ unsigned char *buf, -+ short width, -+ short height, -+ Bool sync, -+ RegionPtr clipBoxes, -+ pointer data) -+{ -+ ScreenPtr pScreen = screen->pScreen; -+ KdScreenPriv(pScreen); -+ GLAMOCardInfo(pScreenPriv); -+ GLAMOScreenInfo(pScreenPriv); -+ GLAMOPortPrivPtr pPortPriv = (GLAMOPortPrivPtr)data; -+ char *mmio = glamoc->reg_base; -+ INT32 x1, x2, y1, y2; -+ int randr = RR_Rotate_0 /* XXX */; -+ int srcPitch, srcPitch2, dstPitch; -+ int top, left, npixels, nlines, size; -+ BoxRec dstBox; -+ int dst_width = width, dst_height = height; -+ int rot_x1, rot_y1, rot_x2, rot_y2; -+ int dst_x1, dst_y1, dst_x2, dst_y2; -+ int rot_src_w, rot_src_h, rot_drw_w, rot_drw_h; -+ -+ /* Clip */ -+ x1 = src_x; -+ x2 = src_x + src_w; -+ y1 = src_y; -+ y2 = src_y + src_h; -+ -+ dstBox.x1 = drw_x; -+ dstBox.x2 = drw_x + drw_w; -+ dstBox.y1 = drw_y; -+ dstBox.y2 = drw_y + drw_h; -+ -+ GLAMOClipVideo(&dstBox, &x1, &x2, &y1, &y2, -+ REGION_EXTENTS(pScreen, clipBoxes), width, height); -+ -+ src_w = (x2 - x1) >> 16; -+ src_h = (y2 - y1) >> 16; -+ drw_w = dstBox.x2 - dstBox.x1; -+ drw_h = dstBox.y2 - dstBox.y1; -+ -+ if ((x1 >= x2) || (y1 >= y2)) -+ return Success; -+ -+ if (mmio == NULL) -+ return BadAlloc; -+ -+ if (randr & (RR_Rotate_0|RR_Rotate_180)) { -+ dst_width = width; -+ dst_height = height; -+ rot_src_w = src_w; -+ rot_src_h = src_h; -+ rot_drw_w = drw_w; -+ rot_drw_h = drw_h; -+ } else { -+ dst_width = height; -+ dst_height = width; -+ rot_src_w = src_h; -+ rot_src_h = src_w; -+ rot_drw_w = drw_h; -+ rot_drw_h = drw_w; -+ } -+ -+ switch (randr & RR_Rotate_All) { -+ case RR_Rotate_0: -+ default: -+ dst_x1 = dstBox.x1; -+ dst_y1 = dstBox.y1; -+ dst_x2 = dstBox.x2; -+ dst_y2 = dstBox.y2; -+ rot_x1 = x1; -+ rot_y1 = y1; -+ rot_x2 = x2; -+ rot_y2 = y2; -+ break; -+ case RR_Rotate_90: -+ dst_x1 = dstBox.y1; -+ dst_y1 = screen->height - dstBox.x2; -+ dst_x2 = dstBox.y2; -+ dst_y2 = screen->height - dstBox.x1; -+ rot_x1 = y1; -+ rot_y1 = (src_w << 16) - x2; -+ rot_x2 = y2; -+ rot_y2 = (src_w << 16) - x1; -+ break; -+ case RR_Rotate_180: -+ dst_x1 = screen->width - dstBox.x2; -+ dst_y1 = screen->height - dstBox.y2; -+ dst_x2 = screen->width - dstBox.x1; -+ dst_y2 = screen->height - dstBox.y1; -+ rot_x1 = (src_w << 16) - x2; -+ rot_y1 = (src_h << 16) - y2; -+ rot_x2 = (src_w << 16) - x1; -+ rot_y2 = (src_h << 16) - y1; -+ break; -+ case RR_Rotate_270: -+ dst_x1 = screen->width - dstBox.y2; -+ dst_y1 = dstBox.x1; -+ dst_x2 = screen->width - dstBox.y1; -+ dst_y2 = dstBox.x2; -+ rot_x1 = (src_h << 16) - y2; -+ rot_y1 = x1; -+ rot_x2 = (src_h << 16) - y1; -+ rot_y2 = x2; -+ break; -+ } -+ -+ switch(id) { -+ case FOURCC_YV12: -+ case FOURCC_I420: -+ dstPitch = ((dst_width << 1) + 15) & ~15; -+ srcPitch = (width + 3) & ~3; -+ srcPitch2 = ((width >> 1) + 3) & ~3; -+ size = dstPitch * dst_height; -+ break; -+ case FOURCC_UYVY: -+ case FOURCC_YUY2: -+ default: -+ dstPitch = ((dst_width << 1) + 15) & ~15; -+ srcPitch = (width << 1); -+ srcPitch2 = 0; -+ size = dstPitch * dst_height; -+ break; -+ } -+ -+ if (pPortPriv->off_screen != NULL && size != pPortPriv->size) { -+ KdOffscreenFree(screen->pScreen, pPortPriv->off_screen); -+ pPortPriv->off_screen = 0; -+ } -+ -+ if (pPortPriv->off_screen == NULL) { -+ pPortPriv->off_screen = KdOffscreenAlloc(screen->pScreen, -+ size * 2, 64, TRUE, GLAMOVideoSave, pPortPriv); -+ if (pPortPriv->off_screen == NULL) -+ return BadAlloc; -+ } -+ -+ -+ if (pDraw->type == DRAWABLE_WINDOW) -+ pPortPriv->pPixmap = -+ (*pScreen->GetWindowPixmap)((WindowPtr)pDraw); -+ else -+ pPortPriv->pPixmap = (PixmapPtr)pDraw; -+ -+ /* Migrate the pixmap to offscreen if necessary. */ -+ if (!kaaPixmapIsOffscreen(pPortPriv->pPixmap)) -+ kaaMoveInPixmap(pPortPriv->pPixmap); -+ -+ if (!kaaPixmapIsOffscreen(pPortPriv->pPixmap)) { -+ return BadAlloc; -+ } -+ -+ pPortPriv->src_offset = pPortPriv->off_screen->offset; -+ pPortPriv->src_addr = (CARD8 *)(pScreenPriv->screen->memory_base + -+ pPortPriv->src_offset); -+ pPortPriv->src_pitch = dstPitch; -+ pPortPriv->size = size; -+ pPortPriv->pDraw = pDraw; -+ -+ /* copy data */ -+ top = rot_y1 >> 16; -+ left = (rot_x1 >> 16) & ~1; -+ npixels = ((((rot_x2 + 0xffff) >> 16) + 1) & ~1) - left; -+ -+ /* Since we're probably overwriting the area that might still be used -+ * for the last PutImage request, wait for idle. -+ */ -+ GLAMOWaitIdle(glamos); -+ -+ switch(id) { -+ case FOURCC_YV12: -+ case FOURCC_I420: -+ top &= ~1; -+ nlines = ((((rot_y2 + 0xffff) >> 16) + 1) & ~1) - top; -+ /* pack the source as YUY2 to vram */ -+ KdXVCopyPlanarData(screen, buf, pPortPriv->src_addr, randr, -+ srcPitch, srcPitch2, dstPitch, rot_src_w, rot_src_h, -+ height, top, left, nlines, npixels, id); -+ break; -+ case FOURCC_UYVY: -+ case FOURCC_YUY2: -+ default: -+ nlines = ((rot_y2 + 0xffff) >> 16) - top; -+ KdXVCopyPackedData(screen, buf, pPortPriv->src_addr, randr, -+ srcPitch, dstPitch, rot_src_w, rot_src_h, top, left, -+ nlines, npixels); -+ break; -+ } -+ -+ /* update cliplist */ -+ if (!REGION_EQUAL(screen->pScreen, &pPortPriv->clip, clipBoxes)) { -+ REGION_COPY(screen->pScreen, &pPortPriv->clip, clipBoxes); -+ } -+ -+ pPortPriv->id = id; -+ pPortPriv->src_x1 = rot_x1; -+ pPortPriv->src_y1 = rot_y1; -+ pPortPriv->src_x2 = rot_x2; -+ pPortPriv->src_y2 = rot_y2; -+ pPortPriv->src_w = rot_src_w; -+ pPortPriv->src_h = rot_src_h; -+ pPortPriv->dst_x1 = dst_x1; -+ pPortPriv->dst_y1 = dst_y1; -+ pPortPriv->dst_x2 = dst_x2; -+ pPortPriv->dst_y2 = dst_y2; -+ pPortPriv->dst_w = rot_drw_w; -+ pPortPriv->dst_h = rot_drw_h; -+ -+ GlamoDisplayVideo(screen, pPortPriv); -+ -+ return Success; -+} -+ -+static int -+GLAMOReputImage(KdScreenInfo *screen, DrawablePtr pDraw, short drw_x, short drw_y, -+ RegionPtr clipBoxes, pointer data) -+{ -+ ScreenPtr pScreen = screen->pScreen; -+ GLAMOPortPrivPtr pPortPriv = (GLAMOPortPrivPtr)data; -+ BoxPtr pOldExtents = REGION_EXTENTS(screen->pScreen, &pPortPriv->clip); -+ BoxPtr pNewExtents = REGION_EXTENTS(screen->pScreen, clipBoxes); -+ -+ if (pOldExtents->x1 != pNewExtents->x1 || -+ pOldExtents->x2 != pNewExtents->x2 || -+ pOldExtents->y1 != pNewExtents->y1 || -+ pOldExtents->y2 != pNewExtents->y2) -+ return BadMatch; -+ -+ if (pDraw->type == DRAWABLE_WINDOW) -+ pPortPriv->pPixmap = -+ (*pScreen->GetWindowPixmap)((WindowPtr)pDraw); -+ else -+ pPortPriv->pPixmap = (PixmapPtr)pDraw; -+ -+ if (!kaaPixmapIsOffscreen(pPortPriv->pPixmap)) -+ kaaMoveInPixmap(pPortPriv->pPixmap); -+ -+ if (!kaaPixmapIsOffscreen(pPortPriv->pPixmap)) { -+ ErrorF("err\n"); -+ return BadAlloc; -+ } -+ -+ -+ /* update cliplist */ -+ if (!REGION_EQUAL(screen->pScreen, &pPortPriv->clip, clipBoxes)) -+ REGION_COPY(screen->pScreen, &pPortPriv->clip, clipBoxes); -+ -+ /* XXX: What do the drw_x and drw_y here mean for us? */ -+ -+ GlamoDisplayVideo(screen, pPortPriv); -+ -+ return Success; -+} -+ -+static int -+GLAMOQueryImageAttributes(KdScreenInfo *screen, int id, unsigned short *w, -+ unsigned short *h, int *pitches, int *offsets) -+{ -+ int size, tmp; -+ -+ if (*w > IMAGE_MAX_WIDTH) -+ *w = IMAGE_MAX_WIDTH; -+ if (*h > IMAGE_MAX_HEIGHT) -+ *h = IMAGE_MAX_HEIGHT; -+ -+ *w = (*w + 1) & ~1; -+ if (offsets) -+ offsets[0] = 0; -+ -+ switch (id) -+ { -+ case FOURCC_YV12: -+ case FOURCC_I420: -+ *h = (*h + 1) & ~1; -+ size = (*w + 3) & ~3; -+ if (pitches) -+ pitches[0] = size; -+ size *= *h; -+ if (offsets) -+ offsets[1] = size; -+ tmp = ((*w >> 1) + 3) & ~3; -+ if (pitches) -+ pitches[1] = pitches[2] = tmp; -+ tmp *= (*h >> 1); -+ size += tmp; -+ if (offsets) -+ offsets[2] = size; -+ size += tmp; -+ break; -+ case FOURCC_UYVY: -+ case FOURCC_YUY2: -+ default: -+ size = *w << 1; -+ if (pitches) -+ pitches[0] = size; -+ size *= *h; -+ break; -+ } -+ -+ return size; -+} -+ -+ -+/* client libraries expect an encoding */ -+static KdVideoEncodingRec DummyEncoding[1] = -+{ -+ { -+ 0, -+ "XV_IMAGE", -+ IMAGE_MAX_WIDTH, IMAGE_MAX_HEIGHT, -+ {1, 1} -+ } -+}; -+ -+#define NUM_FORMATS 1 -+ -+static KdVideoFormatRec Formats[NUM_FORMATS] = -+{ -+ {16, TrueColor} -+}; -+ -+#define NUM_ATTRIBUTES 0 -+ -+static KdAttributeRec Attributes[NUM_ATTRIBUTES] = -+{ -+}; -+ -+#define NUM_IMAGES 4 -+ -+static KdImageRec Images[NUM_IMAGES] = -+{ -+ XVIMAGE_YUY2, -+ XVIMAGE_YV12, -+ XVIMAGE_I420, -+ XVIMAGE_UYVY -+}; -+ -+static KdVideoAdaptorPtr -+GLAMOSetupImageVideo(ScreenPtr pScreen) -+{ -+ KdScreenPriv(pScreen); -+ GLAMOScreenInfo(pScreenPriv); -+ KdVideoAdaptorPtr adapt; -+ GLAMOPortPrivPtr pPortPriv; -+ int i; -+ -+ glamos->num_texture_ports = 16; -+ -+ adapt = xcalloc(1, sizeof(KdVideoAdaptorRec) + glamos->num_texture_ports * -+ (sizeof(GLAMOPortPrivRec) + sizeof(DevUnion))); -+ if (adapt == NULL) -+ return NULL; -+ -+ adapt->type = XvWindowMask | XvInputMask | XvImageMask; -+ adapt->flags = VIDEO_CLIP_TO_VIEWPORT; -+ adapt->name = "GLAMO Texture Video"; -+ adapt->nEncodings = 1; -+ adapt->pEncodings = DummyEncoding; -+ adapt->nFormats = NUM_FORMATS; -+ adapt->pFormats = Formats; -+ adapt->nPorts = glamos->num_texture_ports; -+ adapt->pPortPrivates = (DevUnion*)(&adapt[1]); -+ -+ pPortPriv = -+ (GLAMOPortPrivPtr)(&adapt->pPortPrivates[glamos->num_texture_ports]); -+ -+ for (i = 0; i < glamos->num_texture_ports; i++) -+ adapt->pPortPrivates[i].ptr = &pPortPriv[i]; -+ -+ adapt->nAttributes = NUM_ATTRIBUTES; -+ adapt->pAttributes = Attributes; -+ adapt->pImages = Images; -+ adapt->nImages = NUM_IMAGES; -+ adapt->PutVideo = NULL; -+ adapt->PutStill = NULL; -+ adapt->GetVideo = NULL; -+ adapt->GetStill = NULL; -+ adapt->StopVideo = GLAMOStopVideo; -+ adapt->SetPortAttribute = GLAMOSetPortAttribute; -+ adapt->GetPortAttribute = GLAMOGetPortAttribute; -+ adapt->QueryBestSize = GLAMOQueryBestSize; -+ adapt->PutImage = GLAMOPutImage; -+ adapt->ReputImage = GLAMOReputImage; -+ adapt->QueryImageAttributes = GLAMOQueryImageAttributes; -+ -+ /* gotta uninit this someplace */ -+ REGION_INIT(pScreen, &pPortPriv->clip, NullBox, 0); -+ -+ glamos->pAdaptor = adapt; -+ -+ xvBrightness = MAKE_ATOM("XV_BRIGHTNESS"); -+ xvSaturation = MAKE_ATOM("XV_SATURGLAMOON"); -+ -+ return adapt; -+} -+ -+static void GLAMOPowerUp(ScreenPtr pScreen) -+{ -+ GLAMOEngineEnable(pScreen, GLAMO_ENGINE_ISP); -+ GLAMOEngineReset(pScreen, GLAMO_ENGINE_ISP); -+ -+ /* HW_DEBUG_0?? */ -+ //MMIOSetBitMask(mmio, REG_ISP(0x102), 0x0020, 0); -+} -+ -+static void GLAMOPowerDown(ScreenPtr pScreen) -+{ -+ GLAMOEngineReset(pScreen, GLAMO_ENGINE_ISP); -+ -+ /* ... and stop the clock */ -+} -+ -+Bool GLAMOInitVideo(ScreenPtr pScreen) -+{ -+ KdScreenPriv(pScreen); -+ GLAMOScreenInfo(pScreenPriv); -+ GLAMOCardInfo(pScreenPriv); -+ KdScreenInfo *screen = pScreenPriv->screen; -+ KdVideoAdaptorPtr *adaptors, *newAdaptors = NULL; -+ KdVideoAdaptorPtr newAdaptor = NULL; -+ int num_adaptors; -+ -+ glamos->pAdaptor = NULL; -+ -+ if (glamoc->reg_base == NULL) -+ return FALSE; -+ -+ num_adaptors = KdXVListGenericAdaptors(screen, &adaptors); -+ -+ newAdaptor = GLAMOSetupImageVideo(pScreen); -+ -+ if (newAdaptor) { -+ GLAMOPowerUp(pScreen); -+ -+ if (!num_adaptors) { -+ num_adaptors = 1; -+ adaptors = &newAdaptor; -+ } else { -+ newAdaptors = xalloc((num_adaptors + 1) * -+ sizeof(KdVideoAdaptorPtr *)); -+ if (newAdaptors) { -+ memcpy(newAdaptors, adaptors, num_adaptors * -+ sizeof(KdVideoAdaptorPtr)); -+ newAdaptors[num_adaptors] = newAdaptor; -+ adaptors = newAdaptors; -+ num_adaptors++; -+ } -+ } -+ } -+ -+ if (num_adaptors) -+ KdXVScreenInit(pScreen, adaptors, num_adaptors); -+ -+ if (newAdaptors) -+ xfree(newAdaptors); -+ -+ return TRUE; -+} -+ -+void -+GLAMOFiniVideo(ScreenPtr pScreen) -+{ -+ KdScreenPriv(pScreen); -+ GLAMOScreenInfo(pScreenPriv); -+ KdVideoAdaptorPtr adapt = glamos->pAdaptor; -+ GLAMOPortPrivPtr pPortPriv; -+ int i; -+ -+ if (!adapt) -+ return; -+ -+ GLAMOPowerDown(pScreen); -+ -+ for (i = 0; i < glamos->num_texture_ports; i++) { -+ pPortPriv = (GLAMOPortPrivPtr)(&adapt->pPortPrivates[i].ptr); -+ REGION_UNINIT(pScreen, &pPortPriv->clip); -+ } -+ xfree(adapt); -+ glamos->pAdaptor = NULL; -+} diff --git a/packages/xorg-xserver/xserver-kdrive-common.inc b/packages/xorg-xserver/xserver-kdrive-common.inc index 6ea9c8439f..b0d5e39813 100644 --- a/packages/xorg-xserver/xserver-kdrive-common.inc +++ b/packages/xorg-xserver/xserver-kdrive-common.inc @@ -9,7 +9,6 @@ PACKAGES =+ "xserver-kdrive-fbdev \ xserver-kdrive-xephyr \ xserver-kdrive-epson \ xserver-kdrive-ati \ - xserver-kdrive-glamo \ xserver-kdrive-chips \ xserver-kdrive-i810 \ xserver-kdrive-mach64 \ @@ -33,7 +32,6 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep DESCRIPTION_xserver-kdrive-sdl = "X server from freedesktop.org, SDL version" DESCRIPTION_xserver-kdrive-w100 = "X server from freedesktop.org, supporting the ATI imageon w100 chipset" DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" -DESCRIPTION_xserver-kdrive-glamo = "X server from freedesktop.org, supporting Smedia Glamo chipset" DESCRIPTION_xserver-kdrive-chips = "X server from freedesktop.org, supporting Chips chipsets" DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting Intel chipsets" DESCRIPTION_xserver-kdrive-imageon = "X server from freedesktop.org, supporting the ATI imageon 100 chipset" @@ -56,7 +54,6 @@ FILES_xserver-kdrive-epson = "${bindir}/Xepson" FILES_xserver-kdrive-sdl = "${bindir}/Xsdl" FILES_xserver-kdrive-w100 = "${bindir}/Xw100" FILES_xserver-kdrive-ati = "${bindir}/Xati" -FILES_xserver-kdrive-glamo = "${bindir}/Xglamo" FILES_xserver-kdrive-chips = "${bindir}/Xchips" FILES_xserver-kdrive-i810 = "${bindir}/Xi810" FILES_xserver-kdrive-imageon = "${bindir}/Ximageon" @@ -77,7 +74,6 @@ RDEPENDS_xserver-kdrive-epson = "${PN}" RDEPENDS_xserver-kdrive-sdl = "${PN}" RDEPENDS_xserver-kdrive-w100 = "${PN}" RDEPENDS_xserver-kdrive-ati = "${PN}" -RDEPENDS_xserver-kdrive-glamo = "${PN}" RDEPENDS_xserver-kdrive-chips = "${PN}" RDEPENDS_xserver-kdrive-i810 = "${PN}" RDEPENDS_xserver-kdrive-mach64 = "${PN}" diff --git a/packages/xorg-xserver/xserver-kdrive/00-xglamo-logs.patch b/packages/xorg-xserver/xserver-kdrive/00-xglamo-logs.patch deleted file mode 100644 index 8fc8ff46b9..0000000000 --- a/packages/xorg-xserver/xserver-kdrive/00-xglamo-logs.patch +++ /dev/null @@ -1,386 +0,0 @@ -Index: xorg-server-1.3.0.0/hw/kdrive/glamo/Makefile.am -=================================================================== ---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/Makefile.am 2007-11-28 18:44:27.000000000 +0100 -+++ xorg-server-1.3.0.0/hw/kdrive/glamo/Makefile.am 2007-11-28 18:44:28.000000000 +0100 -@@ -20,6 +20,7 @@ - noinst_LIBRARIES = libglamo.a - - libglamo_a_SOURCES = \ -+ glamo-log.h \ - glamo_dma.c \ - glamo_dma.h \ - glamo_draw.c \ -Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo-log.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo-log.h 2007-11-29 09:05:53.000000000 +0100 -@@ -0,0 +1,63 @@ -+/* -+ * Copyright © 2007 OpenMoko, Inc. -+ * -+ * This driver is based on Xati, -+ * Copyright © 2004 Eric Anholt -+ * -+ * Permission to use, copy, modify, distribute, and sell this software and its -+ * documentation for any purpose is hereby granted without fee, provided that -+ * the above copyright notice appear in all copies and that both that copyright -+ * notice and this permission notice appear in supporting documentation, and -+ * that the name of the copyright holders not be used in advertising or -+ * publicity pertaining to distribution of the software without specific, -+ * written prior permission. The copyright holders make no representations -+ * about the suitability of this software for any purpose. It is provided "as -+ * is" without express or implied warranty. -+ * -+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE -+ * OF THIS SOFTWARE. -+ * -+ * Author: Dodji Seketeli -+ */ -+#ifndef _GLAMO_LOG_H_ -+#define _GLAMO_LOG_H_ -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ -+#include -+#include "os.h" -+ -+#ifdef NDEBUG -+/*we are not in debug mode*/ -+#define GLAMO_LOG -+#define GLAMO_LOG_ERROR -+ -+#else /*NDEBUG*/ -+ -+#define ERROR_LOG_LEVEL 3 -+#define INFO_LOG_LEVEL 4 -+ -+#ifndef GLAMO_LOG -+#define GLAMO_LOG(...) \ -+LogMessageVerb(X_NOTICE, INFO_LOG_LEVEL, "in %s:%d:%s: ",\ -+ __FILE__, __LINE__, __func__) ; \ -+LogMessageVerb(X_NOTICE, INFO_LOG_LEVEL, __VA_ARGS__) -+#endif /*GLAMO_LOG*/ -+ -+#ifndef GLAMO_LOG_ERROR -+#define GLAMO_LOG_ERROR(...) \ -+LogMessageVerb(X_NOTICE, ERROR_LOG_LEVEL, "Error:in %s:%d:%s: ",\ -+ __FILE__, __LINE__, __func__) ; \ -+LogMessageVerb(X_NOTICE, ERROR_LOG_LEVEL, __VA_ARGS__) -+#endif /*GLAMO_LOG_ERROR*/ -+ -+#endif /*NDEBUG*/ -+ -+#endif /*_GLAMO_LOG_H_*/ -+ -Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_draw.c -=================================================================== ---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo_draw.c 2007-11-28 18:44:27.000000000 +0100 -+++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_draw.c 2007-11-29 09:33:11.000000000 +0100 -@@ -26,6 +26,7 @@ - #ifdef HAVE_CONFIG_H - #include - #endif -+#include "glamo-log.h" - #include "glamo.h" - #include "glamo-regs.h" - #include "glamo_dma.h" -@@ -90,45 +91,11 @@ - KdScreenPriv(pScreen); - GLAMOScreenInfo(pScreenPriv); - -- ENTER_DRAW(0); -+ GLAMO_LOG("enter"); - GLAMOWaitIdle(glamos); -- LEAVE_DRAW(0); -+ GLAMO_LOG("leave"); - } - --#if GLAMO_TRACE_DRAW --void --GLAMOEnterDraw (PixmapPtr pPix, const char *function) --{ -- if (pPix != NULL) { -- KdScreenPriv(pPix->drawable.pScreen); -- CARD32 offset; -- -- offset = ((CARD8 *)pPix->devPrivate.ptr - -- pScreenPriv->screen->memory_base); -- -- ErrorF ("Enter %s 0x%x (%dx%dx%d/%d)\n", function, (unsigned int) offset, -- pPix->drawable.width, pPix->drawable.height, pPix->drawable.depth, -- (unsigned int) pPix->drawable.bitsPerPixel); -- } else -- ErrorF ("Enter %s\n", function); --} -- --void --GLAMOLeaveDraw (PixmapPtr pPix, const char *function) --{ -- if (pPix != NULL) { -- KdScreenPriv(pPix->drawable.pScreen); -- CARD32 offset; -- -- offset = ((CARD8 *)pPix->devPrivate.ptr - -- pScreenPriv->screen->memory_base); -- -- ErrorF ("Leave %s 0x%x\n", function, (unsigned int) offset); -- } else -- ErrorF ("Leave %s\n", function); --} --#endif -- - static Bool - GLAMOPrepareSolid(PixmapPtr pPix, int alu, Pixel pm, Pixel fg) - { -@@ -152,7 +119,7 @@ - pScreenPriv->screen->memory_base); - pitch = pPix->devKind; - -- ENTER_DRAW(pPix); -+ GLAMO_LOG("enter"); - - BEGIN_DMA(12); - OUT_REG(GLAMO_REG_2D_DST_ADDRL, offset & 0xffff); -@@ -163,7 +130,7 @@ - OUT_REG(GLAMO_REG_2D_COMMAND2, settings); - END_DMA(); - -- LEAVE_DRAW(pPix); -+ GLAMO_LOG("leave"); - - return TRUE; - } -@@ -171,7 +138,7 @@ - static void - GLAMOSolid(int x1, int y1, int x2, int y2) - { -- ENTER_DRAW(0); -+ GLAMO_LOG("enter"); - GLAMOScreenInfo *glamos = accel_glamos; - RING_LOCALS; - -@@ -184,14 +151,12 @@ - OUT_REG(GLAMO_REG_2D_ID1, 0); - OUT_REG(GLAMO_REG_2D_ID2, 0); - END_DMA(); -- LEAVE_DRAW(0); -+ GLAMO_LOG("leave"); - } - - static void - GLAMODoneSolid(void) - { -- ENTER_DRAW(0); -- LEAVE_DRAW(0); - } - - static Bool -@@ -204,6 +169,8 @@ - FbBits mask; - RING_LOCALS; - -+ GLAMO_LOG("enter"); -+ - if (pSrc->drawable.bitsPerPixel != 16 || - pDst->drawable.bitsPerPixel != 16) - GLAMO_FALLBACK(("Only 16bpp is supported")); -@@ -224,8 +191,6 @@ - - settings = GLAMOBltRop[alu] << 8; - -- ENTER_DRAW (pDst); -- - BEGIN_DMA(16); - - OUT_REG(GLAMO_REG_2D_SRC_ADDRL, src_offset & 0xffff); -@@ -241,7 +206,7 @@ - - END_DMA(); - -- LEAVE_DRAW(pDst); -+ GLAMO_LOG("leave"); - - return TRUE; - } -@@ -268,8 +233,10 @@ - static void - GLAMODoneCopy(void) - { -- ENTER_DRAW(0); -- LEAVE_DRAW(0); -+ GLAMOScreenInfo *glamos = accel_glamos; -+ GLAMO_LOG("enter"); -+ GLAMOFlushIndirect(glamos, 1); -+ GLAMO_LOG("leave"); - } - - static Bool -@@ -279,6 +246,7 @@ - CARD8 *dst_offset; - int dst_pitch; - -+ GLAMO_LOG("enter"); - dst_offset = (CARD8 *)pDst->devPrivate.ptr; - dst_pitch = pDst->devKind; - width = pDst->drawable.width; -@@ -294,83 +262,9 @@ - src += src_pitch; - } - -- ErrorF("hostdata upload %d,%d %dbpp\n", width, height, bpp); -- - return TRUE; - } - -- --#if 0 --static Bool --GLAMOUploadToScratch(PixmapPtr pSrc, PixmapPtr pDst) --{ -- KdScreenPriv(pSrc->drawable.pScreen); -- GLAMOCardInfo(pScreenPriv); -- GLAMOScreenInfo(pScreenPriv); -- int dst_pitch, src_pitch, w, i, size, bytes; -- unsigned char *dst, *src; -- RING_LOCALS; -- -- ENTER_DRAW(pSrc); -- /* Align width to log 2, useful for R128 composite. This should be a -- * KAA flag we check for (and supported in kaa.c in general) since many -- * older bits of hardware are going to want POT pitches. -- */ -- w = pSrc->drawable.width; -- if (glamos->kaa.flags & KAA_OFFSCREEN_ALIGN_POT) -- w = 1 << (GLAMOLog2(w - 1) + 1); -- dst_pitch = (w * pSrc->drawable.bitsPerPixel / 8 + -- glamos->kaa.pitchAlign - 1) & ~(glamos->kaa.pitchAlign - 1); -- -- size = dst_pitch * pSrc->drawable.height; -- if (size > glamos->scratch_area->size) -- GLAMO_FALLBACK(("Pixmap too large for scratch (%d,%d)\n", -- pSrc->drawable.width, pSrc->drawable.height)); -- -- glamos->scratch_next = (glamos->scratch_next + glamos->kaa.offsetAlign - 1) & -- ~(glamos->kaa.offsetAlign - 1); -- if (glamos->scratch_next + size > glamos->scratch_area->offset + -- glamos->scratch_area->size) { -- /* Only sync when we've used all of the scratch area. */ -- kaaWaitSync(pSrc->drawable.pScreen); -- glamos->scratch_next = glamos->scratch_area->offset; -- } -- memcpy(pDst, pSrc, sizeof(*pDst)); -- pDst->devKind = dst_pitch; -- pDst->devPrivate.ptr = pScreenPriv->screen->memory_base + -- glamos->scratch_next; -- glamos->scratch_next += size; -- -- src = pSrc->devPrivate.ptr; -- src_pitch = pSrc->devKind; -- dst = pDst->devPrivate.ptr; -- bytes = src_pitch < dst_pitch ? src_pitch : dst_pitch; -- -- i = pSrc->drawable.height; -- while (i--) { -- memcpy(dst, src, bytes); -- dst += dst_pitch; -- src += src_pitch; -- } -- -- /* Flush the pixel cache */ -- if (glamoc->is_3362) { -- BEGIN_DMA(4); -- OUT_REG(RADEON_REG_RB3D_DSTCACHE_CTLSTAT, -- RADEON_RB3D_DC_FLUSH_ALL); -- OUT_REG(GLAMO_REG_WAIT_UNTIL, RADEON_WAIT_HOST_IDLECLEAN); -- END_DMA(); -- } else { -- BEGIN_DMA(2); -- OUT_REG(R128_REG_PC_GUI_CTLSTAT, R128_PC_FLUSH_ALL); -- END_DMA(); -- } -- -- LEAVE_DRAW(pSrc); -- return TRUE; --} --#endif -- - static void - GLAMOBlockHandler(pointer blockData, OSTimePtr timeout, pointer readmask) - { -Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_dma.c -=================================================================== ---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo_dma.c 2007-11-28 18:44:27.000000000 +0100 -+++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_dma.c 2007-11-28 22:13:23.000000000 +0100 -@@ -25,6 +25,7 @@ - - #include - -+#include "glamo-log.h" - #include "glamo.h" - #include "glamo-regs.h" - #include "glamo_dma.h" -@@ -35,9 +36,7 @@ - #include "glamo_sarea.h" - #endif /* USE_DRI */ - --#define DEBUG_FIFO 1 -- --#if DEBUG_FIFO -+#ifndef NDEBUG - static void - GLAMODebugFifo(GLAMOScreenInfo *glamos) - { -@@ -273,7 +272,7 @@ - count--; - } - if (TIMEDOUT()) { -- ErrorF("Timeout submitting packets, resetting...\n"); -+ GLAMO_LOG_ERROR("Timeout submitting packets, resetting...\n"); - GLAMOEngineReset(glamos->screen->pScreen, GLAMO_ENGINE_CQ); - GLAMODrawSetup(glamos->screen->pScreen); - } -@@ -292,11 +291,6 @@ - if ((glamos->indirectStart == buf->used) && !discard) - return; - --#if DEBUG_FIFO -- ErrorF("Dispatching %d DWORDS\n", (buf->used - glamos->indirectStart) / -- 4); --#endif -- - #ifdef USE_DRI - if (glamos->using_dri) { - buf->drmBuf->used = buf->used; -@@ -384,11 +378,6 @@ - glamos->indirectBuffer = GLAMOGetDMABuffer(glamos); - if (glamos->indirectBuffer == FALSE) - FatalError("Failed to allocate DMA buffer.\n"); -- -- if (glamos->using_dri) -- ErrorF("Initialized DRI DMA\n"); -- else -- ErrorF("Initialized DMA\n"); - } - - void -Index: xorg-server-1.3.0.0/configure.ac -=================================================================== ---- xorg-server-1.3.0.0.orig/configure.ac 2007-11-29 09:07:21.000000000 +0100 -+++ xorg-server-1.3.0.0/configure.ac 2007-11-29 09:15:38.000000000 +0100 -@@ -866,6 +866,10 @@ - - if ! test "x$DEBUGGING" = xyes; then - AC_DEFINE(NDEBUG, 1, [Disable some debugging code]) -+ AC_MSG_NOTICE([disabled debugging]) -+else -+ AC_MSG_NOTICE([enabled debugging]) -+ - fi - - AC_DEFINE(USE_RGB_TXT, 1, [Use rgb.txt directly]) diff --git a/packages/xorg-xserver/xserver-kdrive/01-xglamo-scrolling-artifact-fix.patch b/packages/xorg-xserver/xserver-kdrive/01-xglamo-scrolling-artifact-fix.patch deleted file mode 100644 index 1ca96b954d..0000000000 --- a/packages/xorg-xserver/xserver-kdrive/01-xglamo-scrolling-artifact-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_draw.c -=================================================================== ---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo_draw.c 2007-11-30 09:54:00.000000000 +0100 -+++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_draw.c 2007-11-30 09:55:05.000000000 +0100 -@@ -314,8 +314,8 @@ - */ - - glamos->kaa.flags = KAA_OFFSCREEN_PIXMAPS; -- glamos->kaa.offsetAlign = 2; -- glamos->kaa.pitchAlign = 2; -+ glamos->kaa.offsetAlign = 0; -+ glamos->kaa.pitchAlign = 0; - - kaaInitTrapOffsets(8, sample_offsets_x, sample_offsets_y, 0.0, 0.0); - sample_count = (1 << 8) - 1; diff --git a/packages/xorg-xserver/xserver-kdrive/02-xglamo-no-dri.patch b/packages/xorg-xserver/xserver-kdrive/02-xglamo-no-dri.patch deleted file mode 100644 index 43315121da..0000000000 --- a/packages/xorg-xserver/xserver-kdrive/02-xglamo-no-dri.patch +++ /dev/null @@ -1,438 +0,0 @@ -Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo.c -=================================================================== ---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo.c 2007-11-28 18:44:27.000000000 +0100 -+++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo.c 2007-11-30 10:18:43.000000000 +0100 -@@ -27,9 +27,6 @@ - #include - #endif - #include "glamo.h" --#if defined(USE_DRI) && defined(GLXEXT) --#include "glamo_sarea.h" --#endif - - static Bool - GLAMOCardInit(KdCardInfo *card) -@@ -89,13 +86,6 @@ - return FALSE; - } - --#ifdef USE_DRI -- /* We demand identification by busid, not driver name */ -- glamoc->drmFd = drmOpen(NULL, glamoc->busid); -- if (glamoc->drmFd < 0) -- ErrorF("Failed to open DRM, DRI disabled.\n"); --#endif /* USE_DRI */ -- - card->driver = glamoc; - - glamoc->is_3362 = TRUE; -@@ -122,10 +112,6 @@ - GLAMOSetOffscreen (KdScreenInfo *screen) - { - GLAMOCardInfo(screen); --#if defined(USE_DRI) && defined(GLXEXT) -- GLAMOScreenInfo *glamos = (GLAMOScreenInfo *)screen->driver; -- int l; --#endif - int screen_size; - char *mmio = glamoc->reg_base; - -@@ -152,57 +138,7 @@ - } - - screen_size = screen->fb[0].byteStride * screen->height; -- - screen->off_screen_base = screen_size; -- --#if defined(USE_DRI) && defined(GLXEXT) -- /* Reserve a static area for the back buffer the same size as the -- * visible screen. XXX: This would be better initialized in glamo_dri.c -- * when GLX is set up, but the offscreen memory manager's allocations -- * don't last through VT switches, while the kernel's understanding of -- * offscreen locations does. -- */ -- glamos->frontOffset = 0; -- glamos->frontPitch = screen->fb[0].byteStride; -- -- if (screen->off_screen_base + screen_size <= screen->memory_size) { -- glamos->backOffset = screen->off_screen_base; -- glamos->backPitch = screen->fb[0].byteStride; -- screen->off_screen_base += screen_size; -- } -- -- /* Reserve the depth span for Rage 128 */ -- if (!glamoc->is_3362 && screen->off_screen_base + -- screen->fb[0].byteStride <= screen->memory_size) { -- glamos->spanOffset = screen->off_screen_base; -- screen->off_screen_base += screen->fb[0].byteStride; -- } -- -- /* Reserve the static depth buffer, which happens to be the same -- * bitsPerPixel as the screen. -- */ -- if (screen->off_screen_base + screen_size <= screen->memory_size) { -- glamos->depthOffset = screen->off_screen_base; -- glamos->depthPitch = screen->fb[0].byteStride; -- screen->off_screen_base += screen_size; -- } -- -- /* Reserve approx. half of remaining offscreen memory for local -- * textures. Round down to a whole number of texture regions. -- */ -- glamos->textureSize = (screen->memory_size - screen->off_screen_base) / 2; -- l = GLAMOLog2(glamos->textureSize / GLAMO_NR_TEX_REGIONS); -- if (l < GLAMO_LOG_TEX_GRANULARITY) -- l = GLAMO_LOG_TEX_GRANULARITY; -- glamos->textureSize = (glamos->textureSize >> l) << l; -- if (glamos->textureSize >= 512 * 1024) { -- glamos->textureOffset = screen->off_screen_base; -- screen->off_screen_base += glamos->textureSize; -- } else { -- /* Minimum texture size is for 2 256x256x32bpp textures */ -- glamos->textureSize = 0; -- } --#endif /* USE_DRI && GLXEXT */ - } - - static Bool -@@ -413,9 +349,6 @@ - GLAMODisable(ScreenPtr pScreen) - { - KdScreenPriv(pScreen); --#if defined(USE_DRI) && defined(GLXEXT) -- GLAMOScreenInfo(pScreenPriv); --#endif /* USE_DRI && GLXEXT */ - GLAMOCardInfo(pScreenPriv); - - GLAMOUnmapReg(pScreenPriv->card, glamoc); -Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_dma.c -=================================================================== ---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo_dma.c 2007-11-28 22:13:23.000000000 +0100 -+++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_dma.c 2007-11-30 10:25:49.000000000 +0100 -@@ -31,11 +31,6 @@ - #include "glamo_dma.h" - #include "glamo_draw.h" - --#ifdef USE_DRI --#include "radeon_common.h" --#include "glamo_sarea.h" --#endif /* USE_DRI */ -- - #ifndef NDEBUG - static void - GLAMODebugFifo(GLAMOScreenInfo *glamos) -@@ -168,26 +163,6 @@ - if (glamos->indirectBuffer != NULL) - GLAMOFlushIndirect(glamos, 0); - --#ifdef USE_DRI -- if (glamos->using_dri) { -- int ret = 0; -- int cmd = (glamoc->is_3362 ? DRM_RADEON_CP_IDLE : -- DRM_R128_CCE_IDLE); -- WHILE_NOT_TIMEOUT(2) { -- ret = drmCommandNone(glamoc->drmFd, cmd); -- if (ret != -EBUSY) -- break; -- } -- if (TIMEDOUT()) { -- GLAMODebugFifo(glamos); -- FatalError("Timed out idling CCE (card hung)\n"); -- } -- if (ret != 0) -- ErrorF("Failed to idle DMA, returned %d\n", ret); -- return; -- } --#endif -- - WHILE_NOT_TIMEOUT(.5) { - status = MMIO_IN16(mmio, GLAMO_REG_CQ_STATUS); - if ((status & (1 << 2)) && !(status & (1 << 8))) -@@ -214,20 +189,6 @@ - if (buf == NULL) - return NULL; - --#ifdef USE_DRI -- if (glamos->using_dri) { -- buf->drmBuf = GLAMODRIGetBuffer(glamos); -- if (buf->drmBuf == NULL) { -- xfree(buf); -- return NULL; -- } -- buf->size = buf->drmBuf->total; -- buf->used = buf->drmBuf->used; -- buf->address = buf->drmBuf->address; -- return buf; -- } --#endif /* USE_DRI */ -- - buf->size = glamos->ring_len / 2; - buf->address = xalloc(buf->size); - if (buf->address == NULL) { -@@ -290,25 +251,6 @@ - - if ((glamos->indirectStart == buf->used) && !discard) - return; -- --#ifdef USE_DRI -- if (glamos->using_dri) { -- buf->drmBuf->used = buf->used; -- GLAMODRIDispatchIndirect(glamos, discard); -- if (discard) { -- buf->drmBuf = GLAMODRIGetBuffer(glamos); -- buf->size = buf->drmBuf->total; -- buf->used = buf->drmBuf->used; -- buf->address = buf->drmBuf->address; -- glamos->indirectStart = 0; -- } else { -- /* Start on a double word boundary */ -- glamos->indirectStart = buf->used = (buf->used + 7) & ~7; -- } -- return; -- } --#endif /* USE_DRI */ -- - GLAMODispatchIndirectDMA(glamos); - - buf->used = 0; -@@ -367,13 +309,7 @@ - KdScreenPriv(pScreen); - GLAMOScreenInfo(pScreenPriv); - --#ifdef USE_DRI -- if (glamos->using_dri) -- GLAMODRIDMAStart(glamos); --#endif /* USE_DRI */ -- -- if (!glamos->using_dri) -- GLAMODMAInit(pScreen); -+ GLAMODMAInit(pScreen); - - glamos->indirectBuffer = GLAMOGetDMABuffer(glamos); - if (glamos->indirectBuffer == FALSE) -@@ -388,11 +324,6 @@ - - GLAMOWaitIdle(glamos); - --#ifdef USE_DRI -- if (glamos->using_dri) -- GLAMODRIDMAStop(glamos); --#endif /* USE_DRI */ -- - xfree(glamos->indirectBuffer->address); - xfree(glamos->indirectBuffer); - glamos->indirectBuffer = NULL; -Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo.h -=================================================================== ---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo.h 2007-11-30 10:24:13.000000000 +0100 -+++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo.h 2007-11-30 10:25:06.000000000 +0100 -@@ -39,18 +39,6 @@ - - #include "kxv.h" - --#undef XF86DRI --#ifdef XF86DRI --#define USE_DRI --#include "xf86drm.h" --#include "dri.h" --#ifdef GLXEXT --#include "GL/glxint.h" --#include "GL/glxtokens.h" --#include "glamo_dripriv.h" --#endif --#endif -- - #define GLAMO_REG_BASE(c) ((c)->attr.address[0]) - #define GLAMO_REG_SIZE(c) (0x2400) - -@@ -124,9 +112,6 @@ - Bool is_3362; - CARD32 crtc_pitch; - CARD32 crtc2_pitch; --#ifdef USE_DRI -- int drmFd; --#endif /* USE_DRI */ - Bool use_fbdev, use_vesa; - } GLAMOCardInfo; - -@@ -166,9 +151,6 @@ - int size; - int used; - void *address; --#ifdef USE_DRI -- drmBufPtr drmBuf; --#endif - } dmaBuf; - - typedef struct _GLAMOScreenInfo { -@@ -194,8 +176,6 @@ - KdVideoAdaptorPtr pAdaptor; - int num_texture_ports; - -- Bool using_dri; /* If we use the DRM for DMA. */ -- - KdOffscreenArea *dma_space; /* For "DMA" from framebuffer. */ - CARD16 *ring_addr; /* Beginning of ring buffer. */ - int ring_write; /* Index of write ptr in ring. */ -@@ -204,76 +184,6 @@ - - dmaBuf *indirectBuffer; - int indirectStart; -- --#ifdef USE_DRI -- Bool dma_started; -- -- drmSize registerSize; -- drmHandle registerHandle; -- drmHandle fbHandle; -- -- drmSize gartSize; -- drmHandle agpMemHandle; /* Handle from drmAgpAlloc */ -- unsigned long gartOffset; -- unsigned char *AGP; /* Map */ -- int agpMode; -- drmSize pciSize; -- drmHandle pciMemHandle; -- -- /* ring buffer data */ -- unsigned long ringStart; /* Offset into AGP space */ -- drmHandle ringHandle; /* Handle from drmAddMap */ -- drmSize ringMapSize; /* Size of map */ -- int ringSize; /* Size of ring (MB) */ -- unsigned char *ring; /* Map */ -- -- unsigned long ringReadOffset; /* Offset into AGP space */ -- drmHandle ringReadPtrHandle; /* Handle from drmAddMap */ -- drmSize ringReadMapSize; /* Size of map */ -- unsigned char *ringReadPtr; /* Map */ -- -- /* vertex/indirect buffer data */ -- unsigned long bufStart; /* Offset into AGP space */ -- drmHandle bufHandle; /* Handle from drmAddMap */ -- drmSize bufMapSize; /* Size of map */ -- int bufSize; /* Size of buffers (MB) */ -- unsigned char *buf; /* Map */ -- int bufNumBufs; /* Number of buffers */ -- drmBufMapPtr buffers; /* Buffer map */ -- -- /* AGP Texture data */ -- unsigned long gartTexStart; /* Offset into AGP space */ -- drmHandle gartTexHandle; /* Handle from drmAddMap */ -- drmSize gartTexMapSize; /* Size of map */ -- int gartTexSize; /* Size of AGP tex space (MB) */ -- unsigned char *gartTex; /* Map */ -- int log2GARTTexGran; -- -- int DMAusecTimeout; /* CCE timeout in usecs */ -- -- /* DRI screen private data */ -- int frontOffset; -- int frontPitch; -- int backOffset; -- int backPitch; -- int depthOffset; -- int depthPitch; -- int spanOffset; -- int textureOffset; -- int textureSize; -- int log2TexGran; -- -- int irqEnabled; -- -- int serverContext; -- -- DRIInfoPtr pDRIInfo; --#ifdef GLXEXT -- int numVisualConfigs; -- __GLXvisualConfig *pVisualConfigs; -- GLAMOConfigPrivPtr pVisualConfigsPriv; --#endif /* GLXEXT */ --#endif /* USE_DRI */ - } GLAMOScreenInfo; - - #define getGLAMOScreenInfo(kd) ((GLAMOScreenInfo *) ((kd)->screen->driver)) -@@ -330,31 +240,6 @@ - void - GLAMODrawFini(ScreenPtr pScreen); - --/* glamo_dri.c */ --#ifdef USE_DRI --Bool --GLAMODRIScreenInit(ScreenPtr pScreen); -- --void --GLAMODRICloseScreen(ScreenPtr pScreen); -- --void --GLAMODRIDMAStart(GLAMOScreenInfo *glamos); -- --void --GLAMODRIDMAStop(GLAMOScreenInfo *glamos); -- --void --GLAMODRIDMAReset(GLAMOScreenInfo *glamos); -- --void --GLAMODRIDispatchIndirect(GLAMOScreenInfo *glamos, Bool discard); -- --drmBufPtr --GLAMODRIGetBuffer(GLAMOScreenInfo *glamos); -- --#endif /* USE_DRI */ -- - /* glamo_cursor.c */ - Bool - GLAMOCursorInit(ScreenPtr pScreen); -Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_draw.c -=================================================================== ---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo_draw.c 2007-11-30 09:55:05.000000000 +0100 -+++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_draw.c 2007-11-30 10:26:02.000000000 +0100 -@@ -296,11 +296,6 @@ - RegisterBlockAndWakeupHandlers(GLAMOBlockHandler, GLAMOWakeupHandler, - pScreen); - -- glamos->using_dri = FALSE; --#ifdef USE_DRI -- glamos->using_dri = GLAMODRIScreenInit(pScreen); --#endif /* USE_DRI */ -- - memset(&glamos->kaa, 0, sizeof(KaaScreenInfoRec)); - glamos->kaa.waitMarker = GLAMOWaitMarker; - glamos->kaa.PrepareSolid = GLAMOPrepareSolid; -@@ -357,20 +352,6 @@ - glamos->kaa.UploadToScreen = NULL; - glamos->kaa.UploadToScratch = NULL; - --#ifdef USE_DRI -- if (glamos->using_dri) { -- if (!glamoc->is_3362) { -- /*glamos->kaa.PrepareTrapezoids = R128PrepareTrapezoids; -- glamos->kaa.Trapezoids = R128Trapezoids; -- glamos->kaa.DoneTrapezoids = R128DoneTrapezoids;*/ -- } else if (glamoc->is_r100 || glamoc->is_r200) { -- glamos->kaa.PrepareTrapezoids = RadeonPrepareTrapezoids; -- glamos->kaa.Trapezoids = RadeonTrapezoids; -- glamos->kaa.DoneTrapezoids = RadeonDoneTrapezoids; -- } -- } --#endif /* USE_DRI */ -- - glamos->kaa.UploadToScreen = GLAMOUploadToScreen; - - /* Reserve a scratch area. It'll be used for storing glyph data during -@@ -399,15 +380,6 @@ - void - GLAMODrawFini(ScreenPtr pScreen) - { --#ifdef USE_DRI -- KdScreenPriv(pScreen); -- GLAMOScreenInfo(pScreenPriv); -- if (glamos->using_dri) { -- GLAMODRICloseScreen(pScreen); -- glamos->using_dri = FALSE; -- } --#endif /* USE_DRI */ -- - RemoveBlockAndWakeupHandlers(GLAMOBlockHandler, GLAMOWakeupHandler, - pScreen); - diff --git a/packages/xorg-xserver/xserver-kdrive/03-xglamo-no-vesa.patch b/packages/xorg-xserver/xserver-kdrive/03-xglamo-no-vesa.patch deleted file mode 100644 index 2c44bd8d3d..0000000000 --- a/packages/xorg-xserver/xserver-kdrive/03-xglamo-no-vesa.patch +++ /dev/null @@ -1,141 +0,0 @@ -Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo.c -=================================================================== ---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo.c 2007-11-30 10:18:43.000000000 +0100 -+++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo.c 2007-11-30 10:35:27.000000000 +0100 -@@ -38,9 +38,7 @@ - if (glamoc == NULL) - return FALSE; - --#ifdef KDRIVEFBDEV - if (!initialized && fbdevInitialize(card, &glamoc->backend_priv.fbdev)) { -- glamoc->use_fbdev = TRUE; - initialized = TRUE; - glamoc->backend_funcs.cardfini = fbdevCardFini; - glamoc->backend_funcs.scrfini = fbdevScreenFini; -@@ -58,29 +56,6 @@ - glamoc->backend_funcs.randrSetConfig = fbdevRandRSetConfig; - #endif - } --#endif --#ifdef KDRIVEVESA -- if (!initialized && vesaInitialize(card, &glamoc->backend_priv.vesa)) { -- glamoc->use_vesa = TRUE; -- initialized = TRUE; -- glamoc->backend_funcs.cardfini = vesaCardFini; -- glamoc->backend_funcs.scrfini = vesaScreenFini; -- glamoc->backend_funcs.initScreen = vesaInitScreen; -- glamoc->backend_funcs.finishInitScreen = vesaFinishInitScreen; -- glamoc->backend_funcs.createRes = vesaCreateResources; -- glamoc->backend_funcs.preserve = vesaPreserve; -- glamoc->backend_funcs.restore = vesaRestore; -- glamoc->backend_funcs.dpms = vesaDPMS; -- glamoc->backend_funcs.enable = vesaEnable; -- glamoc->backend_funcs.disable = vesaDisable; -- glamoc->backend_funcs.getColors = vesaGetColors; -- glamoc->backend_funcs.putColors = vesaPutColors; --#ifdef RANDR -- glamoc->backend_funcs.randrSetConfig = vesaRandRSetConfig; --#endif -- } --#endif -- - if (!initialized || !GLAMOMapReg(card, glamoc)) { - xfree(glamoc); - return FALSE; -@@ -158,18 +133,8 @@ - - if (screen->fb[0].depth == 0) - screen->fb[0].depth = 16; --#ifdef KDRIVEFBDEV -- if (glamoc->use_fbdev) { -- success = fbdevScreenInitialize(screen, -- &glamos->backend_priv.fbdev); -- } --#endif --#ifdef KDRIVEVESA -- if (glamoc->use_vesa) { -- success = vesaScreenInitialize(screen, -- &glamos->backend_priv.vesa); -- } --#endif -+ -+ success = fbdevScreenInitialize(screen, &glamos->backend_priv.fbdev); - - if (!success) { - screen->driver = NULL; -Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo.h -=================================================================== ---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo.h 2007-11-30 10:25:06.000000000 +0100 -+++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo.h 2007-11-30 10:35:17.000000000 +0100 -@@ -30,13 +30,7 @@ - #include - #endif - --#ifdef KDRIVEFBDEV - #include --#endif --#ifdef KDRIVEVESA --#include --#endif -- - #include "kxv.h" - - #define GLAMO_REG_BASE(c) ((c)->attr.address[0]) -@@ -99,12 +93,7 @@ - - typedef struct _GLAMOCardInfo { - union { --#ifdef KDRIVEFBDEV - FbdevPriv fbdev; --#endif --#ifdef KDRIVEVESA -- VesaCardPrivRec vesa; --#endif - } backend_priv; - struct backend_funcs backend_funcs; - -@@ -112,7 +101,6 @@ - Bool is_3362; - CARD32 crtc_pitch; - CARD32 crtc2_pitch; -- Bool use_fbdev, use_vesa; - } GLAMOCardInfo; - - #define getGLAMOCardInfo(kd) ((GLAMOCardInfo *) ((kd)->card->driver)) -@@ -155,12 +143,7 @@ - - typedef struct _GLAMOScreenInfo { - union { --#ifdef KDRIVEFBDEV - FbdevScrPriv fbdev; --#endif --#ifdef KDRIVEVESA -- VesaScreenPrivRec vesa; --#endif - } backend_priv; - KaaScreenInfoRec kaa; - -Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_stub.c -=================================================================== ---- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo_stub.c 2007-11-28 18:44:27.000000000 +0100 -+++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_stub.c 2007-11-30 10:34:10.000000000 +0100 -@@ -59,9 +59,6 @@ - ddxUseMsg (void) - { - KdUseMsg(); --#ifdef KDRIVEVESA -- vesaUseMsg(); --#endif - } - - int -@@ -69,9 +66,6 @@ - { - int ret; - --#ifdef KDRIVEVESA -- if (!(ret = vesaProcessArgument (argc, argv, i))) --#endif - ret = KdProcessArgument(argc, argv, i); - - return ret; diff --git a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb index 755a51ca63..4a1a709279 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb @@ -3,7 +3,7 @@ require xserver-kdrive-common.inc DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r24" +PR = "r25" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ @@ -22,12 +22,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ file://kdrive-1.3-18bpp.patch;patch=1 \ file://linux-keyboard-mediumraw.patch;patch=1 \ file://gumstix-kmode.patch;patch=1 \ - file://smedia-glamo.patch;patch=1 \ - file://build-glamo.patch;patch=1 \ - file://00-xglamo-logs.patch;patch=1 \ - file://01-xglamo-scrolling-artifact-fix.patch;patch=1 \ - file://02-xglamo-no-dri.patch;patch=1 \ - file://03-xglamo-no-vesa.patch;patch=1 \ + file://fix-picturestr-include-order.patch;patch=1 \ " SRC_URI_append_avr32 = " \ -- cgit v1.2.3 From d04093e34aee0effce762a26db0f4c29a7c9c4f1 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Wed, 27 Feb 2008 09:12:18 +0000 Subject: xserver-kdrive-glamo_1.3.0.0+git.bb : an Xglamo recipe on its own pulling from the developers git tree directly. --- .../xserver-kdrive-glamo_1.3.0.0+git.bb | 64 ++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb b/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb new file mode 100644 index 0000000000..9f38760234 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb @@ -0,0 +1,64 @@ +DESCRIPTION = "X server for glamo chip in GTA02" +SECTION = "x11/base" +LICENSE = "MIT" +DEPENDS = "compositeproto damageproto fixesproto recordproto resourceproto \ + scrnsaverproto xineramaproto videoproto xextproto xproto \ + libxau libxext libxdmcp libxfont libxrandr tslib virtual/libx11 \ + xtrans libxkbfile libxcalibrate" +DEPENDS += "libxkbfile libxcalibrate" +RDEPENDS_${PN} = "xserver-kdrive" +PROVIDES = "virtual/xserver" +PE = "1" +PR = "r0" + +XGLAMO_GIT_REV = "d96175a2db993ef4bc7d9d910e0b47ec7ff20561" + +SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git;rev=${XGLAMO_GIT_REV} \ + file://kmode.patch;patch=1 \ + file://disable-apm.patch;patch=1 \ + file://no-serial-probing.patch;patch=1 \ + file://fbdev-not-fix.patch;patch=1 \ + file://optional-xkb.patch;patch=1 \ + file://enable-tslib.patch;patch=1 \ + file://kmode-palm.patch;patch=1 \ + file://enable-epson.patch;patch=1 \ + file://enable-builtin-fonts.patch;patch=1 \ + file://kdrive-evdev.patch;patch=1 \ + file://kdrive-use-evdev.patch;patch=1 \ + file://disable-xf86-dga-xorgcfg.patch;patch=1 \ + file://fix_default_mode.patch;patch=1 \ + file://enable-xcalibrate.patch;patch=1 \ + file://hide-cursor-and-ppm-root.patch;patch=1 \ + file://xcalibrate_coords.patch;patch=1 \ + file://w100.patch;patch=1 \ + file://w100-autofoo.patch;patch=1 \ + file://w100-fix-offscreen-bmp.patch;patch=1 \ + file://kdrive-1.3-18bpp.patch;patch=1 \ + file://gumstix-kmode.patch;patch=1 \ +" + +FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-1.3.0.0:${FILE_DIRNAME}/xserver-kdrive:${FILE_DIRNAME}/files" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-composite --enable-kdrive \ + --disable-dga --disable-dri --disable-xinerama \ + --disable-xf86misc --disable-xf86vidmode \ + --disable-xorg --disable-xorgcfg \ + --disable-xkb --disable-xnest --disable-xvfb \ + --disable-xevie --disable-xprint --disable-xtrap \ + --disable-dmx \ + --with-default-font-path=built-ins \ + --enable-tslib --enable-xcalibrate \ + ac_cv_file__usr_share_X11_sgml_defs_ent=no" + +do_configure_prepend() { + sed -i -e 's/tslib-0.0/tslib-1.0/' ${S}/configure.ac +} + +FILES_${PN} = "${bindir}/Xglamo" +FILES_${PN}-dbg = "${bindir}/.debug/Xglamo" + +ARM_INSTRUCTION_SET = "arm" -- cgit v1.2.3 From f53c6446866fe2aeedd2da8b8e07d7adf6b5d877 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 27 Feb 2008 11:04:17 +0000 Subject: libsdl: Remove PATH setting from sdl.m4, it breaks things --- packages/libsdl/files/remove_path.patch | 18 ++++++++++++++++++ packages/libsdl/libsdl.inc | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 packages/libsdl/files/remove_path.patch (limited to 'packages') diff --git a/packages/libsdl/files/remove_path.patch b/packages/libsdl/files/remove_path.patch new file mode 100644 index 0000000000..f5bee40bbd --- /dev/null +++ b/packages/libsdl/files/remove_path.patch @@ -0,0 +1,18 @@ +OE goes to great lengths to set PATH correctly and this just breaks +things since local sdl-config binaries will suddenly be preferred +rather than those in staging. + +RP - 27/02/2008 + +Index: SDL-1.2.9/sdl.m4 +=================================================================== +--- SDL-1.2.9.orig/sdl.m4 2008-02-27 10:08:38.000000000 +0000 ++++ SDL-1.2.9/sdl.m4 2008-02-27 10:08:51.000000000 +0000 +@@ -33,7 +33,6 @@ + fi + + AC_REQUIRE([AC_CANONICAL_TARGET]) +- PATH="$prefix/bin:$prefix/usr/bin:$PATH" + AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) + min_sdl_version=ifelse([$1], ,0.11.0,$1) + AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) diff --git a/packages/libsdl/libsdl.inc b/packages/libsdl/libsdl.inc index a65efb51be..ad74ecc87c 100644 --- a/packages/libsdl/libsdl.inc +++ b/packages/libsdl/libsdl.inc @@ -4,12 +4,13 @@ PRIORITY = "optional" DEPENDS = "alsa-lib mesa virtual/libx11 libxext" PROVIDES = "virtual/libsdl" LICENSE = "LGPL" -PR = "r3" +PR = "r4" SRC_URI = "\ http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://extra-keys.patch;patch=1 \ file://pagesize.patch;patch=1 \ + file://remove_path.patch;patch=1 \ file://acinclude.m4" S = "${WORKDIR}/SDL-${PV}" -- cgit v1.2.3 From d77eff78fcb371cb0016d204854900c932a49ba7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 27 Feb 2008 11:06:44 +0000 Subject: prboom: Remove incorrect sdl parameter from EXTRA_OECONF, m4 patch and custom configure function since sdl.m4 now works properly --- packages/prboom/files/m4.patch | 183 ---------------------------------------- packages/prboom/prboom_2.2.6.bb | 10 +-- packages/prboom/prboom_2.3.1.bb | 8 +- 3 files changed, 3 insertions(+), 198 deletions(-) delete mode 100644 packages/prboom/files/m4.patch (limited to 'packages') diff --git a/packages/prboom/files/m4.patch b/packages/prboom/files/m4.patch deleted file mode 100644 index e7918156e2..0000000000 --- a/packages/prboom/files/m4.patch +++ /dev/null @@ -1,183 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- /dev/null 1970-01-01 01:00:00.000000000 +0100 -+++ Src/m4/sdl.m4 2004-01-21 00:43:55.000000000 +0100 -@@ -0,0 +1,175 @@ -+# Configure paths for SDL -+# Sam Lantinga 9/21/99 -+# stolen from Manish Singh -+# stolen back from Frank Belew -+# stolen from Manish Singh -+# Shamelessly stolen from Owen Taylor -+ -+dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -+dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS -+dnl -+AC_DEFUN(AM_PATH_SDL, -+[dnl -+dnl Get the cflags and libraries from the sdl-config script -+dnl -+AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], -+ sdl_prefix="$withval", sdl_prefix="") -+AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], -+ sdl_exec_prefix="$withval", sdl_exec_prefix="") -+AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], -+ , enable_sdltest=yes) -+ -+ if test x$sdl_exec_prefix != x ; then -+ sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" -+ if test x${SDL_CONFIG+set} != xset ; then -+ SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config -+ fi -+ fi -+ if test x$sdl_prefix != x ; then -+ sdl_args="$sdl_args --prefix=$sdl_prefix" -+ if test x${SDL_CONFIG+set} != xset ; then -+ SDL_CONFIG=$sdl_prefix/bin/sdl-config -+ fi -+ fi -+ -+ AC_REQUIRE([AC_CANONICAL_TARGET]) -+ PATH="$prefix/bin:$prefix/usr/bin:$PATH" -+ AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) -+ min_sdl_version=ifelse([$1], ,0.11.0,$1) -+ AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) -+ no_sdl="" -+ if test "$SDL_CONFIG" = "no" ; then -+ no_sdl=yes -+ else -+ SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` -+ SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` -+ -+ sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ if test "x$enable_sdltest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $SDL_CFLAGS" -+ LIBS="$LIBS $SDL_LIBS" -+dnl -+dnl Now check if the installed SDL is sufficiently new. (Also sanity -+dnl checks the results of sdl-config to some extent -+dnl -+ rm -f conf.sdltest -+ AC_TRY_RUN([ -+#include -+#include -+#include -+#include "SDL.h" -+ -+char* -+my_strdup (char *str) -+{ -+ char *new_str; -+ -+ if (str) -+ { -+ new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); -+ strcpy (new_str, str); -+ } -+ else -+ new_str = NULL; -+ -+ return new_str; -+} -+ -+int main (int argc, char *argv[]) -+{ -+ int major, minor, micro; -+ char *tmp_version; -+ -+ /* This hangs on some systems (?) -+ system ("touch conf.sdltest"); -+ */ -+ { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } -+ -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = my_strdup("$min_sdl_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_sdl_version"); -+ exit(1); -+ } -+ -+ if (($sdl_major_version > major) || -+ (($sdl_major_version == major) && ($sdl_minor_version > minor)) || -+ (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); -+ printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); -+ printf("*** best to upgrade to the required version.\n"); -+ printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); -+ printf("*** to point to the correct copy of sdl-config, and remove the file\n"); -+ printf("*** config.cache before re-running configure\n"); -+ return 1; -+ } -+} -+ -+],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_sdl" = x ; then -+ AC_MSG_RESULT(yes) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$SDL_CONFIG" = "no" ; then -+ echo "*** The sdl-config script installed by SDL could not be found" -+ echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the SDL_CONFIG environment variable to the" -+ echo "*** full path to sdl-config." -+ else -+ if test -f conf.sdltest ; then -+ : -+ else -+ echo "*** Could not run SDL test program, checking why..." -+ CFLAGS="$CFLAGS $SDL_CFLAGS" -+ LIBS="$LIBS $SDL_LIBS" -+ AC_TRY_LINK([ -+#include -+#include "SDL.h" -+ -+int main(int argc, char *argv[]) -+{ return 0; } -+#undef main -+#define main K_and_R_C_main -+], [ return 0; ], -+ [ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding SDL or finding the wrong" -+ echo "*** version of SDL. If it is not finding SDL, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means SDL was incorrectly installed" -+ echo "*** or that you have moved SDL since it was installed. In the latter case, you" -+ echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ SDL_CFLAGS="" -+ SDL_LIBS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(SDL_CFLAGS) -+ AC_SUBST(SDL_LIBS) -+ rm -f conf.sdltest -+]) diff --git a/packages/prboom/prboom_2.2.6.bb b/packages/prboom/prboom_2.2.6.bb index a54616db71..7bcfa90ae1 100644 --- a/packages/prboom/prboom_2.2.6.bb +++ b/packages/prboom/prboom_2.2.6.bb @@ -6,17 +6,11 @@ LICENSE = "GPL" PR = "r1" -SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz \ - file://m4.patch;patch=1" +SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz" inherit autotools -EXTRA_OECONF = "--without-x --disable-sdltest --with-sdl-exec-prefix=${STAGING_DIR_NATIVE}${layout_exec_prefix}" - -do_configure() { - gnu-configize - oe_runconf -} +EXTRA_OECONF = "--without-x --disable-sdltest" do_install() { install -d ${D}${bindir} \ diff --git a/packages/prboom/prboom_2.3.1.bb b/packages/prboom/prboom_2.3.1.bb index 7af6048bcd..e681967424 100644 --- a/packages/prboom/prboom_2.3.1.bb +++ b/packages/prboom/prboom_2.3.1.bb @@ -10,18 +10,12 @@ LICENSE = "GPL" DEFAULT_PREFERENCE = "-1" SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz \ - file://m4.patch;patch=1 \ file://prboom.png \ file://prboom.desktop" inherit autotools -EXTRA_OECONF = "--without-x --disable-sdltest --with-sdl-exec-prefix=${STAGING_DIR_NATIVE}${layout_exec_prefix}" - -do_configure() { - gnu-configize - oe_runconf -} +EXTRA_OECONF = "--without-x --disable-sdltest" do_install() { install -d ${D}${palmtopdir}/bin \ -- cgit v1.2.3 From aedf0d2b8898cc024e9c210580f5d0627a05329b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 27 Feb 2008 11:17:53 +0000 Subject: frodo-4.2: Remove bogus configure option and patch since sdl.m4 is fixed --- packages/frodo/frodo-4.2/m4.patch | 183 -------------------------------------- packages/frodo/frodo_4.2.bb | 5 +- 2 files changed, 2 insertions(+), 186 deletions(-) delete mode 100644 packages/frodo/frodo-4.2/m4.patch (limited to 'packages') diff --git a/packages/frodo/frodo-4.2/m4.patch b/packages/frodo/frodo-4.2/m4.patch deleted file mode 100644 index e7918156e2..0000000000 --- a/packages/frodo/frodo-4.2/m4.patch +++ /dev/null @@ -1,183 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- /dev/null 1970-01-01 01:00:00.000000000 +0100 -+++ Src/m4/sdl.m4 2004-01-21 00:43:55.000000000 +0100 -@@ -0,0 +1,175 @@ -+# Configure paths for SDL -+# Sam Lantinga 9/21/99 -+# stolen from Manish Singh -+# stolen back from Frank Belew -+# stolen from Manish Singh -+# Shamelessly stolen from Owen Taylor -+ -+dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -+dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS -+dnl -+AC_DEFUN(AM_PATH_SDL, -+[dnl -+dnl Get the cflags and libraries from the sdl-config script -+dnl -+AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], -+ sdl_prefix="$withval", sdl_prefix="") -+AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], -+ sdl_exec_prefix="$withval", sdl_exec_prefix="") -+AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], -+ , enable_sdltest=yes) -+ -+ if test x$sdl_exec_prefix != x ; then -+ sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" -+ if test x${SDL_CONFIG+set} != xset ; then -+ SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config -+ fi -+ fi -+ if test x$sdl_prefix != x ; then -+ sdl_args="$sdl_args --prefix=$sdl_prefix" -+ if test x${SDL_CONFIG+set} != xset ; then -+ SDL_CONFIG=$sdl_prefix/bin/sdl-config -+ fi -+ fi -+ -+ AC_REQUIRE([AC_CANONICAL_TARGET]) -+ PATH="$prefix/bin:$prefix/usr/bin:$PATH" -+ AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) -+ min_sdl_version=ifelse([$1], ,0.11.0,$1) -+ AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) -+ no_sdl="" -+ if test "$SDL_CONFIG" = "no" ; then -+ no_sdl=yes -+ else -+ SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` -+ SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` -+ -+ sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ if test "x$enable_sdltest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $SDL_CFLAGS" -+ LIBS="$LIBS $SDL_LIBS" -+dnl -+dnl Now check if the installed SDL is sufficiently new. (Also sanity -+dnl checks the results of sdl-config to some extent -+dnl -+ rm -f conf.sdltest -+ AC_TRY_RUN([ -+#include -+#include -+#include -+#include "SDL.h" -+ -+char* -+my_strdup (char *str) -+{ -+ char *new_str; -+ -+ if (str) -+ { -+ new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); -+ strcpy (new_str, str); -+ } -+ else -+ new_str = NULL; -+ -+ return new_str; -+} -+ -+int main (int argc, char *argv[]) -+{ -+ int major, minor, micro; -+ char *tmp_version; -+ -+ /* This hangs on some systems (?) -+ system ("touch conf.sdltest"); -+ */ -+ { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } -+ -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = my_strdup("$min_sdl_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_sdl_version"); -+ exit(1); -+ } -+ -+ if (($sdl_major_version > major) || -+ (($sdl_major_version == major) && ($sdl_minor_version > minor)) || -+ (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); -+ printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); -+ printf("*** best to upgrade to the required version.\n"); -+ printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); -+ printf("*** to point to the correct copy of sdl-config, and remove the file\n"); -+ printf("*** config.cache before re-running configure\n"); -+ return 1; -+ } -+} -+ -+],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_sdl" = x ; then -+ AC_MSG_RESULT(yes) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$SDL_CONFIG" = "no" ; then -+ echo "*** The sdl-config script installed by SDL could not be found" -+ echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the SDL_CONFIG environment variable to the" -+ echo "*** full path to sdl-config." -+ else -+ if test -f conf.sdltest ; then -+ : -+ else -+ echo "*** Could not run SDL test program, checking why..." -+ CFLAGS="$CFLAGS $SDL_CFLAGS" -+ LIBS="$LIBS $SDL_LIBS" -+ AC_TRY_LINK([ -+#include -+#include "SDL.h" -+ -+int main(int argc, char *argv[]) -+{ return 0; } -+#undef main -+#define main K_and_R_C_main -+], [ return 0; ], -+ [ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding SDL or finding the wrong" -+ echo "*** version of SDL. If it is not finding SDL, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means SDL was incorrectly installed" -+ echo "*** or that you have moved SDL since it was installed. In the latter case, you" -+ echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ SDL_CFLAGS="" -+ SDL_LIBS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(SDL_CFLAGS) -+ AC_SUBST(SDL_LIBS) -+ rm -f conf.sdltest -+]) diff --git a/packages/frodo/frodo_4.2.bb b/packages/frodo/frodo_4.2.bb index 6535b5e2bb..8f8812a6d4 100644 --- a/packages/frodo/frodo_4.2.bb +++ b/packages/frodo/frodo_4.2.bb @@ -4,10 +4,9 @@ PRIORITY = "optional" DEPENDS = "libsdl-qpe" LICENSE = "GPL" SRCDATE = "20040801" -PR = "r1" +PR = "r2" SRC_URI = "cvs://anoncvs:anoncvs@cvs.cebix.net/home/cvs/cebix;module=Frodo4 \ - file://m4.patch;patch=1 \ file://configure.patch;patch=1 \ file://frodorc \ file://Frodo.png \ @@ -17,7 +16,7 @@ S = "${WORKDIR}/Frodo4/Src" inherit autotools -EXTRA_OECONF = "--disable-sdltest --enable-qtopia --with-sdl-exec-prefix=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF = "--disable-sdltest --enable-qtopia" do_install() { install -d ${D}${palmtopdir}/bin \ -- cgit v1.2.3 From b8db1572bff072ccf1af4b484ca4c0919fbbed79 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 27 Feb 2008 13:39:51 +0000 Subject: pax-utils-native: yank do_install --- packages/pax-utils/pax-utils-native_0.1.13.bb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'packages') diff --git a/packages/pax-utils/pax-utils-native_0.1.13.bb b/packages/pax-utils/pax-utils-native_0.1.13.bb index d586dcb29e..52f5d59515 100644 --- a/packages/pax-utils/pax-utils-native_0.1.13.bb +++ b/packages/pax-utils/pax-utils-native_0.1.13.bb @@ -5,3 +5,8 @@ require pax-utils_${PV}.bb do_stage() { oe_runmake PREFIX=${STAGING_DIR}/${HOST_SYS} install } + +do_install() { + : +} + -- cgit v1.2.3 From 79f57b121603b1d53f1a58c9dbf0cdc7c136a956 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 27 Feb 2008 14:19:22 +0000 Subject: python 2.5.1 upgrade to 2.5.2 --- packages/python/python-2.5-manifest.inc | 116 ++++++++++----------- packages/python/python-2.5.1/.mtn2git_empty | 0 packages/python/python-2.5.1/autohell.patch | 49 --------- packages/python/python-2.5.1/bindir-libdir.patch | 20 ---- packages/python/python-2.5.1/crosscompile.patch | 110 ------------------- .../python/python-2.5.1/default-is-optimized.patch | 13 --- .../python/python-2.5.1/enable-ctypes-module.patch | 106 ------------------- .../python-2.5.1/fix-tkinter-detection.patch | 41 -------- packages/python/python-2.5.1/sitebranding.patch | 21 ---- packages/python/python-2.5.1/sitecustomize.py | 45 -------- packages/python/python-2.5.2/.mtn2git_empty | 0 packages/python/python-2.5.2/autohell.patch | 50 +++++++++ packages/python/python-2.5.2/bindir-libdir.patch | 20 ++++ packages/python/python-2.5.2/crosscompile.patch | 110 +++++++++++++++++++ .../python/python-2.5.2/default-is-optimized.patch | 13 +++ .../python/python-2.5.2/enable-ctypes-module.patch | 106 +++++++++++++++++++ .../python-2.5.2/fix-tkinter-detection.patch | 41 ++++++++ packages/python/python-2.5.2/sitebranding.patch | 21 ++++ packages/python/python-2.5.2/sitecustomize.py | 45 ++++++++ packages/python/python_2.5.1.bb | 105 ------------------- packages/python/python_2.5.2.bb | 105 +++++++++++++++++++ 21 files changed, 569 insertions(+), 568 deletions(-) delete mode 100644 packages/python/python-2.5.1/.mtn2git_empty delete mode 100644 packages/python/python-2.5.1/autohell.patch delete mode 100644 packages/python/python-2.5.1/bindir-libdir.patch delete mode 100644 packages/python/python-2.5.1/crosscompile.patch delete mode 100644 packages/python/python-2.5.1/default-is-optimized.patch delete mode 100644 packages/python/python-2.5.1/enable-ctypes-module.patch delete mode 100644 packages/python/python-2.5.1/fix-tkinter-detection.patch delete mode 100644 packages/python/python-2.5.1/sitebranding.patch delete mode 100644 packages/python/python-2.5.1/sitecustomize.py create mode 100644 packages/python/python-2.5.2/.mtn2git_empty create mode 100644 packages/python/python-2.5.2/autohell.patch create mode 100644 packages/python/python-2.5.2/bindir-libdir.patch create mode 100644 packages/python/python-2.5.2/crosscompile.patch create mode 100644 packages/python/python-2.5.2/default-is-optimized.patch create mode 100644 packages/python/python-2.5.2/enable-ctypes-module.patch create mode 100644 packages/python/python-2.5.2/fix-tkinter-detection.patch create mode 100644 packages/python/python-2.5.2/sitebranding.patch create mode 100644 packages/python/python-2.5.2/sitecustomize.py delete mode 100644 packages/python/python_2.5.1.bb create mode 100644 packages/python/python_2.5.2.bb (limited to 'packages') diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc index edf5c7697f..5288bafbf4 100644 --- a/packages/python/python-2.5-manifest.inc +++ b/packages/python/python-2.5-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by 'contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer ] on Tue Jan 22 04:03:18 2008 +### AUTO-GENERATED by './generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer ] on Wed Feb 27 13:29:38 2008 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -13,287 +13,287 @@ PROVIDES+="python-profile python-threading python-distutils python-textutils pyt PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm 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-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " DESCRIPTION_python-profile="Python Basic Profiling Support" -PR_python-profile="ml7" +PR_python-profile="ml0" RDEPENDS_python-profile="python-core" FILES_python-profile="${libdir}/python2.5/profile.* ${libdir}/python2.5/pstats.* " DESCRIPTION_python-threading="Python Threading & Synchronization Support" -PR_python-threading="ml7" +PR_python-threading="ml0" RDEPENDS_python-threading="python-core python-lang" FILES_python-threading="${libdir}/python2.5/_threading_local.* ${libdir}/python2.5/dummy_thread.* ${libdir}/python2.5/dummy_threading.* ${libdir}/python2.5/mutex.* ${libdir}/python2.5/threading.* ${libdir}/python2.5/Queue.* " DESCRIPTION_python-distutils="Python Distribution Utilities" -PR_python-distutils="ml7" +PR_python-distutils="ml0" RDEPENDS_python-distutils="python-core" FILES_python-distutils="${libdir}/python2.5/config ${libdir}/python2.5/distutils " DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support" -PR_python-textutils="ml7" +PR_python-textutils="ml0" RDEPENDS_python-textutils="python-core python-io python-re python-stringold" FILES_python-textutils="${libdir}/python2.5/lib-dynload/_csv.so ${libdir}/python2.5/csv.* ${libdir}/python2.5/optparse.* ${libdir}/python2.5/textwrap.* " DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support" -PR_python-codecs="ml7" +PR_python-codecs="ml0" RDEPENDS_python-codecs="python-core python-lang" FILES_python-codecs="${libdir}/python2.5/codecs.* ${libdir}/python2.5/encodings ${libdir}/python2.5/gettext.* ${libdir}/python2.5/locale.* ${libdir}/python2.5/lib-dynload/_locale.so ${libdir}/python2.5/lib-dynload/unicodedata.so ${libdir}/python2.5/stringprep.* ${libdir}/python2.5/xdrlib.* " DESCRIPTION_python-ctypes="Python C Types Support" -PR_python-ctypes="ml7" +PR_python-ctypes="ml0" RDEPENDS_python-ctypes="python-core" FILES_python-ctypes="${libdir}/python2.5/ctypes ${libdir}/python2.5/lib-dynload/_ctypes.so " DESCRIPTION_python-pickle="Python Persistence Support" -PR_python-pickle="ml7" +PR_python-pickle="ml0" RDEPENDS_python-pickle="python-core python-codecs python-io python-re" FILES_python-pickle="${libdir}/python2.5/pickle.* ${libdir}/python2.5/shelve.* ${libdir}/python2.5/lib-dynload/cPickle.so " DESCRIPTION_python-datetime="Python Calendar and Time support" -PR_python-datetime="ml7" +PR_python-datetime="ml0" RDEPENDS_python-datetime="python-core python-codecs" FILES_python-datetime="${libdir}/python2.5/_strptime.* ${libdir}/python2.5/calendar.* ${libdir}/python2.5/lib-dynload/datetime.so " DESCRIPTION_python-core="Python Interpreter and core modules (needed!)" -PR_python-core="ml7" +PR_python-core="ml0" RDEPENDS_python-core="" FILES_python-core="${libdir}/python2.5/__future__.* ${libdir}/python2.5/copy.* ${libdir}/python2.5/copy_reg.* ${libdir}/python2.5/ConfigParser.* ${libdir}/python2.5/getopt.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/new.* ${libdir}/python2.5/os.* ${libdir}/python2.5/posixpath.* ${libdir}/python2.5/struct.* ${libdir}/python2.5/warnings.* ${libdir}/python2.5/site.* ${libdir}/python2.5/stat.* ${libdir}/python2.5/UserDict.* ${libdir}/python2.5/UserList.* ${libdir}/python2.5/UserString.* ${libdir}/python2.5/lib-dynload/binascii.so ${libdir}/python2.5/lib-dynload/_struct.so ${libdir}/python2.5/lib-dynload/time.so ${libdir}/python2.5/lib-dynload/xreadlines.so ${libdir}/python2.5/types.* ${bindir}/python* " DESCRIPTION_python-io="Python Low-Level I/O" -PR_python-io="ml7" +PR_python-io="ml0" RDEPENDS_python-io="python-core python-math" FILES_python-io="${libdir}/python2.5/lib-dynload/_socket.so ${libdir}/python2.5/lib-dynload/_ssl.so ${libdir}/python2.5/lib-dynload/select.so ${libdir}/python2.5/lib-dynload/termios.so ${libdir}/python2.5/lib-dynload/cStringIO.so ${libdir}/python2.5/pipes.* ${libdir}/python2.5/socket.* ${libdir}/python2.5/tempfile.* ${libdir}/python2.5/StringIO.* " DESCRIPTION_python-compiler="Python Compiler Support" -PR_python-compiler="ml7" +PR_python-compiler="ml0" RDEPENDS_python-compiler="python-core" FILES_python-compiler="${libdir}/python2.5/compiler " DESCRIPTION_python-compression="Python High Level Compression Support" -PR_python-compression="ml7" +PR_python-compression="ml0" RDEPENDS_python-compression="python-core python-zlib" FILES_python-compression="${libdir}/python2.5/gzip.* ${libdir}/python2.5/zipfile.* " DESCRIPTION_python-re="Python Regular Expression APIs" -PR_python-re="ml7" +PR_python-re="ml0" RDEPENDS_python-re="python-core" FILES_python-re="${libdir}/python2.5/re.* ${libdir}/python2.5/sre.* ${libdir}/python2.5/sre_compile.* ${libdir}/python2.5/sre_constants* ${libdir}/python2.5/sre_parse.* " DESCRIPTION_python-xmlrpc="Python XMLRPC Support" -PR_python-xmlrpc="ml7" +PR_python-xmlrpc="ml0" RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang" FILES_python-xmlrpc="${libdir}/python2.5/xmlrpclib.* ${libdir}/python2.5/SimpleXMLRPCServer.* " DESCRIPTION_python-terminal="Python Terminal Controlling Support" -PR_python-terminal="ml7" +PR_python-terminal="ml0" RDEPENDS_python-terminal="python-core python-io" FILES_python-terminal="${libdir}/python2.5/pty.* ${libdir}/python2.5/tty.* " DESCRIPTION_python-email="Python Email Support" -PR_python-email="ml7" +PR_python-email="ml0" RDEPENDS_python-email="python-core python-io python-re python-mime python-audio python-image" FILES_python-email="${libdir}/python2.5/email " DESCRIPTION_python-image="Python Graphical Image Handling" -PR_python-image="ml7" +PR_python-image="ml0" RDEPENDS_python-image="python-core" FILES_python-image="${libdir}/python2.5/colorsys.* ${libdir}/python2.5/imghdr.* ${libdir}/python2.5/lib-dynload/imageop.so ${libdir}/python2.5/lib-dynload/rgbimg.so " DESCRIPTION_python-core-dbg="Python core module debug information" -PR_python-core-dbg="ml7" +PR_python-core-dbg="ml0" RDEPENDS_python-core-dbg="python-core" FILES_python-core-dbg="${libdir}/python2.5/lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug " DESCRIPTION_python-resource="Python Resource Control Interface" -PR_python-resource="ml7" +PR_python-resource="ml0" RDEPENDS_python-resource="python-core" FILES_python-resource="${libdir}/python2.5/lib-dynload/resource.so " DESCRIPTION_python-devel="Python Development Package" -PR_python-devel="ml7" +PR_python-devel="ml0" RDEPENDS_python-devel="python-core" FILES_python-devel="${includedir} ${libdir}/python2.5/config " DESCRIPTION_python-math="Python Math Support" -PR_python-math="ml7" +PR_python-math="ml0" RDEPENDS_python-math="python-core" FILES_python-math="${libdir}/python2.5/lib-dynload/cmath.so ${libdir}/python2.5/lib-dynload/math.so ${libdir}/python2.5/lib-dynload/_random.so ${libdir}/python2.5/random.* ${libdir}/python2.5/sets.* " DESCRIPTION_python-hotshot="Python Hotshot Profiler" -PR_python-hotshot="ml7" +PR_python-hotshot="ml0" RDEPENDS_python-hotshot="python-core" FILES_python-hotshot="${libdir}/python2.5/hotshot ${libdir}/python2.5/lib-dynload/_hotshot.so " DESCRIPTION_python-unixadmin="Python Unix Administration Support" -PR_python-unixadmin="ml7" +PR_python-unixadmin="ml0" RDEPENDS_python-unixadmin="python-core" FILES_python-unixadmin="${libdir}/python2.5/lib-dynload/nis.so ${libdir}/python2.5/lib-dynload/grp.so ${libdir}/python2.5/lib-dynload/pwd.so ${libdir}/python2.5/getpass.* " DESCRIPTION_python-syslog="Python's syslog Interface" -PR_python-syslog="ml7" +PR_python-syslog="ml0" RDEPENDS_python-syslog="python-core" FILES_python-syslog="${libdir}/python2.5/lib-dynload/syslog.so " DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings" -PR_python-tkinter="ml7" +PR_python-tkinter="ml0" RDEPENDS_python-tkinter="python-core" FILES_python-tkinter="${libdir}/python2.5/lib-dynload/_tkinter.so ${libdir}/python2.5/lib-tk " DESCRIPTION_python-gdbm="Python GNU Database Support" -PR_python-gdbm="ml7" +PR_python-gdbm="ml0" RDEPENDS_python-gdbm="python-core" FILES_python-gdbm="${libdir}/python2.5/lib-dynload/gdbm.so " DESCRIPTION_python-fcntl="Python's fcntl Interface" -PR_python-fcntl="ml7" +PR_python-fcntl="ml0" RDEPENDS_python-fcntl="python-core" FILES_python-fcntl="${libdir}/python2.5/lib-dynload/fcntl.so " DESCRIPTION_python-netclient="Python Internet Protocol Clients" -PR_python-netclient="ml7" +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.5/*Cookie*.* ${libdir}/python2.5/base64.* ${libdir}/python2.5/cookielib.* ${libdir}/python2.5/ftplib.* ${libdir}/python2.5/gopherlib.* ${libdir}/python2.5/hmac.* ${libdir}/python2.5/httplib.* ${libdir}/python2.5/mimetypes.* ${libdir}/python2.5/nntplib.* ${libdir}/python2.5/poplib.* ${libdir}/python2.5/smtplib.* ${libdir}/python2.5/telnetlib.* ${libdir}/python2.5/urllib.* ${libdir}/python2.5/urllib2.* ${libdir}/python2.5/urlparse.* " DESCRIPTION_python-pprint="Python Pretty-Print Support" -PR_python-pprint="ml7" +PR_python-pprint="ml0" RDEPENDS_python-pprint="python-core" FILES_python-pprint="${libdir}/python2.5/pprint.* " DESCRIPTION_python-netserver="Python Internet Protocol Servers" -PR_python-netserver="ml7" +PR_python-netserver="ml0" RDEPENDS_python-netserver="python-core python-netclient" FILES_python-netserver="${libdir}/python2.5/cgi.* ${libdir}/python2.5/BaseHTTPServer.* ${libdir}/python2.5/SimpleHTTPServer.* ${libdir}/python2.5/SocketServer.* " DESCRIPTION_python-curses="Python Curses Support" -PR_python-curses="ml7" +PR_python-curses="ml0" RDEPENDS_python-curses="python-core" FILES_python-curses="${libdir}/python2.5/curses ${libdir}/python2.5/lib-dynload/_curses.so ${libdir}/python2.5/lib-dynload/_curses_panel.so " DESCRIPTION_python-smtpd="Python Simple Mail Transport Daemon" -PR_python-smtpd="ml7" +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="ml7" +PR_python-html="ml0" RDEPENDS_python-html="python-core" FILES_python-html="${libdir}/python2.5/formatter.* ${libdir}/python2.5/htmlentitydefs.* ${libdir}/python2.5/htmllib.* ${libdir}/python2.5/markupbase.* ${libdir}/python2.5/sgmllib.* " DESCRIPTION_python-readline="Python Readline Support" -PR_python-readline="ml7" +PR_python-readline="ml0" RDEPENDS_python-readline="python-core" FILES_python-readline="${libdir}/python2.5/lib-dynload/readline.so ${libdir}/python2.5/rlcompleter.* " DESCRIPTION_python-subprocess="Python Subprocess Support" -PR_python-subprocess="ml7" +PR_python-subprocess="ml0" RDEPENDS_python-subprocess="python-core python-io python-re python-fcntl python-pickle" FILES_python-subprocess="${libdir}/python2.5/subprocess.* " DESCRIPTION_python-pydoc="Python Interactive Help Support" -PR_python-pydoc="ml7" +PR_python-pydoc="ml0" RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re" FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.5/pydoc.* " DESCRIPTION_python-logging="Python Logging Support" -PR_python-logging="ml7" +PR_python-logging="ml0" RDEPENDS_python-logging="python-core python-io python-lang python-stringold" FILES_python-logging="${libdir}/python2.5/logging " DESCRIPTION_python-mailbox="Python Mailbox Format Support" -PR_python-mailbox="ml7" +PR_python-mailbox="ml0" RDEPENDS_python-mailbox="python-core python-mime" FILES_python-mailbox="${libdir}/python2.5/mailbox.* " DESCRIPTION_python-xml="Python basic XML support." -PR_python-xml="ml7" +PR_python-xml="ml0" RDEPENDS_python-xml="python-core python-re python-netclient" FILES_python-xml="${libdir}/python2.5/lib-dynload/pyexpat.so ${libdir}/python2.5/xml ${libdir}/python2.5/xmllib.* " DESCRIPTION_python-mime="Python MIME Handling APIs" -PR_python-mime="ml7" +PR_python-mime="ml0" RDEPENDS_python-mime="python-core python-io" FILES_python-mime="${libdir}/python2.5/mimetools.* ${libdir}/python2.5/uu.* ${libdir}/python2.5/quopri.* ${libdir}/python2.5/rfc822.* " DESCRIPTION_python-sqlite3="Python Sqlite3 Database Support" -PR_python-sqlite3="ml7" +PR_python-sqlite3="ml0" RDEPENDS_python-sqlite3="python-core" FILES_python-sqlite3="${libdir}/python2.5/sqlite3 " DESCRIPTION_python-tests="Python Tests" -PR_python-tests="ml7" +PR_python-tests="ml0" RDEPENDS_python-tests="python-core" FILES_python-tests="${libdir}/python2.5/test " DESCRIPTION_python-unittest="Python Unit Testing Framework" -PR_python-unittest="ml7" +PR_python-unittest="ml0" RDEPENDS_python-unittest="python-core python-stringold python-lang" FILES_python-unittest="${libdir}/python2.5/unittest.* " DESCRIPTION_python-stringold="Python String APIs [deprecated]" -PR_python-stringold="ml7" +PR_python-stringold="ml0" RDEPENDS_python-stringold="python-core python-re" FILES_python-stringold="${libdir}/python2.5/lib-dynload/strop.so ${libdir}/python2.5/string.* " DESCRIPTION_python-robotparser="Python robots.txt parser" -PR_python-robotparser="ml7" +PR_python-robotparser="ml0" RDEPENDS_python-robotparser="python-core python-netclient" FILES_python-robotparser="${libdir}/python2.5/robotparser.* " DESCRIPTION_python-lib-old-and-deprecated="Python Deprecated Libraries" -PR_python-lib-old-and-deprecated="ml7" +PR_python-lib-old-and-deprecated="ml0" RDEPENDS_python-lib-old-and-deprecated="python-core" FILES_python-lib-old-and-deprecated="${libdir}/python2.5/lib-old " DESCRIPTION_python-compile="Python Bytecode Compilation Support" -PR_python-compile="ml7" +PR_python-compile="ml0" RDEPENDS_python-compile="python-core" FILES_python-compile="${libdir}/python2.5/py_compile.* ${libdir}/python2.5/compileall.* " DESCRIPTION_python-debugger="Python Debugger" -PR_python-debugger="ml7" +PR_python-debugger="ml0" RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell" FILES_python-debugger="${libdir}/python2.5/bdb.* ${libdir}/python2.5/pdb.* " DESCRIPTION_python-shell="Python Shell-Like Functionality" -PR_python-shell="ml7" +PR_python-shell="ml0" RDEPENDS_python-shell="python-core python-re" FILES_python-shell="${libdir}/python2.5/cmd.* ${libdir}/python2.5/commands.* ${libdir}/python2.5/dircache.* ${libdir}/python2.5/fnmatch.* ${libdir}/python2.5/glob.* ${libdir}/python2.5/popen2.* ${libdir}/python2.5/shutil.* " DESCRIPTION_python-bsddb="Python Berkeley Database Bindings" -PR_python-bsddb="ml7" +PR_python-bsddb="ml0" RDEPENDS_python-bsddb="python-core" FILES_python-bsddb="${libdir}/python2.5/bsddb " DESCRIPTION_python-mmap="Python Memory-Mapped-File Support" -PR_python-mmap="ml7" +PR_python-mmap="ml0" RDEPENDS_python-mmap="python-core python-io" FILES_python-mmap="${libdir}/python2.5/lib-dynload/mmap.so " DESCRIPTION_python-zlib="Python zlib Support." -PR_python-zlib="ml7" +PR_python-zlib="ml0" RDEPENDS_python-zlib="python-core" FILES_python-zlib="${libdir}/python2.5/lib-dynload/zlib.so " DESCRIPTION_python-db="Python File-Based Database Support" -PR_python-db="ml7" +PR_python-db="ml0" RDEPENDS_python-db="python-core" FILES_python-db="${libdir}/python2.5/anydbm.* ${libdir}/python2.5/dumbdbm.* ${libdir}/python2.5/whichdb.* " DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support" -PR_python-crypt="ml7" +PR_python-crypt="ml0" RDEPENDS_python-crypt="python-core" FILES_python-crypt="${libdir}/python2.5/hashlib.* ${libdir}/python2.5/md5.* ${libdir}/python2.5/sha.* ${libdir}/python2.5/lib-dynload/crypt.so ${libdir}/python2.5/lib-dynload/_hashlib.so ${libdir}/python2.5/lib-dynload/_sha256.so ${libdir}/python2.5/lib-dynload/_sha512.so " DESCRIPTION_python-idle="Python Integrated Development Environment" -PR_python-idle="ml7" +PR_python-idle="ml0" RDEPENDS_python-idle="python-core python-tkinter" FILES_python-idle="${bindir}/idle ${libdir}/python2.5/idlelib " DESCRIPTION_python-lang="Python Low-Level Language Support" -PR_python-lang="ml7" +PR_python-lang="ml0" RDEPENDS_python-lang="python-core" FILES_python-lang="${libdir}/python2.5/lib-dynload/array.so ${libdir}/python2.5/lib-dynload/parser.so ${libdir}/python2.5/lib-dynload/operator.so ${libdir}/python2.5/lib-dynload/_weakref.so ${libdir}/python2.5/lib-dynload/itertools.so ${libdir}/python2.5/lib-dynload/collections.so ${libdir}/python2.5/lib-dynload/_bisect.so ${libdir}/python2.5/lib-dynload/_heapq.so ${libdir}/python2.5/atexit.* ${libdir}/python2.5/bisect.* ${libdir}/python2.5/code.* ${libdir}/python2.5/codeop.* ${libdir}/python2.5/dis.* ${libdir}/python2.5/heapq.* ${libdir}/python2.5/inspect.* ${libdir}/python2.5/keyword.* ${libdir}/python2.5/opcode.* ${libdir}/python2.5/repr.* ${libdir}/python2.5/token.* ${libdir}/python2.5/tokenize.* ${libdir}/python2.5/traceback.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/weakref.* " DESCRIPTION_python-audio="Python Audio Handling" -PR_python-audio="ml7" +PR_python-audio="ml0" RDEPENDS_python-audio="python-core" FILES_python-audio="${libdir}/python2.5/wave.* ${libdir}/python2.5/chunk.* ${libdir}/python2.5/sndhdr.* ${libdir}/python2.5/lib-dynload/ossaudiodev.so ${libdir}/python2.5/lib-dynload/audioop.so " diff --git a/packages/python/python-2.5.1/.mtn2git_empty b/packages/python/python-2.5.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/python/python-2.5.1/autohell.patch b/packages/python/python-2.5.1/autohell.patch deleted file mode 100644 index e2d63145be..0000000000 --- a/packages/python/python-2.5.1/autohell.patch +++ /dev/null @@ -1,49 +0,0 @@ -# -# FIXME: Don't simply rip this test out... add getting it from cache -# -Index: Python-2.5.1/configure.in -=================================================================== ---- Python-2.5.1.orig/configure.in -+++ Python-2.5.1/configure.in -@@ -3367,41 +3367,6 @@ else - AC_MSG_RESULT(no) - fi - --AC_MSG_CHECKING(for %zd printf() format support) --AC_TRY_RUN([#include --#include --#include -- --int main() --{ -- char buffer[256]; -- --#ifdef HAVE_SSIZE_T --typedef ssize_t Py_ssize_t; --#elif SIZEOF_VOID_P == SIZEOF_LONG --typedef long Py_ssize_t; --#else --typedef int Py_ssize_t; --#endif -- -- if(sprintf(buffer, "%zd", (size_t)123) < 0) -- return 1; -- -- if (strcmp(buffer, "123")) -- return 1; -- -- if (sprintf(buffer, "%zd", (Py_ssize_t)-123) < 0) -- return 1; -- -- if (strcmp(buffer, "-123")) -- return 1; -- -- return 0; --}], --[AC_MSG_RESULT(yes) -- AC_DEFINE(PY_FORMAT_SIZE_T, "z", [Define to printf format modifier for Py_ssize_t])], -- AC_MSG_RESULT(no)) -- - AC_CHECK_TYPE(socklen_t,, - AC_DEFINE(socklen_t,int, - Define to `int' if does not define.),[ diff --git a/packages/python/python-2.5.1/bindir-libdir.patch b/packages/python/python-2.5.1/bindir-libdir.patch deleted file mode 100644 index 047c358a55..0000000000 --- a/packages/python/python-2.5.1/bindir-libdir.patch +++ /dev/null @@ -1,20 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - -Index: Python-2.5.1/Makefile.pre.in -=================================================================== ---- Python-2.5.1.orig/Makefile.pre.in -+++ Python-2.5.1/Makefile.pre.in -@@ -83,8 +83,8 @@ prefix= @prefix@ - exec_prefix= @exec_prefix@ - - # Expanded directories --BINDIR= $(exec_prefix)/bin --LIBDIR= $(exec_prefix)/lib -+BINDIR= @bindir@ -+LIBDIR= @libdir@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include diff --git a/packages/python/python-2.5.1/crosscompile.patch b/packages/python/python-2.5.1/crosscompile.patch deleted file mode 100644 index f456048ef5..0000000000 --- a/packages/python/python-2.5.1/crosscompile.patch +++ /dev/null @@ -1,110 +0,0 @@ -# -# Patch (C) by Michael 'Mickey' Lauer -# -Index: Python-2.5.1/Makefile.pre.in -=================================================================== ---- Python-2.5.1.orig/Makefile.pre.in -+++ Python-2.5.1/Makefile.pre.in -@@ -170,6 +170,7 @@ UNICODE_OBJS= @UNICODE_OBJS@ - - PYTHON= python$(EXE) - BUILDPYTHON= python$(BUILDEXE) -+HOSTPYTHON= $(BUILDPYTHON) - - # === Definitions added by makesetup === - -@@ -196,7 +197,7 @@ GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar - ########################################################################## - # Parser - PGEN= Parser/pgen$(EXE) -- -+HOSTPGEN= $(PGEN)$(EXE) - POBJS= \ - Parser/acceler.o \ - Parser/grammar1.o \ -@@ -345,8 +346,8 @@ platform: $(BUILDPYTHON) - # Build the shared modules - sharedmods: $(BUILDPYTHON) - case $$MAKEFLAGS in \ -- *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ -- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ -+ *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \ -+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \ - esac - - # Build static library -@@ -470,7 +471,7 @@ Modules/python.o: $(srcdir)/Modules/pyth - - - $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) -- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) -+ -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) - - $(PGEN): $(PGENOBJS) - $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) -@@ -773,19 +774,19 @@ libinstall: $(BUILDPYTHON) $(srcdir)/Lib - done - $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST) - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST) - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -@@ -885,7 +886,7 @@ libainstall: all - # Install the dynamically loadable modules - # This goes into $(exec_prefix) - sharedinstall: -- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \ -+ $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \ - --prefix=$(prefix) \ - --install-scripts=$(BINDIR) \ - --install-platlib=$(DESTSHARED) \ -Index: Python-2.5.1/setup.py -=================================================================== ---- Python-2.5.1.orig/setup.py -+++ Python-2.5.1/setup.py -@@ -211,6 +211,7 @@ class PyBuildExt(build_ext): - except ImportError, why: - self.announce('*** WARNING: renaming "%s" since importing it' - ' failed: %s' % (ext.name, why), level=3) -+ return - assert not self.inplace - basename, tail = os.path.splitext(ext_filename) - newname = basename + "_failed" + tail -@@ -244,8 +245,8 @@ class PyBuildExt(build_ext): - - def detect_modules(self): - # Ensure that /usr/local is always used -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') -+ # add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -+ # add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - - # Add paths specified in the environment variables LDFLAGS and - # CPPFLAGS for header and library files. -@@ -341,6 +342,9 @@ class PyBuildExt(build_ext): - - # XXX Omitted modules: gl, pure, dl, SGI-specific modules - -+ lib_dirs = [ os.getenv( "STAGING_LIBDIR" ) ] -+ inc_dirs = [ os.getenv( "STAGING_INCDIR" ) ] -+ - # - # The following modules are all pretty straightforward, and compile - # on pretty much any POSIXish platform. diff --git a/packages/python/python-2.5.1/default-is-optimized.patch b/packages/python/python-2.5.1/default-is-optimized.patch deleted file mode 100644 index 6beeb6e022..0000000000 --- a/packages/python/python-2.5.1/default-is-optimized.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Python-2.5.1/Python/compile.c -=================================================================== ---- Python-2.5.1.orig/Python/compile.c -+++ Python-2.5.1/Python/compile.c -@@ -30,7 +30,7 @@ - #include "symtable.h" - #include "opcode.h" - --int Py_OptimizeFlag = 0; -+int Py_OptimizeFlag = 1; - - /* - ISSUES: diff --git a/packages/python/python-2.5.1/enable-ctypes-module.patch b/packages/python/python-2.5.1/enable-ctypes-module.patch deleted file mode 100644 index dd5adaf0e7..0000000000 --- a/packages/python/python-2.5.1/enable-ctypes-module.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff -Naur Python-2.5.1.orig/setup.py Python-2.5.1/setup.py ---- Python-2.5.orig/setup.py 2006-08-10 01:42:18.000000000 +0200 -+++ Python-2.5/setup.py 2007-11-21 18:00:43.000000000 +0100 -@@ -1321,16 +1329,16 @@ - ffi_configfile): - from distutils.dir_util import mkpath - mkpath(ffi_builddir) -- config_args = [] -+ config_args = ['--host=%s' % os.environ["HOST_SYS"], ] - - # Pass empty CFLAGS because we'll just append the resulting - # CFLAGS to Python's; -g or -O2 is to be avoided. -- cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \ -- % (ffi_builddir, ffi_srcdir, " ".join(config_args)) -+ cmd = "(cd %s && autoconf -W cross) && (cd %s && env CFLAGS='' '%s/configure' %s)" \ -+ % (ffi_srcdir, ffi_builddir, ffi_srcdir, " ".join(config_args)) - - res = os.system(cmd) - if res or not os.path.exists(ffi_configfile): -- print "Failed to configure _ctypes module" -+ print "Failed to configure _ctypes module, ret %d or missing %s"% (res, ffi_configfile, ) - return False - - fficonfig = {} -diff -Naur Python-2.5.1.orig/Modules/_ctypes/callbacks.c Python-2.5.1/Modules/_ctypes/callbacks.c ---- Python-2.5.1.orig/Modules/_ctypes/callbacks.c 2006-10-17 21:41:10.000000000 +0200 -+++ Python-2.5.1/Modules/_ctypes/callbacks.c 2007-11-22 10:29:33.000000000 +0100 -@@ -273,11 +273,13 @@ - PyErr_NoMemory(); - return NULL; - } -+#if FFI_CLOSURES - p->pcl = MallocClosure(); - if (p->pcl == NULL) { - PyErr_NoMemory(); - goto error; - } -+#endif - - for (i = 0; i < nArgs; ++i) { - PyObject *cnv = PySequence_GetItem(converters, i); -@@ -315,12 +317,14 @@ - "ffi_prep_cif failed with %d", result); - goto error; - } -+#if FFI_CLOSURES - result = ffi_prep_closure(p->pcl, &p->cif, closure_fcn, p); - if (result != FFI_OK) { - PyErr_Format(PyExc_RuntimeError, - "ffi_prep_closure failed with %d", result); - goto error; - } -+#endif - - p->converters = converters; - p->callable = callable; -@@ -328,8 +332,10 @@ - - error: - if (p) { -+#if FFI_CLOSURES - if (p->pcl) - FreeClosure(p->pcl); -+#endif - PyMem_Free(p); - } - return NULL; -diff -Naur Python-2.5.1.orig/Modules/_ctypes/_ctypes.c Python-2.5.1/Modules/_ctypes/_ctypes.c ---- Python-2.5.1.orig/Modules/_ctypes/_ctypes.c 2007-03-23 20:56:45.000000000 +0100 -+++ Python-2.5.1/Modules/_ctypes/_ctypes.c 2007-11-22 10:29:01.000000000 +0100 -@@ -3419,7 +3419,9 @@ - Py_CLEAR(self->paramflags); - - if (self->thunk) { -+#if FFI_CLOSURES - FreeClosure(self->thunk->pcl); -+#endif - PyMem_Free(self->thunk); - self->thunk = NULL; - } -diff -Naur Python-2.5.1.orig/Modules/_ctypes/ctypes.h Python-2.5.1/Modules/_ctypes/ctypes.h ---- Python-2.5.1.orig/Modules/_ctypes/ctypes.h 2006-08-14 13:17:48.000000000 +0200 -+++ Python-2.5.1/Modules/_ctypes/ctypes.h 2007-11-22 10:29:44.000000000 +0100 -@@ -68,7 +68,9 @@ - }; - - typedef struct { -+#if FFI_CLOSURES - ffi_closure *pcl; /* the C callable */ -+#endif - ffi_cif cif; - PyObject *converters; - PyObject *callable; -diff -Naur Python-2.5.1.orig/Modules/_ctypes/malloc_closure.c Python-2.5.1/Modules/_ctypes/malloc_closure.c ---- Python-2.5.1.orig/Modules/_ctypes/malloc_closure.c 2006-06-12 22:56:48.000000000 +0200 -+++ Python-2.5.1/Modules/_ctypes/malloc_closure.c 2007-11-22 10:30:17.000000000 +0100 -@@ -27,7 +27,9 @@ - /******************************************************************/ - - typedef union _tagITEM { -+#if FFI_CLOSURES - ffi_closure closure; -+#endif - union _tagITEM *next; - } ITEM; - diff --git a/packages/python/python-2.5.1/fix-tkinter-detection.patch b/packages/python/python-2.5.1/fix-tkinter-detection.patch deleted file mode 100644 index 93bd343381..0000000000 --- a/packages/python/python-2.5.1/fix-tkinter-detection.patch +++ /dev/null @@ -1,41 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - -Index: Python-2.5.1/setup.py -=================================================================== ---- Python-2.5.1.orig/setup.py -+++ Python-2.5.1/setup.py -@@ -1227,7 +1227,7 @@ class PyBuildExt(build_ext): - dotversion = dotversion[:-1] + '.' + dotversion[-1] - tcl_include_sub = [] - tk_include_sub = [] -- for dir in inc_dirs: -+ for dir in [os.getenv("STAGING_INCDIR")]: - tcl_include_sub += [dir + os.sep + "tcl" + dotversion] - tk_include_sub += [dir + os.sep + "tk" + dotversion] - tk_include_sub += tcl_include_sub -@@ -1246,22 +1246,6 @@ class PyBuildExt(build_ext): - if dir not in include_dirs: - include_dirs.append(dir) - -- # Check for various platform-specific directories -- if platform == 'sunos5': -- include_dirs.append('/usr/openwin/include') -- added_lib_dirs.append('/usr/openwin/lib') -- elif os.path.exists('/usr/X11R6/include'): -- include_dirs.append('/usr/X11R6/include') -- added_lib_dirs.append('/usr/X11R6/lib64') -- added_lib_dirs.append('/usr/X11R6/lib') -- elif os.path.exists('/usr/X11R5/include'): -- include_dirs.append('/usr/X11R5/include') -- added_lib_dirs.append('/usr/X11R5/lib') -- else: -- # Assume default location for X11 -- include_dirs.append('/usr/X11/include') -- added_lib_dirs.append('/usr/X11/lib') -- - # If Cygwin, then verify that X is installed before proceeding - if platform == 'cygwin': - x11_inc = find_file('X11/Xlib.h', [], include_dirs) diff --git a/packages/python/python-2.5.1/sitebranding.patch b/packages/python/python-2.5.1/sitebranding.patch deleted file mode 100644 index c6e486ae97..0000000000 --- a/packages/python/python-2.5.1/sitebranding.patch +++ /dev/null @@ -1,21 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - -Index: Python-2.5.1/Lib/site.py -=================================================================== ---- Python-2.5.1.orig/Lib/site.py -+++ Python-2.5.1/Lib/site.py -@@ -323,8 +323,9 @@ def setcopyright(): - "Jython is maintained by the Jython developers (www.jython.org).") - else: - __builtin__.credits = _Printer("credits", """\ -- Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands -- for supporting Python development. See www.python.org for more information.""") -+ This version of Python has been built by the OpenEmbedded buildsystem (http://openembedded.org). -+ It is a part of the Python-For-Embedded-Systems initiative which is maintained by -+ Michael 'Mickey' Lauer (http://www.Vanille.de/projects/python.spy).""") - here = os.path.dirname(os.__file__) - __builtin__.license = _Printer( - "license", "See http://www.python.org/%.3s/license.html" % sys.version, diff --git a/packages/python/python-2.5.1/sitecustomize.py b/packages/python/python-2.5.1/sitecustomize.py deleted file mode 100644 index 4c0ba3f0da..0000000000 --- a/packages/python/python-2.5.1/sitecustomize.py +++ /dev/null @@ -1,45 +0,0 @@ -# OpenEmbedded sitecustomize.py (C) 2002-2008 Michael 'Mickey' Lauer -# GPLv2 or later -# Version: 20082201 -# Features: -# * set proper default encoding -# * enable readline completion in the interactive interpreter -# * load command line history on startup -# * save command line history on exit - -import os - -def __exithandler(): - try: - readline.write_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) ) - except IOError: - pass - -def __registerExitHandler(): - import atexit - atexit.register( __exithandler ) - -def __enableReadlineSupport(): - readline.parse_and_bind("tab: complete") - try: - readline.read_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) ) - except IOError: - pass - -def __enableDefaultEncoding(): - import sys - try: - sys.setdefaultencoding('utf8') - except LookupError: - pass - -import sys -try: - import rlcompleter, readline -except ImportError: - sys.stderr.write( "Python %s (OpenEmbedded build) sitecustomize.py not active. Please install python-readline.\n" % sys.version.split()[0] ) -else: - __enableDefaultEncoding() - __registerExitHandler() - __enableReadlineSupport() - sys.stderr.write( "Python %s (OpenEmbedded build) sitecustomize.py active.\n" % sys.version.split()[0] ) diff --git a/packages/python/python-2.5.2/.mtn2git_empty b/packages/python/python-2.5.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/python/python-2.5.2/autohell.patch b/packages/python/python-2.5.2/autohell.patch new file mode 100644 index 0000000000..32977955d4 --- /dev/null +++ b/packages/python/python-2.5.2/autohell.patch @@ -0,0 +1,50 @@ +Index: Python-2.5.2/configure.in +=================================================================== +--- Python-2.5.2.orig/configure.in ++++ Python-2.5.2/configure.in +@@ -3410,45 +3410,6 @@ esac + + + +-AC_MSG_CHECKING(for %zd printf() format support) +-AC_TRY_RUN([#include +-#include +-#include +- +-#ifdef HAVE_SYS_TYPES_H +-#include +-#endif +- +-#ifdef HAVE_SSIZE_T +-typedef ssize_t Py_ssize_t; +-#elif SIZEOF_VOID_P == SIZEOF_LONG +-typedef long Py_ssize_t; +-#else +-typedef int Py_ssize_t; +-#endif +- +-int main() +-{ +- char buffer[256]; +- +- if(sprintf(buffer, "%zd", (size_t)123) < 0) +- return 1; +- +- if (strcmp(buffer, "123")) +- return 1; +- +- if (sprintf(buffer, "%zd", (Py_ssize_t)-123) < 0) +- return 1; +- +- if (strcmp(buffer, "-123")) +- return 1; +- +- return 0; +-}], +-[AC_MSG_RESULT(yes) +- AC_DEFINE(PY_FORMAT_SIZE_T, "z", [Define to printf format modifier for Py_ssize_t])], +- AC_MSG_RESULT(no)) +- + AC_CHECK_TYPE(socklen_t,, + AC_DEFINE(socklen_t,int, + Define to `int' if does not define.),[ diff --git a/packages/python/python-2.5.2/bindir-libdir.patch b/packages/python/python-2.5.2/bindir-libdir.patch new file mode 100644 index 0000000000..047c358a55 --- /dev/null +++ b/packages/python/python-2.5.2/bindir-libdir.patch @@ -0,0 +1,20 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: Python-2.5.1/Makefile.pre.in +=================================================================== +--- Python-2.5.1.orig/Makefile.pre.in ++++ Python-2.5.1/Makefile.pre.in +@@ -83,8 +83,8 @@ prefix= @prefix@ + exec_prefix= @exec_prefix@ + + # Expanded directories +-BINDIR= $(exec_prefix)/bin +-LIBDIR= $(exec_prefix)/lib ++BINDIR= @bindir@ ++LIBDIR= @libdir@ + MANDIR= @mandir@ + INCLUDEDIR= @includedir@ + CONFINCLUDEDIR= $(exec_prefix)/include diff --git a/packages/python/python-2.5.2/crosscompile.patch b/packages/python/python-2.5.2/crosscompile.patch new file mode 100644 index 0000000000..f1b1c6f3e0 --- /dev/null +++ b/packages/python/python-2.5.2/crosscompile.patch @@ -0,0 +1,110 @@ +# +# Patch (C) by Michael 'Mickey' Lauer +# +Index: Python-2.5.2/Makefile.pre.in +=================================================================== +--- Python-2.5.2.orig/Makefile.pre.in ++++ Python-2.5.2/Makefile.pre.in +@@ -173,6 +173,7 @@ UNICODE_OBJS= @UNICODE_OBJS@ + + PYTHON= python$(EXE) + BUILDPYTHON= python$(BUILDEXE) ++HOSTPYTHON= $(BUILDPYTHON) + + # === Definitions added by makesetup === + +@@ -199,7 +200,7 @@ GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar + ########################################################################## + # Parser + PGEN= Parser/pgen$(EXE) +- ++HOSTPGEN= $(PGEN)$(EXE) + POBJS= \ + Parser/acceler.o \ + Parser/grammar1.o \ +@@ -348,8 +349,8 @@ platform: $(BUILDPYTHON) + # Build the shared modules + sharedmods: $(BUILDPYTHON) + case $$MAKEFLAGS in \ +- *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ +- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ ++ *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \ ++ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \ + esac + + # Build static library +@@ -474,7 +475,7 @@ Modules/python.o: $(srcdir)/Modules/pyth + + $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) + -@ mkdir Include +- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) ++ -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) + + $(PGEN): $(PGENOBJS) + $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) +@@ -782,19 +783,19 @@ libinstall: $(BUILDPYTHON) $(srcdir)/Lib + done + $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt + PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ ++ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ + -d $(LIBDEST) -f \ + -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST) + PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ ++ $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ + -d $(LIBDEST) -f \ + -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST) + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ ++ $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ + -d $(LIBDEST)/site-packages -f \ + -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ ++ $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ + -d $(LIBDEST)/site-packages -f \ + -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages + +@@ -894,7 +895,7 @@ libainstall: all + # Install the dynamically loadable modules + # This goes into $(exec_prefix) + sharedinstall: +- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \ ++ $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \ + --prefix=$(prefix) \ + --install-scripts=$(BINDIR) \ + --install-platlib=$(DESTSHARED) \ +Index: Python-2.5.2/setup.py +=================================================================== +--- Python-2.5.2.orig/setup.py ++++ Python-2.5.2/setup.py +@@ -211,6 +211,7 @@ class PyBuildExt(build_ext): + except ImportError, why: + self.announce('*** WARNING: renaming "%s" since importing it' + ' failed: %s' % (ext.name, why), level=3) ++ return + assert not self.inplace + basename, tail = os.path.splitext(ext_filename) + newname = basename + "_failed" + tail +@@ -244,8 +245,8 @@ class PyBuildExt(build_ext): + + def detect_modules(self): + # Ensure that /usr/local is always used +- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') +- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') ++ # add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') ++ # add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + + # Add paths specified in the environment variables LDFLAGS and + # CPPFLAGS for header and library files. +@@ -342,6 +343,9 @@ class PyBuildExt(build_ext): + + # XXX Omitted modules: gl, pure, dl, SGI-specific modules + ++ lib_dirs = [ os.getenv( "STAGING_LIBDIR" ) ] ++ inc_dirs = [ os.getenv( "STAGING_INCDIR" ) ] ++ + # + # The following modules are all pretty straightforward, and compile + # on pretty much any POSIXish platform. diff --git a/packages/python/python-2.5.2/default-is-optimized.patch b/packages/python/python-2.5.2/default-is-optimized.patch new file mode 100644 index 0000000000..6beeb6e022 --- /dev/null +++ b/packages/python/python-2.5.2/default-is-optimized.patch @@ -0,0 +1,13 @@ +Index: Python-2.5.1/Python/compile.c +=================================================================== +--- Python-2.5.1.orig/Python/compile.c ++++ Python-2.5.1/Python/compile.c +@@ -30,7 +30,7 @@ + #include "symtable.h" + #include "opcode.h" + +-int Py_OptimizeFlag = 0; ++int Py_OptimizeFlag = 1; + + /* + ISSUES: diff --git a/packages/python/python-2.5.2/enable-ctypes-module.patch b/packages/python/python-2.5.2/enable-ctypes-module.patch new file mode 100644 index 0000000000..dd5adaf0e7 --- /dev/null +++ b/packages/python/python-2.5.2/enable-ctypes-module.patch @@ -0,0 +1,106 @@ +diff -Naur Python-2.5.1.orig/setup.py Python-2.5.1/setup.py +--- Python-2.5.orig/setup.py 2006-08-10 01:42:18.000000000 +0200 ++++ Python-2.5/setup.py 2007-11-21 18:00:43.000000000 +0100 +@@ -1321,16 +1329,16 @@ + ffi_configfile): + from distutils.dir_util import mkpath + mkpath(ffi_builddir) +- config_args = [] ++ config_args = ['--host=%s' % os.environ["HOST_SYS"], ] + + # Pass empty CFLAGS because we'll just append the resulting + # CFLAGS to Python's; -g or -O2 is to be avoided. +- cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \ +- % (ffi_builddir, ffi_srcdir, " ".join(config_args)) ++ cmd = "(cd %s && autoconf -W cross) && (cd %s && env CFLAGS='' '%s/configure' %s)" \ ++ % (ffi_srcdir, ffi_builddir, ffi_srcdir, " ".join(config_args)) + + res = os.system(cmd) + if res or not os.path.exists(ffi_configfile): +- print "Failed to configure _ctypes module" ++ print "Failed to configure _ctypes module, ret %d or missing %s"% (res, ffi_configfile, ) + return False + + fficonfig = {} +diff -Naur Python-2.5.1.orig/Modules/_ctypes/callbacks.c Python-2.5.1/Modules/_ctypes/callbacks.c +--- Python-2.5.1.orig/Modules/_ctypes/callbacks.c 2006-10-17 21:41:10.000000000 +0200 ++++ Python-2.5.1/Modules/_ctypes/callbacks.c 2007-11-22 10:29:33.000000000 +0100 +@@ -273,11 +273,13 @@ + PyErr_NoMemory(); + return NULL; + } ++#if FFI_CLOSURES + p->pcl = MallocClosure(); + if (p->pcl == NULL) { + PyErr_NoMemory(); + goto error; + } ++#endif + + for (i = 0; i < nArgs; ++i) { + PyObject *cnv = PySequence_GetItem(converters, i); +@@ -315,12 +317,14 @@ + "ffi_prep_cif failed with %d", result); + goto error; + } ++#if FFI_CLOSURES + result = ffi_prep_closure(p->pcl, &p->cif, closure_fcn, p); + if (result != FFI_OK) { + PyErr_Format(PyExc_RuntimeError, + "ffi_prep_closure failed with %d", result); + goto error; + } ++#endif + + p->converters = converters; + p->callable = callable; +@@ -328,8 +332,10 @@ + + error: + if (p) { ++#if FFI_CLOSURES + if (p->pcl) + FreeClosure(p->pcl); ++#endif + PyMem_Free(p); + } + return NULL; +diff -Naur Python-2.5.1.orig/Modules/_ctypes/_ctypes.c Python-2.5.1/Modules/_ctypes/_ctypes.c +--- Python-2.5.1.orig/Modules/_ctypes/_ctypes.c 2007-03-23 20:56:45.000000000 +0100 ++++ Python-2.5.1/Modules/_ctypes/_ctypes.c 2007-11-22 10:29:01.000000000 +0100 +@@ -3419,7 +3419,9 @@ + Py_CLEAR(self->paramflags); + + if (self->thunk) { ++#if FFI_CLOSURES + FreeClosure(self->thunk->pcl); ++#endif + PyMem_Free(self->thunk); + self->thunk = NULL; + } +diff -Naur Python-2.5.1.orig/Modules/_ctypes/ctypes.h Python-2.5.1/Modules/_ctypes/ctypes.h +--- Python-2.5.1.orig/Modules/_ctypes/ctypes.h 2006-08-14 13:17:48.000000000 +0200 ++++ Python-2.5.1/Modules/_ctypes/ctypes.h 2007-11-22 10:29:44.000000000 +0100 +@@ -68,7 +68,9 @@ + }; + + typedef struct { ++#if FFI_CLOSURES + ffi_closure *pcl; /* the C callable */ ++#endif + ffi_cif cif; + PyObject *converters; + PyObject *callable; +diff -Naur Python-2.5.1.orig/Modules/_ctypes/malloc_closure.c Python-2.5.1/Modules/_ctypes/malloc_closure.c +--- Python-2.5.1.orig/Modules/_ctypes/malloc_closure.c 2006-06-12 22:56:48.000000000 +0200 ++++ Python-2.5.1/Modules/_ctypes/malloc_closure.c 2007-11-22 10:30:17.000000000 +0100 +@@ -27,7 +27,9 @@ + /******************************************************************/ + + typedef union _tagITEM { ++#if FFI_CLOSURES + ffi_closure closure; ++#endif + union _tagITEM *next; + } ITEM; + diff --git a/packages/python/python-2.5.2/fix-tkinter-detection.patch b/packages/python/python-2.5.2/fix-tkinter-detection.patch new file mode 100644 index 0000000000..93bd343381 --- /dev/null +++ b/packages/python/python-2.5.2/fix-tkinter-detection.patch @@ -0,0 +1,41 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: Python-2.5.1/setup.py +=================================================================== +--- Python-2.5.1.orig/setup.py ++++ Python-2.5.1/setup.py +@@ -1227,7 +1227,7 @@ class PyBuildExt(build_ext): + dotversion = dotversion[:-1] + '.' + dotversion[-1] + tcl_include_sub = [] + tk_include_sub = [] +- for dir in inc_dirs: ++ for dir in [os.getenv("STAGING_INCDIR")]: + tcl_include_sub += [dir + os.sep + "tcl" + dotversion] + tk_include_sub += [dir + os.sep + "tk" + dotversion] + tk_include_sub += tcl_include_sub +@@ -1246,22 +1246,6 @@ class PyBuildExt(build_ext): + if dir not in include_dirs: + include_dirs.append(dir) + +- # Check for various platform-specific directories +- if platform == 'sunos5': +- include_dirs.append('/usr/openwin/include') +- added_lib_dirs.append('/usr/openwin/lib') +- elif os.path.exists('/usr/X11R6/include'): +- include_dirs.append('/usr/X11R6/include') +- added_lib_dirs.append('/usr/X11R6/lib64') +- added_lib_dirs.append('/usr/X11R6/lib') +- elif os.path.exists('/usr/X11R5/include'): +- include_dirs.append('/usr/X11R5/include') +- added_lib_dirs.append('/usr/X11R5/lib') +- else: +- # Assume default location for X11 +- include_dirs.append('/usr/X11/include') +- added_lib_dirs.append('/usr/X11/lib') +- + # If Cygwin, then verify that X is installed before proceeding + if platform == 'cygwin': + x11_inc = find_file('X11/Xlib.h', [], include_dirs) diff --git a/packages/python/python-2.5.2/sitebranding.patch b/packages/python/python-2.5.2/sitebranding.patch new file mode 100644 index 0000000000..c6e486ae97 --- /dev/null +++ b/packages/python/python-2.5.2/sitebranding.patch @@ -0,0 +1,21 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: Python-2.5.1/Lib/site.py +=================================================================== +--- Python-2.5.1.orig/Lib/site.py ++++ Python-2.5.1/Lib/site.py +@@ -323,8 +323,9 @@ def setcopyright(): + "Jython is maintained by the Jython developers (www.jython.org).") + else: + __builtin__.credits = _Printer("credits", """\ +- Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands +- for supporting Python development. See www.python.org for more information.""") ++ This version of Python has been built by the OpenEmbedded buildsystem (http://openembedded.org). ++ It is a part of the Python-For-Embedded-Systems initiative which is maintained by ++ Michael 'Mickey' Lauer (http://www.Vanille.de/projects/python.spy).""") + here = os.path.dirname(os.__file__) + __builtin__.license = _Printer( + "license", "See http://www.python.org/%.3s/license.html" % sys.version, diff --git a/packages/python/python-2.5.2/sitecustomize.py b/packages/python/python-2.5.2/sitecustomize.py new file mode 100644 index 0000000000..4c0ba3f0da --- /dev/null +++ b/packages/python/python-2.5.2/sitecustomize.py @@ -0,0 +1,45 @@ +# OpenEmbedded sitecustomize.py (C) 2002-2008 Michael 'Mickey' Lauer +# GPLv2 or later +# Version: 20082201 +# Features: +# * set proper default encoding +# * enable readline completion in the interactive interpreter +# * load command line history on startup +# * save command line history on exit + +import os + +def __exithandler(): + try: + readline.write_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) ) + except IOError: + pass + +def __registerExitHandler(): + import atexit + atexit.register( __exithandler ) + +def __enableReadlineSupport(): + readline.parse_and_bind("tab: complete") + try: + readline.read_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) ) + except IOError: + pass + +def __enableDefaultEncoding(): + import sys + try: + sys.setdefaultencoding('utf8') + except LookupError: + pass + +import sys +try: + import rlcompleter, readline +except ImportError: + sys.stderr.write( "Python %s (OpenEmbedded build) sitecustomize.py not active. Please install python-readline.\n" % sys.version.split()[0] ) +else: + __enableDefaultEncoding() + __registerExitHandler() + __enableReadlineSupport() + sys.stderr.write( "Python %s (OpenEmbedded build) sitecustomize.py active.\n" % sys.version.split()[0] ) diff --git a/packages/python/python_2.5.1.bb b/packages/python/python_2.5.1.bb deleted file mode 100644 index ecfedf15fe..0000000000 --- a/packages/python/python_2.5.1.bb +++ /dev/null @@ -1,105 +0,0 @@ -DESCRIPTION = "Python Programming Language" -HOMEPAGE = "http://www.python.org" -LICENSE = "PSF" -SECTION = "devel/python" -PRIORITY = "optional" -DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk" -DEPENDS_sharprom = "python-native readline zlib gdbm openssl" - -# NOTE: Keep the digit in sync with BASEREV in contrib/generate-manifest-2.5.py -PR = "ml10" - -PYTHON_MAJMIN = "2.5" - -SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ - file://bindir-libdir.patch;patch=1 \ - file://crosscompile.patch;patch=1 \ - file://fix-tkinter-detection.patch;patch=1 \ - file://autohell.patch;patch=1 \ - file://sitebranding.patch;patch=1 \ - file://enable-ctypes-module.patch;patch=1 \ - file://default-is-optimized.patch;patch=1 \ - file://sitecustomize.py" -S = "${WORKDIR}/Python-${PV}" - -inherit autotools - -EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \ - --without-cxx --with-signal-module --with-wctype-functions \ - --enable-shared" - -# -# copy config.h and an appropriate Makefile for distutils.sysconfig -# which laters uses the information out of these to compile extensions -# -do_compile_prepend() { - install -d ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ - install -d ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/ - install -m 0644 pyconfig.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ - install -m 0644 Makefile Makefile.orig - install -m 0644 Makefile Makefile.backup - sed -e 's,${includedir},${STAGING_INCDIR},' < Makefile.backup > Makefile - install -m 0644 Makefile Makefile.backup - sed -e 's,${libdir},${STAGING_LIBDIR},' < Makefile.backup > Makefile - install -m 0644 Makefile ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/ -} - -do_compile() { - oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ - HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ - STAGING_LIBDIR=${STAGING_LIBDIR} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - OPT="${CFLAGS}" libpython2.5.so - - oe_libinstall -so libpython2.5 ${STAGING_LIBDIR} - - oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ - HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ - STAGING_LIBDIR=${STAGING_LIBDIR} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - OPT="${CFLAGS}" -} - -do_stage() { - install -m 0644 Include/*.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ - oe_libinstall -a -so libpython${PYTHON_MAJMIN} ${STAGING_LIBDIR} -} - -do_install() { - install -m 0644 Makefile.orig Makefile - - oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ - HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ - STAGING_LIBDIR=${STAGING_LIBDIR} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - DESTDIR=${D} LIBDIR=${libdir} install - - install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN} -} - -require python-${PYTHON_MAJMIN}-manifest.inc - -RPROVIDES_python-core = "python" -RRECOMMENDS_python-core = "python-readline" - -# add sitecustomize -FILES_python-core += "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py" - -# package libpython -PACKAGES =+ "libpython2" -FILES_libpython2 = "${libdir}/libpython*" - -# catch debug extensions -FILES_python-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug" - -# catch all the rest (unsorted) -PACKAGES += "python-misc" -FILES_python-misc = "${libdir}/python${PYTHON_MAJMIN}" - -# catch manpage -PACKAGES += "python-man" -FILES_python-man = "${datadir}/man" - diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb new file mode 100644 index 0000000000..24b49f37ed --- /dev/null +++ b/packages/python/python_2.5.2.bb @@ -0,0 +1,105 @@ +DESCRIPTION = "Python Programming Language" +HOMEPAGE = "http://www.python.org" +LICENSE = "PSF" +SECTION = "devel/python" +PRIORITY = "optional" +DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk" +DEPENDS_sharprom = "python-native readline zlib gdbm openssl" + +# NOTE: Keep the digit in sync with BASEREV in contrib/generate-manifest-2.5.py +PR = "ml0" + +PYTHON_MAJMIN = "2.5" + +SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ + file://bindir-libdir.patch;patch=1 \ + file://crosscompile.patch;patch=1 \ + file://fix-tkinter-detection.patch;patch=1 \ + file://autohell.patch;patch=1 \ + file://sitebranding.patch;patch=1 \ + file://enable-ctypes-module.patch;patch=1 \ + file://default-is-optimized.patch;patch=1 \ + file://sitecustomize.py" +S = "${WORKDIR}/Python-${PV}" + +inherit autotools + +EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \ + --without-cxx --with-signal-module --with-wctype-functions \ + --enable-shared" + +# +# copy config.h and an appropriate Makefile for distutils.sysconfig +# which laters uses the information out of these to compile extensions +# +do_compile_prepend() { + install -d ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ + install -d ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/ + install -m 0644 pyconfig.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ + install -m 0644 Makefile Makefile.orig + install -m 0644 Makefile Makefile.backup + sed -e 's,${includedir},${STAGING_INCDIR},' < Makefile.backup > Makefile + install -m 0644 Makefile Makefile.backup + sed -e 's,${libdir},${STAGING_LIBDIR},' < Makefile.backup > Makefile + install -m 0644 Makefile ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/ +} + +do_compile() { + oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ + HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ + STAGING_INCDIR=${STAGING_INCDIR} \ + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + OPT="${CFLAGS}" libpython2.5.so + + oe_libinstall -so libpython2.5 ${STAGING_LIBDIR} + + oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ + HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ + STAGING_INCDIR=${STAGING_INCDIR} \ + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + OPT="${CFLAGS}" +} + +do_stage() { + install -m 0644 Include/*.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ + oe_libinstall -a -so libpython${PYTHON_MAJMIN} ${STAGING_LIBDIR} +} + +do_install() { + install -m 0644 Makefile.orig Makefile + + oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ + HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ + STAGING_INCDIR=${STAGING_INCDIR} \ + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + DESTDIR=${D} LIBDIR=${libdir} install + + install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN} +} + +require python-${PYTHON_MAJMIN}-manifest.inc + +RPROVIDES_python-core = "python" +RRECOMMENDS_python-core = "python-readline" + +# add sitecustomize +FILES_python-core += "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py" + +# package libpython +PACKAGES =+ "libpython2" +FILES_libpython2 = "${libdir}/libpython*" + +# catch debug extensions +FILES_python-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug" + +# catch all the rest (unsorted) +PACKAGES += "python-misc" +FILES_python-misc = "${libdir}/python${PYTHON_MAJMIN}" + +# catch manpage +PACKAGES += "python-man" +FILES_python-man = "${datadir}/man" + -- cgit v1.2.3 From 8522e28917c778b75cc9a551d4875613db0616a7 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 27 Feb 2008 14:40:13 +0000 Subject: add pyneod, remove python-fso-pyproto --- packages/freesmartphone/gsm0710muxd_svn.bb | 4 +- packages/freesmartphone/pyneod_svn.bb | 66 +++++++++++++++++++++++ packages/freesmartphone/python-fso-pyproto_svn.bb | 13 ----- packages/freesmartphone/task-pyneo.bb | 6 +++ 4 files changed, 75 insertions(+), 14 deletions(-) create mode 100644 packages/freesmartphone/pyneod_svn.bb delete mode 100644 packages/freesmartphone/python-fso-pyproto_svn.bb create mode 100644 packages/freesmartphone/task-pyneo.bb (limited to 'packages') diff --git a/packages/freesmartphone/gsm0710muxd_svn.bb b/packages/freesmartphone/gsm0710muxd_svn.bb index 98b9360c00..6c3d29aed4 100644 --- a/packages/freesmartphone/gsm0710muxd_svn.bb +++ b/packages/freesmartphone/gsm0710muxd_svn.bb @@ -3,9 +3,11 @@ HOMEPAGE = "http://www.freesmartphone.org" AUTHOR = "M. Dietrich" SECTION = "console/network" DEPENDS = "intltool-native dbus" +RCONFLICTS = "gsmd" +RREPLACES = "gsmd" LICENSE = "GPL" PV = "0.0+svnr${SRCREV}" -PR = "r2" +PR = "r3" SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=gsm0710muxd" S = "${WORKDIR}/gsm0710muxd" diff --git a/packages/freesmartphone/pyneod_svn.bb b/packages/freesmartphone/pyneod_svn.bb new file mode 100644 index 0000000000..026d693be2 --- /dev/null +++ b/packages/freesmartphone/pyneod_svn.bb @@ -0,0 +1,66 @@ +DESCRIPTION = "FIC Neo Smartphone daemons implementing the freesmartphone.org dbus APIs" +AUTHOR = "M. Dietrich" +SECTION = "console/network" +DEPENDS = "python" +LICENSE = "GPL" +PV = "0.0+svnr${SRCREV}" +PR = "r1" + +inherit update-rc.d + +INITSCRIPT_NAME = "init.d.pyneo" +INITSCRIPT_PARAMS = "defaults 40" + +SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=pyneod" +S = "${WORKDIR}/pyneod" + +export D := "${D}" +export PREFIX = "${prefix}" + +do_compile() { + : +} + +do_install() { + python setup.py +} + +RCONFLICTS = "gsmd" +RREPLACES = "gsmd" +RDEPENDS = "\ + python-codecs \ + python-compression \ + python-crypt \ + python-curses \ + python-datetime \ + python-dbus \ + python-fcntl \ + python-gdbm \ + python-gst \ + python-html \ + python-io \ + python-lang \ + python-logging \ + python-math \ + python-mime \ + python-netclient \ + python-netserver \ + python-pickle \ + python-pprint \ + python-pycrypto \ + python-pygobject \ + python-pyserial \ + python-re \ + python-readline \ + python-shell \ + python-simplejson \ + python-sqlite3 \ + python-stringold \ + python-syslog \ + python-threading \ + python-xml \ + python-zlib \ +" + +FILES_${PN} = "${datadir} ${sysconfdir} ${bindir}" +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/freesmartphone/python-fso-pyproto_svn.bb b/packages/freesmartphone/python-fso-pyproto_svn.bb deleted file mode 100644 index 9d4503d351..0000000000 --- a/packages/freesmartphone/python-fso-pyproto_svn.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "FreeSmartPhone.org Python Prototypes" -AUTHOR = "M. Dietrich" -SECTION = "console/network" -RDEPENDS = "python-serial python-lang" -LICENSE = "GPL" -PV = "0.0+svnr${SRCREV}" -PR = "r0" - -SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=py-proto" -S = "${WORKDIR}/py-proto" - -inherit distutils - diff --git a/packages/freesmartphone/task-pyneo.bb b/packages/freesmartphone/task-pyneo.bb new file mode 100644 index 0000000000..346eb64bbe --- /dev/null +++ b/packages/freesmartphone/task-pyneo.bb @@ -0,0 +1,6 @@ +DESCRIPTION = "Task for a FIC Neo SmartPhone environment" +LICENSE = "MIT" +SECTION = "devel/python" +RDEPENDS = "gsm0710muxd python-pyneod python-pyneog" + +ALLOW_EMPTY = "1" -- cgit v1.2.3 From 5d7233385648fba5113c97d7e4a3e84dbe2fe39a Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 27 Feb 2008 14:49:34 +0000 Subject: add pyneog --- packages/freesmartphone/pyneog_svn.bb | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 packages/freesmartphone/pyneog_svn.bb (limited to 'packages') diff --git a/packages/freesmartphone/pyneog_svn.bb b/packages/freesmartphone/pyneog_svn.bb new file mode 100644 index 0000000000..b640426497 --- /dev/null +++ b/packages/freesmartphone/pyneog_svn.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "FIC Neo Smartphone UI Environment" +AUTHOR = "M. Dietrich" +SECTION = "python/ui" +LICENSE = "GPL" +PV = "0.0+svnr${SRCREV}" +PR = "r0" + +SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=pyneog" +S = "${WORKDIR}/pyneog" + +do_compile() { + : +} + +do_install() { + find . -name ".svn"|xargs rm -rf + install -d ${D}${datadir}/pyneog + for i in media *.py Xsession.d.zadje; do + cp -a $i ${D}${datadir}/pyneog/ + done + + install -d ${D}${sysconfdir}/X11/Xsession.d/ + ln -sf ${datadir}/pyneog/Xsession.d.zadje ${D}${sysconfdir}/X11/Xsession.d/80zadje +} + +FILES_${PN} = "${datadir} ${bindir} ${sysconfdir}" + +RCONFLICTS = "openmoko-session2" +RREPlACES = "openmoko-session2" +RDEPENDS = "task-python-efl" +PACKAGE_ARCH = "${MACHINE_ARCH}" -- cgit v1.2.3 From ed178ed068ec9ebd7f6883fc7c7a06dee4e1f371 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 27 Feb 2008 15:16:04 +0000 Subject: first shot at moko-underground-image --- packages/freesmartphone/task-pyneo.bb | 18 ++++++++++++++- packages/images/moko-underground-image.bb | 37 +++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 packages/images/moko-underground-image.bb (limited to 'packages') diff --git a/packages/freesmartphone/task-pyneo.bb b/packages/freesmartphone/task-pyneo.bb index 346eb64bbe..751fd4c889 100644 --- a/packages/freesmartphone/task-pyneo.bb +++ b/packages/freesmartphone/task-pyneo.bb @@ -1,6 +1,22 @@ DESCRIPTION = "Task for a FIC Neo SmartPhone environment" LICENSE = "MIT" SECTION = "devel/python" -RDEPENDS = "gsm0710muxd python-pyneod python-pyneog" +PR = "r2" ALLOW_EMPTY = "1" + +RDEPENDS = "\ + matchbox-wm \ + ${XSERVER} \ + xserver-kdrive-common \ + xserver-nodm-init \ + xauth \ + xhost \ + xset \ + xrandr \ + \ + gsm0710muxd \ + pyneod \ + pyneog \ +" + diff --git a/packages/images/moko-underground-image.bb b/packages/images/moko-underground-image.bb new file mode 100644 index 0000000000..44dc3bc137 --- /dev/null +++ b/packages/images/moko-underground-image.bb @@ -0,0 +1,37 @@ +#------------------------------------------------------ +# Moko Underground OS Image Recipe +#------------------------------------------------------ + +IMAGE_LINGUAS = "" + +IMAGE_INSTALL = "\ + ${MACHINE_TASK_PROVIDER} \ + task-base \ + netbase \ + sysfsutils \ + modutils-initscripts \ + module-init-tools-depmod \ + rsync \ + screen \ + fbset \ + fbset-modes \ + \ + matchbox-wm \ + ${XSERVER} \ + xserver-kdrive-common \ + xserver-nodm-init \ + xauth \ + xhost \ + xset \ + xrandr \ + " + +DEPENDS = "\ + ${MACHINE_TASK_PROVIDER} \ + task-pyneo \ +" + + +inherit image + +ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp' -- cgit v1.2.3 From 1091018fa2bbde7a581bfd4d46849a34c78ae1d9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 27 Feb 2008 15:44:59 +0000 Subject: pvrusb2-mci: Fix STAGING references in TARGET_LDFLAGS, add 20080210 version which builds against modern kernels --- .../pvrusb2-mci-20080210/.mtn2git_empty | 0 packages/pvrusb2-mci/pvrusb2-mci_20051113.bb | 6 +--- packages/pvrusb2-mci/pvrusb2-mci_20060101.bb | 6 +--- packages/pvrusb2-mci/pvrusb2-mci_20060103.bb | 6 +--- packages/pvrusb2-mci/pvrusb2-mci_20060121.bb | 6 +--- packages/pvrusb2-mci/pvrusb2-mci_20060209.bb | 5 +-- packages/pvrusb2-mci/pvrusb2-mci_20060326.bb | 5 +-- packages/pvrusb2-mci/pvrusb2-mci_20060329.bb | 5 +-- packages/pvrusb2-mci/pvrusb2-mci_20060423.bb | 5 +-- packages/pvrusb2-mci/pvrusb2-mci_20060517.bb | 5 +-- packages/pvrusb2-mci/pvrusb2-mci_20060607.bb | 5 +-- packages/pvrusb2-mci/pvrusb2-mci_20060626.bb | 5 +-- packages/pvrusb2-mci/pvrusb2-mci_20060702.bb | 5 +-- packages/pvrusb2-mci/pvrusb2-mci_20060726.bb | 5 +-- packages/pvrusb2-mci/pvrusb2-mci_20060903.bb | 5 +-- packages/pvrusb2-mci/pvrusb2-mci_20080210.bb | 40 ++++++++++++++++++++++ 16 files changed, 54 insertions(+), 60 deletions(-) create mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20080210/.mtn2git_empty create mode 100644 packages/pvrusb2-mci/pvrusb2-mci_20080210.bb (limited to 'packages') diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20080210/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20080210/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb b/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb index 25a08d9bff..1e24f9bf64 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb @@ -1,4 +1,4 @@ -require pvrusb2-mci.inc +require pvrusb2-mci2.inc PR = "r1" # It in fact requires these modules, but for now is using the local ones. @@ -21,10 +21,6 @@ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ 'LD=${KERNEL_LD}' \ 'KDIR=${STAGING_KERNEL_DIR}'" -export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ - -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" - - do_compile() { cd ivtv; oe_runmake cd ../driver; oe_runmake diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb index 9f91a111ad..e12c68a425 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb @@ -1,4 +1,4 @@ -require pvrusb2-mci.inc +require pvrusb2-mci2.inc PR = "r1" # It in fact requires these modules, but for now is using the local ones. @@ -19,10 +19,6 @@ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ 'LD=${KERNEL_LD}' \ 'KDIR=${STAGING_KERNEL_DIR}'" -export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ - -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" - - do_compile() { cd ivtv; oe_runmake cd ../driver; oe_runmake diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb index d8c17cbde6..6e0d4fa68c 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb @@ -1,4 +1,4 @@ -require pvrusb2-mci.inc +require pvrusb2-mci2.inc PR = "r1" # It in fact requires these modules, but for now is using the local ones. @@ -19,10 +19,6 @@ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ 'LD=${KERNEL_LD}' \ 'KDIR=${STAGING_KERNEL_DIR}'" -export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ - -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" - - do_compile() { cd ivtv; oe_runmake cd ../driver; oe_runmake diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb index fa8a68432d..c16dec2c1c 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb @@ -1,4 +1,4 @@ -require pvrusb2-mci.inc +require pvrusb2-mci2.inc PR = "r1" # It in fact requires these modules, but for now is using the local ones. @@ -19,10 +19,6 @@ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ 'LD=${KERNEL_LD}' \ 'KDIR=${STAGING_KERNEL_DIR}'" -export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ - -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" - - do_compile() { cd ivtv; oe_runmake cd ../driver; oe_runmake diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb index e80430f7d0..ad5935d45e 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb @@ -1,4 +1,4 @@ -require pvrusb2-mci.inc +require pvrusb2-mci2.inc PR = "r2" RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" @@ -19,9 +19,6 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'LD=${KERNEL_LD}' \ 'KDIR=${STAGING_KERNEL_DIR}'" -export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ - -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" - do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb index ac5b82be94..562733e768 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb @@ -1,4 +1,4 @@ -require pvrusb2-mci.inc +require pvrusb2-mci2.inc PR = "r1" RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" @@ -19,9 +19,6 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'LD=${KERNEL_LD}' \ 'KDIR=${STAGING_KERNEL_DIR}'" -export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ - -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" - do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb index 8f1cc4465b..36ea62e771 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb @@ -1,4 +1,4 @@ -require pvrusb2-mci.inc +require pvrusb2-mci2.inc PR = "r1" RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" @@ -22,9 +22,6 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'LD=${KERNEL_LD}' \ 'KDIR=${STAGING_KERNEL_DIR}'" -export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ - -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" - do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb index 8f1cc4465b..36ea62e771 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb @@ -1,4 +1,4 @@ -require pvrusb2-mci.inc +require pvrusb2-mci2.inc PR = "r1" RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" @@ -22,9 +22,6 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'LD=${KERNEL_LD}' \ 'KDIR=${STAGING_KERNEL_DIR}'" -export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ - -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" - do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb index 8f1cc4465b..36ea62e771 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb @@ -1,4 +1,4 @@ -require pvrusb2-mci.inc +require pvrusb2-mci2.inc PR = "r1" RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" @@ -22,9 +22,6 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'LD=${KERNEL_LD}' \ 'KDIR=${STAGING_KERNEL_DIR}'" -export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ - -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" - do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb index 8f1cc4465b..36ea62e771 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb @@ -1,4 +1,4 @@ -require pvrusb2-mci.inc +require pvrusb2-mci2.inc PR = "r1" RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" @@ -22,9 +22,6 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'LD=${KERNEL_LD}' \ 'KDIR=${STAGING_KERNEL_DIR}'" -export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ - -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" - do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb index b2ad76d007..3f14c8ffe2 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb @@ -1,4 +1,4 @@ -require pvrusb2-mci.inc +require pvrusb2-mci2.inc PR = "r1" RRECOMMENDS = "kernel-module-tveeprom \ @@ -32,9 +32,6 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'LD=${KERNEL_LD}' \ 'KDIR=${STAGING_KERNEL_DIR}'" -export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ - -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" - do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb index b2ad76d007..3f14c8ffe2 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb @@ -1,4 +1,4 @@ -require pvrusb2-mci.inc +require pvrusb2-mci2.inc PR = "r1" RRECOMMENDS = "kernel-module-tveeprom \ @@ -32,9 +32,6 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'LD=${KERNEL_LD}' \ 'KDIR=${STAGING_KERNEL_DIR}'" -export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ - -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" - do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb index b2ad76d007..3f14c8ffe2 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb @@ -1,4 +1,4 @@ -require pvrusb2-mci.inc +require pvrusb2-mci2.inc PR = "r1" RRECOMMENDS = "kernel-module-tveeprom \ @@ -32,9 +32,6 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'LD=${KERNEL_LD}' \ 'KDIR=${STAGING_KERNEL_DIR}'" -export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ - -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" - do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb index adf2fe6c5e..5bd4ea2db9 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb @@ -1,4 +1,4 @@ -require pvrusb2-mci.inc +require pvrusb2-mci2.inc RRECOMMENDS = "kernel-module-tveeprom \ kernel-module-firmware-class \ @@ -31,9 +31,6 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'LD=${KERNEL_LD}' \ 'KDIR=${STAGING_KERNEL_DIR}'" -export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ - -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" - do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20080210.bb b/packages/pvrusb2-mci/pvrusb2-mci_20080210.bb new file mode 100644 index 0000000000..5bd4ea2db9 --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci_20080210.bb @@ -0,0 +1,40 @@ +require pvrusb2-mci2.inc + +RRECOMMENDS = "kernel-module-tveeprom \ + kernel-module-firmware-class \ + kernel-module-tuner \ + kernel-module-msp3400 \ + kernel-module-saa7115 \ + kernel-module-tda9887 \ + kernel-module-v4l1-compat \ + kernel-module-v4l2-common \ + kernel-module-videodev" + +SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \ + file://hotplug.functions \ + file://firmware.hotplug \ + file://Makefile.patch;patch=1" + +S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" + +inherit module + +CFLAGS = "'-I${KERNEL_SOURCE}/include' \ + '-I${KERNEL_SOURCE}/drivers/media/video' " + +CFLAGS_append_arm = " '-D__LINUX_ARM_ARCH__=5' " + +CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' " + +EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ + 'CC=${KERNEL_CC}' \ + 'LD=${KERNEL_LD}' \ + 'KDIR=${STAGING_KERNEL_DIR}'" + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media + install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media + mkdir -p ${D}/etc/hotplug.d/firmware + cp ${WORKDIR}/hotplug.functions ${D}/etc/hotplug.d/firmware + cp ${WORKDIR}/firmware.hotplug ${D}/etc/hotplug.d/firmware +} -- cgit v1.2.3 From ae0a253cb9d233b19ddb6e7803fcd02f233ab577 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 27 Feb 2008 15:45:29 +0000 Subject: pvrusb2-mci: Add missing .inc from last commit --- packages/pvrusb2-mci/pvrusb2-mci2.inc | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 packages/pvrusb2-mci/pvrusb2-mci2.inc (limited to 'packages') diff --git a/packages/pvrusb2-mci/pvrusb2-mci2.inc b/packages/pvrusb2-mci/pvrusb2-mci2.inc new file mode 100644 index 0000000000..f916880cf4 --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci2.inc @@ -0,0 +1,4 @@ +require pvrusb2-mci.inc + +export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \ + -Wl,-rpath-link,${STAGING_DIR_TARGET}${layout_libdir}" -- cgit v1.2.3 From 0ee73dca5557b08e170146a7e1727f70da0e3a62 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 27 Feb 2008 15:48:20 +0000 Subject: pvrusb2-mci: Remove a ton of old versions --- .../pvrusb2-mci-20050911/.mtn2git_empty | 0 .../pvrusb2-mci-20050911/Makefile.patch | 15 -------- .../pvrusb2-mci-20050921/.mtn2git_empty | 0 .../pvrusb2-mci-20050921/Makefile.patch | 15 -------- .../pvrusb2-mci-20051016/.mtn2git_empty | 0 .../pvrusb2-mci-20051016/Makefile.patch | 15 -------- .../pvrusb2-mci-20051113/.mtn2git_empty | 0 .../pvrusb2-mci-20051113/Makefile.patch | 15 -------- .../pvrusb2-mci-20060209/.mtn2git_empty | 0 .../pvrusb2-mci-20060209/Makefile.patch | 25 ------------- .../pvrusb2-mci-20060326/.mtn2git_empty | 0 .../pvrusb2-mci-20060326/Makefile.patch | 25 ------------- .../pvrusb2-mci-20060329/.mtn2git_empty | 0 .../pvrusb2-mci-20060329/Makefile.patch | 25 ------------- .../pvrusb2-mci-20060423/.mtn2git_empty | 0 .../pvrusb2-mci-20060423/Makefile.patch | 25 ------------- .../pvrusb2-mci-20060517/.mtn2git_empty | 0 .../pvrusb2-mci-20060517/Makefile.patch | 25 ------------- .../pvrusb2-mci-20060607/.mtn2git_empty | 0 .../pvrusb2-mci-20060607/Makefile.patch | 25 ------------- .../pvrusb2-mci-20060626/.mtn2git_empty | 0 .../pvrusb2-mci-20060626/Makefile.patch | 25 ------------- .../pvrusb2-mci-20060702/.mtn2git_empty | 0 .../pvrusb2-mci-20060702/Makefile.patch | 25 ------------- .../pvrusb2-mci-20060726/.mtn2git_empty | 0 .../pvrusb2-mci-20060726/Makefile.patch | 25 ------------- packages/pvrusb2-mci/pvrusb2-mci_20050911.bb | 25 ------------- packages/pvrusb2-mci/pvrusb2-mci_20050921.bb | 25 ------------- packages/pvrusb2-mci/pvrusb2-mci_20051016.bb | 26 -------------- packages/pvrusb2-mci/pvrusb2-mci_20051113.bb | 34 ------------------ packages/pvrusb2-mci/pvrusb2-mci_20060101.bb | 31 ---------------- packages/pvrusb2-mci/pvrusb2-mci_20060103.bb | 31 ---------------- packages/pvrusb2-mci/pvrusb2-mci_20060121.bb | 31 ---------------- packages/pvrusb2-mci/pvrusb2-mci_20060209.bb | 25 ------------- packages/pvrusb2-mci/pvrusb2-mci_20060326.bb | 25 ------------- packages/pvrusb2-mci/pvrusb2-mci_20060329.bb | 28 --------------- packages/pvrusb2-mci/pvrusb2-mci_20060423.bb | 28 --------------- packages/pvrusb2-mci/pvrusb2-mci_20060517.bb | 28 --------------- packages/pvrusb2-mci/pvrusb2-mci_20060607.bb | 28 --------------- packages/pvrusb2-mci/pvrusb2-mci_20060626.bb | 41 ---------------------- packages/pvrusb2-mci/pvrusb2-mci_20060702.bb | 41 ---------------------- packages/pvrusb2-mci/pvrusb2-mci_20060726.bb | 41 ---------------------- 42 files changed, 773 deletions(-) delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20050911/.mtn2git_empty delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20050911/Makefile.patch delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20050921/.mtn2git_empty delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20050921/Makefile.patch delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20051016/.mtn2git_empty delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20051016/Makefile.patch delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20051113/.mtn2git_empty delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20051113/Makefile.patch delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060209/.mtn2git_empty delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060209/Makefile.patch delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060326/.mtn2git_empty delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060326/Makefile.patch delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060329/.mtn2git_empty delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060329/Makefile.patch delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060423/.mtn2git_empty delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060423/Makefile.patch delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060517/.mtn2git_empty delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060517/Makefile.patch delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060607/.mtn2git_empty delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060607/Makefile.patch delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060626/.mtn2git_empty delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060626/Makefile.patch delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060702/.mtn2git_empty delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060702/Makefile.patch delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060726/.mtn2git_empty delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060726/Makefile.patch delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci_20050911.bb delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci_20050921.bb delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci_20051016.bb delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci_20051113.bb delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci_20060101.bb delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci_20060103.bb delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci_20060121.bb delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci_20060209.bb delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci_20060326.bb delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci_20060329.bb delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci_20060423.bb delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci_20060517.bb delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci_20060607.bb delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci_20060626.bb delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci_20060702.bb delete mode 100644 packages/pvrusb2-mci/pvrusb2-mci_20060726.bb (limited to 'packages') diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20050911/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20050911/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20050911/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20050911/Makefile.patch deleted file mode 100644 index 829c741b69..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci-20050911/Makefile.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- driver/Makefile- 2005-09-11 13:22:08.000000000 -1000 -+++ driver/Makefile 2005-09-17 01:02:06.341217389 -1000 -@@ -37,10 +37,10 @@ - all: modules - - modules modules_install clean: -- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) $@ -+ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS)" -C $(KDIR) M=$(shell pwd) $@ - - install: -- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) modules_install -+ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS)" -C $(KDIR) M=$(shell pwd) modules_install - - else - diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20050921/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20050921/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20050921/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20050921/Makefile.patch deleted file mode 100644 index 829c741b69..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci-20050921/Makefile.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- driver/Makefile- 2005-09-11 13:22:08.000000000 -1000 -+++ driver/Makefile 2005-09-17 01:02:06.341217389 -1000 -@@ -37,10 +37,10 @@ - all: modules - - modules modules_install clean: -- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) $@ -+ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS)" -C $(KDIR) M=$(shell pwd) $@ - - install: -- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) modules_install -+ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS)" -C $(KDIR) M=$(shell pwd) modules_install - - else - diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20051016/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20051016/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20051016/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20051016/Makefile.patch deleted file mode 100644 index b79c42e2c5..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci-20051016/Makefile.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- driver/Makefile- 2005-09-11 13:22:08.000000000 -1000 -+++ driver/Makefile 2005-09-17 01:02:06.341217389 -1000 -@@ -37,10 +37,10 @@ - all: modules - - modules modules_install clean: -- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) $@ -+ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" -C $(KDIR) M=$(shell pwd) $@ - - install: -- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) modules_install -+ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" -C $(KDIR) M=$(shell pwd) modules_install - - else - diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20051113/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20051113/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20051113/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20051113/Makefile.patch deleted file mode 100644 index b79c42e2c5..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci-20051113/Makefile.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- driver/Makefile- 2005-09-11 13:22:08.000000000 -1000 -+++ driver/Makefile 2005-09-17 01:02:06.341217389 -1000 -@@ -37,10 +37,10 @@ - all: modules - - modules modules_install clean: -- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) $@ -+ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" -C $(KDIR) M=$(shell pwd) $@ - - install: -- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) modules_install -+ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" -C $(KDIR) M=$(shell pwd) modules_install - - else - diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060209/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20060209/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060209/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20060209/Makefile.patch deleted file mode 100644 index 29b1267177..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci-20060209/Makefile.patch +++ /dev/null @@ -1,25 +0,0 @@ -*** driver/Makefile- Tue Feb 28 21:05:41 2006 ---- driver/Makefile Tue Feb 28 21:07:15 2006 -*************** -*** 45,54 **** - M:=$(shell pwd) - - modules modules_install clean: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) CONFIG_VIDEO_PVRUSB2=m $@ - - install: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) CONFIG_VIDEO_PVRUSB2=m modules_install - - else - ---- 45,54 ---- - M:=$(shell pwd) - - modules modules_install clean: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) CONFIG_VIDEO_PVRUSB2=m $@ - - install: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) CONFIG_VIDEO_PVRUSB2=m modules_install - - else - diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060326/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20060326/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060326/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20060326/Makefile.patch deleted file mode 100644 index 29b1267177..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci-20060326/Makefile.patch +++ /dev/null @@ -1,25 +0,0 @@ -*** driver/Makefile- Tue Feb 28 21:05:41 2006 ---- driver/Makefile Tue Feb 28 21:07:15 2006 -*************** -*** 45,54 **** - M:=$(shell pwd) - - modules modules_install clean: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) CONFIG_VIDEO_PVRUSB2=m $@ - - install: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) CONFIG_VIDEO_PVRUSB2=m modules_install - - else - ---- 45,54 ---- - M:=$(shell pwd) - - modules modules_install clean: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) CONFIG_VIDEO_PVRUSB2=m $@ - - install: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) CONFIG_VIDEO_PVRUSB2=m modules_install - - else - diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060329/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20060329/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060329/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20060329/Makefile.patch deleted file mode 100644 index 29b1267177..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci-20060329/Makefile.patch +++ /dev/null @@ -1,25 +0,0 @@ -*** driver/Makefile- Tue Feb 28 21:05:41 2006 ---- driver/Makefile Tue Feb 28 21:07:15 2006 -*************** -*** 45,54 **** - M:=$(shell pwd) - - modules modules_install clean: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) CONFIG_VIDEO_PVRUSB2=m $@ - - install: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) CONFIG_VIDEO_PVRUSB2=m modules_install - - else - ---- 45,54 ---- - M:=$(shell pwd) - - modules modules_install clean: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) CONFIG_VIDEO_PVRUSB2=m $@ - - install: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) CONFIG_VIDEO_PVRUSB2=m modules_install - - else - diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060423/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20060423/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060423/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20060423/Makefile.patch deleted file mode 100644 index 3db0b2c9d6..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci-20060423/Makefile.patch +++ /dev/null @@ -1,25 +0,0 @@ -*** driver/Makefile.orig 2006-04-02 03:40:31.000000000 +0200 ---- driver/Makefile 2006-04-26 21:56:46.000000000 +0200 -*************** -*** 57,66 **** - CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y - - modules modules_install clean: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) $@ - - install: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) modules_install - - else - ---- 57,66 ---- - CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y - - modules modules_install clean: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) $@ - - install: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) modules_install - - else - diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060517/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20060517/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060517/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20060517/Makefile.patch deleted file mode 100644 index 3db0b2c9d6..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci-20060517/Makefile.patch +++ /dev/null @@ -1,25 +0,0 @@ -*** driver/Makefile.orig 2006-04-02 03:40:31.000000000 +0200 ---- driver/Makefile 2006-04-26 21:56:46.000000000 +0200 -*************** -*** 57,66 **** - CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y - - modules modules_install clean: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) $@ - - install: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) modules_install - - else - ---- 57,66 ---- - CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y - - modules modules_install clean: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) $@ - - install: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) modules_install - - else - diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060607/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20060607/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060607/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20060607/Makefile.patch deleted file mode 100644 index 3db0b2c9d6..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci-20060607/Makefile.patch +++ /dev/null @@ -1,25 +0,0 @@ -*** driver/Makefile.orig 2006-04-02 03:40:31.000000000 +0200 ---- driver/Makefile 2006-04-26 21:56:46.000000000 +0200 -*************** -*** 57,66 **** - CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y - - modules modules_install clean: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) $@ - - install: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) modules_install - - else - ---- 57,66 ---- - CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y - - modules modules_install clean: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) $@ - - install: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) modules_install - - else - diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060626/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20060626/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060626/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20060626/Makefile.patch deleted file mode 100644 index 3db0b2c9d6..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci-20060626/Makefile.patch +++ /dev/null @@ -1,25 +0,0 @@ -*** driver/Makefile.orig 2006-04-02 03:40:31.000000000 +0200 ---- driver/Makefile 2006-04-26 21:56:46.000000000 +0200 -*************** -*** 57,66 **** - CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y - - modules modules_install clean: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) $@ - - install: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) modules_install - - else - ---- 57,66 ---- - CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y - - modules modules_install clean: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) $@ - - install: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) modules_install - - else - diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060702/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20060702/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060702/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20060702/Makefile.patch deleted file mode 100644 index 3db0b2c9d6..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci-20060702/Makefile.patch +++ /dev/null @@ -1,25 +0,0 @@ -*** driver/Makefile.orig 2006-04-02 03:40:31.000000000 +0200 ---- driver/Makefile 2006-04-26 21:56:46.000000000 +0200 -*************** -*** 57,66 **** - CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y - - modules modules_install clean: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) $@ - - install: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) modules_install - - else - ---- 57,66 ---- - CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y - - modules modules_install clean: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) $@ - - install: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) modules_install - - else - diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060726/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20060726/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060726/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20060726/Makefile.patch deleted file mode 100644 index 3db0b2c9d6..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci-20060726/Makefile.patch +++ /dev/null @@ -1,25 +0,0 @@ -*** driver/Makefile.orig 2006-04-02 03:40:31.000000000 +0200 ---- driver/Makefile 2006-04-26 21:56:46.000000000 +0200 -*************** -*** 57,66 **** - CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y - - modules modules_install clean: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) $@ - - install: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) modules_install - - else - ---- 57,66 ---- - CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y - - modules modules_install clean: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) $@ - - install: -! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) modules_install - - else - diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb b/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb deleted file mode 100644 index 93fa743e53..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb +++ /dev/null @@ -1,25 +0,0 @@ -require pvrusb2-mci.inc - -# It in fact requires these modules, but for now is using the local ones. -# RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" - -SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20050911.tar.bz2 \ - file://Makefile.patch;patch=1" - -S = "${WORKDIR}/pvrusb2-mci-20050911/driver" - -inherit module - -CFLAGS = "'-I${KERNEL_SOURCE}/include' \ - '-D__LINUX_ARM_ARCH__=5'" - -EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ - 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media -} - diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb b/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb deleted file mode 100644 index a62c6f3d42..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb +++ /dev/null @@ -1,25 +0,0 @@ -require pvrusb2-mci.inc - -RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400" -# It in fact also requires kernel-module-saa7115", but for now is using the local ones. - -SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20050921.tar.bz2 \ - file://Makefile.patch;patch=1" - -S = "${WORKDIR}/pvrusb2-mci-20050921/driver" - -inherit module - -CFLAGS = "'-I${KERNEL_SOURCE}/include' \ - '-D__LINUX_ARM_ARCH__=5'" - -EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ - 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media -} - diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb b/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb deleted file mode 100644 index bd8070708e..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb +++ /dev/null @@ -1,26 +0,0 @@ -require pvrusb2-mci.inc - -PR = "r1" -# It in fact requires these modules, but for now is using the local ones. -# RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" - -SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20051016.tar.bz2 \ - file://Makefile.patch;patch=1" - -S = "${WORKDIR}/pvrusb2-mci-20051016/driver" - -inherit module - -CFLAGS = "'-I${KERNEL_SOURCE}/include' \ - '-D__LINUX_ARM_ARCH__=5'" - -EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ - 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media -} - diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb b/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb deleted file mode 100644 index 1e24f9bf64..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb +++ /dev/null @@ -1,34 +0,0 @@ -require pvrusb2-mci2.inc - -PR = "r1" -# It in fact requires these modules, but for now is using the local ones. -# RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" - -SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20051113.tar.bz2" - -#SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20051113.tar.bz2 \ -# file://Makefile.patch;patch=1" - -S = "${WORKDIR}/pvrusb2-mci-20051113" - -inherit module - -CFLAGS = "'-I${KERNEL_SOURCE}/include' \ - '-D__LINUX_ARM_ARCH__=5'" - -EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ - 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" - -do_compile() { - cd ivtv; oe_runmake - cd ../driver; oe_runmake -} - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - install -m 0644 ivtv/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - install -m 0644 driver/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media -} - diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb deleted file mode 100644 index e12c68a425..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb +++ /dev/null @@ -1,31 +0,0 @@ -require pvrusb2-mci2.inc - -PR = "r1" -# It in fact requires these modules, but for now is using the local ones. -# RRECOMMEND = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" -RRECOMMEND = "kernel-module-tda9887" - -SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20060101.tar.bz2" - -S = "${WORKDIR}/pvrusb2-mci-20060101" - -inherit module - -CFLAGS = "'-I${KERNEL_SOURCE}/include' \ - '-D__LINUX_ARM_ARCH__=5'" - -EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ - 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" - -do_compile() { - cd ivtv; oe_runmake - cd ../driver; oe_runmake -} - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - install -m 0644 ivtv/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - install -m 0644 driver/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media -} diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb deleted file mode 100644 index 6e0d4fa68c..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb +++ /dev/null @@ -1,31 +0,0 @@ -require pvrusb2-mci2.inc - -PR = "r1" -# It in fact requires these modules, but for now is using the local ones. -# RRECOMMEND = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" -RRECOMMEND = "kernel-module-tda9887" - -SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20060103.tar.bz2" - -S = "${WORKDIR}/pvrusb2-mci-20060103" - -inherit module - -CFLAGS = "'-I${KERNEL_SOURCE}/include' \ - '-D__LINUX_ARM_ARCH__=5'" - -EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ - 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" - -do_compile() { - cd ivtv; oe_runmake - cd ../driver; oe_runmake -} - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - install -m 0644 ivtv/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - install -m 0644 driver/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media -} diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb deleted file mode 100644 index c16dec2c1c..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb +++ /dev/null @@ -1,31 +0,0 @@ -require pvrusb2-mci2.inc - -PR = "r1" -# It in fact requires these modules, but for now is using the local ones. -# RRECOMMEND = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" -RRECOMMEND = "kernel-module-tda9887" - -SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20060121.tar.bz2" - -S = "${WORKDIR}/pvrusb2-mci-20060121" - -inherit module - -CFLAGS = "'-I${KERNEL_SOURCE}/include' \ - '-D__LINUX_ARM_ARCH__=5'" - -EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ - 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" - -do_compile() { - cd ivtv; oe_runmake - cd ../driver; oe_runmake -} - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - install -m 0644 ivtv/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - install -m 0644 driver/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media -} diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb deleted file mode 100644 index ad5935d45e..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb +++ /dev/null @@ -1,25 +0,0 @@ -require pvrusb2-mci2.inc - -PR = "r2" -RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" - -SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \ - file://Makefile.patch;patch=1" - -S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" - -inherit module - -CFLAGS = "'-I${KERNEL_SOURCE}/include' \ - '-I${KERNEL_SOURCE}/drivers/media/video' \ - '-D__LINUX_ARM_ARCH__=5'" - -EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ - 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media -} diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb deleted file mode 100644 index 562733e768..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb +++ /dev/null @@ -1,25 +0,0 @@ -require pvrusb2-mci2.inc - -PR = "r1" -RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" - -SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \ - file://Makefile.patch;patch=1" - -S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" - -inherit module - -CFLAGS = "'-I${KERNEL_SOURCE}/include' \ - '-I${KERNEL_SOURCE}/drivers/media/video' \ - '-D__LINUX_ARM_ARCH__=5'" - -EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ - 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media -} diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb deleted file mode 100644 index 36ea62e771..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb +++ /dev/null @@ -1,28 +0,0 @@ -require pvrusb2-mci2.inc - -PR = "r1" -RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" - -SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \ - file://Makefile.patch;patch=1" - -S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" - -inherit module - -CFLAGS = "'-I${KERNEL_SOURCE}/include' \ - '-I${KERNEL_SOURCE}/drivers/media/video' " - -CFLAGS_append_arm = " '-D__LINUX_ARM_ARCH__=5' " - -CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' " - -EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ - 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media -} diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb deleted file mode 100644 index 36ea62e771..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb +++ /dev/null @@ -1,28 +0,0 @@ -require pvrusb2-mci2.inc - -PR = "r1" -RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" - -SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \ - file://Makefile.patch;patch=1" - -S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" - -inherit module - -CFLAGS = "'-I${KERNEL_SOURCE}/include' \ - '-I${KERNEL_SOURCE}/drivers/media/video' " - -CFLAGS_append_arm = " '-D__LINUX_ARM_ARCH__=5' " - -CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' " - -EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ - 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media -} diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb deleted file mode 100644 index 36ea62e771..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb +++ /dev/null @@ -1,28 +0,0 @@ -require pvrusb2-mci2.inc - -PR = "r1" -RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" - -SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \ - file://Makefile.patch;patch=1" - -S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" - -inherit module - -CFLAGS = "'-I${KERNEL_SOURCE}/include' \ - '-I${KERNEL_SOURCE}/drivers/media/video' " - -CFLAGS_append_arm = " '-D__LINUX_ARM_ARCH__=5' " - -CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' " - -EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ - 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media -} diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb deleted file mode 100644 index 36ea62e771..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb +++ /dev/null @@ -1,28 +0,0 @@ -require pvrusb2-mci2.inc - -PR = "r1" -RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" - -SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \ - file://Makefile.patch;patch=1" - -S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" - -inherit module - -CFLAGS = "'-I${KERNEL_SOURCE}/include' \ - '-I${KERNEL_SOURCE}/drivers/media/video' " - -CFLAGS_append_arm = " '-D__LINUX_ARM_ARCH__=5' " - -CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' " - -EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ - 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media -} diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb deleted file mode 100644 index 3f14c8ffe2..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb +++ /dev/null @@ -1,41 +0,0 @@ -require pvrusb2-mci2.inc - -PR = "r1" -RRECOMMENDS = "kernel-module-tveeprom \ - kernel-module-firmware-class \ - kernel-module-tuner \ - kernel-module-msp3400 \ - kernel-module-saa7115 \ - kernel-module-tda9887 \ - kernel-module-v4l1-compat \ - kernel-module-v4l2-common \ - kernel-module-videodev" - -SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \ - file://hotplug.functions \ - file://firmware.hotplug \ - file://Makefile.patch;patch=1" - -S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" - -inherit module - -CFLAGS = "'-I${KERNEL_SOURCE}/include' \ - '-I${KERNEL_SOURCE}/drivers/media/video' " - -CFLAGS_append_arm = " '-D__LINUX_ARM_ARCH__=5' " - -CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' " - -EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ - 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - mkdir -p ${D}/etc/hotplug.d/firmware - cp ${WORKDIR}/hotplug.functions ${D}/etc/hotplug.d/firmware - cp ${WORKDIR}/firmware.hotplug ${D}/etc/hotplug.d/firmware -} diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb deleted file mode 100644 index 3f14c8ffe2..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb +++ /dev/null @@ -1,41 +0,0 @@ -require pvrusb2-mci2.inc - -PR = "r1" -RRECOMMENDS = "kernel-module-tveeprom \ - kernel-module-firmware-class \ - kernel-module-tuner \ - kernel-module-msp3400 \ - kernel-module-saa7115 \ - kernel-module-tda9887 \ - kernel-module-v4l1-compat \ - kernel-module-v4l2-common \ - kernel-module-videodev" - -SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \ - file://hotplug.functions \ - file://firmware.hotplug \ - file://Makefile.patch;patch=1" - -S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" - -inherit module - -CFLAGS = "'-I${KERNEL_SOURCE}/include' \ - '-I${KERNEL_SOURCE}/drivers/media/video' " - -CFLAGS_append_arm = " '-D__LINUX_ARM_ARCH__=5' " - -CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' " - -EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ - 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - mkdir -p ${D}/etc/hotplug.d/firmware - cp ${WORKDIR}/hotplug.functions ${D}/etc/hotplug.d/firmware - cp ${WORKDIR}/firmware.hotplug ${D}/etc/hotplug.d/firmware -} diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb deleted file mode 100644 index 3f14c8ffe2..0000000000 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb +++ /dev/null @@ -1,41 +0,0 @@ -require pvrusb2-mci2.inc - -PR = "r1" -RRECOMMENDS = "kernel-module-tveeprom \ - kernel-module-firmware-class \ - kernel-module-tuner \ - kernel-module-msp3400 \ - kernel-module-saa7115 \ - kernel-module-tda9887 \ - kernel-module-v4l1-compat \ - kernel-module-v4l2-common \ - kernel-module-videodev" - -SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \ - file://hotplug.functions \ - file://firmware.hotplug \ - file://Makefile.patch;patch=1" - -S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" - -inherit module - -CFLAGS = "'-I${KERNEL_SOURCE}/include' \ - '-I${KERNEL_SOURCE}/drivers/media/video' " - -CFLAGS_append_arm = " '-D__LINUX_ARM_ARCH__=5' " - -CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' " - -EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ - 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - mkdir -p ${D}/etc/hotplug.d/firmware - cp ${WORKDIR}/hotplug.functions ${D}/etc/hotplug.d/firmware - cp ${WORKDIR}/firmware.hotplug ${D}/etc/hotplug.d/firmware -} -- cgit v1.2.3 From 963292b280b5c5158f47086c3425b6aa11c8ed15 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 27 Feb 2008 17:12:53 +0000 Subject: python 2.5.2 silence sitecustomize.py --- packages/python/python-2.5.2/sitecustomize.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/python/python-2.5.2/sitecustomize.py b/packages/python/python-2.5.2/sitecustomize.py index 4c0ba3f0da..ec626b4b63 100644 --- a/packages/python/python-2.5.2/sitecustomize.py +++ b/packages/python/python-2.5.2/sitecustomize.py @@ -37,9 +37,8 @@ import sys try: import rlcompleter, readline except ImportError: - sys.stderr.write( "Python %s (OpenEmbedded build) sitecustomize.py not active. Please install python-readline.\n" % sys.version.split()[0] ) + pass else: __enableDefaultEncoding() __registerExitHandler() __enableReadlineSupport() - sys.stderr.write( "Python %s (OpenEmbedded build) sitecustomize.py active.\n" % sys.version.split()[0] ) -- cgit v1.2.3 From 1362b18695cc799af345ecc9de591a20eaab1a41 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 27 Feb 2008 18:08:17 +0000 Subject: dbus 1.1.4 update to 1.1.20 (new default version) --- packages/dbus/dbus-1.1.20/.mtn2git_empty | 0 packages/dbus/dbus-1.1.20/cross.patch | 10 ++ packages/dbus/dbus-1.1.20/dbus-1.init | 110 +++++++++++++++++++++ .../dbus/dbus-1.1.20/fix-dbus-launch-x11.patch | 14 +++ packages/dbus/dbus-1.1.20/fix-install-daemon.patch | 13 +++ packages/dbus/dbus-1.1.20/tmpdir.patch | 30 ++++++ packages/dbus/dbus-1.1.4/.mtn2git_empty | 0 packages/dbus/dbus-1.1.4/cross.patch | 10 -- packages/dbus/dbus-1.1.4/dbus-1.init | 110 --------------------- packages/dbus/dbus-1.1.4/fix-install-daemon.patch | 13 --- packages/dbus/dbus-1.1.4/tmpdir.patch | 30 ------ packages/dbus/dbus-native_1.0.2.bb | 4 +- packages/dbus/dbus-native_1.1.20.bb | 26 +++++ packages/dbus/dbus-native_1.1.4.bb | 25 ----- packages/dbus/dbus.inc | 4 +- packages/dbus/dbus_1.0.2.bb | 6 +- packages/dbus/dbus_1.1.20.bb | 5 + packages/dbus/dbus_1.1.4.bb | 3 - 18 files changed, 213 insertions(+), 200 deletions(-) create mode 100644 packages/dbus/dbus-1.1.20/.mtn2git_empty create mode 100644 packages/dbus/dbus-1.1.20/cross.patch create mode 100644 packages/dbus/dbus-1.1.20/dbus-1.init create mode 100644 packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch create mode 100644 packages/dbus/dbus-1.1.20/fix-install-daemon.patch create mode 100644 packages/dbus/dbus-1.1.20/tmpdir.patch delete mode 100644 packages/dbus/dbus-1.1.4/.mtn2git_empty delete mode 100644 packages/dbus/dbus-1.1.4/cross.patch delete mode 100644 packages/dbus/dbus-1.1.4/dbus-1.init delete mode 100644 packages/dbus/dbus-1.1.4/fix-install-daemon.patch delete mode 100644 packages/dbus/dbus-1.1.4/tmpdir.patch create mode 100644 packages/dbus/dbus-native_1.1.20.bb delete mode 100644 packages/dbus/dbus-native_1.1.4.bb create mode 100644 packages/dbus/dbus_1.1.20.bb delete mode 100644 packages/dbus/dbus_1.1.4.bb (limited to 'packages') diff --git a/packages/dbus/dbus-1.1.20/.mtn2git_empty b/packages/dbus/dbus-1.1.20/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/dbus/dbus-1.1.20/cross.patch b/packages/dbus/dbus-1.1.20/cross.patch new file mode 100644 index 0000000000..268a3ae3de --- /dev/null +++ b/packages/dbus/dbus-1.1.20/cross.patch @@ -0,0 +1,10 @@ +--- /tmp/configure.in 2006-11-09 21:47:10.000000000 +0100 ++++ dbus-0.95/configure.in 2006-11-09 21:48:13.108554000 +0100 +@@ -719,6 +719,7 @@ + exit (0); + ]])], + [ac_cv_have_abstract_sockets=yes], ++ [ac_cv_have_abstract_sockets=no], + [ac_cv_have_abstract_sockets=no] + )]) + AC_LANG_POP(C) diff --git a/packages/dbus/dbus-1.1.20/dbus-1.init b/packages/dbus/dbus-1.1.20/dbus-1.init new file mode 100644 index 0000000000..0725083c69 --- /dev/null +++ b/packages/dbus/dbus-1.1.20/dbus-1.init @@ -0,0 +1,110 @@ +#! /bin/sh +# -*- coding: utf-8 -*- +# Debian init.d script for D-BUS +# Copyright © 2003 Colin Walters + +set -e + +DAEMON=/usr/bin/dbus-daemon +NAME=dbus +DAEMONUSER=messagebus +PIDDIR=/var/run/dbus +PIDFILE=$PIDDIR/pid +UUIDDIR=/var/lib/dbus +DESC="system message bus" +EVENTDIR=/etc/dbus-1/event.d + +test -x $DAEMON || exit 0 + +# Source defaults file; edit that file to configure this script. +ENABLED=1 +PARAMS="" +if [ -e /etc/default/dbus ]; then + . /etc/default/dbus +fi + +test "$ENABLED" != "0" || exit 0 + +start_it_up() +{ + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + chown $DAEMONUSER $PIDDIR + chgrp $DAEMONUSER $PIDDIR + fi + if [ -e $PIDFILE ]; then + PIDDIR=/proc/$(cat $PIDFILE) + if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then + echo "$DESC already started; not starting." + else + echo "Removing stale PID file $PIDFILE." + rm -f $PIDFILE + fi + fi + + if [ ! -d $UUIDDIR ]; then + mkdir -p $UUIDDIR + chown $DAEMONUSER $UUIDDIR + chgrp $DAEMONUSER $UUIDDIR + fi + + dbus-uuidgen --ensure + + echo -n "Starting $DESC: " + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS + echo "$NAME." + if [ -d $EVENTDIR ]; then + run-parts --arg=start $EVENTDIR + fi +} + +shut_it_down() +{ + if [ -d $EVENTDIR ]; then + # TODO: --reverse when busybox supports it + run-parts --arg=stop $EVENTDIR + fi + echo -n "Stopping $DESC: " + start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + --user $DAEMONUSER + # We no longer include these arguments so that start-stop-daemon + # can do its job even given that we may have been upgraded. + # We rely on the pidfile being sanely managed + # --exec $DAEMON -- --system $PARAMS + echo "$NAME." + rm -f $PIDFILE +} + +reload_it() +{ + echo -n "Reloading $DESC config: " + dbus-send --print-reply --system --type=method_call \ + --dest=org.freedesktop.DBus \ + / org.freedesktop.DBus.ReloadConfig > /dev/null + # hopefully this is enough time for dbus to reload it's config file. + echo "done." +} + +case "$1" in + start) + start_it_up + ;; + stop) + shut_it_down + ;; + reload|force-reload) + reload_it + ;; + restart) + shut_it_down + sleep 1 + start_it_up + ;; + *) + echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch b/packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch new file mode 100644 index 0000000000..20c8d1b501 --- /dev/null +++ b/packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch @@ -0,0 +1,14 @@ +Index: dbus-1.1.20/tools/dbus-launch.c +=================================================================== +--- dbus-1.1.20.orig/tools/dbus-launch.c ++++ dbus-1.1.20/tools/dbus-launch.c +@@ -966,7 +966,9 @@ main (int argc, char **argv) + char write_pid_fd_as_string[MAX_FD_LEN]; + char write_address_fd_as_string[MAX_FD_LEN]; + ++#ifdef DBUS_BUILD_X11 + xdisplay = NULL; ++#endif + + if (close_stderr) + do_close_stderr (); diff --git a/packages/dbus/dbus-1.1.20/fix-install-daemon.patch b/packages/dbus/dbus-1.1.20/fix-install-daemon.patch new file mode 100644 index 0000000000..c31786357d --- /dev/null +++ b/packages/dbus/dbus-1.1.20/fix-install-daemon.patch @@ -0,0 +1,13 @@ +Index: dbus-0.94/bus/Makefile.am +=================================================================== +--- dbus-0.94.orig/bus/Makefile.am 2006-10-01 17:36:18.000000000 +0200 ++++ dbus-0.94/bus/Makefile.am 2006-10-14 21:40:05.000000000 +0200 +@@ -110,7 +110,7 @@ + $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \ + chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \ + fi +- $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) ++ $(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) + $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus + $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d + $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services diff --git a/packages/dbus/dbus-1.1.20/tmpdir.patch b/packages/dbus/dbus-1.1.20/tmpdir.patch new file mode 100644 index 0000000000..838b903f0a --- /dev/null +++ b/packages/dbus/dbus-1.1.20/tmpdir.patch @@ -0,0 +1,30 @@ +--- dbus-0.22/configure.in.orig 2004-08-13 00:57:16.000000000 +0200 ++++ dbus-0.22/configure.in 2004-12-30 21:15:57.000000000 +0100 +@@ -1047,15 +1048,18 @@ + AC_SUBST(ABSOLUTE_TOP_BUILDDIR) + + #### Find socket directories +-if ! test -z "$TMPDIR" ; then +- DEFAULT_SOCKET_DIR=$TMPDIR +-elif ! test -z "$TEMP" ; then +- DEFAULT_SOCKET_DIR=$TEMP +-elif ! test -z "$TMP" ; then +- DEFAULT_SOCKET_DIR=$TMP +-else +- DEFAULT_SOCKET_DIR=/tmp +-fi ++#if ! test -z "$TMPDIR" ; then ++# DEFAULT_SOCKET_DIR=$TMPDIR ++#elif ! test -z "$TEMP" ; then ++# DEFAULT_SOCKET_DIR=$TEMP ++#elif ! test -z "$TMP" ; then ++# DEFAULT_SOCKET_DIR=$TMP ++#else ++# DEFAULT_SOCKET_DIR=/tmp ++#fi ++ ++# checks disabled to avoid expanding this at build time ++DEFAULT_SOCKET_DIR=/tmp + + if ! test -z "$with_test_socket_dir" ; then + TEST_SOCKET_DIR="$with_test_socket_dir" diff --git a/packages/dbus/dbus-1.1.4/.mtn2git_empty b/packages/dbus/dbus-1.1.4/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/dbus/dbus-1.1.4/cross.patch b/packages/dbus/dbus-1.1.4/cross.patch deleted file mode 100644 index 268a3ae3de..0000000000 --- a/packages/dbus/dbus-1.1.4/cross.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- /tmp/configure.in 2006-11-09 21:47:10.000000000 +0100 -+++ dbus-0.95/configure.in 2006-11-09 21:48:13.108554000 +0100 -@@ -719,6 +719,7 @@ - exit (0); - ]])], - [ac_cv_have_abstract_sockets=yes], -+ [ac_cv_have_abstract_sockets=no], - [ac_cv_have_abstract_sockets=no] - )]) - AC_LANG_POP(C) diff --git a/packages/dbus/dbus-1.1.4/dbus-1.init b/packages/dbus/dbus-1.1.4/dbus-1.init deleted file mode 100644 index 0725083c69..0000000000 --- a/packages/dbus/dbus-1.1.4/dbus-1.init +++ /dev/null @@ -1,110 +0,0 @@ -#! /bin/sh -# -*- coding: utf-8 -*- -# Debian init.d script for D-BUS -# Copyright © 2003 Colin Walters - -set -e - -DAEMON=/usr/bin/dbus-daemon -NAME=dbus -DAEMONUSER=messagebus -PIDDIR=/var/run/dbus -PIDFILE=$PIDDIR/pid -UUIDDIR=/var/lib/dbus -DESC="system message bus" -EVENTDIR=/etc/dbus-1/event.d - -test -x $DAEMON || exit 0 - -# Source defaults file; edit that file to configure this script. -ENABLED=1 -PARAMS="" -if [ -e /etc/default/dbus ]; then - . /etc/default/dbus -fi - -test "$ENABLED" != "0" || exit 0 - -start_it_up() -{ - if [ ! -d $PIDDIR ]; then - mkdir -p $PIDDIR - chown $DAEMONUSER $PIDDIR - chgrp $DAEMONUSER $PIDDIR - fi - if [ -e $PIDFILE ]; then - PIDDIR=/proc/$(cat $PIDFILE) - if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then - echo "$DESC already started; not starting." - else - echo "Removing stale PID file $PIDFILE." - rm -f $PIDFILE - fi - fi - - if [ ! -d $UUIDDIR ]; then - mkdir -p $UUIDDIR - chown $DAEMONUSER $UUIDDIR - chgrp $DAEMONUSER $UUIDDIR - fi - - dbus-uuidgen --ensure - - echo -n "Starting $DESC: " - start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS - echo "$NAME." - if [ -d $EVENTDIR ]; then - run-parts --arg=start $EVENTDIR - fi -} - -shut_it_down() -{ - if [ -d $EVENTDIR ]; then - # TODO: --reverse when busybox supports it - run-parts --arg=stop $EVENTDIR - fi - echo -n "Stopping $DESC: " - start-stop-daemon --stop --quiet --pidfile $PIDFILE \ - --user $DAEMONUSER - # We no longer include these arguments so that start-stop-daemon - # can do its job even given that we may have been upgraded. - # We rely on the pidfile being sanely managed - # --exec $DAEMON -- --system $PARAMS - echo "$NAME." - rm -f $PIDFILE -} - -reload_it() -{ - echo -n "Reloading $DESC config: " - dbus-send --print-reply --system --type=method_call \ - --dest=org.freedesktop.DBus \ - / org.freedesktop.DBus.ReloadConfig > /dev/null - # hopefully this is enough time for dbus to reload it's config file. - echo "done." -} - -case "$1" in - start) - start_it_up - ;; - stop) - shut_it_down - ;; - reload|force-reload) - reload_it - ;; - restart) - shut_it_down - sleep 1 - start_it_up - ;; - *) - echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/packages/dbus/dbus-1.1.4/fix-install-daemon.patch b/packages/dbus/dbus-1.1.4/fix-install-daemon.patch deleted file mode 100644 index c31786357d..0000000000 --- a/packages/dbus/dbus-1.1.4/fix-install-daemon.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: dbus-0.94/bus/Makefile.am -=================================================================== ---- dbus-0.94.orig/bus/Makefile.am 2006-10-01 17:36:18.000000000 +0200 -+++ dbus-0.94/bus/Makefile.am 2006-10-14 21:40:05.000000000 +0200 -@@ -110,7 +110,7 @@ - $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \ - chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \ - fi -- $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) -+ $(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) - $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus - $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d - $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services diff --git a/packages/dbus/dbus-1.1.4/tmpdir.patch b/packages/dbus/dbus-1.1.4/tmpdir.patch deleted file mode 100644 index 838b903f0a..0000000000 --- a/packages/dbus/dbus-1.1.4/tmpdir.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- dbus-0.22/configure.in.orig 2004-08-13 00:57:16.000000000 +0200 -+++ dbus-0.22/configure.in 2004-12-30 21:15:57.000000000 +0100 -@@ -1047,15 +1048,18 @@ - AC_SUBST(ABSOLUTE_TOP_BUILDDIR) - - #### Find socket directories --if ! test -z "$TMPDIR" ; then -- DEFAULT_SOCKET_DIR=$TMPDIR --elif ! test -z "$TEMP" ; then -- DEFAULT_SOCKET_DIR=$TEMP --elif ! test -z "$TMP" ; then -- DEFAULT_SOCKET_DIR=$TMP --else -- DEFAULT_SOCKET_DIR=/tmp --fi -+#if ! test -z "$TMPDIR" ; then -+# DEFAULT_SOCKET_DIR=$TMPDIR -+#elif ! test -z "$TEMP" ; then -+# DEFAULT_SOCKET_DIR=$TEMP -+#elif ! test -z "$TMP" ; then -+# DEFAULT_SOCKET_DIR=$TMP -+#else -+# DEFAULT_SOCKET_DIR=/tmp -+#fi -+ -+# checks disabled to avoid expanding this at build time -+DEFAULT_SOCKET_DIR=/tmp - - if ! test -z "$with_test_socket_dir" ; then - TEST_SOCKET_DIR="$with_test_socket_dir" diff --git a/packages/dbus/dbus-native_1.0.2.bb b/packages/dbus/dbus-native_1.0.2.bb index ebd57b2876..0149ab374f 100644 --- a/packages/dbus/dbus-native_1.0.2.bb +++ b/packages/dbus/dbus-native_1.0.2.bb @@ -1,5 +1,6 @@ require dbus.inc -DEFAULT_PREFERENCE = "1" + +DEFAULT_PREFERENCE = "-1" inherit native @@ -25,4 +26,3 @@ do_stage() { do_install() { : } - diff --git a/packages/dbus/dbus-native_1.1.20.bb b/packages/dbus/dbus-native_1.1.20.bb new file mode 100644 index 0000000000..c97a6c6420 --- /dev/null +++ b/packages/dbus/dbus-native_1.1.20.bb @@ -0,0 +1,26 @@ +require dbus.inc +inherit native + +DEPENDS = "glib-2.0-native libxml2-native expat-native" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}" + +SRC_URI = "\ + http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ + file://cross.patch;patch=1 \ + file://tmpdir.patch;patch=1 \ + file://fix-dbus-launch-x11.patch;patch=1 \ + file://dbus-1.init \ +" + +do_stage() { + oe_runmake install + autotools_stage_all + + # for dbus-glib-native introspection generation + install -d ${STAGING_DATADIR}/dbus + install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf +} + +do_install() { + : +} diff --git a/packages/dbus/dbus-native_1.1.4.bb b/packages/dbus/dbus-native_1.1.4.bb deleted file mode 100644 index a006965a32..0000000000 --- a/packages/dbus/dbus-native_1.1.4.bb +++ /dev/null @@ -1,25 +0,0 @@ -require dbus.inc -inherit native - -DEPENDS = "glib-2.0-native libxml2-native expat-native" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}" - -SRC_URI = "\ - http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ - file://cross.patch;patch=1 \ - file://tmpdir.patch;patch=1 \ - file://dbus-1.init \ -" - -do_stage() { - oe_runmake install - autotools_stage_all - - # for dbus-glib-native introspection generation - install -d ${STAGING_DATADIR}/dbus - install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf -} - -do_install() { - : -} diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc index a8fd31d8c7..bca75856df 100644 --- a/packages/dbus/dbus.inc +++ b/packages/dbus/dbus.inc @@ -4,10 +4,8 @@ SECTION = "base" LICENSE = "GPL" DEPENDS = "expat glib-2.0 virtual/libintl" -DEFAULT_PREFERENCE = "-1" - SRC_URI = "\ - http://freedesktop.org/software/dbus/releases/dbus/dbus-${PV}.tar.gz \ + http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://cross.patch;patch=1 \ file://tmpdir.patch;patch=1 \ file://fix-install-daemon.patch;patch=1 \ diff --git a/packages/dbus/dbus_1.0.2.bb b/packages/dbus/dbus_1.0.2.bb index e803cb7189..da0a298459 100644 --- a/packages/dbus/dbus_1.0.2.bb +++ b/packages/dbus/dbus_1.0.2.bb @@ -1,6 +1,4 @@ require dbus.inc -DEFAULT_PREFERENCE = "1" - -PR = "r9" - +PR = "r10" +DEFAULT_PREFERENCE = "-1" diff --git a/packages/dbus/dbus_1.1.20.bb b/packages/dbus/dbus_1.1.20.bb new file mode 100644 index 0000000000..247e465769 --- /dev/null +++ b/packages/dbus/dbus_1.1.20.bb @@ -0,0 +1,5 @@ +include dbus.inc + +PR = "r0" + +SRC_URI += "file://fix-dbus-launch-x11.patch;patch=1" diff --git a/packages/dbus/dbus_1.1.4.bb b/packages/dbus/dbus_1.1.4.bb deleted file mode 100644 index 7838e55ca1..0000000000 --- a/packages/dbus/dbus_1.1.4.bb +++ /dev/null @@ -1,3 +0,0 @@ -include dbus.inc - -PR = "r2" -- cgit v1.2.3 From de22532e68a443bbfa5bf9af194ee0be2704ea9d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 27 Feb 2008 18:08:37 +0000 Subject: boost: Fix packages so they build --- packages/boost/boost_1.33.0.bb | 33 ++++++++++++++++++++------------- packages/boost/boost_1.33.1.bb | 33 ++++++++++++++++++++------------- 2 files changed, 40 insertions(+), 26 deletions(-) (limited to 'packages') diff --git a/packages/boost/boost_1.33.0.bb b/packages/boost/boost_1.33.0.bb index 6d4a2b860f..441c0754b3 100644 --- a/packages/boost/boost_1.33.0.bb +++ b/packages/boost/boost_1.33.0.bb @@ -21,42 +21,43 @@ SRC_URI += "file://linux-uclibc.patch;patch=1" S = "${WORKDIR}/${BOOST_P}" # Make a package for each library, plus -dev and -python -PACKAGES = +PACKAGES = "${PN}-dbg" +BOOSTLIBS = "" PACKAGES += "boost-date-time" FILES_boost-date-time = "${libdir}/libboost_date_time.so.${PV}" -PACKAGES += "boost-filesystem" +BOOSTLIBS += "boost-filesystem" FILES_boost-filesystem = "${libdir}/libboost_filesystem.so.${PV}" -PACKAGES += "boost-prg-exec-monitor" +BOOSTLIBS += "boost-prg-exec-monitor" FILES_boost-prg-exec-monitor = "${libdir}/libboost_prg_exec_monitor.so.${PV}" -PACKAGES += "boost-program-options" +BOOSTLIBS += "boost-program-options" FILES_boost-program-options = "${libdir}/libboost_program_options.so.${PV}" -PACKAGES += "boost-regex" +BOOSTLIBS += "boost-regex" FILES_boost-regex = "${libdir}/libboost_regex.so.${PV}" -PACKAGES += "boost-signals" +BOOSTLIBS += "boost-signals" FILES_boost-signals = "${libdir}/libboost_signals.so.${PV}" -PACKAGES += "boost-test-exec-monitor" +BOOSTLIBS += "boost-test-exec-monitor" FILES_boost-test-exec-monitor = "${libdir}/libboost_test_exec_monitor.so.${PV}" -PACKAGES += "boost-thread-mt" +BOOSTLIBS += "boost-thread-mt" FILES_boost-thread-mt = "${libdir}/libboost_thread-mt.so.${PV}" -PACKAGES += "boost-unit-test-framework" +BOOSTLIBS += "boost-unit-test-framework" FILES_boost-unit-test-framework = "${libdir}/libboost_unit_test_framework.so.${PV}" -PACKAGES += "boost-iostreams" +BOOSTLIBS += "boost-iostreams" FILES_boost-iostreams = "${libdir}/libboost_iostreams.so.${PV}" -PACKAGES += "boost-serialization" +BOOSTLIBS += "boost-serialization" FILES_boost-serialization = "${libdir}/libboost_serialization.so.${PV}" -PACKAGES += "boost-wserialization" +BOOSTLIBS += "boost-wserialization" FILES_boost-wserialization = "${libdir}/libboost_wserialization.so.${PV}" # Python - remove this and set: @@ -66,13 +67,19 @@ DEPENDS += "python" PYTHON_ROOT = "${STAGING_DIR_HOST}" PYTHON_VERSION = "2.4" -PACKAGES += "boost-python" +BOOSTLIBS += "boost-python" FILES_boost-python = "${libdir}/libboost_python.so.${PV}" +PACKAGES += "${BOOSTLIBS}" + # -dev last to pick up the remaining stuff PACKAGES += "${PN}-dev" FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a" +# "boost" is a metapackage which pulls in all boost librabries +PACKAGES += "${PN}" +RRECOMMENDS_${PN} += "${BOOSTLIBS}" + # Oh yippee, a new build system, it's sooo cooool I could eat my own # foot. inlining=on lets the compiler choose, I think. At least this # stuff is documented... diff --git a/packages/boost/boost_1.33.1.bb b/packages/boost/boost_1.33.1.bb index f132785d79..b71e2f446f 100644 --- a/packages/boost/boost_1.33.1.bb +++ b/packages/boost/boost_1.33.1.bb @@ -21,42 +21,43 @@ SRC_URI += "file://linux-uclibc.patch;patch=1" S = "${WORKDIR}/${BOOST_P}" # Make a package for each library, plus -dev and -python -PACKAGES = +PACKAGES = "${PN}-dbg" +BOOSTLIBS = "" PACKAGES += "boost-date-time" FILES_boost-date-time = "${libdir}/libboost_date_time.so.${PV}" -PACKAGES += "boost-filesystem" +BOOSTLIBS += "boost-filesystem" FILES_boost-filesystem = "${libdir}/libboost_filesystem.so.${PV}" -PACKAGES += "boost-prg-exec-monitor" +BOOSTLIBS += "boost-prg-exec-monitor" FILES_boost-prg-exec-monitor = "${libdir}/libboost_prg_exec_monitor.so.${PV}" -PACKAGES += "boost-program-options" +BOOSTLIBS += "boost-program-options" FILES_boost-program-options = "${libdir}/libboost_program_options.so.${PV}" -PACKAGES += "boost-regex" +BOOSTLIBS += "boost-regex" FILES_boost-regex = "${libdir}/libboost_regex.so.${PV}" -PACKAGES += "boost-signals" +BOOSTLIBS += "boost-signals" FILES_boost-signals = "${libdir}/libboost_signals.so.${PV}" -PACKAGES += "boost-test-exec-monitor" +BOOSTLIBS += "boost-test-exec-monitor" FILES_boost-test-exec-monitor = "${libdir}/libboost_test_exec_monitor.so.${PV}" -PACKAGES += "boost-thread-mt" +BOOSTLIBS += "boost-thread-mt" FILES_boost-thread-mt = "${libdir}/libboost_thread-mt.so.${PV}" -PACKAGES += "boost-unit-test-framework" +BOOSTLIBS += "boost-unit-test-framework" FILES_boost-unit-test-framework = "${libdir}/libboost_unit_test_framework.so.${PV}" -PACKAGES += "boost-iostreams" +BOOSTLIBS += "boost-iostreams" FILES_boost-iostreams = "${libdir}/libboost_iostreams.so.${PV}" -PACKAGES += "boost-serialization" +BOOSTLIBS += "boost-serialization" FILES_boost-serialization = "${libdir}/libboost_serialization.so.${PV}" -PACKAGES += "boost-wserialization" +BOOSTLIBS += "boost-wserialization" FILES_boost-wserialization = "${libdir}/libboost_wserialization.so.${PV}" # Python - remove this and set: @@ -66,13 +67,19 @@ DEPENDS += "python" PYTHON_ROOT = "${STAGING_DIR_HOST}" PYTHON_VERSION = "2.4" -PACKAGES += "boost-python" +BOOSTLIBS += "boost-python" FILES_boost-python = "${libdir}/libboost_python.so.${PV}" +PACKAGES += "${BOOSTLIBS}" + # -dev last to pick up the remaining stuff PACKAGES += "${PN}-dev" FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a" +# "boost" is a metapackage which pulls in all boost librabries +PACKAGES += "${PN}" +RRECOMMENDS_${PN} += "${BOOSTLIBS}" + # Oh yippee, a new build system, it's sooo cooool I could eat my own # foot. inlining=on lets the compiler choose, I think. At least this # stuff is documented... -- cgit v1.2.3 From 699ed1d0989aa9683944441c9dc90956b6268e77 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Wed, 27 Feb 2008 18:11:03 +0000 Subject: docbook-utils-native 0.6.14: Provide yet another name for all tools (via symlink). --- packages/docbook-utils/docbook-utils-native_0.6.14.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/docbook-utils/docbook-utils-native_0.6.14.bb b/packages/docbook-utils/docbook-utils-native_0.6.14.bb index af1113b331..eef3f9e0fb 100644 --- a/packages/docbook-utils/docbook-utils-native_0.6.14.bb +++ b/packages/docbook-utils/docbook-utils-native_0.6.14.bb @@ -1,7 +1,7 @@ SECTION = "console/utils" LICENSE = "GPL" -PR = "r1" +PR = "r2" DEPENDS = "openjade-native sgmlspl-native docbook-dsssl-stylesheets-native docbook-sgml-dtd-3.1-native" @@ -25,6 +25,7 @@ do_stage () { for doctype in html ps dvi man pdf rtf tex texi txt do install -m 0755 ${S}/bin/docbook2$doctype ${STAGING_BINDIR_NATIVE}/ + ln -sf docbook2x-$doctype ${STAGING_BINDIR_NATIVE}/db2$doctype ln -sf docbook2$doctype ${STAGING_BINDIR_NATIVE}/db2$doctype ln -sf docbook2$doctype ${STAGING_BINDIR_NATIVE}/docbook-to-$doctype done -- cgit v1.2.3 From 8a0b3d3e7ac9a6e721916f945701874e4eb97148 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Wed, 27 Feb 2008 18:12:05 +0000 Subject: xvidcap: Added new recipes. --- packages/xvidcap/.mtn2git_empty | 0 packages/xvidcap/xvidcap.inc | 16 ++++++++++++++++ packages/xvidcap/xvidcap_1.1.6.bb | 4 ++++ packages/xvidcap/xvidcap_1.1.7rc1.bb | 6 ++++++ 4 files changed, 26 insertions(+) create mode 100644 packages/xvidcap/.mtn2git_empty create mode 100644 packages/xvidcap/xvidcap.inc create mode 100644 packages/xvidcap/xvidcap_1.1.6.bb create mode 100644 packages/xvidcap/xvidcap_1.1.7rc1.bb (limited to 'packages') diff --git a/packages/xvidcap/.mtn2git_empty b/packages/xvidcap/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xvidcap/xvidcap.inc b/packages/xvidcap/xvidcap.inc new file mode 100644 index 0000000000..a164e1db5b --- /dev/null +++ b/packages/xvidcap/xvidcap.inc @@ -0,0 +1,16 @@ +DESCRIPTION = "Capture X-Window display to individual frames or MPEG video." +SECTION = "multimedia" +PRIORITY = "optional" +LICENSE = "GPL" +AUTHOR = "Rasca Karl H. Beckers " +HOMEPAGE = "http://xvidcap.sf.net" + +DEPENDS = "intltool-native docbook-utils-native gtk+ glib-2.0 libglade lame xmu libxfixes xdamage" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz" + +inherit autotools + +EXTRA_OECONF = "--enable-libmp3lame --with-x" + +FILES_${PN} += "${datadir}/dbus-1" diff --git a/packages/xvidcap/xvidcap_1.1.6.bb b/packages/xvidcap/xvidcap_1.1.6.bb new file mode 100644 index 0000000000..07442e9129 --- /dev/null +++ b/packages/xvidcap/xvidcap_1.1.6.bb @@ -0,0 +1,4 @@ +require xvidcap.inc + +PR = "r0" + diff --git a/packages/xvidcap/xvidcap_1.1.7rc1.bb b/packages/xvidcap/xvidcap_1.1.7rc1.bb new file mode 100644 index 0000000000..55ccaa90b1 --- /dev/null +++ b/packages/xvidcap/xvidcap_1.1.7rc1.bb @@ -0,0 +1,6 @@ +require xvidcap.inc + +PR = "r0" + +# 1.1.7rc1 still uses this directory name +S = "${WORKDIR}/${PN}-1.1.6" -- cgit v1.2.3 From 73d42c94a42b652bec05b08d4a56a51fd0ab471e Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 27 Feb 2008 18:33:32 +0000 Subject: busybox 1.9.1 factor more common things into busybox.inc disable utilities again until we're a proper replacement for tinylogin --- packages/busybox/busybox-1.9.1/defconfig | 38 ++++----- packages/busybox/busybox.inc | 127 +++++++++++++++++++++++++++---- packages/busybox/busybox_1.9.1.bb | 90 +--------------------- 3 files changed, 131 insertions(+), 124 deletions(-) (limited to 'packages') diff --git a/packages/busybox/busybox-1.9.1/defconfig b/packages/busybox/busybox-1.9.1/defconfig index 61865cb4c5..40ec933361 100644 --- a/packages/busybox/busybox-1.9.1/defconfig +++ b/packages/busybox/busybox-1.9.1/defconfig @@ -378,30 +378,30 @@ CONFIG_XARGS=y # CONFIG_FEATURE_SHADOWPASSWDS is not set # CONFIG_USE_BB_SHADOW is not set # CONFIG_USE_BB_PWD_GRP is not set -CONFIG_ADDGROUP=y -CONFIG_FEATURE_ADDUSER_TO_GROUP=y -CONFIG_DELGROUP=y -CONFIG_FEATURE_DEL_USER_FROM_GROUP=y -CONFIG_ADDUSER=y -CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y -CONFIG_DELUSER=y -CONFIG_GETTY=y -CONFIG_FEATURE_UTMP=y -CONFIG_FEATURE_WTMP=y -CONFIG_LOGIN=y +# CONFIG_ADDGROUP is not set +# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set +# CONFIG_DELGROUP is not set +# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set +# CONFIG_ADDUSER is not set +# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set +# CONFIG_DELUSER is not set +# CONFIG_GETTY is not set +# CONFIG_FEATURE_UTMP is not set +# CONFIG_FEATURE_WTMP is not set +# CONFIG_LOGIN is not set # CONFIG_PAM is not set # CONFIG_LOGIN_SCRIPTS is not set -CONFIG_FEATURE_NOLOGIN=y -CONFIG_FEATURE_SECURETTY=y -CONFIG_PASSWD=y -CONFIG_FEATURE_PASSWD_WEAK_CHECK=y +# CONFIG_FEATURE_NOLOGIN is not set +# CONFIG_FEATURE_SECURETTY is not set +# CONFIG_PASSWD is not set +# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set # CONFIG_CRYPTPW is not set # CONFIG_CHPASSWD is not set -CONFIG_SU=y -CONFIG_FEATURE_SU_SYSLOG=y -CONFIG_FEATURE_SU_CHECKS_SHELLS=y +# CONFIG_SU is not set +# CONFIG_FEATURE_SU_SYSLOG is not set +# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set # CONFIG_SULOGIN is not set -CONFIG_VLOCK=y +# CONFIG_VLOCK is not set # # Linux Ext2 FS Progs diff --git a/packages/busybox/busybox.inc b/packages/busybox/busybox.inc index ab17d96db4..0fb3b5efff 100644 --- a/packages/busybox/busybox.inc +++ b/packages/busybox/busybox.inc @@ -11,19 +11,21 @@ LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ - file://busybox-cron \ - file://busybox-httpd \ - file://busybox-udhcpd \ - file://default.script \ - file://dhcp-hostname.patch;patch=1 \ - file://hwclock.sh \ - file://ifupdown-spurious-environ.patch;patch=1 \ - file://mount.busybox \ - file://syslog \ - file://syslog.conf \ - file://udhcpscript.patch;patch=1 \ - file://umount.busybox" +SRC_URI = "\ + http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ + file://busybox-cron \ + file://busybox-httpd \ + file://busybox-udhcpd \ + file://default.script \ + file://dhcp-hostname.patch;patch=1 \ + file://hwclock.sh \ + file://ifupdown-spurious-environ.patch;patch=1 \ + file://mount.busybox \ + file://syslog \ + file://syslog.conf \ + file://udhcpscript.patch;patch=1 \ + file://umount.busybox \ +" SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1" @@ -34,7 +36,7 @@ PACKAGES =+ "${PN}-httpd ${PN}-udhcpd" FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" -FILES_${PN} += " ${datadir}/udhcpc" +FILES_${PN} += "${datadir}/udhcpc" INITSCRIPT_PACKAGES = "${PN} ${PN}-httpd ${PN}-udhcpd" INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd" @@ -47,11 +49,73 @@ INITSCRIPT_PARAMS_${PN}_slugos = "start 20 ." inherit cml1 update-rc.d -do_compile () { - unset CFLAGS +do_compile() { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS base_do_compile } +do_install () { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + install -d ${D}${sysconfdir}/init.d + oe_runmake "PREFIX=${D}" install + cp -pPR ${S}/_install/* ${D}/ + + # Move everything to /busybox (not supposed to end up in any package) + install -d ${D}/busybox + ls ${D} -R + + cp -dPr ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/ + # Move the busybox binary back to /bin + install -d ${D}${base_bindir} + mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/ + # Move back the sh symlink + test -h ${D}/busybox${base_bindir}/sh && mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/ + + install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/ + install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/ + if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then + # Move crond back to /usr/sbin/crond + install -d ${D}${sbindir} + mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/ + + install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/ + fi + if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then + # Move httpd back to /usr/sbin/httpd + install -d ${D}${sbindir} + mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/ + + install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/ + install -d ${D}/srv/www + fi + if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then + # Move udhcpd back to /usr/sbin/udhcpd + install -d ${D}${sbindir} + mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/ + + install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/ + fi + if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then + # Move hwclock back to /sbin/hwclock + install -d ${D}${base_sbindir} + mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/ + + install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/ + fi + if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then + # Move dhcpc back to /usr/sbin/udhcpc + install -d ${D}${base_sbindir} + mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/ + + install -d ${D}${sysconfdir}/udhcpc.d + install -d ${D}${datadir}/udhcpc + install -m 0755 ${S}/examples/udhcp/simple.script ${D}${sysconfdir}/udhcpc.d/50default + install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script + fi + + install -m 0644 ${S}/busybox.links ${D}${sysconfdir} +} + pkg_postinst_${PN} () { # If we are not making an image we create links for the utilities that doesn't exist # so the update-alternatives script will get the utilities it needs @@ -62,3 +126,34 @@ pkg_postinst_${PN} () { # This adds the links, remember that this has to work when building an image too, hence the $D while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done <$D/etc/busybox.links } + +pkg_prerm_${PN} () { + # This is so you can make busybox commit suicide - removing busybox with no other packages + # providing its files, this will make update-alternatives work, but the update-rc.d part + # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh + tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX` + ln -s /bin/busybox $tmpdir/[ + ln -s /bin/busybox $tmpdir/test + ln -s /bin/busybox $tmpdir/head + ln -s /bin/busybox $tmpdir/sh + ln -s /bin/busybox $tmpdir/basename + ln -s /bin/busybox $tmpdir/echo + ln -s /bin/busybox $tmpdir/mv + ln -s /bin/busybox $tmpdir/ln + ln -s /bin/busybox $tmpdir/dirname + ln -s /bin/busybox $tmpdir/rm + ln -s /bin/busybox $tmpdir/sed + ln -s /bin/busybox $tmpdir/sort + export PATH=$PATH:$tmpdir + + while read link + do + case "$link" in + /*/*/*) to="../../bin/busybox";; + /bin/*) to="busybox";; + /*/*) to="../bin/busybox";; + esac + bn=`basename $link` + sh /usr/bin/update-alternatives --remove $bn $to + done Date: Wed, 27 Feb 2008 18:39:27 +0000 Subject: pyneod svn fix init script name --- packages/freesmartphone/pyneod_svn.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/freesmartphone/pyneod_svn.bb b/packages/freesmartphone/pyneod_svn.bb index 026d693be2..68938ed424 100644 --- a/packages/freesmartphone/pyneod_svn.bb +++ b/packages/freesmartphone/pyneod_svn.bb @@ -4,11 +4,11 @@ SECTION = "console/network" DEPENDS = "python" LICENSE = "GPL" PV = "0.0+svnr${SRCREV}" -PR = "r1" +PR = "r2" inherit update-rc.d -INITSCRIPT_NAME = "init.d.pyneo" +INITSCRIPT_NAME = "init.d.pyneod" INITSCRIPT_PARAMS = "defaults 40" SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=pyneod" -- cgit v1.2.3 From 8609cdfb427999ebae457048fedf0f1758020a71 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Wed, 27 Feb 2008 23:01:57 +0000 Subject: classpath-minimal 0.97: Added recipe. classpath 0.97: Added recipe. classpath: Added proper RPROVIDES for ${PN}-common. --- packages/classpath/classpath-minimal_0.96.1.bb | 2 +- packages/classpath/classpath-minimal_0.97.bb | 15 +++++++++++++++ packages/classpath/classpath.inc | 1 + packages/classpath/classpath_0.96.1.bb | 3 +-- packages/classpath/classpath_0.97.bb | 18 ++++++++++++++++++ 5 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 packages/classpath/classpath-minimal_0.97.bb create mode 100644 packages/classpath/classpath_0.97.bb (limited to 'packages') diff --git a/packages/classpath/classpath-minimal_0.96.1.bb b/packages/classpath/classpath-minimal_0.96.1.bb index 982203553e..e71884dc2b 100644 --- a/packages/classpath/classpath-minimal_0.96.1.bb +++ b/packages/classpath/classpath-minimal_0.96.1.bb @@ -1,6 +1,6 @@ require classpath.inc -PR = "r4" +PR = "r5" SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0" diff --git a/packages/classpath/classpath-minimal_0.97.bb b/packages/classpath/classpath-minimal_0.97.bb new file mode 100644 index 0000000000..14495cedff --- /dev/null +++ b/packages/classpath/classpath-minimal_0.97.bb @@ -0,0 +1,15 @@ +require classpath.inc + +PR = "r0" + +PROVIDES = "${PN} classpath" + +EXTRA_OECONF += "\ + --enable-local-sockets \ + --disable-alsa \ + --disable-gconf-peer \ + --disable-gtk-peer \ + --disable-plugin \ + --disable-dssi \ + --disable-examples \ + " diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc index 3e0c99c958..e5f5170b32 100644 --- a/packages/classpath/classpath.inc +++ b/packages/classpath/classpath.inc @@ -13,6 +13,7 @@ RDEPENDS_${PN}-examples = "java2-runtime ${PN}-awt" RDEPENDS_${PN}-tools = "java2-runtime" RPROVIDES_${PN} = "${PBN}" +RPROVIDES_${PN}-common = "${PBN}-common" RPROVIDES_${PN}-gtk = "${PBN}-awt" SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz" diff --git a/packages/classpath/classpath_0.96.1.bb b/packages/classpath/classpath_0.96.1.bb index fdb811a89f..799b0f31ac 100644 --- a/packages/classpath/classpath_0.96.1.bb +++ b/packages/classpath/classpath_0.96.1.bb @@ -2,8 +2,7 @@ require classpath.inc SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0 \ " - -PR = "r3" +PR = "r4" DEPENDS += "gtk+ gconf libxtst" diff --git a/packages/classpath/classpath_0.97.bb b/packages/classpath/classpath_0.97.bb new file mode 100644 index 0000000000..b8cd02084a --- /dev/null +++ b/packages/classpath/classpath_0.97.bb @@ -0,0 +1,18 @@ +require classpath.inc + +PR = "r0" + +DEPENDS += "gtk+ gconf libxtst" + +EXTRA_OECONF += "\ + --disable-alsa \ + --disable-dssi \ + --disable-qt4-peer \ + --disable-plugin \ + --enable-gconf-peer \ + --enable-gtk-peer \ + --enable-local-sockets \ + --with-vm=java \ + " + + -- cgit v1.2.3 From 91aed6119a23f8e6dbb77301e862a8da320b3855 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 27 Feb 2008 23:13:15 +0000 Subject: pvrusb2-mci: Add missing patch --- .../pvrusb2-mci-20080210/Makefile.patch | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20080210/Makefile.patch (limited to 'packages') diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20080210/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20080210/Makefile.patch new file mode 100644 index 0000000000..3db0b2c9d6 --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci-20080210/Makefile.patch @@ -0,0 +1,25 @@ +*** driver/Makefile.orig 2006-04-02 03:40:31.000000000 +0200 +--- driver/Makefile 2006-04-26 21:56:46.000000000 +0200 +*************** +*** 57,66 **** + CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y + + modules modules_install clean: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) $@ + + install: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) modules_install + + else + +--- 57,66 ---- + CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y + + modules modules_install clean: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) $@ + + install: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) modules_install + + else + -- cgit v1.2.3 From d6f7133b8d8e67069233aba56937fa4c6e41d196 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 00:04:07 +0000 Subject: gcc: Enable sysroot options, hacking around path layout issues for now. This fixes the sdk version to use the correct sysroot which is important for ease of use of SDKs and standalone toolchains. This change means a gcc rebuild unfortunately --- packages/gcc/gcc-cross-initial.inc | 2 +- packages/gcc/gcc-cross-sdk_3.4.3.bb | 2 +- packages/gcc/gcc-cross-sdk_3.4.4.bb | 2 +- packages/gcc/gcc-cross-sdk_4.1.0.bb | 2 +- packages/gcc/gcc-cross-sdk_4.1.1.bb | 2 +- packages/gcc/gcc-cross-sdk_4.1.2.bb | 2 +- packages/gcc/gcc-cross-sdk_4.2.2.bb | 2 +- packages/gcc/gcc-cross_3.4.3.bb | 2 +- packages/gcc/gcc-cross_3.4.4.bb | 2 +- packages/gcc/gcc-cross_4.0.0.bb | 2 +- packages/gcc/gcc-cross_4.0.2.bb | 2 +- packages/gcc/gcc-cross_4.1.0.bb | 2 +- packages/gcc/gcc-cross_4.1.1.bb | 2 +- packages/gcc/gcc-cross_4.1.2.bb | 2 +- packages/gcc/gcc-cross_4.2.1.bb | 2 +- packages/gcc/gcc-cross_4.2.2.bb | 2 +- packages/gcc/gcc3-build-cross.inc | 11 +++++++++-- packages/gcc/gcc3-build-sdk.inc | 4 ++-- packages/gcc/gcc4-build-sdk.inc | 11 +++++------ 19 files changed, 32 insertions(+), 26 deletions(-) (limited to 'packages') diff --git a/packages/gcc/gcc-cross-initial.inc b/packages/gcc/gcc-cross-initial.inc index 7c56afecef..2165bf22ce 100644 --- a/packages/gcc/gcc-cross-initial.inc +++ b/packages/gcc/gcc-cross-initial.inc @@ -4,7 +4,7 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" PACKAGES = "" # This is intended to be a -very- basic config -EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR}/${TARGET_SYS} \ +EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ --with-newlib \ --disable-shared \ --disable-threads \ diff --git a/packages/gcc/gcc-cross-sdk_3.4.3.bb b/packages/gcc/gcc-cross-sdk_3.4.3.bb index e6907deb1b..a8e9a67a96 100644 --- a/packages/gcc/gcc-cross-sdk_3.4.3.bb +++ b/packages/gcc/gcc-cross-sdk_3.4.3.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" require gcc_${PV}.bb -PR = "r0" +PR = "r1" inherit sdk diff --git a/packages/gcc/gcc-cross-sdk_3.4.4.bb b/packages/gcc/gcc-cross-sdk_3.4.4.bb index 038d39040b..4b2c583fcb 100644 --- a/packages/gcc/gcc-cross-sdk_3.4.4.bb +++ b/packages/gcc/gcc-cross-sdk_3.4.4.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" require gcc_${PV}.bb -PR = "r2" +PR = "r3" inherit sdk diff --git a/packages/gcc/gcc-cross-sdk_4.1.0.bb b/packages/gcc/gcc-cross-sdk_4.1.0.bb index 2308f2f9eb..cd9fe9ee92 100644 --- a/packages/gcc/gcc-cross-sdk_4.1.0.bb +++ b/packages/gcc/gcc-cross-sdk_4.1.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" require gcc_${PV}.bb -PR = "r1" +PR = "r2" inherit sdk diff --git a/packages/gcc/gcc-cross-sdk_4.1.1.bb b/packages/gcc/gcc-cross-sdk_4.1.1.bb index e2efde139f..1b5ad5e401 100644 --- a/packages/gcc/gcc-cross-sdk_4.1.1.bb +++ b/packages/gcc/gcc-cross-sdk_4.1.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" -PR = "r2" +PR = "r3" inherit sdk diff --git a/packages/gcc/gcc-cross-sdk_4.1.2.bb b/packages/gcc/gcc-cross-sdk_4.1.2.bb index 450dc82b08..85ff74ec33 100644 --- a/packages/gcc/gcc-cross-sdk_4.1.2.bb +++ b/packages/gcc/gcc-cross-sdk_4.1.2.bb @@ -1,4 +1,4 @@ -PR = "r4" +PR = "r5" inherit sdk diff --git a/packages/gcc/gcc-cross-sdk_4.2.2.bb b/packages/gcc/gcc-cross-sdk_4.2.2.bb index 2fdaa7dc27..ba360698bd 100644 --- a/packages/gcc/gcc-cross-sdk_4.2.2.bb +++ b/packages/gcc/gcc-cross-sdk_4.2.2.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" -PR = "r2" +PR = "r3" inherit sdk diff --git a/packages/gcc/gcc-cross_3.4.3.bb b/packages/gcc/gcc-cross_3.4.3.bb index cec0505eda..7ba02967f5 100644 --- a/packages/gcc/gcc-cross_3.4.3.bb +++ b/packages/gcc/gcc-cross_3.4.3.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r12" +PR = "r13" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc-cross_3.4.4.bb b/packages/gcc/gcc-cross_3.4.4.bb index 83c0055017..3248e8d688 100644 --- a/packages/gcc/gcc-cross_3.4.4.bb +++ b/packages/gcc/gcc-cross_3.4.4.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r7" +PR = "r8" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc-cross_4.0.0.bb b/packages/gcc/gcc-cross_4.0.0.bb index 63d0f70c74..716f54b63e 100644 --- a/packages/gcc/gcc-cross_4.0.0.bb +++ b/packages/gcc/gcc-cross_4.0.0.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r3" +PR = "r4" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc-cross_4.0.2.bb b/packages/gcc/gcc-cross_4.0.2.bb index 44ceb4f4ca..5b1ff0bd97 100644 --- a/packages/gcc/gcc-cross_4.0.2.bb +++ b/packages/gcc/gcc-cross_4.0.2.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r9" +PR = "r10" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb index 5719afb740..6dddb45bc0 100644 --- a/packages/gcc/gcc-cross_4.1.0.bb +++ b/packages/gcc/gcc-cross_4.1.0.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r4" +PR = "r5" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb index 02912f2054..4d79d2dca4 100644 --- a/packages/gcc/gcc-cross_4.1.1.bb +++ b/packages/gcc/gcc-cross_4.1.1.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r17" +PR = "r18" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb index 306cf9539c..c5b1d811bd 100644 --- a/packages/gcc/gcc-cross_4.1.2.bb +++ b/packages/gcc/gcc-cross_4.1.2.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .bb changes something that affects its *build* # remember to increment this one too. -PR = "r13" +PR = "r14" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb index 27816e7146..3ee8fbacc2 100644 --- a/packages/gcc/gcc-cross_4.2.1.bb +++ b/packages/gcc/gcc-cross_4.2.1.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r10" +PR = "r11" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb index daf0e65003..d63d055bc7 100644 --- a/packages/gcc/gcc-cross_4.2.2.bb +++ b/packages/gcc/gcc-cross_4.2.2.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r3" +PR = "r4" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc3-build-cross.inc b/packages/gcc/gcc3-build-cross.inc index 0d7f323ea4..1d744c1eae 100644 --- a/packages/gcc/gcc3-build-cross.inc +++ b/packages/gcc/gcc3-build-cross.inc @@ -1,7 +1,9 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' -EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR}/${TARGET_SYS} \ - --with-gxx-include-dir=${STAGING_DIR}/${TARGET_SYS}/include/c++" +EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ + --with-gxx-include-dir=${STAGING_DIR_TARGET}/${layout_includedir}/c++ \ + --with-sysroot=${STAGING_DIR_TARGET} \ + --with-build-sysroot=${STAGING_DIR_TARGET}" do_configure_prepend () { rm -f ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a @@ -21,6 +23,11 @@ do_stage_append () { rm -rf ${CROSS_DIR}/$d done + # Hack to be removed when staging layout matches the target layout + if [ ! -e ${STAGING_DIR_TARGET}/usr ]; then + ln -s ${STAGING_DIR_TARGET} ${STAGING_DIR_TARGET}/usr + fi + # Fix a few include links so cross builds are happier if [ ! -e ${STAGING_INCDIR}/c++ ]; then mkdir -p ${STAGING_INCDIR} diff --git a/packages/gcc/gcc3-build-sdk.inc b/packages/gcc/gcc3-build-sdk.inc index e2ec9565a7..aa540212c4 100644 --- a/packages/gcc/gcc3-build-sdk.inc +++ b/packages/gcc/gcc3-build-sdk.inc @@ -2,8 +2,8 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' SRC_URI += 'file://sdk-libstdc++-includes.patch;patch=1' -STAGING_TARGET_INCDIR = "${STAGING_DIR}/${TARGET_SYS}/include" -STAGING_TARGET_LIBDIR = "${STAGING_DIR}/${TARGET_SYS}/lib" +STAGING_TARGET_INCDIR = "${STAGING_DIR_TARGET}${layout_includedir}" +STAGING_TARGET_LIBDIR = "${STAGING_DIR_TARGET}${layout_libdir}" do_configure () { (cd ${S} && gnu-configize) || die "failure running gnu-configize" diff --git a/packages/gcc/gcc4-build-sdk.inc b/packages/gcc/gcc4-build-sdk.inc index 77d326b3ee..10526454c3 100644 --- a/packages/gcc/gcc4-build-sdk.inc +++ b/packages/gcc/gcc4-build-sdk.inc @@ -1,14 +1,13 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}' -SYSROOT = "${WORKDIR}/sysroot" -EXTRA_OECONF += "--with-sysroot=${SYSROOT}" +EXTRA_OECONF += "--with-sysroot=${prefix}/${TARGET_SYS} --with-build-sysroot=${STAGING_DIR_TARGET}" do_configure () { - # Work around Hardcoded path assumptions in gcc - mkdir -p ${SYSROOT}/usr/ - ln -s ${STAGING_DIR}/${TARGET_SYS}/include ${SYSROOT}/usr/include - ln -s ${STAGING_DIR}/${TARGET_SYS}/lib ${SYSROOT}/usr/lib + # Hack to be removed when staging layout matches the target layout + if [ ! -e ${STAGING_DIR_TARGET}/usr ]; then + ln -s ${STAGING_DIR_TARGET} ${STAGING_DIR_TARGET}/usr + fi (cd ${S} && gnu-configize) || die "failure running gnu-configize" (cd ${S}/libstdc++-v3 && autoreconf) oe_runconf -- cgit v1.2.3 From d1ea1190f2cadd8da3070c688554ee75c94f608c Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 28 Feb 2008 00:50:48 +0000 Subject: linux-ixp4xx: Enable V4L1_COMPAT for pvrusb2-mci --- packages/linux/linux-ixp4xx/defconfig-2.6.24 | 2 +- packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24 | 2 +- packages/meta/slugos-packages.bb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-ixp4xx/defconfig-2.6.24 b/packages/linux/linux-ixp4xx/defconfig-2.6.24 index 9f13364281..790120452a 100644 --- a/packages/linux/linux-ixp4xx/defconfig-2.6.24 +++ b/packages/linux/linux-ixp4xx/defconfig-2.6.24 @@ -1244,7 +1244,7 @@ CONFIG_LEDS_TRIGGER_CPU_ACTIVITY=y # CONFIG_VIDEO_DEV=m # CONFIG_VIDEO_V4L1 is not set -# CONFIG_VIDEO_V4L1_COMPAT is not set +CONFIG_VIDEO_V4L1_COMPAT is not set CONFIG_VIDEO_V4L2=y CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set diff --git a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24 b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24 index 061c0c0724..0e14d09d11 100644 --- a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24 +++ b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24 @@ -1245,7 +1245,7 @@ CONFIG_LEDS_TRIGGER_CPU_ACTIVITY=y # CONFIG_VIDEO_DEV=m # CONFIG_VIDEO_V4L1 is not set -# CONFIG_VIDEO_V4L1_COMPAT is not set +CONFIG_VIDEO_V4L1_COMPAT=y CONFIG_VIDEO_V4L2=y CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index b5d05c9203..adc0554fe4 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r47" +PR = "r48" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2|ixp4xx" @@ -190,6 +190,7 @@ SLUGOS_PACKAGES = "\ procps \ psmisc \ puppy \ + pvrusb2-mci \ python \ quilt \ reiserfsprogs reiser4progs \ @@ -255,7 +256,6 @@ SLUGOS_BROKEN_PACKAGES = "\ lirc-modules lirc \ madfu \ openldap \ - pvrusb2-mci \ pwc \ qc-usb-messenger \ syslog-ng \ -- cgit v1.2.3 From b0b438a77e39ffb6bc09710061af7421ac9751e6 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Thu, 28 Feb 2008 05:55:36 +0000 Subject: netsurf_svn: fix srcrevs --- packages/netsurf/netsurf_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/netsurf/netsurf_svn.bb b/packages/netsurf/netsurf_svn.bb index 4766a20297..78f23991d3 100644 --- a/packages/netsurf/netsurf_svn.bb +++ b/packages/netsurf/netsurf_svn.bb @@ -3,7 +3,7 @@ web standards in use today." HOMEPAGE = "http://www.netsurf-browser.org/" SECTION = "x11/network" LICENSE = "GPLv2" -PV = "1.1+svn${SRCDATE}" +PV = "1.1+svnr${SRCREV}" PR = "r0" SRC_URI = "svn://svn.netsurf-browser.org/trunk;module=netsurf \ -- cgit v1.2.3 From 7721a458d28ab29b41284e229e54a5721f195fc9 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Thu, 28 Feb 2008 06:01:52 +0000 Subject: ffmpeg_svn: fix SRCREV --- packages/ffmpeg/ffmpeg_svn.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/ffmpeg/ffmpeg_svn.bb b/packages/ffmpeg/ffmpeg_svn.bb index 83c40f8b3f..cbf9cf3980 100644 --- a/packages/ffmpeg/ffmpeg_svn.bb +++ b/packages/ffmpeg/ffmpeg_svn.bb @@ -2,8 +2,8 @@ require ffmpeg.inc DEPENDS += "libgsm" -PV = "0.4.9+svn${SRCDATE}" -PR = "r3" +PV = "0.4.9+svnr${SRCREV}" +PR = "r0" DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 1ee0f23e62b61b0af98314c1a15beacf171b24ad Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 28 Feb 2008 11:07:56 +0000 Subject: kgrok: remove from repository - I added it few years ago and no one fixed it --- packages/nonworking/kgrok/.mtn2git_empty | 0 packages/nonworking/kgrok/files/.mtn2git_empty | 0 packages/nonworking/kgrok/files/mediabutton.patch | 15 - packages/nonworking/kgrok/files/parser_yacc.cpp | 2048 --------------------- packages/nonworking/kgrok/files/parser_yacc.h | 92 - packages/nonworking/kgrok/kgrok_1.5.bb | 36 - 6 files changed, 2191 deletions(-) delete mode 100644 packages/nonworking/kgrok/.mtn2git_empty delete mode 100644 packages/nonworking/kgrok/files/.mtn2git_empty delete mode 100644 packages/nonworking/kgrok/files/mediabutton.patch delete mode 100644 packages/nonworking/kgrok/files/parser_yacc.cpp delete mode 100644 packages/nonworking/kgrok/files/parser_yacc.h delete mode 100644 packages/nonworking/kgrok/kgrok_1.5.bb (limited to 'packages') diff --git a/packages/nonworking/kgrok/.mtn2git_empty b/packages/nonworking/kgrok/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/kgrok/files/.mtn2git_empty b/packages/nonworking/kgrok/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/kgrok/files/mediabutton.patch b/packages/nonworking/kgrok/files/mediabutton.patch deleted file mode 100644 index ce2c70e936..0000000000 --- a/packages/nonworking/kgrok/files/mediabutton.patch +++ /dev/null @@ -1,15 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- src/mediabutton.C~mediabutton -+++ src/mediabutton.C -@@ -23,6 +23,7 @@ - #include - #include - #include "bluebutton.h" -+#include "mediabutton.h" - - extern QApplication *app; - diff --git a/packages/nonworking/kgrok/files/parser_yacc.cpp b/packages/nonworking/kgrok/files/parser_yacc.cpp deleted file mode 100644 index 7078dced62..0000000000 --- a/packages/nonworking/kgrok/files/parser_yacc.cpp +++ /dev/null @@ -1,2048 +0,0 @@ -#ifndef lint -static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; -#endif -#define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 -#define yyclearin (yychar=(-1)) -#define yyerrok (yyerrflag=0) -#define YYRECOVERING (yyerrflag!=0) -extern int yyparse(void); -#define yyparse parserparse -#define yylex parserlex -#define yyerror parsererror -#define yychar parserchar -#define yyval parserval -#define yylval parserlval -#define yydebug parserdebug -#define yynerrs parsernerrs -#define yyerrflag parsererrflag -#define yyss parserss -#define yyssp parserssp -#define yyvs parservs -#define yyvsp parservsp -#define yylhs parserlhs -#define yylen parserlen -#define yydefred parserdefred -#define yydgoto parserdgoto -#define yysindex parsersindex -#define yyrindex parserrindex -#define yygindex parsergindex -#define yytable parsertable -#define yycheck parsercheck -#define yyname parsername -#define yyrule parserrule -#define YYPREFIX "parser" -#line 2 "parser.y" -/**/ -/* (C) Copyright 2001 by Thomas Driemeyer www.bitrot.de.*/ -/**/ -/* This is free software; you can redistribute it and/or modify it under the*/ -/* terms of the GNU Library General Public License as published by the Free*/ -/* Software Foundation; either version 2 of the License, or (at your option)*/ -/* any later version. This library is distributed in the hope that it will*/ -/* be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of*/ -/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library*/ -/* General Public License for more details.*/ -/**/ -/* expression language grammar, compiled to parser.C by yacc*/ -/**/ - -#include -#include -#include -#include -#include -#include -#include -#include "form.h" -#include "section.h" -#include "database.h" -#include "evaluate.h" -#include "util.h" - -#define yyparse Evaluate::yyeparse -#line 32 "parser.y" -typedef union { int ival; double dval; char *sval; Arg *aval; } YYSTYPE; -#line 68 "y.tab.c" -#define NUMBER 257 -#define STRING 258 -#define SYMBOL 259 -#define FIELD 260 -#define VAR 261 -#define EQ 262 -#define NEQ 263 -#define LE 264 -#define GE 265 -#define SHR 266 -#define SHL 267 -#define AND 268 -#define OR 269 -#define IN 270 -#define PLA 271 -#define MIA 272 -#define MUA 273 -#define MOA 274 -#define DVA 275 -#define ANA 276 -#define ORA 277 -#define INC 278 -#define DEC_ 279 -#define APP 280 -#define AVG 281 -#define DEV 282 -#define AMIN 283 -#define AMAX 284 -#define SUM 285 -#define QAVG 286 -#define QDEV 287 -#define QMIN_ 288 -#define QMAX_ 289 -#define QSUM 290 -#define SAVG 291 -#define SDEV 292 -#define SMIN 293 -#define SMAX 294 -#define SSUM 295 -#define ABS 296 -#define INT 297 -#define BOUND 298 -#define LEN 299 -#define CHOP 300 -#define TR 301 -#define SUBSTR 302 -#define SQRT 303 -#define EXP 304 -#define LOG 305 -#define LN 306 -#define POW 307 -#define RANDOM 308 -#define SIN 309 -#define COS 310 -#define TAN 311 -#define ASIN 312 -#define ACOS 313 -#define ATAN 314 -#define ATAN2 315 -#define DATE 316 -#define TIME 317 -#define DURATION 318 -#define EXPAND 319 -#define YEAR 320 -#define MONTH 321 -#define DAY 322 -#define HOUR 323 -#define MINUTE 324 -#define SECOND 325 -#define LEAP 326 -#define JULIAN 327 -#define SECTION_ 328 -#define DBASE_ 329 -#define FORM_ 330 -#define PREVFORM 331 -#define SWITCH 332 -#define THIS 333 -#define LAST 334 -#define DISP 335 -#define FOREACH 336 -#define HOST 337 -#define USER 338 -#define UID 339 -#define GID 340 -#define SYSTEM 341 -#define ACCESS 342 -#define BEEP 343 -#define ERROR 344 -#define PRINTF 345 -#define UMINUS 346 -#define YYERRCODE 256 -short parserlhs[] = { -1, - 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 3, 3, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, -}; -short parserlen[] = { 2, - 1, 1, 3, 3, 3, 1, 3, 3, 3, 5, - 3, 3, 3, 3, 3, 3, 3, 1, 4, 3, - 6, 4, 2, 4, 6, 8, 1, 1, 1, 1, - 4, 1, 1, 6, 4, 6, 1, 1, 4, 4, - 4, 4, 7, 4, 1, 4, 1, 3, 1, 3, - 3, 1, 4, 3, 6, 1, 3, 3, 3, 3, - 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, - 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, - 3, 1, 1, 1, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 8, 4, 4, 4, 4, 4, 6, 1, 4, - 4, 4, 4, 4, 4, 6, 1, 4, 1, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 1, 1, 6, -}; -short parserdefred[] = { 0, - 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 33, 32, 29, 0, 0, 27, 28, 0, 45, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 119, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 92, 93, 94, 141, 142, 0, - 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 65, 66, 0, 67, 68, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 69, 70, 71, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, - 0, 24, 0, 0, 40, 39, 41, 42, 0, 31, - 0, 0, 35, 22, 0, 46, 44, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 50, 51, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 80, 81, 77, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 95, 96, 97, 98, 99, 100, 101, 102, - 103, 104, 105, 106, 107, 108, 109, 110, 111, 0, - 113, 114, 115, 116, 117, 0, 120, 121, 122, 123, - 124, 125, 0, 130, 131, 132, 133, 134, 135, 136, - 137, 138, 140, 139, 128, 0, 0, 0, 0, 25, - 0, 0, 34, 36, 0, 0, 0, 0, 0, 0, - 0, 43, 0, 0, 118, 126, 143, 26, 0, 112, -}; -short parserdgoto[] = { 26, - 106, 133, 134, -}; -short parsersindex[] = { 230, - 0, -59, -52, -36, -35, -28, -25, -18, -11, -3, - -75, 0, 0, 0, 16, 28, 0, 0, 38, 0, - 39, 49, 230, 159, -231, 0, 3062, 230, 159, 230, - 230, 230, 230, 230, 159, 159, 159, -217, 159, 230, - 230, 230, 230, 230, 263, 0, -50, 235, -178, -170, - 53, 54, 55, 56, 64, 65, 66, 67, 80, 82, - 83, 84, 85, 87, 88, 89, 90, 91, 93, 94, - 96, 114, 115, 126, 0, 128, 156, 160, 162, 163, - 166, 168, 173, 175, 178, 180, 186, 187, 189, 190, - 195, 196, 197, 26, 0, 0, 0, 0, 0, 208, - 159, 159, 159, 230, 159, 727, 0, 230, 230, 230, - 230, 230, 230, 230, 230, 230, 230, 147, 968, 147, - 147, 846, 1194, 2176, 979, 1006, 1033, -38, 1044, 3031, - 614, 1408, 3062, -17, 3, 0, 159, 159, 159, 159, - 159, 159, 159, 159, 159, 0, 0, 159, 0, 0, - -4, -2, -1, 2, 5, 7, 9, 12, 21, 23, - 24, 29, 30, 31, 34, 159, 159, 159, 230, 159, - 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, - 159, 230, 230, 230, 159, 159, 159, 159, 159, 159, - 159, 159, 159, 230, 0, 0, 0, 1701, 1128, 159, - 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, - 159, 159, 159, 159, 159, 159, 159, 159, 159, 0, - 15, 15, 203, 203, 107, 594, 2956, 203, 203, 0, - 199, 0, 230, 159, 0, 0, 0, 0, 159, 0, - 230, 230, 0, 0, 230, 0, 0, 2528, 1277, 2528, - 2528, 2528, 2528, 2528, 2528, 2528, 2528, 216, 220, 227, - 233, 247, 257, 270, 271, 272, 274, 275, 277, 279, - 283, 287, 1155, 1288, 2203, 1926, 1315, 1342, 1388, 1400, - 2256, 1436, 1472, 1582, 1648, 1683, 1711, 2330, 2937, 2971, - 2980, 1738, 1749, 1776, 1834, 1845, 2010, 2021, 2079, 2093, - 3095, 0, 0, 1882, 1882, 20, 20, 43, 43, 2886, - 2727, 2517, 2120, -12, 2917, 2278, 20, 20, 50, 50, - 0, 0, 0, 230, 230, 2991, 2365, 2132, 3011, 3022, - 3062, 268, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 159, - 0, 0, 0, 0, 0, 159, 0, 0, 0, 0, - 0, 0, 159, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 159, 159, 594, 147, 0, - 159, 289, 0, 0, 159, 2517, 2415, 2443, 2168, 2517, - 2454, 0, 2528, 159, 0, 0, 0, 0, 2489, 0, -}; -short parserrindex[] = { 0, - 0, 273, 459, 0, 0, 0, 539, 550, 0, 0, - 570, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 337, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, -24, 699, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 856, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 883, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 747, 0, 911, - 1219, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 234, 590, 603, 40, 577, 0, 626, 672, 0, - 579, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 299, 0, 300, - 320, 338, 736, 737, 787, 1071, 1118, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 2864, 2874, 2760, 2797, 1223, 2609, 153, - 154, 310, 0, 77, 336, 8, 2841, 2851, 2563, 2601, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 14, 941, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 659, 1558, 0, - 0, 0, 0, 0, 0, 294, 294, 294, 0, 346, - 294, 0, 1119, 0, 0, 0, 0, 0, 294, 0, -}; -short parsergindex[] = { 0, - -29, 191, 295, -}; -#define YYTABLESIZE 3365 -short parsertable[] = { 119, - 13, 28, 238, 32, 33, 125, 126, 127, 31, 129, - 137, 34, 52, 52, 35, 39, 52, 52, 52, 52, - 52, 36, 52, 246, 219, 212, 245, 107, 37, 217, - 216, 29, 215, 52, 218, 52, 38, 52, 52, 17, - 138, 13, 128, 247, 13, 72, 245, 213, 72, 214, - 47, 72, 239, 47, 48, 40, 219, 48, 13, 13, - 117, 217, 216, 13, 215, 72, 218, 41, 52, 52, - 72, 195, 196, 197, 115, 199, 116, 42, 43, 219, - 17, 211, 149, 17, 217, 216, 219, 215, 44, 218, - 150, 217, 151, 152, 153, 154, 218, 17, 17, 52, - 72, 72, 17, 155, 156, 157, 158, 248, 249, 250, - 251, 252, 253, 254, 255, 256, 193, 74, 257, 159, - 74, 160, 161, 162, 163, 13, 164, 165, 166, 167, - 168, 72, 169, 170, 74, 171, 273, 274, 275, 74, - 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, - 287, 288, 117, 172, 173, 292, 293, 294, 295, 296, - 297, 298, 299, 300, 17, 174, 115, 175, 116, 74, - 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, - 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, - 27, 102, 117, 88, 89, 176, 88, 89, 105, 177, - 74, 178, 179, 101, 327, 180, 115, 181, 116, 328, - 88, 89, 182, 45, 183, 88, 89, 184, 118, 185, - 120, 121, 122, 123, 124, 186, 187, 30, 188, 189, - 130, 131, 132, 14, 190, 191, 192, 52, 52, 52, - 52, 52, 52, 52, 52, 88, 89, 194, 117, 200, - 201, 202, 203, 204, 205, 258, 333, 259, 260, 325, - 334, 261, 13, 13, 262, 25, 263, 335, 264, 24, - 13, 265, 18, 336, 14, 72, 72, 14, 110, 111, - 266, 104, 267, 268, 103, 204, 205, 337, 269, 270, - 271, 14, 14, 272, 198, 148, 14, 338, 221, 222, - 223, 224, 225, 226, 227, 228, 229, 230, 117, 17, - 339, 340, 341, 18, 342, 343, 18, 344, 18, 345, - 386, 113, 115, 346, 116, 114, 387, 347, 385, 392, - 18, 18, 18, 388, 18, 18, 1, 91, 135, 54, - 58, 0, 54, 58, 74, 74, 389, 390, 0, 0, - 91, 391, 23, 91, 0, 393, 54, 58, 14, 276, - 59, 54, 58, 59, 399, 0, 0, 91, 108, 109, - 110, 111, 289, 290, 291, 0, 73, 59, 60, 73, - 0, 60, 59, 0, 301, 0, 90, 136, 0, 90, - 0, 54, 58, 73, 0, 60, 0, 18, 73, 0, - 60, 0, 91, 90, 0, 0, 0, 0, 108, 109, - 110, 111, 59, 0, 0, 46, 112, 0, 47, 48, - 88, 88, 89, 326, 0, 0, 0, 0, 73, 73, - 60, 329, 330, 0, 0, 331, 49, 50, 90, 51, - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, - 62, 63, 64, 65, 66, 67, 68, 69, 6, 73, - 0, 70, 71, 72, 73, 74, 75, 76, 77, 78, - 79, 80, 81, 82, 83, 84, 85, 0, 86, 87, - 88, 89, 90, 91, 92, 93, 94, 1, 0, 2, - 3, 95, 96, 97, 0, 14, 14, 98, 99, 6, - 100, 0, 6, 14, 6, 139, 140, 141, 142, 143, - 144, 145, 146, 147, 378, 379, 6, 6, 6, 0, - 6, 6, 0, 0, 108, 109, 110, 111, 0, 4, - 5, 6, 112, 0, 18, 18, 18, 18, 38, 0, - 0, 0, 18, 0, 0, 7, 8, 9, 10, 37, - 0, 0, 0, 0, 0, 0, 0, 11, 12, 13, - 14, 15, 0, 0, 0, 16, 17, 18, 0, 30, - 19, 0, 20, 21, 22, 0, 4, 0, 19, 38, - 0, 0, 38, 6, 38, 0, 0, 0, 0, 15, - 37, 0, 0, 37, 0, 37, 38, 38, 38, 0, - 38, 38, 16, 73, 73, 0, 0, 37, 37, 37, - 30, 37, 37, 30, 0, 30, 0, 4, 0, 19, - 4, 0, 19, 0, 19, 11, 0, 30, 30, 30, - 15, 30, 30, 15, 4, 4, 19, 19, 19, 117, - 19, 19, 0, 16, 0, 0, 16, 15, 15, 15, - 0, 15, 15, 115, 243, 116, 114, 242, 10, 117, - 16, 16, 16, 38, 16, 16, 11, 0, 0, 11, - 0, 12, 113, 115, 37, 116, 114, 0, 0, 0, - 0, 0, 0, 11, 11, 11, 0, 11, 11, 0, - 0, 0, 0, 0, 30, 0, 0, 0, 0, 10, - 0, 4, 10, 19, 0, 0, 0, 0, 0, 0, - 0, 0, 12, 0, 15, 12, 10, 10, 0, 0, - 6, 6, 6, 6, 0, 0, 0, 16, 6, 12, - 12, 12, 0, 12, 12, 56, 56, 0, 0, 56, - 56, 56, 56, 56, 0, 56, 20, 0, 0, 0, - 11, 0, 0, 0, 0, 0, 56, 0, 56, 0, - 56, 56, 0, 219, 212, 0, 0, 220, 217, 216, - 208, 215, 0, 218, 0, 0, 62, 61, 0, 62, - 61, 0, 0, 10, 0, 0, 213, 20, 214, 209, - 20, 56, 56, 62, 61, 0, 12, 0, 62, 61, - 38, 38, 38, 38, 20, 20, 0, 0, 38, 20, - 0, 37, 37, 37, 37, 0, 0, 0, 0, 37, - 211, 0, 56, 0, 0, 0, 0, 63, 62, 61, - 63, 30, 30, 30, 30, 0, 0, 0, 0, 30, - 19, 19, 19, 19, 63, 0, 0, 0, 19, 63, - 210, 15, 15, 15, 15, 108, 109, 110, 111, 15, - 0, 0, 0, 112, 16, 16, 16, 16, 0, 0, - 0, 20, 16, 0, 0, 108, 109, 110, 111, 63, - 0, 0, 0, 112, 0, 0, 232, 11, 11, 11, - 11, 117, 129, 129, 0, 11, 129, 129, 129, 129, - 129, 0, 129, 0, 113, 115, 0, 116, 114, 0, - 7, 0, 0, 129, 0, 129, 0, 129, 129, 127, - 127, 0, 0, 127, 127, 127, 127, 127, 0, 127, - 0, 0, 0, 12, 12, 12, 12, 0, 0, 0, - 127, 12, 127, 0, 127, 127, 0, 0, 129, 129, - 0, 7, 0, 0, 7, 0, 0, 0, 0, 0, - 56, 56, 56, 56, 56, 56, 56, 56, 7, 7, - 0, 0, 0, 7, 0, 127, 127, 53, 53, 129, - 0, 53, 53, 53, 53, 53, 0, 53, 200, 201, - 202, 203, 204, 205, 206, 207, 0, 0, 53, 0, - 53, 0, 53, 53, 219, 212, 127, 0, 0, 217, - 216, 208, 215, 0, 218, 219, 212, 0, 0, 235, - 217, 216, 208, 215, 0, 218, 0, 213, 0, 214, - 209, 0, 0, 53, 53, 7, 0, 0, 213, 0, - 214, 209, 219, 212, 0, 0, 236, 217, 216, 208, - 215, 0, 218, 0, 0, 0, 0, 0, 0, 0, - 231, 211, 0, 0, 53, 213, 0, 214, 209, 219, - 212, 0, 211, 237, 217, 216, 208, 215, 0, 218, - 219, 212, 0, 0, 0, 217, 216, 208, 215, 0, - 218, 210, 213, 0, 214, 209, 0, 0, 0, 211, - 0, 0, 210, 213, 0, 214, 209, 108, 109, 110, - 111, 64, 0, 0, 64, 112, 0, 129, 129, 129, - 129, 129, 129, 129, 129, 0, 211, 0, 64, 210, - 0, 0, 0, 64, 0, 0, 240, 211, 0, 0, - 0, 0, 0, 0, 127, 127, 127, 127, 127, 127, - 127, 127, 0, 0, 0, 0, 210, 0, 57, 55, - 0, 57, 55, 64, 219, 212, 0, 210, 303, 217, - 216, 208, 215, 0, 218, 57, 55, 0, 0, 0, - 57, 55, 0, 0, 0, 0, 0, 213, 0, 214, - 209, 219, 212, 0, 0, 348, 217, 216, 208, 215, - 0, 218, 53, 53, 53, 53, 53, 53, 53, 53, - 57, 55, 0, 0, 213, 0, 214, 209, 8, 0, - 0, 211, 0, 0, 0, 0, 0, 0, 0, 200, - 201, 202, 203, 204, 205, 206, 207, 233, 0, 117, - 200, 201, 202, 203, 204, 205, 206, 207, 211, 0, - 0, 210, 113, 115, 0, 116, 114, 0, 0, 8, - 76, 0, 8, 76, 0, 0, 76, 200, 201, 202, - 203, 204, 205, 206, 207, 0, 8, 8, 210, 0, - 76, 8, 76, 0, 76, 76, 0, 0, 0, 0, - 0, 0, 0, 0, 200, 201, 202, 203, 204, 205, - 206, 207, 0, 0, 0, 200, 201, 202, 203, 204, - 205, 206, 207, 219, 212, 76, 76, 0, 217, 216, - 208, 215, 0, 218, 219, 212, 0, 0, 349, 217, - 216, 208, 215, 0, 218, 0, 213, 0, 214, 209, - 0, 0, 0, 8, 0, 0, 76, 213, 0, 214, - 209, 219, 212, 0, 0, 352, 217, 216, 208, 215, - 0, 218, 0, 0, 0, 0, 0, 0, 0, 332, - 211, 0, 0, 0, 213, 0, 214, 209, 219, 212, - 0, 211, 353, 217, 216, 208, 215, 0, 218, 200, - 201, 202, 203, 204, 205, 206, 207, 0, 0, 0, - 210, 213, 0, 214, 209, 0, 0, 0, 211, 0, - 0, 210, 0, 0, 0, 0, 200, 201, 202, 203, - 204, 205, 206, 207, 219, 212, 0, 0, 354, 217, - 216, 208, 215, 0, 218, 211, 219, 212, 210, 0, - 355, 217, 216, 208, 215, 0, 218, 213, 244, 214, - 209, 0, 0, 117, 0, 108, 109, 110, 111, 213, - 0, 214, 209, 112, 0, 210, 113, 115, 0, 116, - 114, 0, 219, 212, 0, 0, 357, 217, 216, 208, - 215, 211, 218, 0, 76, 76, 76, 76, 76, 76, - 76, 76, 0, 211, 0, 213, 0, 214, 209, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 219, 212, - 0, 210, 358, 217, 216, 208, 215, 0, 218, 0, - 0, 0, 0, 210, 0, 0, 0, 0, 0, 211, - 0, 213, 0, 214, 209, 0, 0, 0, 200, 201, - 202, 203, 204, 205, 206, 207, 0, 0, 0, 200, - 201, 202, 203, 204, 205, 206, 207, 21, 0, 210, - 0, 0, 0, 0, 0, 211, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 200, 201, 202, 203, - 204, 205, 206, 207, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 210, 0, 0, 21, 0, - 0, 21, 0, 200, 201, 202, 203, 204, 205, 206, - 207, 0, 0, 0, 0, 21, 21, 0, 219, 212, - 21, 0, 359, 217, 216, 208, 215, 0, 218, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 213, 0, 214, 209, 0, 0, 0, 0, 200, - 201, 202, 203, 204, 205, 206, 207, 0, 0, 0, - 0, 200, 201, 202, 203, 204, 205, 206, 207, 108, - 109, 110, 111, 0, 0, 211, 0, 112, 0, 0, - 0, 0, 21, 0, 219, 212, 0, 0, 360, 217, - 216, 208, 215, 0, 218, 0, 0, 200, 201, 202, - 203, 204, 205, 206, 207, 210, 0, 213, 0, 214, - 209, 0, 0, 0, 0, 0, 0, 0, 0, 219, - 212, 0, 0, 361, 217, 216, 208, 215, 0, 218, - 0, 0, 0, 200, 201, 202, 203, 204, 205, 206, - 207, 211, 213, 0, 214, 209, 117, 219, 212, 0, - 0, 362, 217, 216, 208, 215, 0, 218, 0, 113, - 115, 0, 116, 114, 0, 0, 0, 0, 0, 0, - 213, 210, 214, 209, 219, 212, 211, 0, 367, 217, - 216, 208, 215, 0, 218, 219, 212, 0, 0, 368, - 217, 216, 208, 215, 0, 218, 0, 213, 0, 214, - 209, 0, 0, 0, 211, 0, 210, 0, 213, 0, - 214, 209, 219, 212, 0, 0, 369, 217, 216, 208, - 215, 0, 218, 0, 0, 302, 0, 0, 0, 0, - 0, 211, 0, 0, 210, 213, 0, 214, 209, 0, - 0, 0, 211, 200, 201, 202, 203, 204, 205, 206, - 207, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 210, 0, 0, 0, 0, 0, 0, 0, 211, - 219, 212, 210, 0, 370, 217, 216, 208, 215, 0, - 218, 219, 212, 0, 0, 371, 217, 216, 208, 215, - 0, 218, 0, 213, 0, 214, 209, 0, 0, 210, - 0, 0, 0, 0, 213, 0, 214, 209, 0, 200, - 201, 202, 203, 204, 205, 206, 207, 0, 219, 0, - 0, 0, 0, 217, 216, 0, 215, 211, 218, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 211, 0, - 0, 213, 0, 214, 200, 201, 202, 203, 204, 205, - 206, 207, 0, 0, 0, 0, 0, 210, 0, 0, - 0, 0, 108, 109, 110, 111, 351, 0, 210, 0, - 112, 117, 200, 201, 202, 203, 204, 205, 206, 207, - 0, 0, 0, 0, 113, 115, 0, 116, 114, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 200, - 201, 202, 203, 204, 205, 206, 207, 0, 0, 0, - 200, 201, 202, 203, 204, 205, 206, 207, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 200, 201, 202, - 203, 204, 205, 206, 207, 0, 219, 212, 0, 0, - 372, 217, 216, 208, 215, 0, 218, 219, 212, 0, - 0, 373, 217, 216, 208, 215, 0, 218, 0, 213, - 0, 214, 209, 0, 0, 0, 0, 0, 0, 0, - 213, 0, 214, 209, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 200, 201, 202, 203, 204, - 205, 206, 207, 211, 0, 0, 200, 201, 202, 203, - 204, 205, 206, 207, 211, 219, 212, 0, 0, 374, - 217, 216, 208, 215, 0, 218, 0, 0, 0, 219, - 212, 0, 0, 210, 217, 216, 208, 215, 213, 218, - 214, 209, 0, 0, 210, 202, 203, 204, 205, 0, - 0, 0, 213, 0, 214, 209, 219, 212, 0, 0, - 0, 217, 216, 208, 215, 0, 218, 0, 219, 212, - 0, 0, 211, 217, 216, 208, 215, 377, 218, 213, - 0, 214, 209, 0, 0, 375, 211, 108, 109, 110, - 111, 213, 0, 214, 209, 112, 0, 0, 0, 0, - 0, 0, 210, 0, 219, 212, 0, 0, 397, 217, - 216, 208, 215, 211, 218, 0, 210, 0, 0, 234, - 0, 117, 0, 0, 382, 211, 0, 213, 0, 214, - 209, 0, 0, 0, 113, 115, 0, 116, 114, 219, - 212, 0, 0, 210, 217, 216, 350, 215, 0, 218, - 0, 0, 0, 0, 0, 210, 0, 0, 0, 0, - 0, 211, 213, 0, 214, 209, 0, 0, 0, 0, - 0, 200, 201, 202, 203, 204, 205, 206, 207, 0, - 0, 0, 200, 201, 202, 203, 204, 205, 206, 207, - 0, 210, 219, 212, 0, 0, 211, 217, 216, 356, - 215, 0, 218, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 219, 213, 0, 214, 209, 217, - 216, 0, 215, 0, 218, 0, 210, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 213, 0, 214, - 200, 201, 202, 203, 204, 205, 206, 207, 0, 211, - 0, 0, 0, 0, 200, 201, 202, 203, 204, 205, - 206, 207, 0, 0, 0, 0, 219, 212, 0, 0, - 0, 217, 216, 363, 215, 0, 218, 0, 0, 210, - 0, 200, 201, 202, 203, 204, 205, 206, 207, 213, - 0, 214, 209, 200, 201, 202, 203, 204, 205, 206, - 207, 219, 212, 0, 0, 0, 217, 216, 381, 215, - 0, 218, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 211, 213, 0, 214, 209, 0, 200, - 201, 202, 203, 204, 205, 206, 207, 108, 109, 110, - 111, 0, 0, 0, 0, 112, 0, 0, 0, 0, - 0, 219, 212, 210, 0, 395, 217, 216, 211, 215, - 0, 218, 0, 0, 200, 201, 202, 203, 204, 205, - 206, 207, 0, 0, 213, 0, 214, 209, 0, 219, - 212, 0, 0, 396, 217, 216, 0, 215, 210, 218, - 219, 212, 0, 0, 398, 217, 216, 0, 215, 0, - 218, 0, 213, 0, 214, 209, 0, 0, 211, 0, - 0, 0, 0, 213, 0, 214, 209, 200, 201, 202, - 203, 204, 205, 206, 207, 219, 212, 0, 0, 400, - 217, 216, 0, 215, 0, 218, 211, 0, 210, 200, - 201, 202, 203, 204, 205, 0, 0, 211, 213, 0, - 214, 209, 0, 219, 212, 0, 0, 0, 217, 216, - 0, 215, 0, 218, 219, 212, 210, 0, 0, 217, - 216, 0, 215, 0, 218, 0, 213, 210, 214, 209, - 0, 0, 211, 0, 0, 0, 0, 213, 0, 214, - 0, 200, 201, 202, 203, 204, 205, 206, 207, 0, - 79, 0, 0, 79, 0, 79, 79, 79, 0, 0, - 211, 0, 210, 0, 0, 0, 0, 0, 0, 0, - 79, 211, 79, 0, 79, 79, 200, 201, 202, 203, - 204, 205, 206, 207, 0, 0, 0, 0, 78, 0, - 210, 78, 0, 78, 78, 78, 75, 0, 0, 75, - 0, 210, 75, 0, 0, 79, 79, 0, 78, 0, - 78, 0, 78, 78, 0, 0, 75, 0, 75, 0, - 75, 75, 0, 0, 0, 0, 200, 201, 202, 203, - 204, 205, 206, 207, 0, 0, 79, 0, 0, 0, - 0, 0, 0, 78, 78, 0, 0, 0, 0, 0, - 0, 75, 75, 0, 200, 201, 202, 203, 204, 205, - 206, 207, 0, 0, 0, 200, 201, 202, 203, 204, - 205, 206, 207, 0, 78, 0, 0, 0, 0, 0, - 0, 0, 75, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 200, 201, 202, 203, 204, 205, 206, 207, 0, 0, - 0, 0, 0, 219, 212, 0, 0, 0, 217, 216, - 0, 215, 0, 218, 0, 0, 0, 0, 200, 201, - 202, 203, 204, 205, 206, 207, 213, 0, 214, 200, - 201, 202, 203, 204, 205, 206, 207, 86, 0, 0, - 86, 0, 0, 86, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 86, 0, 86, - 211, 86, 86, 0, 79, 79, 79, 79, 79, 79, - 79, 79, 0, 0, 87, 0, 0, 87, 0, 0, - 87, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 210, 0, 86, 86, 87, 0, 87, 0, 87, 87, - 0, 0, 78, 78, 78, 78, 78, 78, 78, 78, - 75, 75, 75, 75, 75, 75, 75, 75, 82, 0, - 0, 82, 0, 86, 82, 0, 0, 0, 83, 87, - 87, 83, 0, 0, 83, 0, 0, 0, 82, 0, - 82, 84, 82, 82, 84, 0, 0, 84, 83, 0, - 83, 85, 83, 83, 85, 0, 0, 85, 0, 0, - 87, 84, 219, 212, 0, 0, 84, 217, 216, 0, - 215, 85, 218, 82, 82, 0, 85, 0, 0, 0, - 0, 0, 0, 83, 83, 213, 0, 214, 0, 0, - 0, 0, 0, 219, 212, 0, 84, 84, 217, 216, - 0, 215, 0, 218, 82, 0, 85, 85, 0, 0, - 0, 0, 0, 0, 83, 0, 213, 364, 214, 211, - 0, 0, 117, 0, 0, 0, 0, 84, 200, 201, - 202, 203, 204, 205, 206, 113, 115, 85, 116, 114, - 0, 117, 0, 0, 0, 0, 0, 0, 0, 210, - 0, 365, 0, 324, 113, 115, 117, 116, 114, 0, - 366, 86, 86, 86, 86, 117, 0, 86, 86, 113, - 115, 380, 116, 114, 0, 0, 117, 0, 113, 115, - 0, 116, 114, 0, 0, 0, 0, 0, 0, 113, - 115, 383, 116, 114, 0, 0, 117, 0, 87, 87, - 87, 87, 384, 0, 87, 87, 0, 117, 0, 113, - 115, 0, 116, 114, 241, 0, 117, 0, 0, 0, - 113, 115, 0, 116, 114, 0, 0, 0, 0, 113, - 115, 0, 116, 114, 0, 0, 0, 0, 0, 0, - 0, 0, 82, 82, 82, 82, 0, 117, 82, 82, - 0, 0, 83, 83, 83, 83, 0, 0, 83, 83, - 113, 115, 0, 116, 114, 84, 84, 0, 0, 0, - 0, 84, 84, 0, 0, 85, 85, 0, 376, 0, - 117, 85, 85, 0, 0, 0, 0, 200, 201, 202, - 203, 204, 205, 113, 115, 0, 116, 114, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 200, 201, - 202, 203, 204, 205, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 108, 109, - 110, 111, 0, 0, 0, 0, 112, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 108, 109, 110, - 111, 0, 0, 0, 0, 112, 0, 0, 0, 0, - 0, 0, 108, 109, 110, 111, 0, 0, 0, 0, - 112, 108, 109, 110, 111, 0, 0, 0, 0, 112, - 0, 0, 108, 109, 110, 111, 0, 0, 0, 0, - 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 108, 109, 110, 111, 0, 0, 0, 0, - 112, 0, 0, 108, 109, 110, 111, 0, 0, 0, - 0, 112, 108, 109, 110, 111, 0, 0, 0, 0, - 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 108, 109, 110, 111, 0, 0, 0, - 0, 112, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 108, 109, 110, 111, - 0, 0, 0, 0, 112, -}; -short parsercheck[] = { 29, - 0, 61, 41, 40, 40, 35, 36, 37, 61, 39, - 61, 40, 37, 38, 40, 91, 41, 42, 43, 44, - 45, 40, 47, 41, 37, 38, 44, 259, 40, 42, - 43, 91, 45, 58, 47, 60, 40, 62, 63, 0, - 91, 41, 260, 41, 44, 38, 44, 60, 41, 62, - 41, 44, 91, 44, 41, 40, 37, 44, 58, 59, - 46, 42, 43, 63, 45, 58, 47, 40, 93, 94, - 63, 101, 102, 103, 60, 105, 62, 40, 40, 37, - 41, 94, 261, 44, 42, 43, 37, 45, 40, 47, - 261, 42, 40, 40, 40, 40, 47, 58, 59, 124, - 93, 94, 63, 40, 40, 40, 40, 137, 138, 139, - 140, 141, 142, 143, 144, 145, 91, 41, 148, 40, - 44, 40, 40, 40, 40, 125, 40, 40, 40, 40, - 40, 124, 40, 40, 58, 40, 166, 167, 168, 63, - 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, - 180, 181, 46, 40, 40, 185, 186, 187, 188, 189, - 190, 191, 192, 193, 125, 40, 60, 40, 62, 93, - 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, - 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, - 0, 33, 46, 41, 41, 40, 44, 44, 40, 40, - 124, 40, 40, 45, 234, 40, 60, 40, 62, 239, - 58, 58, 40, 23, 40, 63, 63, 40, 28, 40, - 30, 31, 32, 33, 34, 40, 40, 280, 40, 40, - 40, 41, 42, 0, 40, 40, 40, 262, 263, 264, - 265, 266, 267, 268, 269, 93, 93, 40, 46, 262, - 263, 264, 265, 266, 267, 260, 41, 260, 260, 61, - 41, 260, 262, 263, 260, 36, 260, 41, 260, 40, - 270, 260, 0, 41, 41, 268, 269, 44, 264, 265, - 260, 123, 260, 260, 126, 266, 267, 41, 260, 260, - 260, 58, 59, 260, 104, 61, 63, 41, 108, 109, - 110, 111, 112, 113, 114, 115, 116, 117, 46, 270, - 41, 41, 41, 41, 41, 41, 44, 41, 46, 41, - 350, 59, 60, 41, 62, 63, 356, 41, 61, 41, - 58, 59, 60, 363, 62, 63, 0, 44, 44, 41, - 41, -1, 44, 44, 268, 269, 376, 377, -1, -1, - 41, 381, 123, 44, -1, 385, 58, 58, 125, 169, - 41, 63, 63, 44, 394, -1, -1, 58, 262, 263, - 264, 265, 182, 183, 184, -1, 41, 58, 41, 44, - -1, 44, 63, -1, 194, -1, 41, 125, -1, 44, - -1, 93, 93, 58, -1, 58, -1, 125, 63, -1, - 63, -1, 93, 58, -1, -1, -1, -1, 262, 263, - 264, 265, 93, -1, -1, 257, 270, -1, 260, 261, - 268, 269, 269, 233, -1, -1, -1, -1, 93, 94, - 93, 241, 242, -1, -1, 245, 278, 279, 93, 281, - 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, - 292, 293, 294, 295, 296, 297, 298, 299, 0, 124, - -1, 303, 304, 305, 306, 307, 308, 309, 310, 311, - 312, 313, 314, 315, 316, 317, 318, -1, 320, 321, - 322, 323, 324, 325, 326, 327, 328, 258, -1, 260, - 261, 333, 334, 335, -1, 262, 263, 339, 340, 41, - 342, -1, 44, 270, 46, 271, 272, 273, 274, 275, - 276, 277, 278, 279, 324, 325, 58, 59, 60, -1, - 62, 63, -1, -1, 262, 263, 264, 265, -1, 300, - 301, 302, 270, -1, 262, 263, 264, 265, 0, -1, - -1, -1, 270, -1, -1, 316, 317, 318, 319, 0, - -1, -1, -1, -1, -1, -1, -1, 328, 329, 330, - 331, 332, -1, -1, -1, 336, 337, 338, -1, 0, - 341, -1, 343, 344, 345, -1, 0, -1, 0, 41, - -1, -1, 44, 125, 46, -1, -1, -1, -1, 0, - 41, -1, -1, 44, -1, 46, 58, 59, 60, -1, - 62, 63, 0, 268, 269, -1, -1, 58, 59, 60, - 41, 62, 63, 44, -1, 46, -1, 41, -1, 41, - 44, -1, 44, -1, 46, 0, -1, 58, 59, 60, - 41, 62, 63, 44, 58, 59, 58, 59, 60, 46, - 62, 63, -1, 41, -1, -1, 44, 58, 59, 60, - -1, 62, 63, 60, 41, 62, 63, 44, 0, 46, - 58, 59, 60, 125, 62, 63, 41, -1, -1, 44, - -1, 0, 59, 60, 125, 62, 63, -1, -1, -1, - -1, -1, -1, 58, 59, 60, -1, 62, 63, -1, - -1, -1, -1, -1, 125, -1, -1, -1, -1, 41, - -1, 125, 44, 125, -1, -1, -1, -1, -1, -1, - -1, -1, 41, -1, 125, 44, 58, 59, -1, -1, - 262, 263, 264, 265, -1, -1, -1, 125, 270, 58, - 59, 60, -1, 62, 63, 37, 38, -1, -1, 41, - 42, 43, 44, 45, -1, 47, 0, -1, -1, -1, - 125, -1, -1, -1, -1, -1, 58, -1, 60, -1, - 62, 63, -1, 37, 38, -1, -1, 41, 42, 43, - 44, 45, -1, 47, -1, -1, 41, 41, -1, 44, - 44, -1, -1, 125, -1, -1, 60, 41, 62, 63, - 44, 93, 94, 58, 58, -1, 125, -1, 63, 63, - 262, 263, 264, 265, 58, 59, -1, -1, 270, 63, - -1, 262, 263, 264, 265, -1, -1, -1, -1, 270, - 94, -1, 124, -1, -1, -1, -1, 41, 93, 93, - 44, 262, 263, 264, 265, -1, -1, -1, -1, 270, - 262, 263, 264, 265, 58, -1, -1, -1, 270, 63, - 124, 262, 263, 264, 265, 262, 263, 264, 265, 270, - -1, -1, -1, 270, 262, 263, 264, 265, -1, -1, - -1, 125, 270, -1, -1, 262, 263, 264, 265, 93, - -1, -1, -1, 270, -1, -1, 41, 262, 263, 264, - 265, 46, 37, 38, -1, 270, 41, 42, 43, 44, - 45, -1, 47, -1, 59, 60, -1, 62, 63, -1, - 0, -1, -1, 58, -1, 60, -1, 62, 63, 37, - 38, -1, -1, 41, 42, 43, 44, 45, -1, 47, - -1, -1, -1, 262, 263, 264, 265, -1, -1, -1, - 58, 270, 60, -1, 62, 63, -1, -1, 93, 94, - -1, 41, -1, -1, 44, -1, -1, -1, -1, -1, - 262, 263, 264, 265, 266, 267, 268, 269, 58, 59, - -1, -1, -1, 63, -1, 93, 94, 37, 38, 124, - -1, 41, 42, 43, 44, 45, -1, 47, 262, 263, - 264, 265, 266, 267, 268, 269, -1, -1, 58, -1, - 60, -1, 62, 63, 37, 38, 124, -1, -1, 42, - 43, 44, 45, -1, 47, 37, 38, -1, -1, 41, - 42, 43, 44, 45, -1, 47, -1, 60, -1, 62, - 63, -1, -1, 93, 94, 125, -1, -1, 60, -1, - 62, 63, 37, 38, -1, -1, 41, 42, 43, 44, - 45, -1, 47, -1, -1, -1, -1, -1, -1, -1, - 93, 94, -1, -1, 124, 60, -1, 62, 63, 37, - 38, -1, 94, 41, 42, 43, 44, 45, -1, 47, - 37, 38, -1, -1, -1, 42, 43, 44, 45, -1, - 47, 124, 60, -1, 62, 63, -1, -1, -1, 94, - -1, -1, 124, 60, -1, 62, 63, 262, 263, 264, - 265, 41, -1, -1, 44, 270, -1, 262, 263, 264, - 265, 266, 267, 268, 269, -1, 94, -1, 58, 124, - -1, -1, -1, 63, -1, -1, 93, 94, -1, -1, - -1, -1, -1, -1, 262, 263, 264, 265, 266, 267, - 268, 269, -1, -1, -1, -1, 124, -1, 41, 41, - -1, 44, 44, 93, 37, 38, -1, 124, 41, 42, - 43, 44, 45, -1, 47, 58, 58, -1, -1, -1, - 63, 63, -1, -1, -1, -1, -1, 60, -1, 62, - 63, 37, 38, -1, -1, 41, 42, 43, 44, 45, - -1, 47, 262, 263, 264, 265, 266, 267, 268, 269, - 93, 93, -1, -1, 60, -1, 62, 63, 0, -1, - -1, 94, -1, -1, -1, -1, -1, -1, -1, 262, - 263, 264, 265, 266, 267, 268, 269, 44, -1, 46, - 262, 263, 264, 265, 266, 267, 268, 269, 94, -1, - -1, 124, 59, 60, -1, 62, 63, -1, -1, 41, - 38, -1, 44, 41, -1, -1, 44, 262, 263, 264, - 265, 266, 267, 268, 269, -1, 58, 59, 124, -1, - 58, 63, 60, -1, 62, 63, -1, -1, -1, -1, - -1, -1, -1, -1, 262, 263, 264, 265, 266, 267, - 268, 269, -1, -1, -1, 262, 263, 264, 265, 266, - 267, 268, 269, 37, 38, 93, 94, -1, 42, 43, - 44, 45, -1, 47, 37, 38, -1, -1, 41, 42, - 43, 44, 45, -1, 47, -1, 60, -1, 62, 63, - -1, -1, -1, 125, -1, -1, 124, 60, -1, 62, - 63, 37, 38, -1, -1, 41, 42, 43, 44, 45, - -1, 47, -1, -1, -1, -1, -1, -1, -1, 93, - 94, -1, -1, -1, 60, -1, 62, 63, 37, 38, - -1, 94, 41, 42, 43, 44, 45, -1, 47, 262, - 263, 264, 265, 266, 267, 268, 269, -1, -1, -1, - 124, 60, -1, 62, 63, -1, -1, -1, 94, -1, - -1, 124, -1, -1, -1, -1, 262, 263, 264, 265, - 266, 267, 268, 269, 37, 38, -1, -1, 41, 42, - 43, 44, 45, -1, 47, 94, 37, 38, 124, -1, - 41, 42, 43, 44, 45, -1, 47, 60, 41, 62, - 63, -1, -1, 46, -1, 262, 263, 264, 265, 60, - -1, 62, 63, 270, -1, 124, 59, 60, -1, 62, - 63, -1, 37, 38, -1, -1, 41, 42, 43, 44, - 45, 94, 47, -1, 262, 263, 264, 265, 266, 267, - 268, 269, -1, 94, -1, 60, -1, 62, 63, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 37, 38, - -1, 124, 41, 42, 43, 44, 45, -1, 47, -1, - -1, -1, -1, 124, -1, -1, -1, -1, -1, 94, - -1, 60, -1, 62, 63, -1, -1, -1, 262, 263, - 264, 265, 266, 267, 268, 269, -1, -1, -1, 262, - 263, 264, 265, 266, 267, 268, 269, 0, -1, 124, - -1, -1, -1, -1, -1, 94, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 262, 263, 264, 265, - 266, 267, 268, 269, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 124, -1, -1, 41, -1, - -1, 44, -1, 262, 263, 264, 265, 266, 267, 268, - 269, -1, -1, -1, -1, 58, 59, -1, 37, 38, - 63, -1, 41, 42, 43, 44, 45, -1, 47, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 60, -1, 62, 63, -1, -1, -1, -1, 262, - 263, 264, 265, 266, 267, 268, 269, -1, -1, -1, - -1, 262, 263, 264, 265, 266, 267, 268, 269, 262, - 263, 264, 265, -1, -1, 94, -1, 270, -1, -1, - -1, -1, 125, -1, 37, 38, -1, -1, 41, 42, - 43, 44, 45, -1, 47, -1, -1, 262, 263, 264, - 265, 266, 267, 268, 269, 124, -1, 60, -1, 62, - 63, -1, -1, -1, -1, -1, -1, -1, -1, 37, - 38, -1, -1, 41, 42, 43, 44, 45, -1, 47, - -1, -1, -1, 262, 263, 264, 265, 266, 267, 268, - 269, 94, 60, -1, 62, 63, 46, 37, 38, -1, - -1, 41, 42, 43, 44, 45, -1, 47, -1, 59, - 60, -1, 62, 63, -1, -1, -1, -1, -1, -1, - 60, 124, 62, 63, 37, 38, 94, -1, 41, 42, - 43, 44, 45, -1, 47, 37, 38, -1, -1, 41, - 42, 43, 44, 45, -1, 47, -1, 60, -1, 62, - 63, -1, -1, -1, 94, -1, 124, -1, 60, -1, - 62, 63, 37, 38, -1, -1, 41, 42, 43, 44, - 45, -1, 47, -1, -1, 125, -1, -1, -1, -1, - -1, 94, -1, -1, 124, 60, -1, 62, 63, -1, - -1, -1, 94, 262, 263, 264, 265, 266, 267, 268, - 269, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 124, -1, -1, -1, -1, -1, -1, -1, 94, - 37, 38, 124, -1, 41, 42, 43, 44, 45, -1, - 47, 37, 38, -1, -1, 41, 42, 43, 44, 45, - -1, 47, -1, 60, -1, 62, 63, -1, -1, 124, - -1, -1, -1, -1, 60, -1, 62, 63, -1, 262, - 263, 264, 265, 266, 267, 268, 269, -1, 37, -1, - -1, -1, -1, 42, 43, -1, 45, 94, 47, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 94, -1, - -1, 60, -1, 62, 262, 263, 264, 265, 266, 267, - 268, 269, -1, -1, -1, -1, -1, 124, -1, -1, - -1, -1, 262, 263, 264, 265, 41, -1, 124, -1, - 270, 46, 262, 263, 264, 265, 266, 267, 268, 269, - -1, -1, -1, -1, 59, 60, -1, 62, 63, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 262, - 263, 264, 265, 266, 267, 268, 269, -1, -1, -1, - 262, 263, 264, 265, 266, 267, 268, 269, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 262, 263, 264, - 265, 266, 267, 268, 269, -1, 37, 38, -1, -1, - 41, 42, 43, 44, 45, -1, 47, 37, 38, -1, - -1, 41, 42, 43, 44, 45, -1, 47, -1, 60, - -1, 62, 63, -1, -1, -1, -1, -1, -1, -1, - 60, -1, 62, 63, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 262, 263, 264, 265, 266, - 267, 268, 269, 94, -1, -1, 262, 263, 264, 265, - 266, 267, 268, 269, 94, 37, 38, -1, -1, 41, - 42, 43, 44, 45, -1, 47, -1, -1, -1, 37, - 38, -1, -1, 124, 42, 43, 44, 45, 60, 47, - 62, 63, -1, -1, 124, 264, 265, 266, 267, -1, - -1, -1, 60, -1, 62, 63, 37, 38, -1, -1, - -1, 42, 43, 44, 45, -1, 47, -1, 37, 38, - -1, -1, 94, 42, 43, 44, 45, 58, 47, 60, - -1, 62, 63, -1, -1, 93, 94, 262, 263, 264, - 265, 60, -1, 62, 63, 270, -1, -1, -1, -1, - -1, -1, 124, -1, 37, 38, -1, -1, 41, 42, - 43, 44, 45, 94, 47, -1, 124, -1, -1, 44, - -1, 46, -1, -1, 93, 94, -1, 60, -1, 62, - 63, -1, -1, -1, 59, 60, -1, 62, 63, 37, - 38, -1, -1, 124, 42, 43, 44, 45, -1, 47, - -1, -1, -1, -1, -1, 124, -1, -1, -1, -1, - -1, 94, 60, -1, 62, 63, -1, -1, -1, -1, - -1, 262, 263, 264, 265, 266, 267, 268, 269, -1, - -1, -1, 262, 263, 264, 265, 266, 267, 268, 269, - -1, 124, 37, 38, -1, -1, 94, 42, 43, 44, - 45, -1, 47, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 37, 60, -1, 62, 63, 42, - 43, -1, 45, -1, 47, -1, 124, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 60, -1, 62, - 262, 263, 264, 265, 266, 267, 268, 269, -1, 94, - -1, -1, -1, -1, 262, 263, 264, 265, 266, 267, - 268, 269, -1, -1, -1, -1, 37, 38, -1, -1, - -1, 42, 43, 44, 45, -1, 47, -1, -1, 124, - -1, 262, 263, 264, 265, 266, 267, 268, 269, 60, - -1, 62, 63, 262, 263, 264, 265, 266, 267, 268, - 269, 37, 38, -1, -1, -1, 42, 43, 44, 45, - -1, 47, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 94, 60, -1, 62, 63, -1, 262, - 263, 264, 265, 266, 267, 268, 269, 262, 263, 264, - 265, -1, -1, -1, -1, 270, -1, -1, -1, -1, - -1, 37, 38, 124, -1, 41, 42, 43, 94, 45, - -1, 47, -1, -1, 262, 263, 264, 265, 266, 267, - 268, 269, -1, -1, 60, -1, 62, 63, -1, 37, - 38, -1, -1, 41, 42, 43, -1, 45, 124, 47, - 37, 38, -1, -1, 41, 42, 43, -1, 45, -1, - 47, -1, 60, -1, 62, 63, -1, -1, 94, -1, - -1, -1, -1, 60, -1, 62, 63, 262, 263, 264, - 265, 266, 267, 268, 269, 37, 38, -1, -1, 41, - 42, 43, -1, 45, -1, 47, 94, -1, 124, 262, - 263, 264, 265, 266, 267, -1, -1, 94, 60, -1, - 62, 63, -1, 37, 38, -1, -1, -1, 42, 43, - -1, 45, -1, 47, 37, 38, 124, -1, -1, 42, - 43, -1, 45, -1, 47, -1, 60, 124, 62, 63, - -1, -1, 94, -1, -1, -1, -1, 60, -1, 62, - -1, 262, 263, 264, 265, 266, 267, 268, 269, -1, - 38, -1, -1, 41, -1, 43, 44, 45, -1, -1, - 94, -1, 124, -1, -1, -1, -1, -1, -1, -1, - 58, 94, 60, -1, 62, 63, 262, 263, 264, 265, - 266, 267, 268, 269, -1, -1, -1, -1, 38, -1, - 124, 41, -1, 43, 44, 45, 38, -1, -1, 41, - -1, 124, 44, -1, -1, 93, 94, -1, 58, -1, - 60, -1, 62, 63, -1, -1, 58, -1, 60, -1, - 62, 63, -1, -1, -1, -1, 262, 263, 264, 265, - 266, 267, 268, 269, -1, -1, 124, -1, -1, -1, - -1, -1, -1, 93, 94, -1, -1, -1, -1, -1, - -1, 93, 94, -1, 262, 263, 264, 265, 266, 267, - 268, 269, -1, -1, -1, 262, 263, 264, 265, 266, - 267, 268, 269, -1, 124, -1, -1, -1, -1, -1, - -1, -1, 124, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 262, 263, 264, 265, 266, 267, 268, 269, -1, -1, - -1, -1, -1, 37, 38, -1, -1, -1, 42, 43, - -1, 45, -1, 47, -1, -1, -1, -1, 262, 263, - 264, 265, 266, 267, 268, 269, 60, -1, 62, 262, - 263, 264, 265, 266, 267, 268, 269, 38, -1, -1, - 41, -1, -1, 44, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 58, -1, 60, - 94, 62, 63, -1, 262, 263, 264, 265, 266, 267, - 268, 269, -1, -1, 38, -1, -1, 41, -1, -1, - 44, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 124, -1, 93, 94, 58, -1, 60, -1, 62, 63, - -1, -1, 262, 263, 264, 265, 266, 267, 268, 269, - 262, 263, 264, 265, 266, 267, 268, 269, 38, -1, - -1, 41, -1, 124, 44, -1, -1, -1, 38, 93, - 94, 41, -1, -1, 44, -1, -1, -1, 58, -1, - 60, 38, 62, 63, 41, -1, -1, 44, 58, -1, - 60, 38, 62, 63, 41, -1, -1, 44, -1, -1, - 124, 58, 37, 38, -1, -1, 63, 42, 43, -1, - 45, 58, 47, 93, 94, -1, 63, -1, -1, -1, - -1, -1, -1, 93, 94, 60, -1, 62, -1, -1, - -1, -1, -1, 37, 38, -1, 93, 94, 42, 43, - -1, 45, -1, 47, 124, -1, 93, 94, -1, -1, - -1, -1, -1, -1, 124, -1, 60, 41, 62, 94, - -1, -1, 46, -1, -1, -1, -1, 124, 262, 263, - 264, 265, 266, 267, 268, 59, 60, 124, 62, 63, - -1, 46, -1, -1, -1, -1, -1, -1, -1, 124, - -1, 41, -1, 58, 59, 60, 46, 62, 63, -1, - 41, 262, 263, 264, 265, 46, -1, 268, 269, 59, - 60, 41, 62, 63, -1, -1, 46, -1, 59, 60, - -1, 62, 63, -1, -1, -1, -1, -1, -1, 59, - 60, 41, 62, 63, -1, -1, 46, -1, 262, 263, - 264, 265, 41, -1, 268, 269, -1, 46, -1, 59, - 60, -1, 62, 63, 44, -1, 46, -1, -1, -1, - 59, 60, -1, 62, 63, -1, -1, -1, -1, 59, - 60, -1, 62, 63, -1, -1, -1, -1, -1, -1, - -1, -1, 262, 263, 264, 265, -1, 46, 268, 269, - -1, -1, 262, 263, 264, 265, -1, -1, 268, 269, - 59, 60, -1, 62, 63, 262, 263, -1, -1, -1, - -1, 268, 269, -1, -1, 262, 263, -1, 44, -1, - 46, 268, 269, -1, -1, -1, -1, 262, 263, 264, - 265, 266, 267, 59, 60, -1, 62, 63, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 262, 263, - 264, 265, 266, 267, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 262, 263, - 264, 265, -1, -1, -1, -1, 270, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 262, 263, 264, - 265, -1, -1, -1, -1, 270, -1, -1, -1, -1, - -1, -1, 262, 263, 264, 265, -1, -1, -1, -1, - 270, 262, 263, 264, 265, -1, -1, -1, -1, 270, - -1, -1, 262, 263, 264, 265, -1, -1, -1, -1, - 270, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 262, 263, 264, 265, -1, -1, -1, -1, - 270, -1, -1, 262, 263, 264, 265, -1, -1, -1, - -1, 270, 262, 263, 264, 265, -1, -1, -1, -1, - 270, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 262, 263, 264, 265, -1, -1, -1, - -1, 270, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 262, 263, 264, 265, - -1, -1, -1, -1, 270, -}; -#define YYFINAL 26 -#ifndef YYDEBUG -#define YYDEBUG 0 -#endif -#define YYMAXTOKEN 346 -#if YYDEBUG -char *parsername[] = { -"end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -"'!'",0,0,"'$'","'%'","'&'",0,"'('","')'","'*'","'+'","','","'-'","'.'","'/'",0, -0,0,0,0,0,0,0,0,0,"':'","';'","'<'","'='","'>'","'?'",0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,"'['",0,"']'","'^'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,"'{'","'|'","'}'","'~'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"NUMBER", -"STRING","SYMBOL","FIELD","VAR","EQ","NEQ","LE","GE","SHR","SHL","AND","OR", -"IN","PLA","MIA","MUA","MOA","DVA","ANA","ORA","INC","DEC_","APP","AVG","DEV", -"AMIN","AMAX","SUM","QAVG","QDEV","QMIN_","QMAX_","QSUM","SAVG","SDEV","SMIN", -"SMAX","SSUM","ABS","INT","BOUND","LEN","CHOP","TR","SUBSTR","SQRT","EXP","LOG", -"LN","POW","RANDOM","SIN","COS","TAN","ASIN","ACOS","ATAN","ATAN2","DATE", -"TIME","DURATION","EXPAND","YEAR","MONTH","DAY","HOUR","MINUTE","SECOND","LEAP", -"JULIAN","SECTION_","DBASE_","FORM_","PREVFORM","SWITCH","THIS","LAST","DISP", -"FOREACH","HOST","USER","UID","GID","SYSTEM","ACCESS","BEEP","ERROR","PRINTF", -"UMINUS", -}; -char *parserrule[] = { -"$accept : stmt", -"stmt : string", -"string : STRING", -"string : '{' string '}'", -"string : string ';' string", -"string : string '.' string", -"string : VAR", -"string : VAR APP string", -"string : VAR '=' string", -"string : '(' number ')'", -"string : string '?' string ':' string", -"string : string '<' string", -"string : string '>' string", -"string : string EQ string", -"string : string NEQ string", -"string : string LE string", -"string : string GE string", -"string : string IN string", -"string : FIELD", -"string : FIELD '[' number ']'", -"string : FIELD '=' string", -"string : FIELD '[' number ']' '=' string", -"string : SYSTEM '(' string ')'", -"string : '$' SYMBOL", -"string : CHOP '(' string ')'", -"string : TR '(' string ',' string ')'", -"string : SUBSTR '(' string ',' number ',' number ')'", -"string : HOST", -"string : USER", -"string : PREVFORM", -"string : SECTION_", -"string : SECTION_ '[' number ']'", -"string : FORM_", -"string : DBASE_", -"string : SWITCH '(' string ',' string ')'", -"string : FOREACH '(' string ')'", -"string : FOREACH '(' string ',' string ')'", -"string : TIME", -"string : DATE", -"string : TIME '(' number ')'", -"string : DATE '(' number ')'", -"string : DURATION '(' number ')'", -"string : EXPAND '(' FIELD ')'", -"string : EXPAND '(' FIELD '[' number ']' ')'", -"string : PRINTF '(' args ')'", -"string : BEEP", -"string : ERROR '(' args ')'", -"args : string", -"args : args ',' string", -"number : NUMBER", -"number : '{' string '}'", -"number : '(' number ')'", -"number : FIELD", -"number : FIELD '[' number ']'", -"number : FIELD '=' number", -"number : FIELD '[' number ']' '=' number", -"number : VAR", -"number : VAR '=' number", -"number : VAR PLA number", -"number : VAR MIA number", -"number : VAR MUA number", -"number : VAR DVA number", -"number : VAR MOA number", -"number : VAR ANA number", -"number : VAR ORA number", -"number : VAR INC", -"number : VAR DEC_", -"number : INC VAR", -"number : DEC_ VAR", -"number : '-' number", -"number : '!' number", -"number : '~' number", -"number : number '&' number", -"number : number '^' number", -"number : number '|' number", -"number : number SHL number", -"number : number SHR number", -"number : number '%' number", -"number : number '+' number", -"number : number '-' number", -"number : number '*' number", -"number : number '/' number", -"number : number '<' number", -"number : number '>' number", -"number : number EQ number", -"number : number NEQ number", -"number : number LE number", -"number : number GE number", -"number : number AND number", -"number : number OR number", -"number : number '?' number ':' number", -"number : number ',' number", -"number : THIS", -"number : LAST", -"number : DISP", -"number : AVG '(' FIELD ')'", -"number : DEV '(' FIELD ')'", -"number : AMIN '(' FIELD ')'", -"number : AMAX '(' FIELD ')'", -"number : SUM '(' FIELD ')'", -"number : QAVG '(' FIELD ')'", -"number : QDEV '(' FIELD ')'", -"number : QMIN_ '(' FIELD ')'", -"number : QMAX_ '(' FIELD ')'", -"number : QSUM '(' FIELD ')'", -"number : SAVG '(' FIELD ')'", -"number : SDEV '(' FIELD ')'", -"number : SMIN '(' FIELD ')'", -"number : SMAX '(' FIELD ')'", -"number : SSUM '(' FIELD ')'", -"number : ABS '(' number ')'", -"number : INT '(' number ')'", -"number : BOUND '(' number ',' number ',' number ')'", -"number : LEN '(' string ')'", -"number : SQRT '(' number ')'", -"number : EXP '(' number ')'", -"number : LOG '(' number ')'", -"number : LN '(' number ')'", -"number : POW '(' number ',' number ')'", -"number : RANDOM", -"number : SIN '(' number ')'", -"number : COS '(' number ')'", -"number : TAN '(' number ')'", -"number : ASIN '(' number ')'", -"number : ACOS '(' number ')'", -"number : ATAN '(' number ')'", -"number : ATAN2 '(' number ',' number ')'", -"number : SECTION_", -"number : SECTION_ '[' number ']'", -"number : DATE", -"number : DATE '(' string ')'", -"number : TIME '(' string ')'", -"number : DURATION '(' string ')'", -"number : YEAR '(' number ')'", -"number : MONTH '(' number ')'", -"number : DAY '(' number ')'", -"number : HOUR '(' number ')'", -"number : MINUTE '(' number ')'", -"number : SECOND '(' number ')'", -"number : JULIAN '(' number ')'", -"number : LEAP '(' number ')'", -"number : UID", -"number : GID", -"number : ACCESS '(' string ',' number ')'", -}; -#endif -#ifdef YYSTACKSIZE -#undef YYMAXDEPTH -#define YYMAXDEPTH YYSTACKSIZE -#else -#ifdef YYMAXDEPTH -#define YYSTACKSIZE YYMAXDEPTH -#else -#define YYSTACKSIZE 500 -#define YYMAXDEPTH 500 -#endif -#endif -int yydebug; -int yynerrs; -int yyerrflag; -int yychar; -short *yyssp; -YYSTYPE *yyvsp; -YYSTYPE yyval; -YYSTYPE yylval; -short yyss[YYSTACKSIZE]; -YYSTYPE yyvs[YYSTACKSIZE]; -#define yystacksize YYSTACKSIZE -#define YYABORT goto yyabort -#define YYREJECT goto yyabort -#define YYACCEPT goto yyaccept -#define YYERROR goto yyerrlab -int -yyparse(void) -{ - register int yym, yyn, yystate; -#if YYDEBUG - register char *yys; - extern char *getenv(); - - if (yys = getenv("YYDEBUG")) - { - yyn = *yys; - if (yyn >= '0' && yyn <= '9') - yydebug = yyn - '0'; - } -#endif - - yynerrs = 0; - yyerrflag = 0; - yychar = (-1); - - yyssp = yyss; - yyvsp = yyvs; - *yyssp = yystate = 0; - -yyloop: - if ((yyn = yydefred[yystate]) != 0) goto yyreduce; - if (yychar < 0) - { - if ((yychar = yylex()) < 0) yychar = 0; -#if YYDEBUG - if (yydebug) - { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; - printf("%sdebug: state %d, reading %d (%s)\n", - YYPREFIX, yystate, yychar, yys); - } -#endif - } - if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 && - yyn <= YYTABLESIZE && yycheck[yyn] == yychar) - { -#if YYDEBUG - if (yydebug) - printf("%sdebug: state %d, shifting to state %d\n", - YYPREFIX, yystate, yytable[yyn]); -#endif - if (yyssp >= yyss + yystacksize - 1) - { - goto yyoverflow; - } - *++yyssp = yystate = yytable[yyn]; - *++yyvsp = yylval; - yychar = (-1); - if (yyerrflag > 0) --yyerrflag; - goto yyloop; - } - if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 && - yyn <= YYTABLESIZE && yycheck[yyn] == yychar) - { - yyn = yytable[yyn]; - goto yyreduce; - } - if (yyerrflag) goto yyinrecovery; -#ifdef lint - goto yynewerror; -#endif -yynewerror: - yyerror("syntax error"); -#ifdef lint - goto yyerrlab; -#endif -yyerrlab: - ++yynerrs; -yyinrecovery: - if (yyerrflag < 3) - { - yyerrflag = 3; - for (;;) - { - if ((yyn = yysindex[*yyssp]) && (yyn += YYERRCODE) >= 0 && - yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE) - { -#if YYDEBUG - if (yydebug) - printf("%sdebug: state %d, error recovery shifting\ - to state %d\n", YYPREFIX, *yyssp, yytable[yyn]); -#endif - if (yyssp >= yyss + yystacksize - 1) - { - goto yyoverflow; - } - *++yyssp = yystate = yytable[yyn]; - *++yyvsp = yylval; - goto yyloop; - } - else - { -#if YYDEBUG - if (yydebug) - printf("%sdebug: error recovery discarding state %d\n", - YYPREFIX, *yyssp); -#endif - if (yyssp <= yyss) goto yyabort; - --yyssp; - --yyvsp; - } - } - } - else - { - if (yychar == 0) goto yyabort; -#if YYDEBUG - if (yydebug) - { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; - printf("%sdebug: state %d, error recovery discards token %d (%s)\n", - YYPREFIX, yystate, yychar, yys); - } -#endif - yychar = (-1); - goto yyloop; - } -yyreduce: -#if YYDEBUG - if (yydebug) - printf("%sdebug: state %d, reducing by rule %d (%s)\n", - YYPREFIX, yystate, yyn, yyrule[yyn]); -#endif - yym = yylen[yyn]; - yyval = yyvsp[1-yym]; - switch (yyn) - { -case 1: -#line 71 "parser.y" -{ yyret = yyvsp[0].sval; } -break; -case 2: -#line 74 "parser.y" -{ yyval.sval = yyvsp[0].sval; } -break; -case 3: -#line 75 "parser.y" -{ yyval.sval = yyvsp[-1].sval; } -break; -case 4: -#line 76 "parser.y" -{ yyval.sval = yyvsp[0].sval; f_free(yyvsp[-2].sval); } -break; -case 5: -#line 77 "parser.y" -{ char *s=yyvsp[-2].sval, *t=yyvsp[0].sval, *r=new - char[f_len(s)+f_len(t)+1]; *r=0; - if (s) strcpy(r, s); f_free(s); - if (t) strcat(r, t); f_free(t); - yyval.sval = r; } -break; -case 6: -#line 82 "parser.y" -{ yyval.sval = f_getsvar(yyvsp[0].ival); } -break; -case 7: -#line 83 "parser.y" -{ int v=yyvsp[-2].ival; - char *s=f_getsvar(v), *t=yyvsp[0].sval, *r=new - char[f_len(s)+f_len(t)+1]; *r=0; - if (s) strcpy(r, s); f_free(s); - if (t) strcat(r, t); f_free(t); - yyval.sval = f_setsvar(v, r); } -break; -case 8: -#line 89 "parser.y" -{ yyval.sval = f_setsvar(yyvsp[-2].ival, yyvsp[0].sval);} -break; -case 9: -#line 90 "parser.y" -{ yyval.sval = f_str(yyvsp[-1].dval); } -break; -case 10: -#line 91 "parser.y" -{ yyval.sval = f_num(yyvsp[-4].sval) ? yyvsp[-2].sval : yyvsp[0].sval; } -break; -case 11: -#line 92 "parser.y" -{ yyval.sval = f_str((double) - (f_cmp(yyvsp[-2].sval, yyvsp[0].sval) < 0));} -break; -case 12: -#line 94 "parser.y" -{ yyval.sval = f_str((double) - (f_cmp(yyvsp[-2].sval, yyvsp[0].sval) > 0));} -break; -case 13: -#line 96 "parser.y" -{ yyval.sval = f_str((double) - (f_cmp(yyvsp[-2].sval, yyvsp[0].sval) == 0));} -break; -case 14: -#line 98 "parser.y" -{ yyval.sval = f_str((double) - (f_cmp(yyvsp[-2].sval, yyvsp[0].sval) != 0));} -break; -case 15: -#line 100 "parser.y" -{ yyval.sval = f_str((double) - (f_cmp(yyvsp[-2].sval, yyvsp[0].sval) <= 0));} -break; -case 16: -#line 102 "parser.y" -{ yyval.sval = f_str((double) - (f_cmp(yyvsp[-2].sval, yyvsp[0].sval) >= 0));} -break; -case 17: -#line 104 "parser.y" -{ yyval.sval = f_str((double)f_instr(yyvsp[-2].sval, yyvsp[0].sval));} -break; -case 18: -#line 105 "parser.y" -{ yyval.sval = f_field(yyvsp[0].ival,database->getrow());} -break; -case 19: -#line 106 "parser.y" -{ yyval.sval = f_field(yyvsp[-3].ival, (int)yyvsp[-1].dval); } -break; -case 20: -#line 107 "parser.y" -{ yyval.sval = f_assign(yyvsp[-2].ival, - database->getrow(), yyvsp[0].sval); - assigned = 1; } -break; -case 21: -#line 111 "parser.y" -{ yyval.sval = f_assign(yyvsp[-5].ival, (int)yyvsp[-3].dval, yyvsp[0].sval); - assigned = 1; } -break; -case 22: -#line 113 "parser.y" -{ yyval.sval = f_system(yyvsp[-1].sval); } -break; -case 23: -#line 114 "parser.y" -{ yyval.sval = copystring(getenv(yyvsp[0].sval)); } -break; -case 24: -#line 115 "parser.y" -{ char *s=yyvsp[-1].sval; if (s) { int n=strlen(s); - if (n && s[n-1]=='\n') s[n-1] = 0; } - yyval.sval = s; } -break; -case 25: -#line 118 "parser.y" -{ yyval.sval = f_tr(yyvsp[-3].sval, yyvsp[-1].sval); } -break; -case 26: -#line 120 "parser.y" -{ yyval.sval = f_substr(yyvsp[-5].sval, (int)yyvsp[-3].dval, (int)yyvsp[-1].dval);} -break; -case 27: -#line 121 "parser.y" -{ char s[80]; if (gethostname(s, 80)) - *s=0; s[80-1]=0; yyval.sval = copystring(s);} -break; -case 28: -#line 123 "parser.y" -{ yyval.sval = copystring(getenv("USER")); } -break; -case 29: -#line 124 "parser.y" -{ yyval.sval = copystring(prev_form); } -break; -case 30: -#line 125 "parser.y" -{ yyval.sval = !database ? 0 : copystring( - sections->at(sections->curr())->name);} -break; -case 31: -#line 127 "parser.y" -{ yyval.sval = copystring(sections->at( - f_section((int)yyvsp[-1].dval))->name);} -break; -case 32: -#line 129 "parser.y" -{ yyval.sval = form && form->name ? - copystring(resolve_tilde - (form->memindex, - form->name, "gf")):0;} -break; -case 33: -#line 133 "parser.y" -{ yyval.sval = form && form->dbase ? - copystring(resolve_tilde - (form->memindex, - form->dbase, - form->proc ? - 0 : "db")) :0;} -break; -case 34: -#line 140 "parser.y" -{ char *name = yyvsp[-3].sval, *expr = yyvsp[-1].sval; - f_free(switch_name); - f_free(switch_expr); - switch_name = copystring(name); - switch_expr = copystring(expr); - f_free(name); f_free(expr); yyval.sval = 0; } -break; -case 35: -#line 146 "parser.y" -{ f_foreach(0, yyvsp[-1].sval); yyval.sval = 0; } -break; -case 36: -#line 148 "parser.y" -{ f_foreach(yyvsp[-3].sval, yyvsp[-1].sval); yyval.sval = 0; } -break; -case 37: -#line 149 "parser.y" -{ yyval.sval = copystring(mktimestring - (time(0), FALSE)); } -break; -case 38: -#line 151 "parser.y" -{ yyval.sval = copystring(mkdatestring - (time(0))); } -break; -case 39: -#line 153 "parser.y" -{ yyval.sval = copystring(mktimestring - ((time_t)yyvsp[-1].dval, FALSE)); } -break; -case 40: -#line 155 "parser.y" -{ yyval.sval = copystring(mkdatestring - ((time_t)yyvsp[-1].dval)); } -break; -case 41: -#line 157 "parser.y" -{ yyval.sval = copystring(mktimestring - ((time_t)yyvsp[-1].dval, TRUE)); } -break; -case 42: -#line 159 "parser.y" -{ yyval.sval = f_expand(yyvsp[-1].ival, - database->getrow()); } -break; -case 43: -#line 162 "parser.y" -{ yyval.sval = f_expand(yyvsp[-4].ival, (int)yyvsp[-2].dval); } -break; -case 44: -#line 163 "parser.y" -{ yyval.sval = f_printf(yyvsp[-1].aval); } -break; -case 45: -#line 164 "parser.y" -{ /*<<< XBell(display, 0);*/ yyval.sval = 0; } -break; -case 46: -#line 165 "parser.y" -{ char *s = f_printf(yyvsp[-1].aval); - QMessageBox::warning(0, "KGrok", s); - f_free(s); yyval.sval = 0; } -break; -case 47: -#line 170 "parser.y" -{ yyval.aval = f_addarg(0, yyvsp[0].sval); } -break; -case 48: -#line 171 "parser.y" -{ yyval.aval = f_addarg(yyvsp[-2].aval, yyvsp[0].sval); } -break; -case 49: -#line 174 "parser.y" -{ yyval.dval = yyvsp[0].dval; } -break; -case 50: -#line 175 "parser.y" -{ yyval.dval = f_num(yyvsp[-1].sval); } -break; -case 51: -#line 176 "parser.y" -{ yyval.dval = yyvsp[-1].dval; } -break; -case 52: -#line 177 "parser.y" -{ yyval.dval = f_num(f_field(yyvsp[0].ival, - database->getrow())); } -break; -case 53: -#line 179 "parser.y" -{ yyval.dval = f_num(f_field(yyvsp[-3].ival, (int)yyvsp[-1].dval)); } -break; -case 54: -#line 180 "parser.y" -{ f_free(f_assign(yyvsp[-2].ival, database-> - getrow(), f_str(yyval.dval = yyvsp[0].dval))); - assigned = 1; } -break; -case 55: -#line 184 "parser.y" -{ f_free(f_assign(yyvsp[-5].ival, (int)yyvsp[-3].dval, - f_str(yyval.dval = yyvsp[0].dval))); assigned = 1; } -break; -case 56: -#line 186 "parser.y" -{ yyval.dval = f_getnvar(yyvsp[0].ival); } -break; -case 57: -#line 187 "parser.y" -{ yyval.dval = f_setnvar(yyvsp[-2].ival, yyvsp[0].dval); } -break; -case 58: -#line 188 "parser.y" -{ int v = yyvsp[-2].ival; - yyval.dval = f_setnvar(v, f_getnvar(v)+yyvsp[0].dval); } -break; -case 59: -#line 190 "parser.y" -{ int v = yyvsp[-2].ival; - yyval.dval = f_setnvar(v, f_getnvar(v)-yyvsp[0].dval); } -break; -case 60: -#line 192 "parser.y" -{ int v = yyvsp[-2].ival; - yyval.dval = f_setnvar(v, f_getnvar(v)*yyvsp[0].dval); } -break; -case 61: -#line 194 "parser.y" -{ int v = yyvsp[-2].ival; double d=yyvsp[0].dval; if(d==0)d=1; - yyval.dval = f_setnvar(v, f_getnvar(v)/d); } -break; -case 62: -#line 196 "parser.y" -{ int v = yyvsp[-2].ival; double d=yyvsp[0].dval; if(d==0)d=1; - yyval.dval = f_setnvar(v, (double)((int) - f_getnvar(v)%(int)d));} -break; -case 63: -#line 199 "parser.y" -{ int v = yyvsp[-2].ival; - yyval.dval = f_setnvar(v, (double)((int)yyvsp[0].dval & - (int)f_getnvar(v)));} -break; -case 64: -#line 202 "parser.y" -{ int v = yyvsp[-2].ival; - yyval.dval = f_setnvar(v, (double)((int)yyvsp[0].dval | - (int)f_getnvar(v)));} -break; -case 65: -#line 205 "parser.y" -{ int v = yyvsp[-1].ival; - yyval.dval = f_setnvar(v, f_getnvar(v)+1)-1;} -break; -case 66: -#line 207 "parser.y" -{ int v = yyvsp[-1].ival; - yyval.dval = f_setnvar(v, f_getnvar(v)-1)+1;} -break; -case 67: -#line 209 "parser.y" -{ int v = yyvsp[0].ival; - yyval.dval = f_setnvar(v, f_getnvar(v)+1); } -break; -case 68: -#line 211 "parser.y" -{ int v = yyvsp[0].ival; - yyval.dval = f_setnvar(v, f_getnvar(v)-1); } -break; -case 69: -#line 213 "parser.y" -{ yyval.dval = - yyvsp[0].dval; } -break; -case 70: -#line 214 "parser.y" -{ yyval.dval = ! yyvsp[0].dval; } -break; -case 71: -#line 215 "parser.y" -{ yyval.dval = ~ (int)yyvsp[0].dval; } -break; -case 72: -#line 216 "parser.y" -{ yyval.dval = (int)yyvsp[-2].dval & (int)yyvsp[0].dval; } -break; -case 73: -#line 217 "parser.y" -{ yyval.dval = (int)yyvsp[-2].dval ^ (int)yyvsp[0].dval; } -break; -case 74: -#line 218 "parser.y" -{ yyval.dval = (int)yyvsp[-2].dval | (int)yyvsp[0].dval; } -break; -case 75: -#line 219 "parser.y" -{ yyval.dval = (int)yyvsp[-2].dval << (int)yyvsp[0].dval; } -break; -case 76: -#line 220 "parser.y" -{ yyval.dval = (int)yyvsp[-2].dval >> (int)yyvsp[0].dval; } -break; -case 77: -#line 221 "parser.y" -{ int i=(int)yyvsp[0].dval; if (i==0) i=1; - yyval.dval = (int)yyvsp[-2].dval % i; } -break; -case 78: -#line 223 "parser.y" -{ yyval.dval = yyvsp[-2].dval + yyvsp[0].dval; } -break; -case 79: -#line 224 "parser.y" -{ yyval.dval = yyvsp[-2].dval - yyvsp[0].dval; } -break; -case 80: -#line 225 "parser.y" -{ yyval.dval = yyvsp[-2].dval * yyvsp[0].dval; } -break; -case 81: -#line 226 "parser.y" -{ double d=yyvsp[0].dval; if (d==0) d=1; - yyval.dval = yyvsp[-2].dval / d; } -break; -case 82: -#line 228 "parser.y" -{ yyval.dval = yyvsp[-2].dval < yyvsp[0].dval; } -break; -case 83: -#line 229 "parser.y" -{ yyval.dval = yyvsp[-2].dval > yyvsp[0].dval; } -break; -case 84: -#line 230 "parser.y" -{ yyval.dval = yyvsp[-2].dval == yyvsp[0].dval; } -break; -case 85: -#line 231 "parser.y" -{ yyval.dval = yyvsp[-2].dval != yyvsp[0].dval; } -break; -case 86: -#line 232 "parser.y" -{ yyval.dval = yyvsp[-2].dval <= yyvsp[0].dval; } -break; -case 87: -#line 233 "parser.y" -{ yyval.dval = yyvsp[-2].dval >= yyvsp[0].dval; } -break; -case 88: -#line 234 "parser.y" -{ yyval.dval = yyvsp[-2].dval && yyvsp[0].dval; } -break; -case 89: -#line 235 "parser.y" -{ yyval.dval = yyvsp[-2].dval || yyvsp[0].dval; } -break; -case 90: -#line 236 "parser.y" -{ yyval.dval = yyvsp[-4].dval ? yyvsp[-2].dval : yyvsp[0].dval; } -break; -case 91: -#line 237 "parser.y" -{ yyval.dval = yyvsp[0].dval; } -break; -case 92: -#line 238 "parser.y" -{ yyval.dval = database->getrow() > 0 ? - database->getrow() : 0; } -break; -case 93: -#line 240 "parser.y" -{ yyval.dval = database ? - database->rowcount() - 1 : -1; } -break; -case 94: -#line 242 "parser.y" -{ /*<<<$$ = database && card->disprow >= 0 - && card->disprow < - database->rowcount() - ? card->disprow : -1; <<<*/ } -break; -case 95: -#line 246 "parser.y" -{ yyval.dval = f_avg(yyvsp[-1].ival); } -break; -case 96: -#line 247 "parser.y" -{ yyval.dval = f_dev(yyvsp[-1].ival); } -break; -case 97: -#line 248 "parser.y" -{ yyval.dval = f_min(yyvsp[-1].ival); } -break; -case 98: -#line 249 "parser.y" -{ yyval.dval = f_max(yyvsp[-1].ival); } -break; -case 99: -#line 250 "parser.y" -{ yyval.dval = f_sum(yyvsp[-1].ival); } -break; -case 100: -#line 251 "parser.y" -{ yyval.dval = f_qavg(yyvsp[-1].ival); } -break; -case 101: -#line 252 "parser.y" -{ yyval.dval = f_qdev(yyvsp[-1].ival); } -break; -case 102: -#line 253 "parser.y" -{ yyval.dval = f_qmin(yyvsp[-1].ival); } -break; -case 103: -#line 254 "parser.y" -{ yyval.dval = f_qmax(yyvsp[-1].ival); } -break; -case 104: -#line 255 "parser.y" -{ yyval.dval = f_qsum(yyvsp[-1].ival); } -break; -case 105: -#line 256 "parser.y" -{ yyval.dval = f_savg(yyvsp[-1].ival); } -break; -case 106: -#line 257 "parser.y" -{ yyval.dval = f_sdev(yyvsp[-1].ival); } -break; -case 107: -#line 258 "parser.y" -{ yyval.dval = f_smin(yyvsp[-1].ival); } -break; -case 108: -#line 259 "parser.y" -{ yyval.dval = f_smax(yyvsp[-1].ival); } -break; -case 109: -#line 260 "parser.y" -{ yyval.dval = f_ssum(yyvsp[-1].ival); } -break; -case 110: -#line 261 "parser.y" -{ yyval.dval = fabs(yyvsp[-1].dval); } -break; -case 111: -#line 262 "parser.y" -{ yyval.dval = (int)(yyvsp[-1].dval); } -break; -case 112: -#line 264 "parser.y" -{ register double a=yyvsp[-5].dval, b=yyvsp[-3].dval, c=yyvsp[-1].dval; - yyval.dval = a < b ? b : a > c ? c : a; } -break; -case 113: -#line 266 "parser.y" -{ char *a=yyvsp[-1].sval; yyval.dval = a ? f_len(a) : 0; - f_free(a); } -break; -case 114: -#line 268 "parser.y" -{ yyval.dval = sqrt(fabs(yyvsp[-1].dval)); } -break; -case 115: -#line 269 "parser.y" -{ yyval.dval = exp(yyvsp[-1].dval); } -break; -case 116: -#line 270 "parser.y" -{ double a=yyvsp[-1].dval; yyval.dval = a<=0 ? 0:log10(a);} -break; -case 117: -#line 271 "parser.y" -{ double a=yyvsp[-1].dval; yyval.dval = a<=0 ? 0:log(a); } -break; -case 118: -#line 273 "parser.y" -{ yyval.dval = pow(yyvsp[-3].dval, yyvsp[-1].dval); } -break; -case 119: -#line 274 "parser.y" -{ yyval.dval = drand48(); } -break; -case 120: -#line 275 "parser.y" -{ yyval.dval = sin(yyvsp[-1].dval); } -break; -case 121: -#line 276 "parser.y" -{ yyval.dval = cos(yyvsp[-1].dval); } -break; -case 122: -#line 277 "parser.y" -{ yyval.dval = tan(yyvsp[-1].dval); } -break; -case 123: -#line 278 "parser.y" -{ yyval.dval = asin(yyvsp[-1].dval); } -break; -case 124: -#line 279 "parser.y" -{ yyval.dval = acos(yyvsp[-1].dval); } -break; -case 125: -#line 280 "parser.y" -{ yyval.dval = atan(yyvsp[-1].dval); } -break; -case 126: -#line 282 "parser.y" -{ yyval.dval = atan2(yyvsp[-3].dval, yyvsp[-1].dval); } -break; -case 127: -#line 283 "parser.y" -{ yyval.dval = database ? sections->curr() :0;} -break; -case 128: -#line 284 "parser.y" -{ yyval.dval = f_section((int)yyvsp[-1].dval); } -break; -case 129: -#line 285 "parser.y" -{ yyval.dval = time(0); } -break; -case 130: -#line 286 "parser.y" -{ yyval.dval = parse_datetimestring(yyvsp[-1].sval); } -break; -case 131: -#line 287 "parser.y" -{ yyval.dval = parse_timestring(yyvsp[-1].sval, FALSE); } -break; -case 132: -#line 288 "parser.y" -{ yyval.dval = parse_timestring(yyvsp[-1].sval, TRUE); } -break; -case 133: -#line 289 "parser.y" -{ const time_t t = (time_t)yyvsp[-1].dval; - yyval.dval = localtime(&t)->tm_year; } -break; -case 134: -#line 291 "parser.y" -{ const time_t t = (time_t)yyvsp[-1].dval; - yyval.dval = localtime(&t)->tm_mon+1; } -break; -case 135: -#line 293 "parser.y" -{ const time_t t = (time_t)yyvsp[-1].dval; - yyval.dval = localtime(&t)->tm_mday; } -break; -case 136: -#line 295 "parser.y" -{ const time_t t = (time_t)yyvsp[-1].dval; - yyval.dval = localtime(&t)->tm_hour; } -break; -case 137: -#line 297 "parser.y" -{ const time_t t = (time_t)yyvsp[-1].dval; - yyval.dval = localtime(&t)->tm_min; } -break; -case 138: -#line 299 "parser.y" -{ const time_t t = (time_t)yyvsp[-1].dval; - yyval.dval = localtime(&t)->tm_sec; } -break; -case 139: -#line 301 "parser.y" -{ const time_t t = (time_t)yyvsp[-1].dval; - yyval.dval = localtime(&t)->tm_yday; } -break; -case 140: -#line 303 "parser.y" -{ const time_t t = (time_t)yyvsp[-1].dval; - int y=localtime(&t)->tm_year; - yyval.dval = !(y%4) ^ !(y%100) ^ !(y%400); } -break; -case 141: -#line 306 "parser.y" -{ yyval.dval = getuid(); } -break; -case 142: -#line 307 "parser.y" -{ yyval.dval = getgid(); } -break; -case 143: -#line 309 "parser.y" -{ char *a = yyvsp[-3].sval; - yyval.dval = a ? access(a, (int)yyvsp[-1].dval) : 0; - f_free(a); } -break; -#line 1993 "y.tab.c" - } - yyssp -= yym; - yystate = *yyssp; - yyvsp -= yym; - yym = yylhs[yyn]; - if (yystate == 0 && yym == 0) - { -#if YYDEBUG - if (yydebug) - printf("%sdebug: after reduction, shifting from state 0 to\ - state %d\n", YYPREFIX, YYFINAL); -#endif - yystate = YYFINAL; - *++yyssp = YYFINAL; - *++yyvsp = yyval; - if (yychar < 0) - { - if ((yychar = yylex()) < 0) yychar = 0; -#if YYDEBUG - if (yydebug) - { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; - printf("%sdebug: state %d, reading %d (%s)\n", - YYPREFIX, YYFINAL, yychar, yys); - } -#endif - } - if (yychar == 0) goto yyaccept; - goto yyloop; - } - if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 && - yyn <= YYTABLESIZE && yycheck[yyn] == yystate) - yystate = yytable[yyn]; - else - yystate = yydgoto[yym]; -#if YYDEBUG - if (yydebug) - printf("%sdebug: after reduction, shifting from state %d \ -to state %d\n", YYPREFIX, *yyssp, yystate); -#endif - if (yyssp >= yyss + yystacksize - 1) - { - goto yyoverflow; - } - *++yyssp = yystate; - *++yyvsp = yyval; - goto yyloop; -yyoverflow: - yyerror("yacc stack overflow"); -yyabort: - return (1); -yyaccept: - return (0); -} diff --git a/packages/nonworking/kgrok/files/parser_yacc.h b/packages/nonworking/kgrok/files/parser_yacc.h deleted file mode 100644 index d673cedaf5..0000000000 --- a/packages/nonworking/kgrok/files/parser_yacc.h +++ /dev/null @@ -1,92 +0,0 @@ -#define NUMBER 257 -#define STRING 258 -#define SYMBOL 259 -#define FIELD 260 -#define VAR 261 -#define EQ 262 -#define NEQ 263 -#define LE 264 -#define GE 265 -#define SHR 266 -#define SHL 267 -#define AND 268 -#define OR 269 -#define IN 270 -#define PLA 271 -#define MIA 272 -#define MUA 273 -#define MOA 274 -#define DVA 275 -#define ANA 276 -#define ORA 277 -#define INC 278 -#define DEC_ 279 -#define APP 280 -#define AVG 281 -#define DEV 282 -#define AMIN 283 -#define AMAX 284 -#define SUM 285 -#define QAVG 286 -#define QDEV 287 -#define QMIN_ 288 -#define QMAX_ 289 -#define QSUM 290 -#define SAVG 291 -#define SDEV 292 -#define SMIN 293 -#define SMAX 294 -#define SSUM 295 -#define ABS 296 -#define INT 297 -#define BOUND 298 -#define LEN 299 -#define CHOP 300 -#define TR 301 -#define SUBSTR 302 -#define SQRT 303 -#define EXP 304 -#define LOG 305 -#define LN 306 -#define POW 307 -#define RANDOM 308 -#define SIN 309 -#define COS 310 -#define TAN 311 -#define ASIN 312 -#define ACOS 313 -#define ATAN 314 -#define ATAN2 315 -#define DATE 316 -#define TIME 317 -#define DURATION 318 -#define EXPAND 319 -#define YEAR 320 -#define MONTH 321 -#define DAY 322 -#define HOUR 323 -#define MINUTE 324 -#define SECOND 325 -#define LEAP 326 -#define JULIAN 327 -#define SECTION_ 328 -#define DBASE_ 329 -#define FORM_ 330 -#define PREVFORM 331 -#define SWITCH 332 -#define THIS 333 -#define LAST 334 -#define DISP 335 -#define FOREACH 336 -#define HOST 337 -#define USER 338 -#define UID 339 -#define GID 340 -#define SYSTEM 341 -#define ACCESS 342 -#define BEEP 343 -#define ERROR 344 -#define PRINTF 345 -#define UMINUS 346 -typedef union { int ival; double dval; char *sval; Arg *aval; } YYSTYPE; -extern YYSTYPE parserlval; diff --git a/packages/nonworking/kgrok/kgrok_1.5.bb b/packages/nonworking/kgrok/kgrok_1.5.bb deleted file mode 100644 index 67b668efc8..0000000000 --- a/packages/nonworking/kgrok/kgrok_1.5.bb +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION = "Palmtop Data Manager \ -KGrok is a shared flatfile database visualization engine. Simple application \ -scripts turn it into a phone list, todo list, notepad, and others. Encryption \ -optionally secures personal data." -SECTION = "opie/applications" -PRIORITY = "optional" -LICENSE = "GPL" -AUTHOR = "Thomas Driemeyer " -HOMEPAGE = "http://www.bitrot.de/pda_kgrok.html" -APPNAME = "kgrok" -APPTYPE = "binary" -APPDESKTOP = "${S}/apps/KGrok" - -SRC_URI = "ftp://ftp.bitrot.de/pub/kgrok/kgrok-src_1.5.tar.gz \ - file://parser_yacc.* \ - file://mediabutton.patch;patch=1" -S = "${WORKDIR}/src/" - -inherit opie - -EXTRA_QMAKEVARS_POST += "DEFINES+=ORDER_DCBA YACCSOURCES= SOURCES+=parser_yacc.cpp" -QMAKE_PROFILES = "src.pro" - -do_configure_prepend() { - cd ${S} && qmake -project -} - -do_compile_prepend() { - install -m 0655 ${WORKDIR}/parser_yacc.* ${S} -} - -do_install () { - install -d ${D}/${palmtopdir}/pics/ - install -m 0644 src/temtor.png ${D}/${palmtopdir}/pics/ -} - -- cgit v1.2.3 From d12c1326114c9cf34ee183dd49efffb252aec58f Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 28 Feb 2008 11:08:53 +0000 Subject: lftp: removed 3.2.1 from nonworking - we have 3.5.1 --- packages/nonworking/lftp/.mtn2git_empty | 0 packages/nonworking/lftp/files/.mtn2git_empty | 0 packages/nonworking/lftp/files/pty.patch | 31 --------------------------- packages/nonworking/lftp/lftp_3.2.1.bb | 23 -------------------- 4 files changed, 54 deletions(-) delete mode 100644 packages/nonworking/lftp/.mtn2git_empty delete mode 100644 packages/nonworking/lftp/files/.mtn2git_empty delete mode 100644 packages/nonworking/lftp/files/pty.patch delete mode 100644 packages/nonworking/lftp/lftp_3.2.1.bb (limited to 'packages') diff --git a/packages/nonworking/lftp/.mtn2git_empty b/packages/nonworking/lftp/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/lftp/files/.mtn2git_empty b/packages/nonworking/lftp/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/lftp/files/pty.patch b/packages/nonworking/lftp/files/pty.patch deleted file mode 100644 index 166b665f3f..0000000000 --- a/packages/nonworking/lftp/files/pty.patch +++ /dev/null @@ -1,31 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- lftp-2.6.11/m4/pty.m4~pty -+++ lftp-2.6.11/m4/pty.m4 -@@ -4,14 +4,20 @@ - *-*-sco3.2v4*) no_dev_ptmx=1;; - *-*-sco3.2v5*) no_dev_ptmx=1;; - esac -+AC_SEARCH_LIBS(openpty,util, -+ [ -+ AC_DEFINE(HAVE_OPENPTY,1,[define if you have openpty function]) -+ no_dev_ptc=yes -+ no_dev_ptmx=yes -+ ]) -+AC_CHECK_FUNCS([_getpty]) - if test -z "$no_dev_ptmx" ; then - AC_CHECK_FILE("/dev/ptmx", [ - AC_DEFINE(HAVE_DEV_PTMX,1,[define if you have /dev/ptmx device])]) - fi -+if test -z "$no_dev_ptc" ; then - AC_CHECK_FILE("/dev/ptc", [ - AC_DEFINE(HAVE_DEV_PTS_AND_PTC,1,[define if you have /dev/ptc device])]) -+fi - AC_CHECK_HEADERS([util.h sys/stropts.h pty.h]) --AC_SEARCH_LIBS(openpty,util, -- [AC_DEFINE(HAVE_OPENPTY,1,[define if you have openpty function])]) --AC_CHECK_FUNCS([_getpty]) - ]) diff --git a/packages/nonworking/lftp/lftp_3.2.1.bb b/packages/nonworking/lftp/lftp_3.2.1.bb deleted file mode 100644 index 0acc1e328d..0000000000 --- a/packages/nonworking/lftp/lftp_3.2.1.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "lftp is a sophisticated command line based file \ -transfer program. Supported protocols include FTP, HTTP, and FISH." -HOMEPAGE = "http://lftp.yar.ru" -SECTION = "console/network" -DEPENDS = "readline" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/lftp-${PV}.tar.bz2 \ - file://pty.patch;patch=1" -S = "${WORKDIR}/lftp-${PV}" - -EXTRA_OECONF = "--disable-largefile --disable-rpath --with-included-readline=no" - -inherit autotools gettext - -PARALLEL_MAKE = "" - -do_configure() { - gnu-configize - oe_runconf -} - -- cgit v1.2.3 From 6f48ca8e0564f6e3850a0d3049c36ed89b27a3c7 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 28 Feb 2008 11:09:39 +0000 Subject: apache: drop 2.0.x from nonworking - we have 2.2.x working --- packages/nonworking/apache/.mtn2git_empty | 0 .../nonworking/apache/apache-2.0.47/.mtn2git_empty | 0 .../apache/apache-2.0.47/configure.patch | 903 --------------------- packages/nonworking/apache/apache-2.0.47/init | 73 -- .../apache/apache-2.0.47/pcre-configure.patch | 36 - packages/nonworking/apache/apache/.mtn2git_empty | 0 .../apache/apache/apache-2.0.48/.mtn2git_empty | 0 .../apache/apache/apache-2.0.48/configure.patch | 390 --------- .../apache/apache-2.0.48/pcre-configure.patch | 36 - packages/nonworking/apache/apache/apache_2.0.48.bb | 87 -- .../nonworking/apache/apache/files/.mtn2git_empty | 0 packages/nonworking/apache/apache/files/httpd.conf | 0 packages/nonworking/apache/apache/files/init | 73 -- packages/nonworking/apache/apache_2.0.47.bb | 84 -- 14 files changed, 1682 deletions(-) delete mode 100644 packages/nonworking/apache/.mtn2git_empty delete mode 100644 packages/nonworking/apache/apache-2.0.47/.mtn2git_empty delete mode 100644 packages/nonworking/apache/apache-2.0.47/configure.patch delete mode 100755 packages/nonworking/apache/apache-2.0.47/init delete mode 100644 packages/nonworking/apache/apache-2.0.47/pcre-configure.patch delete mode 100644 packages/nonworking/apache/apache/.mtn2git_empty delete mode 100644 packages/nonworking/apache/apache/apache-2.0.48/.mtn2git_empty delete mode 100644 packages/nonworking/apache/apache/apache-2.0.48/configure.patch delete mode 100644 packages/nonworking/apache/apache/apache-2.0.48/pcre-configure.patch delete mode 100644 packages/nonworking/apache/apache/apache_2.0.48.bb delete mode 100644 packages/nonworking/apache/apache/files/.mtn2git_empty delete mode 100644 packages/nonworking/apache/apache/files/httpd.conf delete mode 100755 packages/nonworking/apache/apache/files/init delete mode 100644 packages/nonworking/apache/apache_2.0.47.bb (limited to 'packages') diff --git a/packages/nonworking/apache/.mtn2git_empty b/packages/nonworking/apache/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/apache/apache-2.0.47/.mtn2git_empty b/packages/nonworking/apache/apache-2.0.47/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/apache/apache-2.0.47/configure.patch b/packages/nonworking/apache/apache-2.0.47/configure.patch deleted file mode 100644 index 95d43fcd1b..0000000000 --- a/packages/nonworking/apache/apache-2.0.47/configure.patch +++ /dev/null @@ -1,903 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- httpd-2.0.47/./configure.in~configure 2003-05-21 00:46:00.000000000 -0400 -+++ httpd-2.0.47/./configure.in 2004-01-26 19:43:04.000000000 -0500 -@@ -4,8 +4,9 @@ - dnl Use ./buildconf to produce a configure script - dnl - --AC_PREREQ(2.13) --AC_INIT(ABOUT_APACHE) -+AC_PREREQ(2.57) -+AC_INIT -+AC_CONFIG_SRCDIR([ABOUT_APACHE]) - - AC_CONFIG_HEADER(include/ap_config_auto.h) - AC_CONFIG_AUX_DIR(build) -@@ -55,7 +56,7 @@ - dnl shared library support for these packages doesn't currently - dnl work on some platforms - --AC_CANONICAL_SYSTEM -+AC_CANONICAL_TARGET([]) - - orig_prefix="$prefix" - -@@ -209,7 +210,7 @@ - APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1]) - ;; - *-solaris2*) -- dnl This is a hack -- we should be using AC_TRY_RUN instead -+ dnl This is a hack -- we should be using AC_RUN_IFELSE([AC_LANG_SOURCE([[]])],[],[],[]) instead - ap_platform_runtime_link_flag="-R" - dnl solaris 8 and above don't have a thundering herd - dnl not sure about rev's before this one. -@@ -286,7 +287,7 @@ - dnl ## Check for typedefs, structures, and compiler characteristics. - - AC_C_CONST --if test "$ac_cv_prog_gcc" = "yes"; then -+if test "$ac_cv_c_compiler_gnu" = "yes"; then - APR_ADDTO(NOTEST_CPPFLAGS,-DAP_HAVE_DESIGNATED_INITIALIZER) - fi - -@@ -305,9 +306,8 @@ - - dnl ## Check for the tm_gmtoff field in struct tm to get the timezone diffs - AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff, --[AC_TRY_COMPILE([#include --#include ], [struct tm tm; tm.tm_gmtoff;], -- ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)]) -+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include -+#include ]], [[struct tm tm; tm.tm_gmtoff;]])],[ac_cv_struct_tm_gmtoff=yes],[ac_cv_struct_tm_gmtoff=no])]) - if test "$ac_cv_struct_tm_gmtoff" = "yes"; then - AC_DEFINE(HAVE_GMTOFF) - fi -@@ -566,7 +566,9 @@ - dnl Ensure that docs/conf is created. - test -d docs/conf||$mkdir_p docs/conf - --AC_OUTPUT($APACHE_OUTPUT_FILES docs/conf/httpd-std.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk,[true],[ -+AC_CONFIG_FILES([$APACHE_OUTPUT_FILES docs/conf/httpd-std.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk]) -+AC_CONFIG_COMMANDS([default],[[true]],[[ - APACHE_GEN_MAKEFILES --]) -+]]) -+AC_OUTPUT - ---- httpd-2.0.47/./srclib/apr/configure.in~configure 2003-06-11 11:20:33.000000000 -0400 -+++ httpd-2.0.47/./srclib/apr/configure.in 2004-01-26 19:39:34.000000000 -0500 -@@ -4,7 +4,8 @@ - dnl Process this file with autoconf to produce a configure script. - dnl Use ./buildconf to prepare build files and run autoconf for APR. - --AC_INIT(build/apr_common.m4) -+AC_INIT -+AC_CONFIG_SRCDIR([build/apr_common.m4]) - AC_CONFIG_HEADER(include/arch/unix/apr_private.h) - AC_CONFIG_AUX_DIR(build) - -@@ -29,7 +30,7 @@ - dnl - APR_CONFIG_NICE(config.nice) - --AC_CANONICAL_SYSTEM -+AC_CANONICAL_TARGET([]) - echo "Configuring APR library" - echo "Platform: $host" - -@@ -510,18 +511,14 @@ - dnl Linux is silly as it has pthread_rwlock_init defined - dnl but keeps the pthread_rwlock_t structure hidden unless - dnl special things are defined. -- AC_TRY_COMPILE([#include --#include ], -- [pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;], -- ac_cv_struct_pthread_rw=yes, ac_cv_struct_pthread_rw=no) -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include -+#include ]], [[pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;]])],[ac_cv_struct_pthread_rw=yes],[ac_cv_struct_pthread_rw=no]) - if test "$ac_cv_struct_pthread_rw" = "no"; then -- AC_TRY_COMPILE([#define _XOPEN_SOURCE 500 -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _XOPEN_SOURCE 500 - #define _BSD_SOURCE - #define _SVID_SOURCE - #include --#include ], -- [pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;], -- ac_cv_struct_pthread_rw=yes, ac_cv_struct_pthread_rw=no) -+#include ]], [[pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;]])],[ac_cv_struct_pthread_rw=yes],[ac_cv_struct_pthread_rw=no]) - if test "$ac_cv_struct_pthread_rw" = "yes"; then - APR_ADDTO(CPPFLAGS, [-D_XOPEN_SOURCE=500 -D_BSD_SOURCE]) - APR_ADDTO(CPPFLAGS, [-D_SVID_SOURCE]) -@@ -602,7 +599,7 @@ - if test "$ac_cv_func_mmap" = "yes" && - test "$ac_cv_file__dev_zero" = "yes"; then - AC_MSG_CHECKING(for mmap that can map /dev/zero) -- AC_TRY_RUN([ -+ AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - #include - #include -@@ -625,7 +622,7 @@ - return 3; - } - return 0; -- }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no]) -+ }]])],[],[ac_cv_file__dev_zero=no],[ac_cv_file__dev_zero=no]) - - AC_MSG_RESULT($ac_cv_file__dev_zero) - fi -@@ -829,7 +826,8 @@ - AC_SUBST(sendfile) - - AC_CHECK_FUNCS(sigaction, [ have_sigaction="1" ], [ have_sigaction="0" ]) --AC_DECL_SYS_SIGLIST -+AC_CHECK_DECLS([sys_siglist]) -+ - - AC_CHECK_FUNCS(fork, [ fork="1" ], [ fork="0" ]) - APR_CHECK_INET_ADDR -@@ -936,12 +934,11 @@ - # being included by itself. Check for manually, - # including another header file first. - AC_CACHE_CHECK([for netinet/tcp.h], [apr_cv_hdr_netinet_tcp_h], --[AC_TRY_CPP( --[#ifdef HAVE_NETINET_IN_H -+[AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#ifdef HAVE_NETINET_IN_H - #include - #endif - #include --], [apr_cv_hdr_netinet_tcp_h=yes], [apr_cv_hdr_netinet_tcp_h=no])]) -+]])],[apr_cv_hdr_netinet_tcp_h=yes],[apr_cv_hdr_netinet_tcp_h=no])]) - if test "$apr_cv_hdr_netinet_tcp_h" = "yes"; then - netinet_tcph=1 - AC_DEFINE([HAVE_NETINET_TCP_H], 1, [Defined if netinet/tcp.h is present]) -@@ -1012,7 +1009,7 @@ - if test "x$ac_cv_sizeof_voidp" != "x"; then - voidp_size=$ac_cv_sizeof_voidp - else -- AC_ERROR([Cannot determine size of void*]) -+ AC_MSG_ERROR([Cannot determine size of void*]) - fi - - dnl Checks for integer size -@@ -1351,7 +1348,7 @@ - fi - - AC_CACHE_CHECK(struct rlimit,ac_cv_struct_rlimit,[ --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - #include - #include -@@ -1361,10 +1358,10 @@ - limit.rlim_cur = 0; - limit.rlim_max = 0; - exit(0); --}], [ -- ac_cv_struct_rlimit=yes ], [ -- ac_cv_struct_rlimit=no ], [ -- ac_cv_struct_rlimit=no ] ) ] ) -+}]])],[ -+ ac_cv_struct_rlimit=yes ],[ -+ ac_cv_struct_rlimit=no ],[ -+ ac_cv_struct_rlimit=no ]) ] ) - struct_rlimit=0 - test "x$ac_cv_struct_rlimit" = xyes && struct_rlimit=1 - AC_SUBST(struct_rlimit) -@@ -1378,7 +1375,7 @@ - - # Some systems return ENOSYS from sem_open. - AC_CACHE_CHECK(for working sem_open,ac_cv_func_sem_open,[ --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - #include - #include -@@ -1397,22 +1394,21 @@ - sem_close(psem); - sem_unlink(sem_name); - exit(0); --}], [ac_cv_func_sem_open=yes], [ac_cv_func_sem_open=no], --[ac_cv_func_sem_open=no])]) -+}]])],[ac_cv_func_sem_open=yes],[ac_cv_func_sem_open=no],[ac_cv_func_sem_open=no])]) - - # It's stupid, but not all platforms have union semun, even those that need it. - AC_MSG_CHECKING(for union semun in sys/sem.h) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include - #include - #include --],[ -+]], [[ - union semun arg; - semctl(0, 0, 0, arg); --], [have_union_semun="1" union_semun=yes ] --msg=yes, [ -+]])],[have_union_semun="1" union_semun=yes -+msg=yes],[ - have_union_semun="0" --msg=no ] ) -+msg=no ]) - AC_MSG_RESULT([$msg]) - AC_SUBST(have_union_semun) - -@@ -1434,7 +1430,7 @@ - # Linux and older versions of AIX have this problem. - APR_IFALLYES(header:pthread.h define:PTHREAD_PROCESS_SHARED func:pthread_mutexattr_setpshared, [ - AC_CACHE_CHECK([for working PROCESS_SHARED locks], apr_cv_process_shared_works, [ -- AC_TRY_RUN([ -+ AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - #include - int main() -@@ -1452,7 +1448,7 @@ - if (pthread_mutex_destroy(&mutex)) - exit(5); - exit(0); -- }], [apr_cv_process_shared_works=yes], [apr_cv_process_shared_works=no])]) -+ }]])],[apr_cv_process_shared_works=yes],[apr_cv_process_shared_works=no],[])]) - # Override detection of pthread_mutexattr_setpshared - ac_cv_func_pthread_mutexattr_setpshared=$apr_cv_process_shared_works]) - -@@ -1461,15 +1457,15 @@ - if test "$ac_cv_func_pthread_mutexattr_setrobust_np" = "no"; then - AC_CACHE_CHECK([for pthread_mutexattr_setrobust_np with _POSIX_THREAD_PRIO_INHERIT], - [apr_cv_setrobust_with_prio_inherit], [ -- AC_TRY_COMPILE([#define _POSIX_THREAD_PRIO_INHERIT -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _POSIX_THREAD_PRIO_INHERIT - #include --#include ],[ -+#include ]], [[ - int main() - { - pthread_mutexattr_t attr; - pthread_mutexattr_setrobust_np(&attr, PTHREAD_MUTEX_ROBUST_NP); - return 0; -- }], [apr_cv_setrobust_with_prio_inherit=yes], [apr_cv_setrobust_with_prio_inherit=no])]) -+ }]])],[apr_cv_setrobust_with_prio_inherit=yes],[apr_cv_setrobust_with_prio_inherit=no])]) - if test "$apr_cv_setrobust_with_prio_inherit" = "yes"; then - ac_cv_func_pthread_mutexattr_setrobust_np=yes - APR_ADDTO(CPPFLAGS, -D_POSIX_THREAD_PRIO_INHERIT) -@@ -1637,7 +1633,7 @@ - if test -r "$apr_devrandom"; then - rand="1" - else -- AC_ERROR([$apr_devrandom not found or unreadable.]) -+ AC_MSG_ERROR([$apr_devrandom not found or unreadable.]) - fi - fi - -@@ -1673,9 +1669,8 @@ - dnl ----------------------------- Checking for Time Support - echo "${nl}Checking for Time Support..." - AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff, --[AC_TRY_COMPILE([#include --#include ], [struct tm tm; tm.tm_gmtoff;], -- ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)]) -+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include -+#include ]], [[struct tm tm; tm.tm_gmtoff;]])],[ac_cv_struct_tm_gmtoff=yes],[ac_cv_struct_tm_gmtoff=no])]) - - if test "$ac_cv_struct_tm_gmtoff" = "yes"; then - AC_DEFINE(HAVE_GMTOFF, 1, [Define if struct tm has a tm_gmtoff field]) -@@ -1684,14 +1679,14 @@ - dnl ----------------------------- Checking for Networking Support - echo "${nl}Checking for Networking support..." - AC_MSG_CHECKING(for in_addr in netinet/in.h) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include - #include --],[ -+]], [[ - struct in_addr arg; - arg.s_addr = htonl(INADDR_ANY); --], [ have_in_addr="1" --msg=yes ] , [ have_in_addr="0" -+]])],[ have_in_addr="1" -+msg=yes ],[ have_in_addr="0" - msg=no ]) - AC_MSG_RESULT([$msg]) - -@@ -1898,12 +1893,13 @@ - dir=include/arch/unix - test -d $dir || $MKDIR $dir - --AC_OUTPUT([ -+AC_CONFIG_FILES([ - $MAKEFILE1 $MAKEFILE2 $MAKEFILE3 - include/apr.h - build/apr_rules.mk - apr-config --],[ -+]) -+AC_CONFIG_COMMANDS([default],[[ - for i in $SAVE_FILES; do - if cmp -s $i $i.save 2>/dev/null; then - mv $i.save $i -@@ -1912,7 +1908,8 @@ - rm -f $i.save - done - chmod +x apr-config --]) -+]],[[]]) -+AC_OUTPUT - - dnl ----------------------------- Fixup Makefiles for VPATH support - ---- httpd-2.0.47/./srclib/pcre/configure.in~configure 2002-03-20 01:56:34.000000000 -0500 -+++ httpd-2.0.47/./srclib/pcre/configure.in 2004-01-26 19:43:27.000000000 -0500 -@@ -3,7 +3,8 @@ - dnl This is required at the start; the name is the name of a file - dnl it should be seeing, to verify it is in the same directory. - --AC_INIT(dftables.c) -+AC_INIT -+AC_CONFIG_SRCDIR([dftables.c]) - - dnl Arrange to build config.h from config.in. Note that pcre.h is - dnl built differently, as it is just a "substitution" file. -@@ -101,4 +102,6 @@ - AC_SUBST(PCRE_POSIXLIB_VERSION) - - dnl This must be last; it determines what files are written as well as config.h --AC_OUTPUT(Makefile pcre.h:pcre.in pcre-config,[chmod a+x pcre-config]) -+AC_CONFIG_FILES([Makefile pcre.h:pcre.in pcre-config]) -+AC_CONFIG_COMMANDS([default],[[chmod a+x pcre-config]],[[]]) -+AC_OUTPUT ---- httpd-2.0.47/./srclib/apr-util/xml/expat/configure.in~configure 2001-07-08 22:31:04.000000000 -0400 -+++ httpd-2.0.47/./srclib/apr-util/xml/expat/configure.in 2004-01-26 19:39:34.000000000 -0500 -@@ -10,7 +10,8 @@ - dnl in the file COPYING that comes with this distribution. - dnl - --AC_INIT(Makefile.in) -+AC_INIT -+AC_CONFIG_SRCDIR([Makefile.in]) - AC_CONFIG_AUX_DIR(conftools) - - dnl -@@ -45,7 +46,7 @@ - - AC_CONFIG_HEADER(config.h) - --AC_CANONICAL_SYSTEM -+AC_CANONICAL_TARGET([]) - case "$host_alias" in - *os2*) - # Use a custom made libtool replacement -@@ -106,4 +107,5 @@ - - AC_CHECK_FUNCS(memmove bcopy) - --AC_OUTPUT(Makefile lib/Makefile lib/expat.h) -+AC_CONFIG_FILES([Makefile lib/Makefile lib/expat.h]) -+AC_OUTPUT ---- httpd-2.0.47/./srclib/apr-util/configure.in~configure 2003-06-12 03:27:10.000000000 -0400 -+++ httpd-2.0.47/./srclib/apr-util/configure.in 2004-01-26 19:39:34.000000000 -0500 -@@ -2,8 +2,9 @@ - dnl Process this file with autoconf to produce a configure script - dnl - --AC_PREREQ(2.13) --AC_INIT(export_vars.sh.in) -+AC_PREREQ(2.57) -+AC_INIT -+AC_CONFIG_SRCDIR([export_vars.sh.in]) - - AC_CONFIG_HEADER(include/private/apu_config.h) - AC_CONFIG_AUX_DIR(build) -@@ -29,7 +30,7 @@ - USE_VPATH=1 - fi - --AC_CANONICAL_SYSTEM -+AC_CANONICAL_TARGET([]) - - dnl - dnl compute the top directory of the build -@@ -191,13 +192,15 @@ - dnl - dnl everthing is done. - MAKEFILES="Makefile buckets/Makefile crypto/Makefile dbm/Makefile dbm/sdbm/Makefile encoding/Makefile hooks/Makefile ldap/Makefile uri/Makefile xml/Makefile misc/Makefile strmatch/Makefile xlate/Makefile $test_Makefile" --AC_OUTPUT([ -+AC_CONFIG_FILES([ - export_vars.sh - apu-config - include/private/apu_select_dbm.h - include/apr_ldap.h - include/apu.h - $MAKEFILES -- ],[ -+ ]) -+AC_CONFIG_COMMANDS([default],[[ - chmod +x apu-config --]) -+]],[[]]) -+AC_OUTPUT ---- httpd-2.0.47/acinclude.m4~configure 2002-11-29 06:05:57.000000000 -0500 -+++ httpd-2.0.47/acinclude.m4 2004-01-26 19:39:34.000000000 -0500 -@@ -4,25 +4,25 @@ - dnl AC_HELP_STRING, so let's try to call it if we can. - dnl Note: this define must be on one line so that it can be properly returned - dnl as the help string. --AC_DEFUN(APACHE_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[ ]$1 substr([ ],len($1))$2)])dnl -+AC_DEFUN([APACHE_HELP_STRING],[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[ ]$1 substr([ ],len($1))$2)])dnl - - dnl APACHE_SUBST(VARIABLE) - dnl Makes VARIABLE available in generated files - dnl (do not use @variable@ in Makefiles, but $(variable)) --AC_DEFUN(APACHE_SUBST,[ -+AC_DEFUN([APACHE_SUBST],[ - APACHE_VAR_SUBST="$APACHE_VAR_SUBST $1" - AC_SUBST($1) - ]) - - dnl APACHE_FAST_OUTPUT(FILENAME) - dnl Perform substitutions on FILENAME (Makefiles only) --AC_DEFUN(APACHE_FAST_OUTPUT,[ -+AC_DEFUN([APACHE_FAST_OUTPUT],[ - APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $1" - ]) - - dnl APACHE_GEN_CONFIG_VARS - dnl Creates config_vars.mk --AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ -+AC_DEFUN([APACHE_GEN_CONFIG_VARS],[ - APACHE_SUBST(abs_srcdir) - APACHE_SUBST(bindir) - APACHE_SUBST(sbindir) -@@ -104,14 +104,14 @@ - - dnl APACHE_GEN_MAKEFILES - dnl Creates Makefiles --AC_DEFUN(APACHE_GEN_MAKEFILES,[ -+AC_DEFUN([APACHE_GEN_MAKEFILES],[ - $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $BSD_MAKEFILE $APACHE_FAST_OUTPUT_FILES - ]) - - dnl ## APACHE_OUTPUT(file) - dnl ## adds "file" to the list of files generated by AC_OUTPUT - dnl ## This macro can be used several times. --AC_DEFUN(APACHE_OUTPUT, [ -+AC_DEFUN([APACHE_OUTPUT], [ - APACHE_OUTPUT_FILES="$APACHE_OUTPUT_FILES $1" - ]) - -@@ -120,7 +120,7 @@ - dnl - dnl If rlim_t is not defined, define it to int - dnl --AC_DEFUN(APACHE_TYPE_RLIM_T, [ -+AC_DEFUN([APACHE_TYPE_RLIM_T], [ - AC_CACHE_CHECK([for rlim_t], ac_cv_type_rlim_t, [ - AC_TRY_COMPILE([ - #include -@@ -138,7 +138,7 @@ - ]) - - dnl APACHE_MODPATH_INIT(modpath) --AC_DEFUN(APACHE_MODPATH_INIT,[ -+AC_DEFUN([APACHE_MODPATH_INIT],[ - current_dir=$1 - modpath_current=modules/$1 - modpath_static= -@@ -147,7 +147,7 @@ - > $modpath_current/modules.mk - ])dnl - dnl --AC_DEFUN(APACHE_MODPATH_FINISH,[ -+AC_DEFUN([APACHE_MODPATH_FINISH],[ - echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk - echo "static = $modpath_static" >> $modpath_current/modules.mk - echo "shared = $modpath_shared" >> $modpath_current/modules.mk -@@ -160,7 +160,7 @@ - ])dnl - dnl - dnl APACHE_MODPATH_ADD(name[, shared[, objects [, ldflags[, libs]]]]) --AC_DEFUN(APACHE_MODPATH_ADD,[ -+AC_DEFUN([APACHE_MODPATH_ADD],[ - if test -z "$3"; then - objects="mod_$1.lo" - else -@@ -203,7 +203,7 @@ - dnl setting. otherwise, fall under the "all" setting. - dnl explicit yes/no always overrides. - dnl --AC_DEFUN(APACHE_MODULE,[ -+AC_DEFUN([APACHE_MODULE],[ - AC_MSG_CHECKING(whether to enable mod_$1) - define([optname],[--]ifelse($5,yes,disable,enable)[-]translit($1,_,-))dnl - AC_ARG_ENABLE(translit($1,_,-),APACHE_HELP_STRING(optname(),$2),,enable_$1=ifelse($5,,maybe-all,$5)) -@@ -273,7 +273,7 @@ - dnl - dnl APACHE_LAYOUT(configlayout, layoutname) - dnl --AC_DEFUN(APACHE_LAYOUT,[ -+AC_DEFUN([APACHE_LAYOUT],[ - if test ! -f $srcdir/config.layout; then - echo "** Error: Layout file $srcdir/config.layout not found" - echo "** Error: Cannot use undefined layout '$LAYOUT'" -@@ -325,7 +325,7 @@ - dnl - dnl APACHE_ENABLE_LAYOUT - dnl --AC_DEFUN(APACHE_ENABLE_LAYOUT,[ -+AC_DEFUN([APACHE_ENABLE_LAYOUT],[ - AC_ARG_ENABLE(layout, - [ --enable-layout=LAYOUT],[ - LAYOUT=$enableval -@@ -343,7 +343,7 @@ - dnl - dnl APACHE_ENABLE_MODULES - dnl --AC_DEFUN(APACHE_ENABLE_MODULES,[ -+AC_DEFUN([APACHE_ENABLE_MODULES],[ - module_selection=default - module_default=yes - -@@ -372,7 +372,7 @@ - ]) - ]) - --AC_DEFUN(APACHE_REQUIRE_CXX,[ -+AC_DEFUN([APACHE_REQUIRE_CXX],[ - if test -z "$apache_cxx_done"; then - AC_PROG_CXX - AC_PROG_CXXCPP -@@ -389,7 +389,7 @@ - dnl and then AC_TRY_LINK to test the libraries directly for the version, - dnl but that will require someone who knows how to program openssl. - dnl --AC_DEFUN(APACHE_CHECK_SSL_TOOLKIT,[ -+AC_DEFUN([APACHE_CHECK_SSL_TOOLKIT],[ - if test "x$ap_ssltk_base" = "x"; then - AC_MSG_CHECKING(for SSL/TLS toolkit base) - ap_ssltk_base="" -@@ -499,14 +499,14 @@ - dnl apache will use while generating scripts like autoconf and apxs and - dnl the default config file. - --AC_DEFUN(APACHE_SUBST_EXPANDED_ARG,[ -+AC_DEFUN([APACHE_SUBST_EXPANDED_ARG],[ - APR_EXPAND_VAR(exp_$1, [$]$1) - APACHE_SUBST(exp_$1) - APR_PATH_RELATIVE(rel_$1, [$]exp_$1, ${prefix}) - APACHE_SUBST(rel_$1) - ]) - --AC_DEFUN(APACHE_EXPORT_ARGUMENTS,[ -+AC_DEFUN([APACHE_EXPORT_ARGUMENTS],[ - APACHE_SUBST_EXPANDED_ARG(exec_prefix) - APACHE_SUBST_EXPANDED_ARG(bindir) - APACHE_SUBST_EXPANDED_ARG(sbindir) ---- httpd-2.0.47/srclib/apr/build/apr_common.m4~configure 2003-04-05 16:42:20.000000000 -0500 -+++ httpd-2.0.47/srclib/apr/build/apr_common.m4 2004-01-26 19:39:34.000000000 -0500 -@@ -6,7 +6,7 @@ - dnl - dnl Saves a snapshot of the configure command-line for later reuse - dnl --AC_DEFUN(APR_CONFIG_NICE,[ -+AC_DEFUN([APR_CONFIG_NICE],[ - rm -f $1 - cat >$1</dev/null 2>&1 -@@ -93,7 +93,7 @@ - dnl Trying to optimize this is left as an exercise to the reader who wants - dnl to put up with more autoconf craziness. I give up. - dnl --AC_DEFUN(APR_SUBDIR_CONFIG, [ -+AC_DEFUN([APR_SUBDIR_CONFIG], [ - # save our work to this point; this allows the sub-package to use it - AC_CACHE_SAVE - -@@ -158,7 +158,7 @@ - dnl - dnl Stores the variable (usually a Makefile macro) for later restoration - dnl --AC_DEFUN(APR_SAVE_THE_ENVIRONMENT,[ -+AC_DEFUN([APR_SAVE_THE_ENVIRONMENT],[ - apr_ste_save_$1="$$1" - ])dnl - -@@ -170,7 +170,7 @@ - dnl and restoring the original variable contents. This makes it possible - dnl for a user to override configure when it does something stupid. - dnl --AC_DEFUN(APR_RESTORE_THE_ENVIRONMENT,[ -+AC_DEFUN([APR_RESTORE_THE_ENVIRONMENT],[ - if test "x$apr_ste_save_$1" = "x"; then - $2$1="$$1" - $1= -@@ -192,7 +192,7 @@ - dnl - dnl Set variable iff it's currently null - dnl --AC_DEFUN(APR_SETIFNULL,[ -+AC_DEFUN([APR_SETIFNULL],[ - if test -z "$$1"; then - echo " setting $1 to \"$2\"" - $1="$2" -@@ -204,7 +204,7 @@ - dnl - dnl Set variable no matter what - dnl --AC_DEFUN(APR_SETVAR,[ -+AC_DEFUN([APR_SETVAR],[ - echo " forcing $1 to \"$2\"" - $1="$2" - ])dnl -@@ -214,7 +214,7 @@ - dnl - dnl Add value to variable - dnl --AC_DEFUN(APR_ADDTO,[ -+AC_DEFUN([APR_ADDTO],[ - if test "x$$1" = "x"; then - echo " setting $1 to \"$2\"" - $1="$2" -@@ -241,7 +241,7 @@ - dnl - dnl Remove a value from a variable - dnl --AC_DEFUN(APR_REMOVEFROM,[ -+AC_DEFUN([APR_REMOVEFROM],[ - if test "x$$1" = "x$2"; then - echo " nulling $1" - $1="" -@@ -265,7 +265,7 @@ - dnl - dnl APR_CHECK_DEFINE_FILES( symbol, header_file [header_file ...] ) - dnl --AC_DEFUN(APR_CHECK_DEFINE_FILES,[ -+AC_DEFUN([APR_CHECK_DEFINE_FILES],[ - AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[ - ac_cv_define_$1=no - for curhdr in $2 -@@ -287,7 +287,7 @@ - dnl - dnl APR_CHECK_DEFINE(symbol, header_file) - dnl --AC_DEFUN(APR_CHECK_DEFINE,[ -+AC_DEFUN([APR_CHECK_DEFINE],[ - AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[ - AC_EGREP_CPP(YES_IS_DEFINED, [ - #include <$2> -@@ -304,7 +304,7 @@ - dnl - dnl APR_CHECK_APR_DEFINE( symbol ) - dnl --AC_DEFUN(APR_CHECK_APR_DEFINE,[ -+AC_DEFUN([APR_CHECK_APR_DEFINE],[ - apr_old_cppflags=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $INCLUDES" - AC_EGREP_CPP(YES_IS_DEFINED, [ -@@ -329,7 +329,7 @@ - fi]) - ]) - --define(APR_IFALLYES,[dnl -+define([APR_IFALLYES],[dnl - ac_rc=yes - for ac_spec in $1; do - ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'` -@@ -364,14 +364,14 @@ - ]) - - --define(APR_BEGIN_DECISION,[dnl -+define([APR_BEGIN_DECISION],[dnl - ac_decision_item='$1' - ac_decision_msg='FAILED' - ac_decision='' - ]) - - --define(APR_DECIDE,[dnl -+define([APR_DECIDE],[dnl - ac_decision='$1' - ac_decision_msg='$2' - ac_decision_$1=yes -@@ -379,7 +379,7 @@ - ]) - - --define(APR_DECISION_OVERRIDE,[dnl -+define([APR_DECISION_OVERRIDE],[dnl - ac_decision='' - for ac_item in $1; do - eval "ac_decision_this=\$ac_decision_${ac_item}" -@@ -391,13 +391,13 @@ - ]) - - --define(APR_DECISION_FORCE,[dnl -+define([APR_DECISION_FORCE],[dnl - ac_decision="$1" - eval "ac_decision_msg=\"\$ac_decision_${ac_decision}_msg\"" - ]) - - --define(APR_END_DECISION,[dnl -+define([APR_END_DECISION],[dnl - if test ".$ac_decision" = .; then - echo "[$]0:Error: decision on $ac_decision_item failed" 1>&2 - exit 1 -@@ -417,7 +417,7 @@ - dnl A variant of AC_CHECK_SIZEOF which allows the checking of - dnl sizes of non-builtin types - dnl --AC_DEFUN(APR_CHECK_SIZEOF_EXTENDED, -+AC_DEFUN([APR_CHECK_SIZEOF_EXTENDED], - [changequote(<<,>>)dnl - dnl The name to #define - define(<>, translit(sizeof_$2, [a-z *], [A-Z_P]))dnl -@@ -450,7 +450,7 @@ - dnl Tries a compile test with warnings activated so that the result - dnl is false if the code doesn't compile cleanly. - dnl --AC_DEFUN(APR_TRY_COMPILE_NO_WARNING, -+AC_DEFUN([APR_TRY_COMPILE_NO_WARNING], - [if test "x$CFLAGS_WARN" = "x"; then - apr_tcnw_flags="" - else -@@ -489,7 +489,7 @@ - dnl string. - dnl - dnl --AC_DEFUN(APR_CHECK_STRERROR_R_RC,[ -+AC_DEFUN([APR_CHECK_STRERROR_R_RC],[ - AC_MSG_CHECKING(for type of return code from strerror_r) - AC_TRY_RUN([ - #include -@@ -522,7 +522,7 @@ - dnl Decide which of a couple of flavors of crypt_r() is necessary for - dnl this platform. - dnl --AC_DEFUN(APR_CHECK_CRYPT_R_STYLE,[ -+AC_DEFUN([APR_CHECK_CRYPT_R_STYLE],[ - AC_CACHE_CHECK(style of crypt_r, ac_cv_crypt_r_style,[ - dnl - ac_cv_crypt_r_style=none -@@ -576,7 +576,7 @@ - dnl structure on this platform. Single UNIX Spec says d_ino, - dnl BSD uses d_fileno. Undef to find the real beast. - dnl --AC_DEFUN(APR_CHECK_DIRENT_INODE, [ -+AC_DEFUN([APR_CHECK_DIRENT_INODE], [ - AC_CACHE_CHECK([for inode member of struct dirent], apr_cv_dirent_inode, [ - apr_cv_dirent_inode=no - AC_TRY_COMPILE([ -@@ -613,7 +613,7 @@ - dnl Note that this is worthless without DT_xxx macros, so - dnl look for one while we are at it. - dnl --AC_DEFUN(APR_CHECK_DIRENT_TYPE,[ -+AC_DEFUN([APR_CHECK_DIRENT_TYPE],[ - AC_CACHE_CHECK([for file type member of struct dirent], apr_cv_dirent_type,[ - apr_cv_dirent_type=no - AC_TRY_COMPILE([ -@@ -645,8 +645,8 @@ - dnl within each iteration. - dnl - changequote({,}) --define({APR_COMMA_ARGS},{patsubst([$}{1],[[}apr_whitespace{]+],[,])}) --define({APR_FOREACH}, -+define([{APR_COMMA_ARGS}],{patsubst([$}{1],[[}apr_whitespace{]+],[,])}) -+define([{APR_FOREACH}], - {ifelse($}{2,,, - [define([eachval], - $}{2)$}{1[]APR_FOREACH([$}{1], -@@ -661,7 +661,7 @@ - dnl all "." and "-" chars. If the 3rd parameter is "yes" then instead of - dnl setting to 1 or 0, we set FLAG-TO-SET to yes or no. - dnl --AC_DEFUN(APR_FLAG_HEADERS,[ -+AC_DEFUN([APR_FLAG_HEADERS],[ - AC_CHECK_HEADERS($1) - for aprt_i in $1 - do -@@ -682,7 +682,7 @@ - dnl is "yes" then instead of setting to 1 or 0, we set FLAG-TO-SET - dnl to yes or no. - dnl --AC_DEFUN(APR_FLAG_FUNCS,[ -+AC_DEFUN([APR_FLAG_FUNCS],[ - AC_CHECK_FUNCS($1) - for aprt_j in $1 - do -@@ -707,7 +707,7 @@ - dnl APR_EXPAND_VAR(fraz, $baz) - dnl $fraz is now "1/2/3" - dnl --AC_DEFUN(APR_EXPAND_VAR,[ -+AC_DEFUN([APR_EXPAND_VAR],[ - ap_last= - ap_cur="$2" - while test "x${ap_cur}" != "x${ap_last}"; -@@ -726,7 +726,7 @@ - dnl orig_path="${prefix}/bar" - dnl APR_PATH_RELATIVE(final_path, $orig_path, $prefix) - dnl $final_path now contains "bar" --AC_DEFUN(APR_PATH_RELATIVE,[ -+AC_DEFUN([APR_PATH_RELATIVE],[ - ap_stripped=`echo $2 | sed -e "s#^$3##"` - # check if the stripping was successful - if test "x$2" != "x${ap_stripped}"; then -@@ -744,12 +744,12 @@ - dnl Note: this define must be on one line so that it can be properly returned - dnl as the help string. When using this macro with a multi-line RHS, ensure - dnl that you surround the macro invocation with []s --AC_DEFUN(APR_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING([$1],[$2]),[ ][$1] substr([ ],len($1))[$2])]) -+AC_DEFUN([APR_HELP_STRING],[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING([$1],[$2]),[ ][$1] substr([ ],len($1))[$2])]) - - dnl - dnl APR_LAYOUT(configlayout, layoutname [, extravars]) - dnl --AC_DEFUN(APR_LAYOUT,[ -+AC_DEFUN([APR_LAYOUT],[ - if test ! -f $srcdir/config.layout; then - echo "** Error: Layout file $srcdir/config.layout not found" - echo "** Error: Cannot use undefined layout '$LAYOUT'" -@@ -805,7 +805,7 @@ - dnl - dnl APR_ENABLE_LAYOUT(default layout name [, extra vars]) - dnl --AC_DEFUN(APR_ENABLE_LAYOUT,[ -+AC_DEFUN([APR_ENABLE_LAYOUT],[ - AC_ARG_ENABLE(layout, - [ --enable-layout=LAYOUT],[ - LAYOUT=$enableval -@@ -826,7 +826,7 @@ - dnl a reimplementation of autoconf's argument parser, - dnl used here to allow us to co-exist layouts and argument based - dnl set ups. --AC_DEFUN(APR_PARSE_ARGUMENTS,[ -+AC_DEFUN([APR_PARSE_ARGUMENTS],[ - ac_prev= - for ac_option - do -@@ -948,7 +948,7 @@ - dnl - dnl Determine what program we can use to generate .deps-style dependencies - dnl --AC_DEFUN(APR_CHECK_DEPEND,[ -+AC_DEFUN([APR_CHECK_DEPEND],[ - dnl Try to determine what depend program we can use - dnl All GCC-variants should have -MM. - dnl If not, then we can check on those, too. ---- httpd-2.0.47/srclib/apr/build/find_apr.m4~configure 2002-11-05 17:09:19.000000000 -0500 -+++ httpd-2.0.47/srclib/apr/build/find_apr.m4 2004-01-26 19:39:34.000000000 -0500 -@@ -37,7 +37,7 @@ - dnl value of apr_config to fetch any necessary build/link information. - dnl - --AC_DEFUN(APR_FIND_APR, [ -+AC_DEFUN([APR_FIND_APR], [ - apr_found="no" - - if test "$ac_cv_emxos2" = "yes"; then ---- httpd-2.0.47/srclib/apr-util/build/find_apu.m4~configure 2002-11-05 17:13:42.000000000 -0500 -+++ httpd-2.0.47/srclib/apr-util/build/find_apu.m4 2004-01-26 19:39:34.000000000 -0500 -@@ -41,7 +41,7 @@ - dnl value of apu_config to fetch any necessary build/link information. - dnl - --AC_DEFUN(APR_FIND_APU, [ -+AC_DEFUN([APR_FIND_APU], [ - apu_found="no" - - AC_MSG_CHECKING(for APR-util) diff --git a/packages/nonworking/apache/apache-2.0.47/init b/packages/nonworking/apache/apache-2.0.47/init deleted file mode 100755 index 7a05c38a9a..0000000000 --- a/packages/nonworking/apache/apache-2.0.47/init +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh -# -# apache Start the apache HTTP server. -# - -NAME=apache -PATH=/bin:/usr/bin:/sbin:/usr/sbin -DAEMON=/usr/sbin/httpd -SUEXEC=/usr/lib/apache/suexec -PIDFILE=/var/run/$NAME.pid -CONF=/etc/apache/httpd.conf -APACHECTL=/usr/sbin/apachectl - -trap "" 1 -export LANG=C -export PATH - -test -f $DAEMON || exit 0 -test -f $APACHECTL || exit 0 - -# ensure we don't leak environment vars into apachectl -APACHECTL="env -i LANG=${LANG} PATH=${PATH} $APACHECTL" - -if egrep -q -i "^[[:space:]]*ServerType[[:space:]]+inet" $CONF -then - exit 0 -fi - -case "$1" in - start) - echo -n "Starting web server: $NAME" - start-stop-daemon -S -x $DAEMON - ;; - - stop) - echo -n "Stopping web server: $NAME" - start-stop-daemon -K -x $DAEMON - ;; - - reload) - echo -n "Reloading $NAME configuration" - start-stop-daemon -K --signal USR1 -x $DAEMON - ;; - - reload-modules) - echo -n "Reloading $NAME modules" - start-stop-daemon -K - start-stop-daemon -S -x $DAEMON - ;; - - restart) - $0 reload-modules - exit $? - ;; - - force-reload) - $0 reload-modules - exit $? - ;; - - *) - echo "Usage: /etc/init.d/$NAME {start|stop|reload|reload-modules|force-reload|restart}" - exit 1 - ;; -esac - -if [ $? == 0 ]; then - echo . - exit 0 -else - echo failed - exit 1 -fi diff --git a/packages/nonworking/apache/apache-2.0.47/pcre-configure.patch b/packages/nonworking/apache/apache-2.0.47/pcre-configure.patch deleted file mode 100644 index 0460d17456..0000000000 --- a/packages/nonworking/apache/apache-2.0.47/pcre-configure.patch +++ /dev/null @@ -1,36 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- httpd-2.0.47/srclib/pcre/configure.in~pcre-configure -+++ httpd-2.0.47/srclib/pcre/configure.in -@@ -72,7 +72,8 @@ - AC_ARG_ENABLE(newline-is-cr, - [ --enable-newline-is-cr use CR as the newline character], - if test "$enableval" = "yes"; then -- NEWLINE=-DNEWLINE=13 -+ AC_DEFINE(NEWLINE, 13) -+# NEWLINE=-DNEWLINE=13 - fi - ) - -@@ -81,7 +82,8 @@ - AC_ARG_ENABLE(newline-is-lf, - [ --enable-newline-is-lf use LF as the newline character], - if test "$enableval" = "yes"; then -- NEWLINE=-DNEWLINE=10 -+ AC_DEFINE(NEWLINE, 10) -+# NEWLINE=-DNEWLINE=10 - fi - ) - -@@ -91,7 +93,7 @@ - AC_SUBST(HAVE_STRERROR) - AC_SUBST(LIBTOOL) - AC_SUBST(LIBSUFFIX) --AC_SUBST(NEWLINE) -+#AC_SUBST(NEWLINE) - AC_SUBST(UTF8) - AC_SUBST(PCRE_MAJOR) - AC_SUBST(PCRE_MINOR) diff --git a/packages/nonworking/apache/apache/.mtn2git_empty b/packages/nonworking/apache/apache/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/apache/apache/apache-2.0.48/.mtn2git_empty b/packages/nonworking/apache/apache/apache-2.0.48/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/apache/apache/apache-2.0.48/configure.patch b/packages/nonworking/apache/apache/apache-2.0.48/configure.patch deleted file mode 100644 index 13217ed4b9..0000000000 --- a/packages/nonworking/apache/apache/apache-2.0.48/configure.patch +++ /dev/null @@ -1,390 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- httpd-2.0.48/./configure.in~configure -+++ httpd-2.0.48/./configure.in -@@ -4,8 +4,9 @@ - dnl Use ./buildconf to produce a configure script - dnl - --AC_PREREQ(2.13) --AC_INIT(ABOUT_APACHE) -+AC_PREREQ(2.57) -+AC_INIT -+AC_CONFIG_SRCDIR([ABOUT_APACHE]) - - AC_CONFIG_HEADER(include/ap_config_auto.h) - AC_CONFIG_AUX_DIR(build) -@@ -55,7 +56,7 @@ - dnl shared library support for these packages doesn't currently - dnl work on some platforms - --AC_CANONICAL_SYSTEM -+AC_CANONICAL_TARGET([]) - - orig_prefix="$prefix" - -@@ -209,7 +210,7 @@ - APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1]) - ;; - *-solaris2*) -- dnl This is a hack -- we should be using AC_TRY_RUN instead -+ dnl This is a hack -- we should be using AC_RUN_IFELSE([AC_LANG_SOURCE([[]])],[],[],[]) instead - ap_platform_runtime_link_flag="-R" - dnl solaris 8 and above don't have a thundering herd - dnl not sure about rev's before this one. -@@ -286,7 +287,7 @@ - dnl ## Check for typedefs, structures, and compiler characteristics. - - AC_C_CONST --if test "$ac_cv_prog_gcc" = "yes"; then -+if test "$ac_cv_c_compiler_gnu" = "yes"; then - APR_ADDTO(NOTEST_CPPFLAGS,-DAP_HAVE_DESIGNATED_INITIALIZER) - fi - -@@ -305,9 +306,8 @@ - - dnl ## Check for the tm_gmtoff field in struct tm to get the timezone diffs - AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff, --[AC_TRY_COMPILE([#include --#include ], [struct tm tm; tm.tm_gmtoff;], -- ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)]) -+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include -+#include ]], [[struct tm tm; tm.tm_gmtoff;]])],[ac_cv_struct_tm_gmtoff=yes],[ac_cv_struct_tm_gmtoff=no])]) - if test "$ac_cv_struct_tm_gmtoff" = "yes"; then - AC_DEFINE(HAVE_GMTOFF) - fi ---- httpd-2.0.48/./srclib/apr/configure.in~configure -+++ httpd-2.0.48/./srclib/apr/configure.in -@@ -4,7 +4,8 @@ - dnl Process this file with autoconf to produce a configure script. - dnl Use ./buildconf to prepare build files and run autoconf for APR. - --AC_INIT(build/apr_common.m4) -+AC_INIT -+AC_CONFIG_SRCDIR([build/apr_common.m4]) - AC_CONFIG_HEADER(include/arch/unix/apr_private.h) - AC_CONFIG_AUX_DIR(build) - -@@ -29,7 +30,7 @@ - dnl - APR_CONFIG_NICE(config.nice) - --AC_CANONICAL_SYSTEM -+AC_CANONICAL_TARGET([]) - echo "Configuring APR library" - echo "Platform: $host" - -@@ -532,18 +533,14 @@ - dnl Linux is silly as it has pthread_rwlock_init defined - dnl but keeps the pthread_rwlock_t structure hidden unless - dnl special things are defined. -- AC_TRY_COMPILE([#include --#include ], -- [pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;], -- ac_cv_struct_pthread_rw=yes, ac_cv_struct_pthread_rw=no) -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include -+#include ]], [[pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;]])],[ac_cv_struct_pthread_rw=yes],[ac_cv_struct_pthread_rw=no]) - if test "$ac_cv_struct_pthread_rw" = "no"; then -- AC_TRY_COMPILE([#define _XOPEN_SOURCE 500 -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _XOPEN_SOURCE 500 - #define _BSD_SOURCE - #define _SVID_SOURCE - #include --#include ], -- [pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;], -- ac_cv_struct_pthread_rw=yes, ac_cv_struct_pthread_rw=no) -+#include ]], [[pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;]])],[ac_cv_struct_pthread_rw=yes],[ac_cv_struct_pthread_rw=no]) - if test "$ac_cv_struct_pthread_rw" = "yes"; then - APR_ADDTO(CPPFLAGS, [-D_XOPEN_SOURCE=500 -D_BSD_SOURCE]) - APR_ADDTO(CPPFLAGS, [-D_SVID_SOURCE]) -@@ -624,7 +621,7 @@ - if test "$ac_cv_func_mmap" = "yes" && - test "$ac_cv_file__dev_zero" = "yes"; then - AC_MSG_CHECKING(for mmap that can map /dev/zero) -- AC_TRY_RUN([ -+ AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - #include - #include -@@ -647,7 +644,7 @@ - return 3; - } - return 0; -- }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no]) -+ }]])],[],[ac_cv_file__dev_zero=no],[ac_cv_file__dev_zero=no]) - - AC_MSG_RESULT($ac_cv_file__dev_zero) - fi -@@ -852,7 +849,8 @@ - AC_SUBST(sendfile) - - AC_CHECK_FUNCS(sigaction, [ have_sigaction="1" ], [ have_sigaction="0" ]) --AC_DECL_SYS_SIGLIST -+AC_CHECK_DECLS([sys_siglist]) -+ - - AC_CHECK_FUNCS(fork, [ fork="1" ], [ fork="0" ]) - APR_CHECK_INET_ADDR -@@ -961,12 +959,11 @@ - # being included by itself. Check for manually, - # including another header file first. - AC_CACHE_CHECK([for netinet/tcp.h], [apr_cv_hdr_netinet_tcp_h], --[AC_TRY_CPP( --[#ifdef HAVE_NETINET_IN_H -+[AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#ifdef HAVE_NETINET_IN_H - #include - #endif - #include --], [apr_cv_hdr_netinet_tcp_h=yes], [apr_cv_hdr_netinet_tcp_h=no])]) -+]])],[apr_cv_hdr_netinet_tcp_h=yes],[apr_cv_hdr_netinet_tcp_h=no])]) - if test "$apr_cv_hdr_netinet_tcp_h" = "yes"; then - netinet_tcph=1 - AC_DEFINE([HAVE_NETINET_TCP_H], 1, [Defined if netinet/tcp.h is present]) -@@ -1039,7 +1036,7 @@ - if test "x$ac_cv_sizeof_voidp" != "x"; then - voidp_size=$ac_cv_sizeof_voidp - else -- AC_ERROR([Cannot determine size of void*]) -+ AC_MSG_ERROR([Cannot determine size of void*]) - fi - - dnl Checks for integer size -@@ -1378,7 +1375,7 @@ - fi - - AC_CACHE_CHECK(struct rlimit,ac_cv_struct_rlimit,[ --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - #include - #include -@@ -1388,10 +1385,10 @@ - limit.rlim_cur = 0; - limit.rlim_max = 0; - exit(0); --}], [ -- ac_cv_struct_rlimit=yes ], [ -- ac_cv_struct_rlimit=no ], [ -- ac_cv_struct_rlimit=no ] ) ] ) -+}]])],[ -+ ac_cv_struct_rlimit=yes ],[ -+ ac_cv_struct_rlimit=no ],[ -+ ac_cv_struct_rlimit=no ]) ] ) - struct_rlimit=0 - test "x$ac_cv_struct_rlimit" = xyes && struct_rlimit=1 - AC_SUBST(struct_rlimit) -@@ -1405,7 +1402,7 @@ - - # Some systems return ENOSYS from sem_open. - AC_CACHE_CHECK(for working sem_open,ac_cv_func_sem_open,[ --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - #include - #include -@@ -1424,22 +1421,21 @@ - sem_close(psem); - sem_unlink(sem_name); - exit(0); --}], [ac_cv_func_sem_open=yes], [ac_cv_func_sem_open=no], --[ac_cv_func_sem_open=no])]) -+}]])],[ac_cv_func_sem_open=yes],[ac_cv_func_sem_open=no],[ac_cv_func_sem_open=no])]) - - # It's stupid, but not all platforms have union semun, even those that need it. - AC_MSG_CHECKING(for union semun in sys/sem.h) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include - #include - #include --],[ -+]], [[ - union semun arg; - semctl(0, 0, 0, arg); --], [have_union_semun="1" union_semun=yes ] --msg=yes, [ -+]])],[have_union_semun="1" union_semun=yes -+msg=yes],[ - have_union_semun="0" --msg=no ] ) -+msg=no ]) - AC_MSG_RESULT([$msg]) - AC_SUBST(have_union_semun) - -@@ -1461,7 +1457,7 @@ - # Linux and older versions of AIX have this problem. - APR_IFALLYES(header:pthread.h define:PTHREAD_PROCESS_SHARED func:pthread_mutexattr_setpshared, [ - AC_CACHE_CHECK([for working PROCESS_SHARED locks], apr_cv_process_shared_works, [ -- AC_TRY_RUN([ -+ AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - #include - int main() -@@ -1479,7 +1475,7 @@ - if (pthread_mutex_destroy(&mutex)) - exit(5); - exit(0); -- }], [apr_cv_process_shared_works=yes], [apr_cv_process_shared_works=no])]) -+ }]])],[apr_cv_process_shared_works=yes],[apr_cv_process_shared_works=no],[])]) - # Override detection of pthread_mutexattr_setpshared - ac_cv_func_pthread_mutexattr_setpshared=$apr_cv_process_shared_works]) - -@@ -1488,15 +1484,15 @@ - if test "$ac_cv_func_pthread_mutexattr_setrobust_np" = "no"; then - AC_CACHE_CHECK([for pthread_mutexattr_setrobust_np with _POSIX_THREAD_PRIO_INHERIT], - [apr_cv_setrobust_with_prio_inherit], [ -- AC_TRY_COMPILE([#define _POSIX_THREAD_PRIO_INHERIT -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _POSIX_THREAD_PRIO_INHERIT - #include --#include ],[ -+#include ]], [[ - int main() - { - pthread_mutexattr_t attr; - pthread_mutexattr_setrobust_np(&attr, PTHREAD_MUTEX_ROBUST_NP); - return 0; -- }], [apr_cv_setrobust_with_prio_inherit=yes], [apr_cv_setrobust_with_prio_inherit=no])]) -+ }]])],[apr_cv_setrobust_with_prio_inherit=yes],[apr_cv_setrobust_with_prio_inherit=no])]) - if test "$apr_cv_setrobust_with_prio_inherit" = "yes"; then - ac_cv_func_pthread_mutexattr_setrobust_np=yes - APR_ADDTO(CPPFLAGS, -D_POSIX_THREAD_PRIO_INHERIT) -@@ -1664,7 +1660,7 @@ - if test -r "$apr_devrandom"; then - rand="1" - else -- AC_ERROR([$apr_devrandom not found or unreadable.]) -+ AC_MSG_ERROR([$apr_devrandom not found or unreadable.]) - fi - fi - -@@ -1700,9 +1696,8 @@ - dnl ----------------------------- Checking for Time Support - echo "${nl}Checking for Time Support..." - AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff, --[AC_TRY_COMPILE([#include --#include ], [struct tm tm; tm.tm_gmtoff;], -- ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)]) -+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include -+#include ]], [[struct tm tm; tm.tm_gmtoff;]])],[ac_cv_struct_tm_gmtoff=yes],[ac_cv_struct_tm_gmtoff=no])]) - - if test "$ac_cv_struct_tm_gmtoff" = "yes"; then - AC_DEFINE(HAVE_GMTOFF, 1, [Define if struct tm has a tm_gmtoff field]) -@@ -1711,14 +1706,14 @@ - dnl ----------------------------- Checking for Networking Support - echo "${nl}Checking for Networking support..." - AC_MSG_CHECKING(for in_addr in netinet/in.h) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include - #include --],[ -+]], [[ - struct in_addr arg; - arg.s_addr = htonl(INADDR_ANY); --], [ have_in_addr="1" --msg=yes ] , [ have_in_addr="0" -+]])],[ have_in_addr="1" -+msg=yes ],[ have_in_addr="0" - msg=no ]) - AC_MSG_RESULT([$msg]) - -@@ -1920,12 +1915,13 @@ - dir=include/arch/unix - test -d $dir || $MKDIR $dir - --AC_OUTPUT([ -+AC_CONFIG_FILES([ - $MAKEFILE1 $MAKEFILE2 $MAKEFILE3 - include/apr.h - build/apr_rules.mk - apr-config --],[ -+]) -+AC_CONFIG_COMMANDS([default],[[ - for i in $SAVE_FILES; do - if cmp -s $i $i.save 2>/dev/null; then - mv $i.save $i -@@ -1934,7 +1930,8 @@ - rm -f $i.save - done - chmod +x apr-config --]) -+]],[[]]) -+AC_OUTPUT - - dnl ----------------------------- Fixup Makefiles for VPATH support - ---- httpd-2.0.48/./srclib/pcre/configure.in~configure -+++ httpd-2.0.48/./srclib/pcre/configure.in -@@ -3,7 +3,8 @@ - dnl This is required at the start; the name is the name of a file - dnl it should be seeing, to verify it is in the same directory. - --AC_INIT(dftables.c) -+AC_INIT -+AC_CONFIG_SRCDIR([dftables.c]) - - dnl Arrange to build config.h from config.in. Note that pcre.h is - dnl built differently, as it is just a "substitution" file. -@@ -101,4 +102,6 @@ - AC_SUBST(PCRE_POSIXLIB_VERSION) - - dnl This must be last; it determines what files are written as well as config.h --AC_OUTPUT(Makefile pcre.h:pcre.in pcre-config,[chmod a+x pcre-config]) -+AC_CONFIG_FILES([Makefile pcre.h:pcre.in pcre-config]) -+AC_CONFIG_COMMANDS([default],[[chmod a+x pcre-config]],[[]]) -+AC_OUTPUT ---- httpd-2.0.48/./srclib/apr-util/xml/expat/configure.in~configure -+++ httpd-2.0.48/./srclib/apr-util/xml/expat/configure.in -@@ -10,7 +10,8 @@ - dnl in the file COPYING that comes with this distribution. - dnl - --AC_INIT(Makefile.in) -+AC_INIT -+AC_CONFIG_SRCDIR([Makefile.in]) - AC_CONFIG_AUX_DIR(conftools) - - dnl -@@ -45,7 +46,7 @@ - - AC_CONFIG_HEADER(config.h) - --AC_CANONICAL_SYSTEM -+AC_CANONICAL_TARGET([]) - case "$host_alias" in - *os2*) - # Use a custom made libtool replacement -@@ -106,4 +107,5 @@ - - AC_CHECK_FUNCS(memmove bcopy) - --AC_OUTPUT(Makefile lib/Makefile lib/expat.h) -+AC_CONFIG_FILES([Makefile lib/Makefile lib/expat.h]) -+AC_OUTPUT ---- httpd-2.0.48/./srclib/apr-util/configure.in~configure -+++ httpd-2.0.48/./srclib/apr-util/configure.in -@@ -2,8 +2,9 @@ - dnl Process this file with autoconf to produce a configure script - dnl - --AC_PREREQ(2.13) --AC_INIT(export_vars.sh.in) -+AC_PREREQ(2.57) -+AC_INIT -+AC_CONFIG_SRCDIR([export_vars.sh.in]) - - AC_CONFIG_HEADER(include/private/apu_config.h) - AC_CONFIG_AUX_DIR(build) -@@ -30,7 +31,7 @@ - USE_VPATH=1 - fi - --AC_CANONICAL_SYSTEM -+AC_CANONICAL_TARGET([]) - - dnl - dnl compute the top directory of the build diff --git a/packages/nonworking/apache/apache/apache-2.0.48/pcre-configure.patch b/packages/nonworking/apache/apache/apache-2.0.48/pcre-configure.patch deleted file mode 100644 index 0460d17456..0000000000 --- a/packages/nonworking/apache/apache/apache-2.0.48/pcre-configure.patch +++ /dev/null @@ -1,36 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- httpd-2.0.47/srclib/pcre/configure.in~pcre-configure -+++ httpd-2.0.47/srclib/pcre/configure.in -@@ -72,7 +72,8 @@ - AC_ARG_ENABLE(newline-is-cr, - [ --enable-newline-is-cr use CR as the newline character], - if test "$enableval" = "yes"; then -- NEWLINE=-DNEWLINE=13 -+ AC_DEFINE(NEWLINE, 13) -+# NEWLINE=-DNEWLINE=13 - fi - ) - -@@ -81,7 +82,8 @@ - AC_ARG_ENABLE(newline-is-lf, - [ --enable-newline-is-lf use LF as the newline character], - if test "$enableval" = "yes"; then -- NEWLINE=-DNEWLINE=10 -+ AC_DEFINE(NEWLINE, 10) -+# NEWLINE=-DNEWLINE=10 - fi - ) - -@@ -91,7 +93,7 @@ - AC_SUBST(HAVE_STRERROR) - AC_SUBST(LIBTOOL) - AC_SUBST(LIBSUFFIX) --AC_SUBST(NEWLINE) -+#AC_SUBST(NEWLINE) - AC_SUBST(UTF8) - AC_SUBST(PCRE_MAJOR) - AC_SUBST(PCRE_MINOR) diff --git a/packages/nonworking/apache/apache/apache_2.0.48.bb b/packages/nonworking/apache/apache/apache_2.0.48.bb deleted file mode 100644 index adb068a575..0000000000 --- a/packages/nonworking/apache/apache/apache_2.0.48.bb +++ /dev/null @@ -1,87 +0,0 @@ -BROKEN = "1" -SECTION = "console/network" -DEPENDS = "expat openssl" -DESCRIPTION = "A high performance Unix-based HTTP server." -LICENSE="Apache-2.0" - -SRC_URI = "http://ftp.epix.net/apache/httpd/httpd-${PV}.tar.gz \ - file://configure.patch;patch=1 \ - file://pcre-configure.patch;patch=1 \ - file://init \ - file://httpd.conf" -S = "${WORKDIR}/httpd-${PV}" - -basesysconfdir := "${sysconfdir}" -sysconfdir = "/etc/apache" - -inherit autotools - -FILES_${PN}="${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ - ${libdir}/*/ ${basesysconfdir} ${sharedstatedir} ${localstatedir} \ - /bin /sbin /lib/*/ /lib/*.so* ${datadir}/${PN} ${datadir}/htdocs \ - ${datadir}/icons ${datadir}/cgi-bin ${datadir}/error /var" - -CFLAGS_append = " -DPATH_MAX=4096" -CFLAGS_prepend = "-I${STAGING_INCDIR}/openssl " -EXTRA_OECONF = "--enable-ssl --with-ssl=${STAGING_LIBDIR}/.. --enable-dav \ - --enable-dav-fs --with-dbm=sdbm --with-berkeley-db=no \ - --with-gdbm=no --with-ndbm=no" -do_configure () { - (cd srclib/apr && ./buildconf) - (cd srclib/apr-util && ./buildconf) - - cp srclib/apr/build/config.guess srclib/apr/build/config.sub \ - srclib/apr/build/PrintPath srclib/apr/build/apr_common.m4 \ - srclib/apr/build/find_apr.m4 $apu_src_dir/build/find_apu.m4 build - - (cd srclib/pcre && autoconf) - - aclocal -I build - autoheader - autoconf - oe_runconf -} - -do_compile () { - touch srclib/apr-util/uri/gen_uri_delims.lo - ${BUILD_CC} srclib/apr-util/uri/gen_uri_delims.c -o srclib/apr-util/uri/gen_uri_delims - touch srclib/pcre/dftables.lo - ${BUILD_CC} -I/usr/include/pcre srclib/pcre/dftables.c -o srclib/pcre/dftables - cd server - ${BUILD_CC} -I${S}/srclib/apr/include -c gen_test_char.c && touch gen_test_char.lo - ${BUILD_CC} -I${S}/os/unix -I${S}/srclib/apr/include -I${S}/srclib/apr-util/include -I${S}/include -c util_debug.c && touch util_debug.lo - ${BUILD_CC} gen_test_char.o util_debug.o -o gen_test_char - /bin/sh ${S}/srclib/apr/libtool --silent --mode=compile ${CC} -DPATH_MAX=4096 -I${S}/srclib/apr/include -prefer-non-pic -static -c gen_test_char.c && touch gen_test_char.lo - /bin/sh ${S}/srclib/apr/libtool --silent --mode=compile ${CC} -DPATH_MAX=4096 -I${S}/os/unix -I${S}/srclib/apr/include -I${S}/srclib/apr-util/include -I${S}/include -prefer-non-pic -static -c util_debug.c && touch util_debug.lo - touch gen_test_char - cd .. - oe_runmake -} - -do_install_append () { - set -x - install -d ${D}${basesysconfdir}/init.d - cat ${WORKDIR}/init | \ - sed -e 's,/usr/sbin/,${sbindir}/,g; \ - s,/usr/bin/,${bindir}/,g; \ - s,/usr/lib,${libdir}/,g; \ - s,/etc/apache/,${sysconfdir}/,g; \ - s,/etc/,${basesysconfdir}/,g; \ - s,/usr/,${prefix}/,g;' > ${D}${basesysconfdir}/init.d/httpd - chmod 755 ${D}${basesysconfdir}/init.d/httpd - install -m 0644 ${WORKDIR}/httpd.conf ${D}${sysconfdir}/httpd.conf -} - -pkg_postinst () { - if test -n "${D}"; then - D="-r $D" - fi - update-rc.d $D httpd defaults 91 20 -} - -pkg_prerm () { - if test -n "${D}"; then - D="-r $D" - fi - update-rc.d $D httpd remove -} diff --git a/packages/nonworking/apache/apache/files/.mtn2git_empty b/packages/nonworking/apache/apache/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/apache/apache/files/httpd.conf b/packages/nonworking/apache/apache/files/httpd.conf deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/apache/apache/files/init b/packages/nonworking/apache/apache/files/init deleted file mode 100755 index 7a05c38a9a..0000000000 --- a/packages/nonworking/apache/apache/files/init +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh -# -# apache Start the apache HTTP server. -# - -NAME=apache -PATH=/bin:/usr/bin:/sbin:/usr/sbin -DAEMON=/usr/sbin/httpd -SUEXEC=/usr/lib/apache/suexec -PIDFILE=/var/run/$NAME.pid -CONF=/etc/apache/httpd.conf -APACHECTL=/usr/sbin/apachectl - -trap "" 1 -export LANG=C -export PATH - -test -f $DAEMON || exit 0 -test -f $APACHECTL || exit 0 - -# ensure we don't leak environment vars into apachectl -APACHECTL="env -i LANG=${LANG} PATH=${PATH} $APACHECTL" - -if egrep -q -i "^[[:space:]]*ServerType[[:space:]]+inet" $CONF -then - exit 0 -fi - -case "$1" in - start) - echo -n "Starting web server: $NAME" - start-stop-daemon -S -x $DAEMON - ;; - - stop) - echo -n "Stopping web server: $NAME" - start-stop-daemon -K -x $DAEMON - ;; - - reload) - echo -n "Reloading $NAME configuration" - start-stop-daemon -K --signal USR1 -x $DAEMON - ;; - - reload-modules) - echo -n "Reloading $NAME modules" - start-stop-daemon -K - start-stop-daemon -S -x $DAEMON - ;; - - restart) - $0 reload-modules - exit $? - ;; - - force-reload) - $0 reload-modules - exit $? - ;; - - *) - echo "Usage: /etc/init.d/$NAME {start|stop|reload|reload-modules|force-reload|restart}" - exit 1 - ;; -esac - -if [ $? == 0 ]; then - echo . - exit 0 -else - echo failed - exit 1 -fi diff --git a/packages/nonworking/apache/apache_2.0.47.bb b/packages/nonworking/apache/apache_2.0.47.bb deleted file mode 100644 index e8a7c390e5..0000000000 --- a/packages/nonworking/apache/apache_2.0.47.bb +++ /dev/null @@ -1,84 +0,0 @@ -SECTION = net -DEPENDS = expat openssl - -SRC_URI = http://ftp.epix.net/apache/httpd/httpd-${PV}.tar.gz \ - file://${FILESDIR}/configure.patch;patch=1 \ - file://${FILESDIR}/pcre-configure.patch;patch=1 -S = ${WORKDIR}/httpd-${PV} - -basesysconfdir := ${sysconfdir} -sysconfdir = /etc/apache - -inherit autotools - -FILES_${PN}=${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ - ${libdir}/*/ ${basesysconfdir} ${sharedstatedir} ${localstatedir} \ - /bin /sbin /lib/*/ /lib/*.so* ${datadir}/${PN} ${datadir}/htdocs \ - ${datadir}/icons ${datadir}/cgi-bin ${datadir}/error /var - -CFLAGS_append = " -DPATH_MAX=4096" -CFLAGS_prepend = "-I${STAGING_INCDIR}/openssl " -EXTRA_OECONF = "--enable-ssl --with-ssl=${STAGING_LIBDIR}/.. --enable-dav \ - --enable-dav-fs --with-dbm=sdbm --with-berkeley-db=no \ - --with-gdbm=no --with-ndbm=no" -do_configure () { - (cd srclib/apr && ./buildconf) - (cd srclib/apr-util && ./buildconf) - - cp srclib/apr/build/config.guess srclib/apr/build/config.sub \ - srclib/apr/build/PrintPath srclib/apr/build/apr_common.m4 \ - srclib/apr/build/find_apr.m4 $apu_src_dir/build/find_apu.m4 build - - (cd srclib/pcre && autoconf) - - aclocal -I build - autoheader - autoconf - oe_runconf -} - -do_compile () { - touch srclib/apr-util/uri/gen_uri_delims.lo - ${BUILD_CC} srclib/apr-util/uri/gen_uri_delims.c -o srclib/apr-util/uri/gen_uri_delims - touch srclib/pcre/dftables.lo - ${BUILD_CC} -I/usr/include/pcre srclib/pcre/dftables.c -o srclib/pcre/dftables - cd server - ${BUILD_CC} -I${S}/srclib/apr/include -c gen_test_char.c && touch gen_test_char.lo - ${BUILD_CC} -I${S}/os/unix -I${S}/srclib/apr/include -I${S}/srclib/apr-util/include -I${S}/include -c util_debug.c && touch util_debug.lo - ${BUILD_CC} gen_test_char.o util_debug.o -o gen_test_char - /bin/sh ${S}/srclib/apr/libtool --silent --mode=compile ${CC} -DPATH_MAX=4096 -I${S}/srclib/apr/include -prefer-non-pic -static -c gen_test_char.c && touch gen_test_char.lo - /bin/sh ${S}/srclib/apr/libtool --silent --mode=compile ${CC} -DPATH_MAX=4096 -I${S}/os/unix -I${S}/srclib/apr/include -I${S}/srclib/apr-util/include -I${S}/include -prefer-non-pic -static -c util_debug.c && touch util_debug.lo - touch gen_test_char - cd .. - oe_runmake -} - -do_install_append () { - set -x - install -d ${D}/${basesysconfdir}/init.d - cat ${FILESDIR}/init | \ - sed -e 's,/usr/sbin/,${sbindir}/,g; \ - s,/usr/bin/,${bindir}/,g; \ - s,/usr/lib,${libdir}/,g; \ - s,/etc/apache/,${sysconfdir}/,g; \ - s,/etc/,${basesysconfdir}/,g; \ - s,/usr/,${prefix}/,g;' > ${D}/${basesysconfdir}/init.d/httpd - chmod 755 ${D}/${basesysconfdir}/init.d/httpd - if test -e ${FILESDIR}/httpd.conf.${MACHINE}; then - install -m 0644 ${FILESDIR}/httpd.conf.${MACHINE} ${D}/${sysconfdir}/httpd.conf - fi -} - -pkg_postinst () { - if test -n "$D"; then - D="-r $D" - fi - update-rc.d $D httpd defaults 91 20 -} - -pkg_prerm () { - if test -n "$D"; then - D="-r $D" - fi - update-rc.d $D httpd remove -} -- cgit v1.2.3 From 8bc8ceff85fa15a61dcd87fe181cde185fa0cbd4 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 28 Feb 2008 11:11:41 +0000 Subject: lzma: dropped nonworking 0.01 version --- packages/nonworking/lzma/.mtn2git_empty | 0 packages/nonworking/lzma/lzma_0.01.bb | 33 --------------------------------- 2 files changed, 33 deletions(-) delete mode 100644 packages/nonworking/lzma/.mtn2git_empty delete mode 100644 packages/nonworking/lzma/lzma_0.01.bb (limited to 'packages') diff --git a/packages/nonworking/lzma/.mtn2git_empty b/packages/nonworking/lzma/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/lzma/lzma_0.01.bb b/packages/nonworking/lzma/lzma_0.01.bb deleted file mode 100644 index ec710c45fa..0000000000 --- a/packages/nonworking/lzma/lzma_0.01.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "LZMA is a compression algorithm, based on the famous \ -Lempel Ziff compression method. The windows only open source tool 7-zip \ -is another tool which uses this algorithm." -SECTION = "libs" -PRIORITY = "optional" - -SRC_URI = "http://students.fhs-hagenberg.ac.at/se/se00001/lzma-0.01.tar.bz2" -S = "${WORKDIR}/" - -inherit qmake - -do_configure_prepend() { - ${STAGING_BINDIR_NATIVE}/qmake -project -o lzma.pro -} - -do_install_append () { - # Make install doesn't properly install these - oe_libinstall -so -C shlib libhistory ${D}/${libdir} - oe_libinstall -so -C shlib libreadline ${D}/${libdir} -} - -do_stage() { - oe_libinstall -so -C shlib libhistory ${STAGING_LIBDIR} - oe_libinstall -so -C shlib libreadline ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/readline - for f in readline.h chardefs.h keymaps.h history.h tilde.h rlstdc.h \ - rlconf.h rltypedefs.h - do - install -m 0644 $f ${STAGING_INCDIR}/readline/ - done - -} -- cgit v1.2.3 From 0108e4109915cb8bb54212fc1a2985b81af4f7d5 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 28 Feb 2008 11:12:52 +0000 Subject: dropped minisip and its components from nonworking - we have them in packages/ too --- packages/nonworking/libmikey/.mtn2git_empty | 0 packages/nonworking/libmikey/libmikey0_0.3.2.bb | 22 --------------------- packages/nonworking/libmikey/libmikey_0.1a.bb | 23 ---------------------- packages/nonworking/libmnetutil/.mtn2git_empty | 0 .../nonworking/libmnetutil/libmnetutil0_0.2.2.bb | 22 --------------------- packages/nonworking/libmsip/.mtn2git_empty | 0 packages/nonworking/libmsip/libmsip0_0.2.2.bb | 22 --------------------- packages/nonworking/minisip/.mtn2git_empty | 0 packages/nonworking/minisip/minisip_0.6.2.bb | 21 -------------------- 9 files changed, 110 deletions(-) delete mode 100644 packages/nonworking/libmikey/.mtn2git_empty delete mode 100644 packages/nonworking/libmikey/libmikey0_0.3.2.bb delete mode 100644 packages/nonworking/libmikey/libmikey_0.1a.bb delete mode 100644 packages/nonworking/libmnetutil/.mtn2git_empty delete mode 100644 packages/nonworking/libmnetutil/libmnetutil0_0.2.2.bb delete mode 100644 packages/nonworking/libmsip/.mtn2git_empty delete mode 100644 packages/nonworking/libmsip/libmsip0_0.2.2.bb delete mode 100644 packages/nonworking/minisip/.mtn2git_empty delete mode 100644 packages/nonworking/minisip/minisip_0.6.2.bb (limited to 'packages') diff --git a/packages/nonworking/libmikey/.mtn2git_empty b/packages/nonworking/libmikey/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/libmikey/libmikey0_0.3.2.bb b/packages/nonworking/libmikey/libmikey0_0.3.2.bb deleted file mode 100644 index 21210937a6..0000000000 --- a/packages/nonworking/libmikey/libmikey0_0.3.2.bb +++ /dev/null @@ -1,22 +0,0 @@ -LICENSE = "LGPL" - -DESCRIPTION = "C++ implementation of the Multimedia Internet KEYing (RFC3830)" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "libmutil0 openssl" - -inherit autotools - -SRC_URI = "http://www.minisip.org/snapshots/libmikey-${PV}.tar.gz" -S="${WORKDIR}/libmikey-${PV}" - - - -FILES_${PN} = " ${libdir}/libmikey.so.0 ${libdir}/libmikey.so.0.0.0 " - -do_stage() { - oe_libinstall -a -so libmikey ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/libmikey - install -m 0644 ${S}/include/libmikey/* ${STAGING_INCDIR}/libmikey -} diff --git a/packages/nonworking/libmikey/libmikey_0.1a.bb b/packages/nonworking/libmikey/libmikey_0.1a.bb deleted file mode 100644 index e00ce25594..0000000000 --- a/packages/nonworking/libmikey/libmikey_0.1a.bb +++ /dev/null @@ -1,23 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "libmikey is a C++ library that implements the IETF work-in-progress MIKEY protocol." -HOMEPAGE = "http://minisip.org/libmikey" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "openssl" - -SRC_URI = "http://minisip.org/source/libmikey-${PV}.tar.gz" -S = "${WORKDIR}/libmikey-0.1" - -inherit autotools - -do_configure() { - gnu-configize - oe_runconf -} - -do_stage() { - oe_libinstall -so libmikey ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/libmikey - install -m 0644 include/libmikey/*.h ${STAGING_INCDIR}/libmikey/ -} diff --git a/packages/nonworking/libmnetutil/.mtn2git_empty b/packages/nonworking/libmnetutil/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/libmnetutil/libmnetutil0_0.2.2.bb b/packages/nonworking/libmnetutil/libmnetutil0_0.2.2.bb deleted file mode 100644 index d41a86b4e2..0000000000 --- a/packages/nonworking/libmnetutil/libmnetutil0_0.2.2.bb +++ /dev/null @@ -1,22 +0,0 @@ -LICENSE = "LGPL" - -DESCRIPTION = "Networking class library for C++ programming" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "libmutil0 openssl" - -inherit autotools - -SRC_URI = "http://www.minisip.org/snapshots/libmnetutil-${PV}.tar.gz" -S="${WORKDIR}/libmnetutil-${PV}" - - - -FILES_${PN} = " ${libdir}/libmnetutil.so.0 ${libdir}/libmnetutil.so.0.0.0 " - -do_stage() { - oe_libinstall -a -so libmnetutil ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/libmnetutil - install -m 0644 ${S}/include/libmnetutil/* ${STAGING_INCDIR}/libmnetutil -} diff --git a/packages/nonworking/libmsip/.mtn2git_empty b/packages/nonworking/libmsip/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/libmsip/libmsip0_0.2.2.bb b/packages/nonworking/libmsip/libmsip0_0.2.2.bb deleted file mode 100644 index 161e270f7d..0000000000 --- a/packages/nonworking/libmsip/libmsip0_0.2.2.bb +++ /dev/null @@ -1,22 +0,0 @@ -LICENSE = "LGPL" - -DESCRIPTION = "C++ implementation Session Initiation Protocol (RFC3261)" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "libmnetutil0 libmutil0" - -inherit autotools - -SRC_URI = "http://www.minisip.org/snapshots/libmsip-${PV}.tar.gz" -S="${WORKDIR}/libmsip-${PV}" - - - -FILES_${PN} = " ${libdir}/libmsip.so.0 ${libdir}/libmsip.so.0.0.0 " - -do_stage() { - oe_libinstall -a -so libmsip ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/libmsip - install -m 0644 ${S}/include/libmsip/* ${STAGING_INCDIR}/libmsip -} diff --git a/packages/nonworking/minisip/.mtn2git_empty b/packages/nonworking/minisip/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/minisip/minisip_0.6.2.bb b/packages/nonworking/minisip/minisip_0.6.2.bb deleted file mode 100644 index b85007deef..0000000000 --- a/packages/nonworking/minisip/minisip_0.6.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -PR = "r0" - -DESCRIPTION = "SIP user agent, with focus on security" -DEPENDS = "libglademm libmsip0 libmikey0" -SRC_URI = "http://www.minisip.org/snapshots/minisip-${PV}.tar.gz" - - -FILES_${PN} += "${datadir}/minisip" - -inherit autotools - -EXTRA_OECONF = "--enable-ipaq" - -do_install_append () { - install -d ${D}${datadir}/pixmaps - install -d ${D}${datadir}/applications - install -m 0644 share/minisip.png ${D}${datadir}/pixmaps/minisip.png - install -m 0644 share/minisip.desktop ${D}${datadir}/applications/minisip.desktop -} -- cgit v1.2.3 From cd3f430e99ae5de479703bed78a56962881e355c Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 28 Feb 2008 11:34:36 +0000 Subject: python-dbus 0.82.4 fix packaging, so that development stuff actually ends up in -dev packages --- packages/python/python-dbus_0.82.4.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/python/python-dbus_0.82.4.bb b/packages/python/python-dbus_0.82.4.bb index c17f1c766b..8e80882a30 100644 --- a/packages/python/python-dbus_0.82.4.bb +++ b/packages/python/python-dbus_0.82.4.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus" LICENSE = "MIT" DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native" RDEPENDS = "python-threading python-io python-stringold python-logging" -PR = "ml1" +PR = "ml2" SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz" S = "${WORKDIR}/dbus-python-${PV}" @@ -18,3 +18,4 @@ do_stage() { autotools_stage_all } +FILES_${PN}-dev += "${libdir}/pkgconfig -- cgit v1.2.3 From 15ad3f7014c91008312af77de2c6cb62664c9c38 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 28 Feb 2008 11:36:30 +0000 Subject: moko-underground-image: add pyneod, pyneog, gsm0710muxd --- packages/images/moko-underground-image.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/images/moko-underground-image.bb b/packages/images/moko-underground-image.bb index 44dc3bc137..f86fcfba58 100644 --- a/packages/images/moko-underground-image.bb +++ b/packages/images/moko-underground-image.bb @@ -24,7 +24,11 @@ IMAGE_INSTALL = "\ xhost \ xset \ xrandr \ - " + \ + gsm0710muxd \ + pyneod \ + pyneog \ +" DEPENDS = "\ ${MACHINE_TASK_PROVIDER} \ -- cgit v1.2.3 From c746035e93fbf5e834252a98ca4ad6ea3193f609 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 28 Feb 2008 11:45:45 +0000 Subject: linux-handhelds-2.6: Add support for building kernel with internal initramfs * KERNEL_INITRAMFS_PATH should be set to teh full path of cpio.gz image of initramfs. It is assumed to be built with OE as previous step, so usually points to deploy dir. --- packages/linux/linux-handhelds-2.6.inc | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'packages') diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc index a0aec9cb36..845c11d7d6 100644 --- a/packages/linux/linux-handhelds-2.6.inc +++ b/packages/linux/linux-handhelds-2.6.inc @@ -54,6 +54,16 @@ do_configure() { } +do_compile_prepend() { + if [ -n "${KERNEL_INITRAMFS_PATH}" -a "${ANGSTROM_MODE}" == "glibc" ]; then + if [ ! -f ${KERNEL_INITRAMFS_PATH} ]; then + echo "${KERNEL_INITRAMFS_PATH} does not exist, you may need to bitbake it separately" + exit 1 + fi + cp ${KERNEL_INITRAMFS_PATH} usr/initramfs_data.cpio.gz + fi +} + do_deploy() { install -d ${DEPLOY_DIR_IMAGE} install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_FILENAME} -- cgit v1.2.3 From 70d0879a2267b4f02025ff0f323c3659fa81d68d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 11:54:41 +0000 Subject: mono.bclass: Fix the location used for mono clilibs information to be host specific otherwise this will break when multiple arch builds are made. shlibs was fixed in a similar way. Note that mono apps will need to be rebuilt after this change --- packages/mono/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/mono/README b/packages/mono/README index eb2fed051f..61bba80c07 100644 --- a/packages/mono/README +++ b/packages/mono/README @@ -28,6 +28,6 @@ This function calls mono_find_provides_and_requires which finds out (through calls to monodis --assembly and monodis --assemblyref) which assemblies are provided and required by a particular package. mono_do_clilibs then puts the information about provided assemblies into -${STAGING_DIR}/clilibs/${packagename}.list and information about the +${CLILIBSDIR}/${packagename}.list and information about the required packages into ${PKGDEST}/{packagename}.clilibdeps where it will later be picked up by read_shlibdeps. -- cgit v1.2.3 From c72f258e5eac11c9bb5acf7e66e22d06cfe04628 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 11:56:10 +0000 Subject: radlib: Drop strange file --- packages/radlib/x | 1 - 1 file changed, 1 deletion(-) delete mode 100644 packages/radlib/x (limited to 'packages') diff --git a/packages/radlib/x b/packages/radlib/x deleted file mode 100644 index c27c3cae43..0000000000 --- a/packages/radlib/x +++ /dev/null @@ -1 +0,0 @@ - file://Makefile.am.patch;patch=1" -- cgit v1.2.3 From 5243c2f3c13973340c4175f22697f0a90f42b33c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 11:57:08 +0000 Subject: nonworking: Attempt to fix up various random broken staging references whilst in the area --- packages/nonworking/docbook/docbook_4.2.bb | 4 ++-- packages/nonworking/lufs/lufs_0.9.7.bb | 9 ++++----- packages/nonworking/pixdev/pixdev-stable_0.1.bb | 2 +- packages/nonworking/python/python-gsl_0.2.0.bb | 2 +- packages/nonworking/xfree86/xfree86_4.3.0.bb | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) (limited to 'packages') diff --git a/packages/nonworking/docbook/docbook_4.2.bb b/packages/nonworking/docbook/docbook_4.2.bb index 5bd2aa0e63..ee1ab674cd 100644 --- a/packages/nonworking/docbook/docbook_4.2.bb +++ b/packages/nonworking/docbook/docbook_4.2.bb @@ -5,9 +5,9 @@ installfiles = calstblx.dtd ChangeLog dbgenent.mod dbnotnx.mod docbook.cat docbo catalog.xml dbcentx.mod dbhierx.mod dbpoolx.mod docbook.dcl docbookx.dtd soextblx.dtd do_stage () { - install -d ${STAGING_DIR}/share/sgml/docbook_${PV} + install -d ${STAGING_DATADIR}/sgml/docbook_${PV} for i in ${installfiles}; do - install -m 0644 $i ${STAGING_DIR}/share/sgml/docbook_${PV} + install -m 0644 $i ${STAGING_DATADIR}/sgml/docbook_${PV} done } diff --git a/packages/nonworking/lufs/lufs_0.9.7.bb b/packages/nonworking/lufs/lufs_0.9.7.bb index 58c1aa135e..c56410f847 100644 --- a/packages/nonworking/lufs/lufs_0.9.7.bb +++ b/packages/nonworking/lufs/lufs_0.9.7.bb @@ -6,11 +6,10 @@ LICENSE = "GPL" SRC_URI = "${SOURCEFORGE_MIRROR}/lufs/lufs-${PV}.tar.gz" S = "${WORKDIR}/lufs-${PV}" -inherit autotools +inherit autotools module -KERNEL_VERSION = "`cat ${STAGING_DIR}/target/kernel/kernel-version`" -KERNEL_SOURCE = "`cat ${STAGING_DIR}/target/kernel/kernel-source`" -KERNEL_PATH = "${STAGING_DIR}/target/kernel" +KERNEL_SOURCE = "${STAGING_KERNEL_DIR}" +KERNEL_PATH = "${STAGING_KERNEL_DIR}" -EXTRA_OECONF = " --with-kernel=${KERNEL_VERSION} --with-kheaders=${STAGING_DIR}/target/kernel/include" +EXTRA_OECONF = " --with-kernel=${KERNEL_VERSION} --with-kheaders=${STAGING_KERNEL_DIR}/include" diff --git a/packages/nonworking/pixdev/pixdev-stable_0.1.bb b/packages/nonworking/pixdev/pixdev-stable_0.1.bb index 9542c668b9..78a658d7e7 100644 --- a/packages/nonworking/pixdev/pixdev-stable_0.1.bb +++ b/packages/nonworking/pixdev/pixdev-stable_0.1.bb @@ -17,7 +17,7 @@ do_compile() { if [ -z "$CONFIG" ]; then CONFIG=defconfig; fi oe_runmake $CONFIG - oe_runmake MWDIR=${STAGING_DIR}/target/ "TARGET_CROSS=${TARGET_PREFIX}" all + oe_runmake MWDIR=${STAGING_DIR_TARGET} "TARGET_CROSS=${TARGET_PREFIX}" all } do_install() { diff --git a/packages/nonworking/python/python-gsl_0.2.0.bb b/packages/nonworking/python/python-gsl_0.2.0.bb index ddb901532d..a0bc000182 100644 --- a/packages/nonworking/python/python-gsl_0.2.0.bb +++ b/packages/nonworking/python/python-gsl_0.2.0.bb @@ -11,4 +11,4 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils -export STAGING=${STAGING_DIR} +#export STAGING=${STAGING_DIR} diff --git a/packages/nonworking/xfree86/xfree86_4.3.0.bb b/packages/nonworking/xfree86/xfree86_4.3.0.bb index 02ef88f326..4c7c966593 100644 --- a/packages/nonworking/xfree86/xfree86_4.3.0.bb +++ b/packages/nonworking/xfree86/xfree86_4.3.0.bb @@ -38,7 +38,7 @@ XCURSORGEN=/usr/local/X11R6/bin/xcursorgen EXTRA_OEMAKE="-C ${S} CC='${BUILD_CC}' \ CROSSCOMPILEDIR='${WORKDIR}/XXcompiler' \ EXTRA_LDOPTIONS='${LDFLAGS}' \ - EXTRA_INCLUDES='-I${STAGING_DIR}/target/include' " + EXTRA_INCLUDES='-I${STAGING_INCDIR}' " do_compile() { sed -e "s/^\#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=2 -DXResExtension.*/\#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=2 -DXResExtension ${FULL_OPTIMIZATION}/" < ${FILESDIR}/host.def > ${S}/config/cf/host.def; -- cgit v1.2.3 From f803172b1bfc33ca076f1a8a8b03f753fd0f95c4 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 28 Feb 2008 11:57:28 +0000 Subject: python-gst 0.10.10 fix packaging, increase package granularity --- packages/python/python-gst_0.10.10.bb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/python/python-gst_0.10.10.bb b/packages/python/python-gst_0.10.10.bb index cc1a19574e..59cc6ad268 100644 --- a/packages/python/python-gst_0.10.10.bb +++ b/packages/python/python-gst_0.10.10.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Python Gstreamer bindings" SECTION = "devel/python" LICENSE = "LGPL" DEPENDS = "gstreamer gst-plugins-base python-pygobject" -PR = "ml0" +PR = "ml1" SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \ file://python-path.patch;patch=1" @@ -21,6 +21,12 @@ do_stage() { autotools_stage_all } +PACKAGES =+ "${PN}-examples" + FILES_${PN} += "${datadir}/gst-python" -FILES_${PN}-dev += "${datadir}/gst-python/0.10/defs" +FILES_${PN}-dev += "\ + ${datadir}/gst-python/0.10/defs \ + ${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/*.la \ +" FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/.debug/" +FILES_${PN}-examples = "${datadir}/gst-python/0.10/examples" -- cgit v1.2.3 From a3eb6f1a3c72e6d6c5fe8d92f6f99787e8c17217 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 11:58:30 +0000 Subject: uqm: Fix 0.5.0 build assumptions with a patch, fix staging references --- packages/uqm/uqm-0.5.0/.mtn2git_empty | 0 packages/uqm/uqm-0.5.0/build-oe.patch | 40 +++++++++++++++++++++++++++++++++++ packages/uqm/uqm_0.3.bb | 2 +- packages/uqm/uqm_0.5.0.bb | 5 +++-- 4 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 packages/uqm/uqm-0.5.0/.mtn2git_empty create mode 100644 packages/uqm/uqm-0.5.0/build-oe.patch (limited to 'packages') diff --git a/packages/uqm/uqm-0.5.0/.mtn2git_empty b/packages/uqm/uqm-0.5.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/uqm/uqm-0.5.0/build-oe.patch b/packages/uqm/uqm-0.5.0/build-oe.patch new file mode 100644 index 0000000000..045082a920 --- /dev/null +++ b/packages/uqm/uqm-0.5.0/build-oe.patch @@ -0,0 +1,40 @@ +Index: build/unix/config_proginfo_build +=================================================================== +--- build/unix/config_proginfo_build.orig 2008-02-28 10:00:47.000000000 +0000 ++++ build/unix/config_proginfo_build 2008-02-28 10:01:38.000000000 +0000 +@@ -37,9 +37,9 @@ + + ### gcc ### + PROG_gcc_NAME="GNU C compiler" +-PROG_gcc_FILE="gcc" ++PROG_gcc_FILE="$CC" + PROG_gcc_ACTION="" +-PROG_gcc_VERSION='$(gcc --version)' ++PROG_gcc_VERSION='$($CC --version)' + + + ### sed ### +Index: build/unix/config_proginfo_host +=================================================================== +--- build/unix/config_proginfo_host.orig 2008-02-28 10:00:47.000000000 +0000 ++++ build/unix/config_proginfo_host 2008-02-28 10:03:09.000000000 +0000 +@@ -69,7 +69,7 @@ + ;; + *) + LIB_SDL_CFLAGS='$(sdl-config --cflags)' +- LIB_SDL_LDFLAGS='$(sdl-config --libs)' ++ LIB_SDL_LDFLAGS='$(sdl-config --libs) -lts -lpng -ljpeg -lz' + LIB_SDL_VERSION='$(sdl-config --version)' + ;; + esac +@@ -170,8 +170,8 @@ + LIB_vorbisfile_LDFLAGS="-lvorbisfile -lvorbis -logg -lm" + ;; + *) +- LIB_vorbisfile_CFLAGS="" +- LIB_vorbisfile_LDFLAGS="-lvorbisfile -lvorbis" ++ LIB_vorbisfile_CFLAGS="-I$STAGING_INCDIR" ++ LIB_vorbisfile_LDFLAGS="-L$STAGING_LIBDIR -lvorbisfile -lvorbis -logg" + ;; + esac + LIB_vorbisfile_VERSION="" diff --git a/packages/uqm/uqm_0.3.bb b/packages/uqm/uqm_0.3.bb index 036e1a9bc1..b5b80ddc58 100644 --- a/packages/uqm/uqm_0.3.bb +++ b/packages/uqm/uqm_0.3.bb @@ -16,7 +16,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/sc2/uqm-${PV}-source.tgz \ do_configure() { install ${WORKDIR}/build-opts.sh ${S}/ - ./build-opts.sh ${STAGING_DIR} ${STAGING_BINDIR} ${STAGING_LIBDIR} + ./build-opts.sh ${STAGING_DIR_HOST}${layout_prefix} ${STAGING_BINDIR} ${STAGING_LIBDIR} } do_compile() { diff --git a/packages/uqm/uqm_0.5.0.bb b/packages/uqm/uqm_0.5.0.bb index 0367137e03..089922a472 100644 --- a/packages/uqm/uqm_0.5.0.bb +++ b/packages/uqm/uqm_0.5.0.bb @@ -6,17 +6,18 @@ SECTION = "games" PRIORITY = "optional" LICENSE = "GPL" -PR = "r0" +PR = "r2" S = "${WORKDIR}/uqm-${PV}" SRC_URI = "${SOURCEFORGE_MIRROR}/sc2/uqm-${PV}-source.tar.gz \ file://build-opts.sh \ + file://build-oe.patch;patch=1;pnum=0 \ " do_configure() { install ${WORKDIR}/build-opts.sh ${S}/ - ./build-opts.sh ${STAGING_DIR} ${STAGING_BINDIR} ${STAGING_LIBDIR} + ./build-opts.sh ${STAGING_DIR_HOST}${layout_prefix} ${STAGING_BINDIR} ${STAGING_LIBDIR} } do_compile() { -- cgit v1.2.3 From 2332bdabebdd7880b9d14e86d785d91890f3978b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 11:59:43 +0000 Subject: uclibc: Clean up so only one set of headers are staged and better staging variables are used --- packages/uclibc/uclibc.inc | 44 ++++++++++++++------------------------------ 1 file changed, 14 insertions(+), 30 deletions(-) (limited to 'packages') diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc index e57ef174a9..5965c0b8bd 100644 --- a/packages/uclibc/uclibc.inc +++ b/packages/uclibc/uclibc.inc @@ -66,8 +66,7 @@ UCLIBC_LOCALE_URI_arm = "http://openembedded.org/dl/uclibc-locale/${UCLIBC_LOCAL SRC_URI = "${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \ file://uClibc.config" -UCLIBC_PREFIX = "${CROSS_DIR}/${TARGET_SYS}" -UCLIBC_STAGE_PREFIX = "${STAGING_DIR}/${HOST_SYS}" +UCLIBC_STAGE_PREFIX = "${STAGING_DIR_HOST}${layout_prefix}" # do_stage barfs on a CC with whitepspace, therefore put the 'HOST_CC_ARCH' in # the CFLAGS (for when building the utils). @@ -77,8 +76,8 @@ EXTRA_OEMAKE = "${OEMAKE_NO_CC} 'CC=${CC}'" EXTRA_OEMAKE_task_do_populate_staging = "${OEMAKE_NO_CC}" EXTRA_OEMAKE_task_do_package = "${OEMAKE_NO_CC}" -KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}/include" -KERNEL_HEADERS = "${CROSS_DIR}/${TARGET_SYS}/include" +KERNEL_SOURCE = "${STAGING_INCDIR}" +KERNEL_HEADERS = "${STAGING_INCDIR}" # Lets munge this via siteinfo.bbclass as well: # ARCH_BIG_ENDIAN=y @@ -145,33 +144,18 @@ do_configure() { } do_stage() { - # Install into the cross dir (this MUST be done first because we - # will install crt1.o in the install_dev stage and gcc needs it) - oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \ - RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \ - install_dev install_runtime - - oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \ - RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \ - install_utils - - # We don't really need this - rm -f ${UCLIBC_PREFIX}/include/.cvsignore - - # Fixup shared lib symlinks - ( cd ${UCLIBC_PREFIX}/lib - for f in c crypt dl m nsl pthread resolv thread_db util; do - ln -sf lib${f}.so.? lib${f}.so - done - ) + # This MUST be done first because we + # will install crt1.o in the install_dev stage and gcc needs it - # This conflicts with the c++ version of this header - rm -f ${UCLIBC_PREFIX}/include/bits/atomicity.h + # Install into the staging dir + oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ + RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ + install_dev install_runtime # Install into the staging dir oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ - install_dev install_runtime install_utils + install_utils # We don't really need this rm -f ${UCLIBC_STAGE_PREFIX}/include/.cvsignore @@ -188,11 +172,11 @@ do_stage() { } do_install() { - # Install into the cross dir (this MUST be done first because we + # This MUST be done first because we # will install crt1.o in the install_dev stage and gcc needs it) - oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \ - RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \ - install_dev install_runtime + oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ + RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ + install_dev install_runtime oe_runmake PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ install_dev install_runtime -- cgit v1.2.3 From f25ee3a9e8b035de1ea0de78b842809cbed423e3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:00:13 +0000 Subject: tremor: Use autotools_stage_all --- packages/tremor/tremor_svn.bb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'packages') diff --git a/packages/tremor/tremor_svn.bb b/packages/tremor/tremor_svn.bb index c7830f2063..29851f55af 100644 --- a/packages/tremor/tremor_svn.bb +++ b/packages/tremor/tremor_svn.bb @@ -15,14 +15,6 @@ inherit autotools EXTRA_OECONF=" --enable-shared --disable-rpath " -#do_configure_prepend() { -# ./autogen.sh -#} - do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR}/tremor \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} + autotools_stage_all } -- cgit v1.2.3 From a204d168c30e69ce2af470c9bf7b19ae0bcfa952 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:00:34 +0000 Subject: startup-notification: Use autotools_stage_all --- packages/startup-notification/startup-notification_0.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/startup-notification/startup-notification_0.5.bb b/packages/startup-notification/startup-notification_0.5.bb index c48e89ce0b..e073476472 100644 --- a/packages/startup-notification/startup-notification_0.5.bb +++ b/packages/startup-notification/startup-notification_0.5.bb @@ -9,5 +9,5 @@ inherit autotools pkgconfig SRC_URI = "http://freedesktop.org/Software/startup-notification/releases/startup-notification-${PV}.tar.gz" do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } -- cgit v1.2.3 From ab4f4e3e6f62259437c9f37ebed8382a07f022f7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:02:03 +0000 Subject: qt, qte, qt4: Use better staging variables --- packages/qt/qt-x11-free-common.inc | 2 +- packages/qt/qt-x11-free-native_3.3.5.bb | 10 +++++----- packages/qt4/qt4-x11-free_4.1.2.bb | 2 +- packages/qte/qte-common_2.3.10.inc | 12 ++++++------ packages/qte/qte-mt-static_2.3.10.bb | 12 ++++++------ packages/qte/qte-mt-static_2.3.12.bb | 14 +++++++------- 6 files changed, 26 insertions(+), 26 deletions(-) (limited to 'packages') diff --git a/packages/qt/qt-x11-free-common.inc b/packages/qt/qt-x11-free-common.inc index a68575d601..745c7fab3c 100644 --- a/packages/qt/qt-x11-free-common.inc +++ b/packages/qt/qt-x11-free-common.inc @@ -9,7 +9,7 @@ S = "${WORKDIR}/qt-x11-free-${PV}" inherit qmake_base qt3x11 export QTDIR = "${S}" -STAGING_QT_DIR = "${STAGING_DIR}/${HOST_SYS}/qt3" +STAGING_QT_DIR = "${STAGING_DIR_HOST}/qt3" ARCH_i686 = "x86" EXTRA_OEMAKE = "-e" diff --git a/packages/qt/qt-x11-free-native_3.3.5.bb b/packages/qt/qt-x11-free-native_3.3.5.bb index 2ed3da49b5..f23d874648 100644 --- a/packages/qt/qt-x11-free-native_3.3.5.bb +++ b/packages/qt/qt-x11-free-native_3.3.5.bb @@ -41,16 +41,16 @@ do_compile() { } do_stage() { - install -d ${STAGING_DIR}/${HOST_SYS}/qt3/lib - oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_DIR}/${HOST_SYS}/qt3/lib - install -d ${STAGING_DIR}/${HOST_SYS}/qt3/include/private + install -d ${STAGING_DIR_HOST}/qt3/lib + oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_DIR_HOST}/qt3/lib + install -d ${STAGING_DIR_HOST}/qt3/include/private for f in include/*.h do - install -m 0644 $f ${STAGING_DIR}/${HOST_SYS}/qt3/include/ + install -m 0644 $f ${STAGING_DIR_HOST}/qt3/include/ done for f in include/private/*.h do - install -m 0644 $f ${STAGING_DIR}/${HOST_SYS}/qt3/include/private + install -m 0644 $f ${STAGING_DIR_HOST}/qt3/include/private done } diff --git a/packages/qt4/qt4-x11-free_4.1.2.bb b/packages/qt4/qt4-x11-free_4.1.2.bb index 77fa6dba12..54c706463a 100644 --- a/packages/qt4/qt4-x11-free_4.1.2.bb +++ b/packages/qt4/qt4-x11-free_4.1.2.bb @@ -22,7 +22,7 @@ PARALLEL_MAKE = "" inherit qmake_base qt4x11 pkgconfig export QTDIR = "${S}" -STAGING_QT_DIR = "${STAGING_DIR}/${TARGET_SYS}/qt4" +STAGING_QT_DIR = "${STAGING_DIR_TARGET}/qt4" EXTRA_OEMAKE = "-e" require qt4_arch.inc diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index 5f9c01ba80..9b69b00b48 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -134,13 +134,13 @@ do_compile() { } do_stage() { - rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2 - install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib - oe_libinstall -so -C lib lib${PN} ${STAGING_DIR}/${HOST_SYS}/qt2/lib + rm -rf ${STAGING_DIR_HOST}/qt2 + install -d ${STAGING_DIR_HOST}/qt2/lib + oe_libinstall -so -C lib lib${PN} ${STAGING_DIR_HOST}/qt2/lib rm -f include/qxt.h - install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include - cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include - cp -pPR lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/ + install -d ${STAGING_DIR_HOST}/qt2/include + cp -pfLR include/* ${STAGING_DIR_HOST}/qt2/include + cp -pPR lib/fonts ${STAGING_DIR_HOST}/qt2/lib/ } do_install() { diff --git a/packages/qte/qte-mt-static_2.3.10.bb b/packages/qte/qte-mt-static_2.3.10.bb index c7d962343a..68ab2aceab 100644 --- a/packages/qte/qte-mt-static_2.3.10.bb +++ b/packages/qte/qte-mt-static_2.3.10.bb @@ -6,13 +6,13 @@ DEFAULT_PREFERENCE = "-1" EXTRA_OECONF += "-static -thread" do_stage() { - rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2 - install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib - oe_libinstall -a -C lib libqte-mt ${STAGING_DIR}/${HOST_SYS}/qt2/lib + rm -rf ${STAGING_DIR_HOST}/qt2 + install -d ${STAGING_DIR_HOST}/qt2/lib + oe_libinstall -a -C lib libqte-mt ${STAGING_DIR_HOST}/qt2/lib rm -f include/qxt.h - install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include - cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include - cp -pPR lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/ + install -d ${STAGING_DIR_HOST}/qt2/include + cp -pfLR include/* ${STAGING_DIR_HOST}/qt2/include + cp -pPR lib/fonts ${STAGING_DIR_HOST}/qt2/lib/ } do_install() { diff --git a/packages/qte/qte-mt-static_2.3.12.bb b/packages/qte/qte-mt-static_2.3.12.bb index 9210d85dc3..8403528415 100644 --- a/packages/qte/qte-mt-static_2.3.12.bb +++ b/packages/qte/qte-mt-static_2.3.12.bb @@ -6,14 +6,14 @@ DEFAULT_PREFERENCE = "-1" EXTRA_OECONF += "-static -thread" do_stage() { - rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2 - install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib - oe_libinstall -a -C lib libqte-mt ${STAGING_DIR}/${HOST_SYS}/qt2/lib + rm -rf ${STAGING_DIR_HOST}/qt2 + install -d ${STAGING_DIR_HOST}/qt2/lib + oe_libinstall -a -C lib libqte-mt ${STAGING_DIR_HOST}/qt2/lib rm -f include/qxt.h - install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include - cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include - cp -pPR lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/ - install -m 0644 src/kernel/qsnoopdata_qws_p.h ${STAGING_DIR}/${HOST_SYS}/qt2/include/ + install -d ${STAGING_DIR_HOST}/qt2/include + cp -pfLR include/* ${STAGING_DIR_HOST}/qt2/include + cp -pPR lib/fonts ${STAGING_DIR_HOST}/qt2/lib/ + install -m 0644 src/kernel/qsnoopdata_qws_p.h ${STAGING_DIR_HOST}/qt2/include/ } do_install() { -- cgit v1.2.3 From 16530454e68fc5a069c1167339009ffad2f176eb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:02:47 +0000 Subject: libpixman: Use autotools_stage_all --- packages/libpixman/libpixman_0.1.5.bb | 2 +- packages/libpixman/libpixman_0.1.6.bb | 2 +- packages/libpixman/libpixman_cvs.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/libpixman/libpixman_0.1.5.bb b/packages/libpixman/libpixman_0.1.5.bb index 6cedbf480d..bf23947fc1 100644 --- a/packages/libpixman/libpixman_0.1.5.bb +++ b/packages/libpixman/libpixman_0.1.5.bb @@ -8,5 +8,5 @@ SRC_URI = "http://cairographics.org/snapshots/libpixman-${PV}.tar.gz" inherit autotools pkgconfig do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } diff --git a/packages/libpixman/libpixman_0.1.6.bb b/packages/libpixman/libpixman_0.1.6.bb index 6cedbf480d..bf23947fc1 100644 --- a/packages/libpixman/libpixman_0.1.6.bb +++ b/packages/libpixman/libpixman_0.1.6.bb @@ -8,5 +8,5 @@ SRC_URI = "http://cairographics.org/snapshots/libpixman-${PV}.tar.gz" inherit autotools pkgconfig do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } diff --git a/packages/libpixman/libpixman_cvs.bb b/packages/libpixman/libpixman_cvs.bb index 956f652454..a75a284bca 100644 --- a/packages/libpixman/libpixman_cvs.bb +++ b/packages/libpixman/libpixman_cvs.bb @@ -12,5 +12,5 @@ DEFAULT_PREFERENCE = "-1" inherit autotools pkgconfig do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } -- cgit v1.2.3 From 755c434854cd25c18ed1dbac87be7a901e01e506 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:04:58 +0000 Subject: eglibc: Remove hardcoded layout, improve staging path references --- packages/glibc/eglibc-initial_svn.bb | 8 ++++---- packages/glibc/eglibc_svn.bb | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'packages') diff --git a/packages/glibc/eglibc-initial_svn.bb b/packages/glibc/eglibc-initial_svn.bb index 5b78d57dc4..298c775152 100644 --- a/packages/glibc/eglibc-initial_svn.bb +++ b/packages/glibc/eglibc-initial_svn.bb @@ -33,14 +33,14 @@ do_compile () { } do_stage () { - oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers + oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} includedir=${layout_includedir} prefix="" install-headers # Two headers -- stubs.h and features.h -- aren't installed by install-headers, # so do them by hand. We can tolerate an empty stubs.h for the moment. # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html - mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu - touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h - cp ${S}/include/features.h ${STAGING_DIR}/${HOST_SYS}/include/features.h + mkdir -p ${STAGING_INCDIR}/gnu + touch ${STAGING_INCDIR}/gnu/stubs.h + cp ${S}/include/features.h ${STAGING_INCDIR}/features.h } do_install () { diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb index ff68185bcc..a03c63b2fb 100644 --- a/packages/glibc/eglibc_svn.bb +++ b/packages/glibc/eglibc_svn.bb @@ -90,8 +90,8 @@ do_stage() { # make sure there isn't a conflicting libc in staging # this should be solved differently rm -f ${STAGING_LIBDIR}/libc.so.6 - oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \ - 'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \ + oe_runmake 'install_root=${STAGING_DIR_HOST}' \ + 'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \ '${STAGING_LIBDIR}/libc.so.6' \ install-headers install-lib -- cgit v1.2.3 From 2b08254beae049c1bdffaf56c62daa2b7ffb6fe2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:08:10 +0000 Subject: meta-toolchain: Sync with Poky. Add site-config file with distilled site configuration from OE, add environment setup script to tarball, add version file to tarball. Generate extras package with tarball separately since this information is only needed when using the toolchain with OE as an external toolchain. Change the way the target packages are installed so fix bugs with the previous approach --- packages/meta/meta-toolchain.bb | 103 +++++++++++++++++++++++++--------------- 1 file changed, 65 insertions(+), 38 deletions(-) (limited to 'packages') diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb index 923844ef8c..3c92712dff 100644 --- a/packages/meta/meta-toolchain.bb +++ b/packages/meta/meta-toolchain.bb @@ -1,22 +1,22 @@ DESCRIPTION = "Meta package for building a installable toolchain" LICENSE = "MIT" DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" -PR = "r2" inherit sdk meta SDK_DIR = "${WORKDIR}/sdk" SDK_OUTPUT = "${SDK_DIR}/image" +SDK_OUTPUT2 = "${SDK_DIR}/image-extras" SDK_DEPLOY = "${TMPDIR}/deploy/sdk" -SDK_SUFFIX = "toolchain" - -FEED_ARCH ?= "${TARGET_ARCH}" IPKG_HOST = "ipkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}" -IPKG_TARGET = "ipkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/${prefix}" +IPKG_TARGET = "ipkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/temp-target" TOOLCHAIN_HOST_TASK ?= "task-sdk-host" TOOLCHAIN_TARGET_TASK ?= "task-sdk-bare" +FEED_ARCH ?= "${TARGET_ARCH}" +SDK_SUFFIX = "toolchain" +TOOLCHAIN_OUTPUTNAME ?= "${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}-${SDK_SUFFIX}" RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" @@ -37,12 +37,22 @@ do_populate_sdk() { ${IPKG_TARGET} update ${IPKG_TARGET} install ${TOOLCHAIN_TARGET_TASK} - mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} - cp -pPR ${SDK_OUTPUT}/${prefix}/usr/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} - rm -rf ${SDK_OUTPUT}/${prefix}/usr/ - - cp -pPR ${SDK_OUTPUT}/${prefix}/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib - rm -rf ${SDK_OUTPUT}/${prefix}/lib/* + mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include + mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/.debug/ + mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/share + mv ${SDK_OUTPUT}/temp-target/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status + rm -rf ${SDK_OUTPUT}/temp-target/usr/lib/ipkg/ + cp -pPR ${SDK_OUTPUT}/temp-target/usr/include/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ + cp -pPR ${SDK_OUTPUT}/temp-target/usr/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/ + if [ -d ${SDK_OUTPUT}/temp-target/usr/lib/.debug ]; then + cp -pPR ${SDK_OUTPUT}/temp-target/usr/lib/.debug/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/.debug/ + fi + cp -pPR ${SDK_OUTPUT}/temp-target/usr/share/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/share/ + cp -pPR ${SDK_OUTPUT}/temp-target/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/ + if [ -d ${SDK_OUTPUT}/temp-target/lib/.debug ]; then + cp -pPR ${SDK_OUTPUT}/temp-target/lib/.debug/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/.debug/ + fi + rm -rf ${SDK_OUTPUT}/temp-target/ for fn in `ls ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/`; do if [ -h ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/$fn ]; then @@ -55,47 +65,36 @@ do_populate_sdk() { fi done - mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/gcc ${SDK_OUTPUT}/${prefix}/lib - echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libpthread.so echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so # remove unwanted housekeeping files - mv ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status - rm -Rf ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/ipkg mv ${SDK_OUTPUT}/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status-host rm -Rf ${SDK_OUTPUT}/usr/lib # extract and store ipks, pkgdata and shlibs data target_pkgs=`cat ${SDK_OUTPUT}/${prefix}/package-status | grep Package: | cut -f 2 -d ' '` - mkdir -p ${SDK_OUTPUT}/${prefix}/ipk/ - mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/runtime/ - mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/ + mkdir -p ${SDK_OUTPUT2}/${prefix}/ipk/ + mkdir -p ${SDK_OUTPUT2}/${prefix}/pkgdata/runtime/ + mkdir -p ${SDK_OUTPUT2}/${prefix}/${TARGET_SYS}/shlibs/ for pkg in $target_pkgs ; do for arch in $revipkgarchs; do pkgnames=${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk if [ -e $pkgnames ]; then oenote "Found $pkgnames" - cp $pkgnames ${SDK_OUTPUT}/${prefix}/ipk/ + cp $pkgnames ${SDK_OUTPUT2}/${prefix}/ipk/ orig_pkg=`ipkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2` - pkg_subdir_postfix=${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]} - for aarch in $revipkgarchs; do - if [ -e "${STAGING_DIR}/pkgdata/${aarch}${pkg_subdir_postfix}/${orig_pkg}" ]; then - pkg_subdir="${aarch}${pkg_subdir_postfix}" - break - fi - done - oenote "Original package in ${pkg_subdir}" - mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime - cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/ + pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]} + mkdir -p ${SDK_OUTPUT2}/${prefix}/pkgdata/$pkg_subdir/runtime + cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT2}/${prefix}/pkgdata/$pkg_subdir/ subpkgs=`cat ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg | grep PACKAGES: | cut -b 10-` for subpkg in $subpkgs; do - cp ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime/ + cp ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg ${SDK_OUTPUT2}/${prefix}/pkgdata/$pkg_subdir/runtime/ if [ -e ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ];then - cp ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime/ + cp ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ${SDK_OUTPUT2}/${prefix}/pkgdata/$pkg_subdir/runtime/ fi if [ -e ${STAGING_DIR_TARGET}/shlibs/$subpkg.list ]; then - cp ${STAGING_DIR_TARGET}/shlibs/$subpkg.* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/ + cp ${STAGING_DIR_TARGET}/shlibs/$subpkg.* ${SDK_OUTPUT2}/${prefix}/${TARGET_SYS}/shlibs/ fi done break @@ -109,12 +108,14 @@ do_populate_sdk() { # gcc-cross-sdk get built :( (30/11/07) ln -sf libgcc_s.so.1 ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libgcc_s.so - # remove unwanted executables - rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc - - # remove broken .la files + # Remove broken .la files rm -f ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/*.la + # Generate link for sysroot use + # /usr/local/poky/eabi-glibc/arm/arm-poky-linux-gnueabi/usr -> . + cd ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} + ln -sf . usr + # fix pkgconfig data files if [ -e ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig ]; then cd ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig @@ -126,10 +127,36 @@ do_populate_sdk() { done fi - # package it up + + # Setup site file for external use + siteconfig=${SDK_OUTPUT}/${prefix}/site-config + touch $siteconfig + for sitefile in ${CONFIG_SITE} ; do + cat $sitefile >> $siteconfig + done + + # Create environment setup script + script=${SDK_OUTPUT}/${prefix}/environment-setup + touch $script + echo 'export PATH=${prefix}/bin:$PATH' >> $script + echo 'export PKG_CONFIG_SYSROOT_DIR=${prefix}/${TARGET_SYS}' >> $script + echo 'export PKG_CONFIG_PATH=${prefix}/${TARGET_SYS}/lib/pkgconfig' >> $script + echo 'export CONFIG_SITE=${prefix}/site-config' >> $script + + # Add version information + versionfile=${SDK_OUTPUT}/${prefix}/version + touch $versionfile + echo 'Distro: ${DISTRO}' >> $versionfile + echo 'Distro Version: ${DISTRO_VERSION}' >> $versionfile + echo 'Metadata Revision: ${METADATA_REVISION}' >> $versionfile + echo 'Timestamp: ${DATETIME}' >> $versionfile + + # Package it up mkdir -p ${SDK_DEPLOY} cd ${SDK_OUTPUT} - fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}-${SDK_SUFFIX}.tar.bz2 . + fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 . + cd ${SDK_OUTPUT2} + fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}-extras.tar.bz2 . } do_populate_sdk[nostamp] = "1" -- cgit v1.2.3 From 460190d359908c79a69ec403680823964c5eab63 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:27:44 +0000 Subject: mpfr: Convert to autotools_stage_all --- packages/mpfr/mpfr_2.1.1.bb | 7 +------ packages/mpfr/mpfr_2.3.0.bb | 6 +----- packages/mpfr/mpfr_svn.bb | 6 +----- 3 files changed, 3 insertions(+), 16 deletions(-) (limited to 'packages') diff --git a/packages/mpfr/mpfr_2.1.1.bb b/packages/mpfr/mpfr_2.1.1.bb index a42498cfd4..1a60ab17a2 100644 --- a/packages/mpfr/mpfr_2.1.1.bb +++ b/packages/mpfr/mpfr_2.1.1.bb @@ -7,10 +7,5 @@ SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2" S = "${WORKDIR}/mpfr-${PV}" do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - infodir=${STAGING_DIR}/${HOST_SYS}/info + autotools_stage_all } diff --git a/packages/mpfr/mpfr_2.3.0.bb b/packages/mpfr/mpfr_2.3.0.bb index 92fbe7bd4b..869c4227e2 100644 --- a/packages/mpfr/mpfr_2.3.0.bb +++ b/packages/mpfr/mpfr_2.3.0.bb @@ -7,9 +7,5 @@ SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2" S = "${WORKDIR}/mpfr-${PV}" do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} + autotools_stage_all } diff --git a/packages/mpfr/mpfr_svn.bb b/packages/mpfr/mpfr_svn.bb index da6036e69f..f1e9273a65 100644 --- a/packages/mpfr/mpfr_svn.bb +++ b/packages/mpfr/mpfr_svn.bb @@ -8,9 +8,5 @@ SRC_URI = "svn://scm.gforge.inria.fr/svn/mpfr;module=trunk" S = "${WORKDIR}/trunk" do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} + autotools_stage_all } -- cgit v1.2.3 From dc9d3acf56b6eac5a864e97a6f58de9e498f9647 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:28:20 +0000 Subject: sox-native: Fix STAGING_DIR reference --- packages/sox/sox-native_13.0.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/sox/sox-native_13.0.0.bb b/packages/sox/sox-native_13.0.0.bb index 9b4dd29433..9be032260c 100644 --- a/packages/sox/sox-native_13.0.0.bb +++ b/packages/sox/sox-native_13.0.0.bb @@ -9,7 +9,7 @@ do_patch() { } do_stage() { - make bindir="${STAGING_BINDIR}" libdir="${STAGING_LIBDIR}" mandir="${STAGING_DIR}/${HOST_SYS}/man" includedir="${STAGING_INCDIR}" install + make bindir="${STAGING_BINDIR}" libdir="${STAGING_LIBDIR}" mandir="${STAGING_DIR_HOST}${layout_mandir}" includedir="${STAGING_INCDIR}" install rm ${STAGING_BINDIR}/rec ln -s ${STAGING_BINDIR}/play ${STAGING_BINDIR}/rec } -- cgit v1.2.3 From 5b2706b836588d20e748819e9cc5340473f459e0 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:28:50 +0000 Subject: skippy-xd: Fix hardcoded staging paths --- packages/skippy/skippy-xd_0.5.0.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/skippy/skippy-xd_0.5.0.bb b/packages/skippy/skippy-xd_0.5.0.bb index a27670da76..c5ed177aa6 100644 --- a/packages/skippy/skippy-xd_0.5.0.bb +++ b/packages/skippy/skippy-xd_0.5.0.bb @@ -9,9 +9,9 @@ SRC_URI = "http://thegraveyard.org/files/${PN}-${PV}.tar.bz2 \ file://fix-makefile.patch;patch=1 \ file://event_base.patch;patch=1" -EXTRA_OEMAKE = "X11PREFIX='${STAGING_DIR}/${TARGET_SYS}' PKG_CONFIG='${STAGING_BINDIR_NATIVE}/pkg-config'" -CFLAGS_append = " -I${STAGING_DIR}/${TARGET_SYS}/include/X11" -LDFLAGS_append = " -L${STAGING_DIR}/${TARGET_SYS}/lib/X11" +EXTRA_OEMAKE = "X11PREFIX='${STAGING_DIR_TARGET}${layout_prefix}' PKG_CONFIG='${STAGING_BINDIR_NATIVE}/pkg-config'" +CFLAGS_append = " -I${STAGING_INCDIR}/X11" +LDFLAGS_append = " -L${STAGING_LIBDIR}/X11" do_install() { oe_runmake 'BINDIR=${D}${bindir}' install -- cgit v1.2.3 From f07c1f920faeda45892fe931196542223cc7fd81 Mon Sep 17 00:00:00 2001 From: Derek Young Date: Thu, 28 Feb 2008 12:28:56 +0000 Subject: bump PR, forgot to do it 11 days ago when re-adding 801 series patch. --- packages/gcc/gcc_4.2.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gcc/gcc_4.2.2.bb b/packages/gcc/gcc_4.2.2.bb index 06cbbb23e4..1cfd085b27 100644 --- a/packages/gcc/gcc_4.2.2.bb +++ b/packages/gcc/gcc_4.2.2.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" -PR = "r4" +PR = "r5" inherit autotools gettext -- cgit v1.2.3 From 0fc092d533028f0382e88bd3b77df1cbcbfdb6c5 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:29:19 +0000 Subject: radlib: Fix STAGING_DIR reference --- packages/radlib/radlib-mysql.inc | 2 +- packages/radlib/radlib.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/radlib/radlib-mysql.inc b/packages/radlib/radlib-mysql.inc index a6a5923343..12cb73dcea 100644 --- a/packages/radlib/radlib-mysql.inc +++ b/packages/radlib/radlib-mysql.inc @@ -2,5 +2,5 @@ DEPENDS = "mysql" export CFLAGS_append=" -I${STAGING_INCDIR}/mysql " -EXTRA_OECONF = " --host=${TARGET_SYS} --prefix=${STAGING_DIR} --enable-mysql" +EXTRA_OECONF = " --host=${TARGET_SYS} --prefix=${STAGING_DIR_HOST}${layout_prefix} --enable-mysql" diff --git a/packages/radlib/radlib.inc b/packages/radlib/radlib.inc index 67357ebe55..b8fa555771 100644 --- a/packages/radlib/radlib.inc +++ b/packages/radlib/radlib.inc @@ -1 +1 @@ -EXTRA_OECONF = " --host=${TARGET_SYS} --prefix=${STAGING_DIR}" +EXTRA_OECONF = " --host=${TARGET_SYS} --prefix=${STAGING_DIR_HOST}${layout_prefix}" -- cgit v1.2.3 From bf73168e1eb084394091056a3dfe75e04708c4e8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:30:04 +0000 Subject: xsp, xpext: Convert to autotools_stage_all --- packages/maemo/xpext_1.0-5.bb | 9 ++------- packages/maemo/xsp_1.0.0-8.bb | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) (limited to 'packages') diff --git a/packages/maemo/xpext_1.0-5.bb b/packages/maemo/xpext_1.0-5.bb index cc40205c50..71fcad27cf 100644 --- a/packages/maemo/xpext_1.0-5.bb +++ b/packages/maemo/xpext_1.0-5.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" LICENSE= "MIT" DESCRIPTION = "X Server Nokia 770 extensions library" SECTION = "x11/libs" @@ -18,10 +18,5 @@ do_configure_prepend () { } do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DATADIR}/man + autotools_stage_all } diff --git a/packages/maemo/xsp_1.0.0-8.bb b/packages/maemo/xsp_1.0.0-8.bb index d5f94c64cd..f4f872e57f 100644 --- a/packages/maemo/xsp_1.0.0-8.bb +++ b/packages/maemo/xsp_1.0.0-8.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" LICENSE= "MIT" DESCRIPTION = "X Server Nokia 770 extensions library" SECTION = "x11/libs" @@ -11,10 +11,5 @@ S = "${WORKDIR}/Xsp" inherit autotools pkgconfig do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DATADIR}/man + autotools_stage_all } -- cgit v1.2.3 From 09da5ca70feb67f1b0d7fb4025a942cc8145dc0c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:30:42 +0000 Subject: roadster: Improve staging variables --- packages/roadster/roadster_cvs.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/roadster/roadster_cvs.bb b/packages/roadster/roadster_cvs.bb index ae32f204a2..81e406c6e1 100644 --- a/packages/roadster/roadster_cvs.bb +++ b/packages/roadster/roadster_cvs.bb @@ -11,7 +11,7 @@ RDEPENDS = "gpsd gtk+ cairo libxml2" SRC_URI = "cvs://anoncvs@cvs.cairographics.org/cvs/cairo;module=roadster" S = "${WORKDIR}/${PN}" -EXTRA_OECONF = " --with-gpsd=${STAGING_DIR}/${TARGET_SYS} " +EXTRA_OECONF = " --with-gpsd=${STAGING_DIR_TARGET}${layout_exec_prefix} " inherit autotools CFLAGS += " -I{$STAGING_INCDIR} " -- cgit v1.2.3 From 2b345e364ec858f31d630aaa67616b14a33d2585 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:30:56 +0000 Subject: pwc: Improve staging variables --- packages/pwc/pwc_10.0.12-rc1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/pwc/pwc_10.0.12-rc1.bb b/packages/pwc/pwc_10.0.12-rc1.bb index 626a8ef47a..af1d5f53ab 100644 --- a/packages/pwc/pwc_10.0.12-rc1.bb +++ b/packages/pwc/pwc_10.0.12-rc1.bb @@ -23,8 +23,8 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'LD=${KERNEL_LD}' \ 'KDIR=${STAGING_KERNEL_DIR}'" -export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ - -rpath-link ${STAGING_DIR}/${TARGET_SYS}/lib" +export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \ + -rpath-link ${STAGING_DIR_TARGET}${layout_libdir}" do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media -- cgit v1.2.3 From 6f71bee779d41309ed0a7a11e807d3dffaebaaa3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:31:13 +0000 Subject: php: Improve staging variables --- packages/php/php_5.2.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/php/php_5.2.0.bb b/packages/php/php_5.2.0.bb index 4ed88cf411..890d467c10 100644 --- a/packages/php/php_5.2.0.bb +++ b/packages/php/php_5.2.0.bb @@ -15,7 +15,7 @@ EXTRA_OECONF = " --without-iconv \ --enable-embedded-mysqli \ --enable-magic-quotes \ --with-zlib \ - --with-mysql="${STAGING_DIR}/${TARGET_SYS}" \ + --with-mysql="${STAGING_DIR_TARGET}${layout_exec_prefix}" \ --with-mysqli="${STAGING_BINDIR_NATIVE}/mysql_config" \ " -- cgit v1.2.3 From 4b90159489bf71e718bc260f7f2628d7ffdf539a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:31:29 +0000 Subject: pax-utils-native: Improve staging variables --- packages/pax-utils/pax-utils-native_0.1.13.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/pax-utils/pax-utils-native_0.1.13.bb b/packages/pax-utils/pax-utils-native_0.1.13.bb index 52f5d59515..5a56c01aa4 100644 --- a/packages/pax-utils/pax-utils-native_0.1.13.bb +++ b/packages/pax-utils/pax-utils-native_0.1.13.bb @@ -3,7 +3,7 @@ inherit native require pax-utils_${PV}.bb do_stage() { - oe_runmake PREFIX=${STAGING_DIR}/${HOST_SYS} install + oe_runmake PREFIX=${STAGING_DIR_HOST}${layout_prefix} install } do_install() { -- cgit v1.2.3 From 3a958aa86853deef7b3376f9dfd631bd74b23d51 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:31:56 +0000 Subject: netatalk: Fix hardcoded staging paths --- packages/netatalk/netatalk_2.0.3.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/netatalk/netatalk_2.0.3.bb b/packages/netatalk/netatalk_2.0.3.bb index 5fd7255fed..4f802dbcf6 100644 --- a/packages/netatalk/netatalk_2.0.3.bb +++ b/packages/netatalk/netatalk_2.0.3.bb @@ -17,13 +17,13 @@ inherit autotools update-rc.d do_configure () { autoreconf - ac_cv_header_rpcsvc_rquota_h=no LDFLAGS="-lpthread -L${STAGING_DIR}/${TARGET_SYS}/lib" ./configure \ + ac_cv_header_rpcsvc_rquota_h=no LDFLAGS="-lpthread -L${STAGING_LIBDIR}" ./configure \ --build=${BUILD_SYS} \ --host=${HOST_SYS} \ --target=${TARGET_SYS} \ --prefix=${prefix} \ - --with-bdb=${STAGING_DIR}/${TARGET_SYS} \ - --with-ssl-dir=${STAGING_DIR}/${TARGET_SYS} \ + --with-bdb=${STAGING_DIR_TARGET}${layout_exec_prefix} \ + --with-ssl-dir=${STAGING_DIR_TARGET}${layout_exec_prefix} \ --without-shadow \ --sysconfdir=${sysconfdir} \ --disable-nls \ -- cgit v1.2.3 From eb8390324e23fd1981e1d4dc7db477c9272303f4 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:33:11 +0000 Subject: libaio: Fix hardcoded staging paths --- packages/libaio/libaio_0.3.103.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/libaio/libaio_0.3.103.bb b/packages/libaio/libaio_0.3.103.bb index b0bc73617e..1453599855 100644 --- a/packages/libaio/libaio_0.3.103.bb +++ b/packages/libaio/libaio_0.3.103.bb @@ -26,8 +26,8 @@ do_unpack() { } do_stage () { - #make install prefix='${STAGING_DIR}/${TARGET_SYS}' - install -D -m 644 src/libaio.h ${STAGING_DIR}/${TARGET_SYS}/include/libaio.h + #make install prefix='${STAGING_DIR_TARGET}${layout_prefix}' + install -D -m 644 src/libaio.h ${STAGING_INCDIR}/libaio.h oe_libinstall -so -C src libaio ${STAGING_LIBDIR} } -- cgit v1.2.3 From 82f68bd8df3929d262ae239dcd3935c3a07ad81f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:33:36 +0000 Subject: ltrace: Improve staging variables --- packages/ltrace/ltrace_0.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/ltrace/ltrace_0.4.bb b/packages/ltrace/ltrace_0.4.bb index e679e25b8d..19a0d43e33 100644 --- a/packages/ltrace/ltrace_0.4.bb +++ b/packages/ltrace/ltrace_0.4.bb @@ -17,7 +17,7 @@ EXTRA_OEMAKE = "INSTALL_FILE='$(INSTALL) -p -m 0644' \ INSTALL_SCRIPT='$(INSTALL) -p -m 0755' \ INSTALL_DIR='$(INSTALL) -p -d -m 0755' " -export TARGET_CFLAGS = "${SELECTED_OPTIMIZATION} -isystem ${STAGING_DIR}/${TARGET_SYS}/include" +export TARGET_CFLAGS = "${SELECTED_OPTIMIZATION} -isystem ${STAGING_INCDIR}" do_configure_prepend() { ln -sf ./linux-gnu sysdeps/linux-gnueabi -- cgit v1.2.3 From 7d49c7f6b572cd7d933f8b6480e3bf1c9ad6cc23 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:34:09 +0000 Subject: linphone: Improve staging variables --- packages/gpephone/linphone_1.5.0.bb | 4 ++-- packages/linphone/linphone_1.3.99.8.bb | 6 +++--- packages/linphone/linphone_1.6.0.bb | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'packages') diff --git a/packages/gpephone/linphone_1.5.0.bb b/packages/gpephone/linphone_1.5.0.bb index 5ce1c0b58c..631c2d7933 100644 --- a/packages/gpephone/linphone_1.5.0.bb +++ b/packages/gpephone/linphone_1.5.0.bb @@ -15,8 +15,8 @@ inherit autotools pkgconfig EXTRA_OECONF = "--disable-gnome_ui --disable-gtk-doc --without-ffmpeg \ --without-sdl --disable-video --enable-alsa \ - --with-osip=${STAGING_DIR}/${HOST_SYS} \ - --with-readline=${STAGING_DIR}/${HOST_SYS} \ + --with-osip=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --with-readline=${STAGING_DIR_HOST}${layout_exec_prefix} \ --disable-truespeech --disable-manual \ --disable-glibtest --disable-glib --disable-strict" diff --git a/packages/linphone/linphone_1.3.99.8.bb b/packages/linphone/linphone_1.3.99.8.bb index 05998f889d..f96bd66b82 100644 --- a/packages/linphone/linphone_1.3.99.8.bb +++ b/packages/linphone/linphone_1.3.99.8.bb @@ -15,9 +15,9 @@ inherit autotools EXTRA_OECONF = "--disable-gnome_ui --disable-gtk-doc --without-ffmpeg \ --without-sdl --disable-video --enable-alsa \ - --with-osip=${STAGING_DIR}/${HOST_SYS} \ - --with-readline=${STAGING_DIR}/${HOST_SYS} \ - --with-speex=${STAGING_DIR}/${HOST_SYS} \ + --with-osip=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --with-readline=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --with-speex=${STAGING_DIR_HOST}${layout_exec_prefix} \ --disable-truespeech --disable-manual \ --disable-glibtest --disable-glib" diff --git a/packages/linphone/linphone_1.6.0.bb b/packages/linphone/linphone_1.6.0.bb index 7a90cdd5c9..fe40b6a270 100644 --- a/packages/linphone/linphone_1.6.0.bb +++ b/packages/linphone/linphone_1.6.0.bb @@ -32,9 +32,9 @@ export PKG_CONFIG=${STAGING_BINDIR_NATIVE}/pkg-config EXTRA_OECONF = "--disable-gtk-doc \ --without-ffmpeg --disable-video --without-sdl \ --enable-alsa \ - --with-osip=${STAGING_DIR}/${HOST_SYS} \ - --with-readline=${STAGING_DIR}/${HOST_SYS} \ - --with-speex=${STAGING_DIR}/${HOST_SYS} \ + --with-osip=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --with-readline=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --with-speex=${STAGING_DIR_HOST}${layout_exec_prefix} \ --disable-truespeech --disable-manual \ --disable-gnome_ui" -- cgit v1.2.3 From d49e6b55e78521adb8a2c95cc53dd1e5498dd730 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:34:42 +0000 Subject: libxslt: Improve staging variables --- packages/libxslt/libxslt_1.1.17.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/libxslt/libxslt_1.1.17.bb b/packages/libxslt/libxslt_1.1.17.bb index 2ae61eeaf5..d4fadc401b 100644 --- a/packages/libxslt/libxslt_1.1.17.bb +++ b/packages/libxslt/libxslt_1.1.17.bb @@ -32,8 +32,8 @@ do_stage () { install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i done - cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_DIR}/${HOST_SYS}," \ - -e "s,^exec_prefix=.*,exec_prefix=${STAGING_DIR}/${HOST_SYS}," \ + cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_DIR_HOST}${layout_prefix}," \ + -e "s,^exec_prefix=.*,exec_prefix=${STAGING_DIR_HOST}${layout_exec_prefix}," \ -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \ -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR_CROSS}/xslt-config chmod a+rx ${STAGING_BINDIR_CROSS}/xslt-config -- cgit v1.2.3 From 76fe690e35a7a400a1318167161895c2abb99110 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:35:36 +0000 Subject: konqueror: Improve staging variables --- packages/konqueror/konqueror-embedded_20060404.bb | 6 +++--- packages/konqueror/konqueror-embedded_20070212.bb | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'packages') diff --git a/packages/konqueror/konqueror-embedded_20060404.bb b/packages/konqueror/konqueror-embedded_20060404.bb index 9acfc71204..a84f47d471 100644 --- a/packages/konqueror/konqueror-embedded_20060404.bb +++ b/packages/konqueror/konqueror-embedded_20060404.bb @@ -35,9 +35,9 @@ EXTRA_OECONF = '--prefix=${palmtopdir} \ --with-extra-includes=${STAGING_INCDIR} \ --with-extra-libs=${STAGING_LIBDIR} \ --with-ssl-version=0.9.7e \ - --with-ssl-dir=${STAGING_LIBDIR}/.. \ - --with-qt-includes=${STAGING_DIR}/${HOST_SYS}/qt2/include \ - --with-qt-libraries=${STAGING_DIR}/${HOST_SYS}/qt2/lib \ + --with-ssl-dir=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --with-qt-includes=${STAGING_DIR_HOST}/qt2/include \ + --with-qt-libraries=${STAGING_DIR_HOST}/qt2/lib \ --enable-fontsubs \ --with-konq-tmp-prefix=/tmp/kde-cache \ # --enable-static \ diff --git a/packages/konqueror/konqueror-embedded_20070212.bb b/packages/konqueror/konqueror-embedded_20070212.bb index 02e411e9f7..3fb8a5cfa6 100644 --- a/packages/konqueror/konqueror-embedded_20070212.bb +++ b/packages/konqueror/konqueror-embedded_20070212.bb @@ -36,9 +36,9 @@ EXTRA_OECONF = '--prefix=${palmtopdir} \ --with-extra-libs=${STAGING_LIBDIR} \ --with-qtopia-dir=${OPIEDIR} \ --with-ssl-version=0.9.7e \ - --with-ssl-dir=${STAGING_LIBDIR}/.. \ - --with-qt-includes=${STAGING_DIR}/${HOST_SYS}/qt2/include \ - --with-qt-libraries=${STAGING_DIR}/${HOST_SYS}/qt2/lib \ + --with-ssl-dir=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --with-qt-includes=${STAGING_DIR_HOST}/qt2/include \ + --with-qt-libraries=${STAGING_DIR_HOST}/qt2/lib \ --with-qt-dir=${QTDIR} \ --enable-fontsubs \ --with-konq-tmp-prefix=/tmp/kde-cache \ -- cgit v1.2.3 From 0ac73ab09fa9aa4ab706985c9bc08d917ad66ddf Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:35:56 +0000 Subject: gxine: Improve staging variables --- packages/gxine/gxine_0.4.1.bb | 2 +- packages/gxine/gxine_0.4.1enhanced.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/gxine/gxine_0.4.1.bb b/packages/gxine/gxine_0.4.1.bb index 057b8a48eb..9648e9ef0c 100644 --- a/packages/gxine/gxine_0.4.1.bb +++ b/packages/gxine/gxine_0.4.1.bb @@ -36,7 +36,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/xine/${PN}-${PV}.tar.gz \ EXTRA_OECONF = " --includedir=${STAGING_INCDIR} \ --libdir=${STAGING_LIBDIR} \ --disable-xinetest \ - --with-xine-prefix=${STAGING_DIR}/${HOST_SYS}" + --with-xine-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}" LDFLAGS += "-lxine" diff --git a/packages/gxine/gxine_0.4.1enhanced.bb b/packages/gxine/gxine_0.4.1enhanced.bb index 7245d1de13..96776645ab 100644 --- a/packages/gxine/gxine_0.4.1enhanced.bb +++ b/packages/gxine/gxine_0.4.1enhanced.bb @@ -39,7 +39,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/xine/${PN}-0.4.1.tar.gz \ EXTRA_OECONF = " --includedir=${STAGING_INCDIR} \ --libdir=${STAGING_LIBDIR} \ --disable-xinetest \ - --with-xine-prefix=${STAGING_DIR}/${HOST_SYS}" + --with-xine-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}" LDFLAGS += "-lxine" -- cgit v1.2.3 From db5c3ccdabd9f493a2266d20c6db243057a9e369 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:36:09 +0000 Subject: gpgme: Improve staging variables --- packages/gpgme/gpgme.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gpgme/gpgme.inc b/packages/gpgme/gpgme.inc index dc8df2c85f..71cd68fa2b 100644 --- a/packages/gpgme/gpgme.inc +++ b/packages/gpgme/gpgme.inc @@ -5,7 +5,7 @@ DEPENDS = "libgpg-error pth libassuan" SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.gz" -EXTRA_OECONF = "--with-pth=${STAGING_DIR}/${HOST_SYS} --without-pth-test --with-gpg=${bindir}/gpg --without-gpgsm" +EXTRA_OECONF = "--with-pth=${STAGING_DIR_HOST}${layout_exec_prefix} --without-pth-test --with-gpg=${bindir}/gpg --without-gpgsm" LEAD_SONAME = "libgpgme.so" -- cgit v1.2.3 From 1554e0ea2afcb6b3e8eb1e17294d02fb41624615 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:36:25 +0000 Subject: dtnrg: Improve staging variables --- packages/dtnrg/dtn_2.5.0.bb | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'packages') diff --git a/packages/dtnrg/dtn_2.5.0.bb b/packages/dtnrg/dtn_2.5.0.bb index 5975a29e7c..3878829ce5 100644 --- a/packages/dtnrg/dtn_2.5.0.bb +++ b/packages/dtnrg/dtn_2.5.0.bb @@ -3,29 +3,30 @@ HOMEPAGE = "http://www.dtnrg.org/wiki" SECTION = "libs" DEPENDS = "db openssl python-native xerces-c" LICENSE = "Apache" -SRC_URI = "http://www.dtnrg.org/docs/code/dtn_${PV}.tgz" -PR = "r2" +SRC_URI = "http://www.dtnrg.org/docs/code/dtn_${PV}.tgz \ + file://configure_fix.patch;patch=1" +PR = "r3" inherit autotools EXTRA_OECONF = "\ --with-python=${STAGING_BINDIR_NATIVE}/python \ - --with-db=${STAGING_DIR} \ - --with-tcl=${STAGING_DIR} \ + --with-db=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --with-tcl=${STAGING_DIR_HOST}${layout_exec_prefix} \ --without-google-perftools \ --without-bluez \ --without-bonjour \ - --with-expat=${STAGING_DIR} \ - --with-xerces-c=${STAGING_DIR} \ + --with-expat=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --with-xerces-c=${STAGING_DIR_HOST}${layout_exec_prefix} \ --without-tclreadline \ - --with-zlib=${STAGING_DIR} \ + --with-zlib=${STAGING_DIR_HOST}${layout_exec_prefix} \ --without-xsd-tool \ - --with-db=${STAGING_DIR} \ + --with-db=${STAGING_DIR_HOST}${layout_exec_prefix} \ --enable-ecl \ --enable-edp \ --without-mysql \ --without-postgres \ - --with-openssl=${STAGING_DIR} \ + --with-openssl=${STAGING_DIR_HOST}${layout_exec_prefix} \ " def dtn_python_dir(d): -- cgit v1.2.3 From b67e7a3b5663d2fbdcbd200cd37c04a7150b9514 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:37:02 +0000 Subject: callweaver: Improve staging variables --- packages/callweaver/callweaver_1.2.0-rc5.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/callweaver/callweaver_1.2.0-rc5.bb b/packages/callweaver/callweaver_1.2.0-rc5.bb index 608181f96c..32869936b6 100644 --- a/packages/callweaver/callweaver_1.2.0-rc5.bb +++ b/packages/callweaver/callweaver_1.2.0-rc5.bb @@ -29,9 +29,9 @@ INITSCRIPT_PARAMS = "defaults 60" inherit autotools update-rc.d -EXTRA_OECONF = " --with-ssl=${STAGING_DIR}/${HOST_SYS} --enable-low_memory \ +EXTRA_OECONF = " --with-ssl=${STAGING_DIR_HOST}${layout_exec_prefix} --enable-low_memory \ --disable-zaptel --with-directory-layout=lsb --enable-t38 \ - --with-codec-speex=${STAGING_DIR}/${HOST_SYS} \ + --with-codec-speex=${STAGING_DIR_HOST}${layout_exec_prefix} \ --with-perl-shebang='#!${bindir}/perl' --with-jabber --with-res_jabber \ --with-javascript --with-res_js \ --bindir=${bindir} --datadir=${datadir} --sysconfdir=${sysconfdir} \ -- cgit v1.2.3 From 3b8b2bfbcc61af20f7c66db79028e2c57a5c8c80 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:37:22 +0000 Subject: ark1136: Improve staging variables --- packages/ark3116/ark3116_0.4.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/ark3116/ark3116_0.4.1.bb b/packages/ark3116/ark3116_0.4.1.bb index 89bcfa85d9..629c50a3ca 100644 --- a/packages/ark3116/ark3116_0.4.1.bb +++ b/packages/ark3116/ark3116_0.4.1.bb @@ -25,8 +25,8 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ 'LD=${KERNEL_LD}' \ 'KDIR=${STAGING_KERNEL_DIR}'" -export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ - -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" +export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \ + -Wl,-rpath-link,${STAGING_DIR_TARGET}${layout_libdir}" do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/serial -- cgit v1.2.3 From 03254c66f41798f7596dfbd55eea5083d1c0450e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:37:50 +0000 Subject: emacs: Improve staging variables --- packages/emacs/emacs_cvs.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/emacs/emacs_cvs.bb b/packages/emacs/emacs_cvs.bb index e8f263d1a9..4a406d6516 100644 --- a/packages/emacs/emacs_cvs.bb +++ b/packages/emacs/emacs_cvs.bb @@ -26,7 +26,7 @@ FILES_${PN}-el = "${datadir}/emacs/*/*/*.el.gz \ FILES_${PN} += "${datadir}/emacs" -QEMU = "qemu-${TARGET_ARCH} -L ${STAGING_DIR}/${TARGET_SYS}" +QEMU = "qemu-${TARGET_ARCH} -L ${STAGING_DIR_TARGET}" LDFLAGS += "-L${CROSS_DIR}/${TARGET_SYS}/lib" EXTRA_OECONF = "--without-sound --without-x" -- cgit v1.2.3 From 7ea73917d196a1298b68e28945099849bdf7e011 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:38:17 +0000 Subject: dejagnu: Improve staging variables --- packages/dejagnu/dejagnu-qemu_1.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/dejagnu/dejagnu-qemu_1.0.bb b/packages/dejagnu/dejagnu-qemu_1.0.bb index 7230f985f6..2eef27e9a3 100644 --- a/packages/dejagnu/dejagnu-qemu_1.0.bb +++ b/packages/dejagnu/dejagnu-qemu_1.0.bb @@ -13,7 +13,7 @@ do_stage() { install -m 0644 ${WORKDIR}/arm-qemu.exp ${STAGING_DATADIR}/dejagnu/baseboards/ cat <${STAGING_BINDIR_NATIVE}/${QEMU}-test-wrapper #!/bin/sh -exec ${QEMU} ${CROSS_DIR}/${TARGET_SYS}/${LD_SO} --library-path ${CROSS_DIR}/${TARGET_SYS}/lib:${STAGING_DIR}/${TARGET_SYS}/lib \$1 +exec ${QEMU} ${CROSS_DIR}/${TARGET_SYS}/${LD_SO} --library-path ${CROSS_DIR}/${TARGET_SYS}/lib:${STAGING_DIR_TARGET}${layout_libdir} \$1 EOF chmod 755 ${STAGING_BINDIR_NATIVE}/arm-qemu-test-wrapper } -- cgit v1.2.3 From 4713d888ebcf7e0a9064346bf3f0a86d22ad7129 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 12:38:30 +0000 Subject: erlang: Improve staging variables --- packages/erlang/erlang_R11B.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/erlang/erlang_R11B.1.bb b/packages/erlang/erlang_R11B.1.bb index 4c754f6c3e..e85a297ff9 100644 --- a/packages/erlang/erlang_R11B.1.bb +++ b/packages/erlang/erlang_R11B.1.bb @@ -11,7 +11,7 @@ SRC_URI += "file://erts-configure.in.patch;patch=1 \ EXTRA_OEMAKE = "BUILD_CC='${BUILD_CC}'" -EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${HOST_SYS}" +EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${layout_exec_prefix}" EXTRA_OECONF_append_arm = " --disable-smp-support --disable-hipe" EXTRA_OECONF_append_armeb = " --disable-smp-support --disable-hipe" -- cgit v1.2.3 From 00622e0623ba79af842df9b01ead40d93199e392 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 13:22:05 +0000 Subject: mono: Use STAGING_DATADIR --- packages/mono/mono-mcs-intermediate.inc | 4 ++-- packages/mono/mono_1.2.5.1.bb | 2 +- packages/mono/mono_1.2.6.bb | 2 +- packages/mono/mono_svn.bb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/mono/mono-mcs-intermediate.inc b/packages/mono/mono-mcs-intermediate.inc index db74b96ee3..f6631c1eb1 100644 --- a/packages/mono/mono-mcs-intermediate.inc +++ b/packages/mono/mono-mcs-intermediate.inc @@ -47,8 +47,8 @@ do_populate_staging() { cd ${D} rm -f ${WORKDIR}/mono-mcs-${PV}.tar.gz tar -cvzf ${WORKDIR}/mono-mcs-${PV}.tar.gz . - install -d ${STAGING_DIR}/share/mono-mcs - cp ${WORKDIR}/mono-mcs-${PV}.tar.gz ${STAGING_DIR}/share/mono-mcs/ + install -d ${STAGING_DATADIR}/mono-mcs + cp ${WORKDIR}/mono-mcs-${PV}.tar.gz ${STAGING_DATADIR}/mono-mcs/ } do_package_write_ipk() { diff --git a/packages/mono/mono_1.2.5.1.bb b/packages/mono/mono_1.2.5.1.bb index 1d58c2d810..a9bf2f8e1e 100644 --- a/packages/mono/mono_1.2.5.1.bb +++ b/packages/mono/mono_1.2.5.1.bb @@ -14,7 +14,7 @@ EXTRA_OECONF += " --disable-mcs-build " do_install_prepend() { install -d ${D} pushd ${D} - tar -xzf ${STAGING_DIR}/share/mono-mcs/mono-mcs-${PV}.tar.gz + tar -xzf ${STAGING_DATADIR}/mono-mcs/mono-mcs-${PV}.tar.gz popd } diff --git a/packages/mono/mono_1.2.6.bb b/packages/mono/mono_1.2.6.bb index 5c5d8476bb..a5359125a9 100644 --- a/packages/mono/mono_1.2.6.bb +++ b/packages/mono/mono_1.2.6.bb @@ -13,7 +13,7 @@ EXTRA_OECONF += " --disable-mcs-build " do_install_prepend() { install -d ${D} pushd ${D} - tar -xzf ${STAGING_DIR}/share/mono-mcs/mono-mcs-${PV}.tar.gz + tar -xzf ${STAGING_DATADIR}/mono-mcs/mono-mcs-${PV}.tar.gz popd } diff --git a/packages/mono/mono_svn.bb b/packages/mono/mono_svn.bb index 6644efb4e3..53d0fb0d30 100644 --- a/packages/mono/mono_svn.bb +++ b/packages/mono/mono_svn.bb @@ -14,7 +14,7 @@ EXTRA_OECONF += " --disable-mcs-build " do_install_prepend() { install -d ${D} pushd ${D} - tar -xzf ${STAGING_DIR}/share/mono-mcs/mono-mcs-${PV}.tar.gz + tar -xzf ${STAGING_DATADIR}/mono-mcs/mono-mcs-${PV}.tar.gz popd } -- cgit v1.2.3 From 97c73a30ec43a9958a072959a20c5d6193415440 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 13:22:36 +0000 Subject: libidl: Use autotools_stage_all --- packages/libidl/libidl_0.8.2.bb | 2 +- packages/libidl/libidl_0.8.3.bb | 8 +------- packages/libidl/libidl_0.8.6.bb | 3 --- 3 files changed, 2 insertions(+), 11 deletions(-) (limited to 'packages') diff --git a/packages/libidl/libidl_0.8.2.bb b/packages/libidl/libidl_0.8.2.bb index 85114d6524..8a5b683d1e 100644 --- a/packages/libidl/libidl_0.8.2.bb +++ b/packages/libidl/libidl_0.8.2.bb @@ -6,5 +6,5 @@ S = "${WORKDIR}/libIDL-${PV}" inherit autotools pkgconfig do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } diff --git a/packages/libidl/libidl_0.8.3.bb b/packages/libidl/libidl_0.8.3.bb index 7a5a0d454e..5f788a91d8 100644 --- a/packages/libidl/libidl_0.8.3.bb +++ b/packages/libidl/libidl_0.8.3.bb @@ -13,13 +13,7 @@ inherit autotools pkgconfig # strange reason - so we do some sed fu to fix the path there do_stage() { - oe_runmake install \ - prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - infodir=${STAGING_INFODIR} + autotools_stage_all cp ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR}/libIDL-config-2.orig cat ${STAGING_BINDIR}/libIDL-config-2.orig | sed -e 's:${includedir}:${STAGING_INCDIR}:' > ${STAGING_BINDIR}/libIDL-config-2 diff --git a/packages/libidl/libidl_0.8.6.bb b/packages/libidl/libidl_0.8.6.bb index 33a1154357..2f44147711 100644 --- a/packages/libidl/libidl_0.8.6.bb +++ b/packages/libidl/libidl_0.8.6.bb @@ -10,9 +10,6 @@ S = "${WORKDIR}/libIDL-${PV}" BINCONFIG_GLOB = "*-config-2" inherit autotools pkgconfig binconfig -# Firefox uses the libIDL-config-2 script instead of pkgconfig (for some -# strange reason - so we do some sed fu to fix the path there - do_stage() { autotools_stage_all } -- cgit v1.2.3 From 7a2f3a7a1e05bcea0175091ac813270d75a6952d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 13:23:09 +0000 Subject: fltk: Use autotools_stage_all --- packages/fltk/efltk_2.0.7.bb | 6 +----- packages/fltk/fltk_1.1.4.bb | 6 +----- packages/fltk/fltk_1.1.7.bb | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) (limited to 'packages') diff --git a/packages/fltk/efltk_2.0.7.bb b/packages/fltk/efltk_2.0.7.bb index 57737e1c57..b048e078b3 100644 --- a/packages/fltk/efltk_2.0.7.bb +++ b/packages/fltk/efltk_2.0.7.bb @@ -40,11 +40,7 @@ do_configure_append() { } do_stage() { - oe_runmake install prefix="${STAGING_DIR}" \ - bindir="${STAGING_BINDIR}" \ - includedir="${STAGING_INCDIR}" \ - libdir="${STAGING_LIBDIR}" \ - datadir="${STAGING_DATADIR}" + autotools_stage_all } do_install () { diff --git a/packages/fltk/fltk_1.1.4.bb b/packages/fltk/fltk_1.1.4.bb index 66c4b214ec..ae7c0e1c95 100644 --- a/packages/fltk/fltk_1.1.4.bb +++ b/packages/fltk/fltk_1.1.4.bb @@ -21,11 +21,7 @@ do_configure() { } do_install () { - oe_runmake prefix="${D}${prefix}" \ - bindir="${D}${bindir}" \ - libdir="${D}${libdir}" \ - includedir="${D}${includedir}" \ - install + autotools_stage_all } do_stage() { diff --git a/packages/fltk/fltk_1.1.7.bb b/packages/fltk/fltk_1.1.7.bb index 3e095b45a3..866db129e8 100644 --- a/packages/fltk/fltk_1.1.7.bb +++ b/packages/fltk/fltk_1.1.7.bb @@ -19,11 +19,7 @@ do_configure() { } do_stage() { - oe_runmake install prefix="${STAGING_DIR}" \ - bindir="${STAGING_BINDIR}" \ - includedir="${STAGING_INCDIR}" \ - libdir="${STAGING_LIBDIR}" \ - datadir="${STAGING_DATADIR}" + autotools_stage_all } do_install () { -- cgit v1.2.3 From 52a8aa712d2a391082505407bdde6a721de44286 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 13:23:48 +0000 Subject: libsvg-cairo/xsvg: Use autotools_stage_all --- packages/cairo/libsvg-cairo_0.1.5.bb | 2 +- packages/cairo/libsvg-cairo_0.1.6.bb | 2 +- packages/cairo/xsvg_cvs.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/cairo/libsvg-cairo_0.1.5.bb b/packages/cairo/libsvg-cairo_0.1.5.bb index 9cee27bf29..add660752a 100644 --- a/packages/cairo/libsvg-cairo_0.1.5.bb +++ b/packages/cairo/libsvg-cairo_0.1.5.bb @@ -9,5 +9,5 @@ SRC_URI = "http://cairographics.org/snapshots/libsvg-cairo-${PV}.tar.gz" inherit autotools pkgconfig do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } diff --git a/packages/cairo/libsvg-cairo_0.1.6.bb b/packages/cairo/libsvg-cairo_0.1.6.bb index 9cee27bf29..add660752a 100644 --- a/packages/cairo/libsvg-cairo_0.1.6.bb +++ b/packages/cairo/libsvg-cairo_0.1.6.bb @@ -9,5 +9,5 @@ SRC_URI = "http://cairographics.org/snapshots/libsvg-cairo-${PV}.tar.gz" inherit autotools pkgconfig do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } diff --git a/packages/cairo/xsvg_cvs.bb b/packages/cairo/xsvg_cvs.bb index 8f4f4bfdc4..210898f576 100644 --- a/packages/cairo/xsvg_cvs.bb +++ b/packages/cairo/xsvg_cvs.bb @@ -14,5 +14,5 @@ BROKEN = "1" inherit autotools pkgconfig do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } -- cgit v1.2.3 From ad4192d3f44206460eab2ebeeadf65776f98cfea Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 13:26:06 +0000 Subject: enca, motion, iperf, gdk-pixbuf, gtk+-directfb, python-sword: Use staging prefix/exec_prefix --- packages/enca/enca_1.9.bb | 2 +- packages/gtk+/gdk-pixbuf_2.10.14.bb | 2 +- packages/gtk+/gtk+-directfb_2.10.14.bb | 2 +- packages/iperf/iperf_2.0.2.bb | 2 +- packages/motion/motion_3.2.9.bb | 2 +- packages/python/python-sword_1.5.10.bb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'packages') diff --git a/packages/enca/enca_1.9.bb b/packages/enca/enca_1.9.bb index ddd7acef82..548a824523 100644 --- a/packages/enca/enca_1.9.bb +++ b/packages/enca/enca_1.9.bb @@ -13,7 +13,7 @@ SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/enca-${PV} inherit autotools -EXTRA_OECONF="--with-libiconv-prefix=${STAGING_DIR}" +EXTRA_OECONF="--with-libiconv-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}" do_configure_append() { sed -i s:-I/usr/include::g Makefile diff --git a/packages/gtk+/gdk-pixbuf_2.10.14.bb b/packages/gtk+/gdk-pixbuf_2.10.14.bb index ecd2d51d49..7d3e7dc92a 100644 --- a/packages/gtk+/gdk-pixbuf_2.10.14.bb +++ b/packages/gtk+/gdk-pixbuf_2.10.14.bb @@ -73,7 +73,7 @@ do_compile() { do_stage() { oe_libinstall -C gdk-pixbuf -so libgdk_pixbuf-2.0 ${STAGING_LIBDIR} - cd gdk-pixbuf && oe_runmake install DESTDIR=${STAGING_DIR}/usr + cd gdk-pixbuf && oe_runmake install DESTDIR=${STAGING_DIR_HOST}${layout_exec_prefix} autotools_stage_includes # install -d -m 0755 ${STAGING_LIBDIR}/gtk-2.0/include # install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h diff --git a/packages/gtk+/gtk+-directfb_2.10.14.bb b/packages/gtk+/gtk+-directfb_2.10.14.bb index e77f24638d..6fcaf299dc 100644 --- a/packages/gtk+/gtk+-directfb_2.10.14.bb +++ b/packages/gtk+/gtk+-directfb_2.10.14.bb @@ -44,7 +44,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ # file://gtk-doc.patch;patch=1 \ " EXTRA_OECONF =" \ - --prefix=${STAGING_DIR} \ + --prefix=${STAGING_DIR_HOST}${layout_prefix} \ --with-gdktarget=directfb \ --without-x \ --without-libtiff \ diff --git a/packages/iperf/iperf_2.0.2.bb b/packages/iperf/iperf_2.0.2.bb index c54bafe70d..28d009ad58 100644 --- a/packages/iperf/iperf_2.0.2.bb +++ b/packages/iperf/iperf_2.0.2.bb @@ -14,7 +14,7 @@ S="${WORKDIR}/iperf-${PV}" # --disable-threads is needed on epia/x86 with uclibc do_configure() { gnu-configize - oe_runconf --exec-prefix=${STAGING_DIR} --disable-threads + oe_runconf --exec-prefix=${STAGING_DIR_HOST}${layout_exec_prefix} --disable-threads } do_compile() { diff --git a/packages/motion/motion_3.2.9.bb b/packages/motion/motion_3.2.9.bb index 1010e7f046..f5f5b62708 100644 --- a/packages/motion/motion_3.2.9.bb +++ b/packages/motion/motion_3.2.9.bb @@ -16,4 +16,4 @@ inherit autotools EXTRA_OECONF = " --with-ffmpeg=${STAGING_LIBDIR} \ --with-mysql-lib=${STAGING_LIBDIR} \ --with-mysql-include=${STAGING_INCDIR}/mysql \ - --with-pgsql=${STAGING_DIR} " + --with-pgsql=${STAGING_DIR_HOST}${layout_exec_prefix} " diff --git a/packages/python/python-sword_1.5.10.bb b/packages/python/python-sword_1.5.10.bb index a18cf89466..4769a8814f 100644 --- a/packages/python/python-sword_1.5.10.bb +++ b/packages/python/python-sword_1.5.10.bb @@ -11,7 +11,7 @@ SRC_URI = "http://crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar. S = "${WORKDIR}/${SRCNAME}-${PV}/bindings/swig/package" -EXTRA_OECONF = "--with-sword-dir=${STAGING_DIR}/${HOST_SYS}" +EXTRA_OECONF = "--with-sword-dir=${STAGING_DIR_HOST}${layout_exec_prefix}" inherit distutils autotools -- cgit v1.2.3 From 3c1299f257f06b1b7f629de108041345cd16d6c8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 13:26:31 +0000 Subject: fs: Use autotools_stage_all --- packages/fs/fs_cvs.bb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/fs/fs_cvs.bb b/packages/fs/fs_cvs.bb index 8e2724ce4b..b1d6ed4bea 100644 --- a/packages/fs/fs_cvs.bb +++ b/packages/fs/fs_cvs.bb @@ -10,9 +10,5 @@ S = "${WORKDIR}/FS" inherit autotools pkgconfig do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} + autotools_stage_all } -- cgit v1.2.3 From 5e602298fb5bae9cd1f8d0f78d5a96c09ca0a532 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 13:26:53 +0000 Subject: avr-libc: Fix STAGING_DIR references --- packages/avr-libc/avr-libc_1.0.3.bb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/avr-libc/avr-libc_1.0.3.bb b/packages/avr-libc/avr-libc_1.0.3.bb index 1c627a1576..20a2850958 100644 --- a/packages/avr-libc/avr-libc_1.0.3.bb +++ b/packages/avr-libc/avr-libc_1.0.3.bb @@ -22,12 +22,13 @@ prefix = "${CROSS_DIR}" exec_prefix = "${prefix}" do_stage () { -# install into CROSS_DIR + # install into CROSS_DIR oe_runmake install -# install into STAGING_DIR - oe_runmake "prefix=${STAGING_DIR}" "exec_prefix=${STAGING_DIR}" \ + # install into staging + oe_runmake "prefix=${STAGING_DIR_HOST}${layout_prefix}" \ + "exec_prefix=${STAGING_DIR_HOST}${layout_exec_prefix}" \ "bindir=${STAGING_BINDIR}" "libdir=${STAGING_LIBDIR}" \ - "tooldir=${STAGING_DIR}" "toolibdir=${STAGING_LIBDIR}" \ + "tooldir=${STAGING_DIR_HOST}" "toolibdir=${STAGING_LIBDIR}" \ install } -- cgit v1.2.3 From b7aeef3fb4a7b70c8c70b24f4198a683b2452ba1 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 28 Feb 2008 13:28:30 +0000 Subject: ode 0.8 update to 0.9 and bring back from nonworking --- packages/nonworking/ode/.mtn2git_empty | 0 packages/nonworking/ode/files/.mtn2git_empty | 0 packages/nonworking/ode/files/config.h | 48 ---------------------------- packages/nonworking/ode/ode_0.8.bb | 30 ----------------- packages/ode/.mtn2git_empty | 0 packages/ode/files/.mtn2git_empty | 0 packages/ode/ode_0.9.bb | 30 +++++++++++++++++ 7 files changed, 30 insertions(+), 78 deletions(-) delete mode 100644 packages/nonworking/ode/.mtn2git_empty delete mode 100644 packages/nonworking/ode/files/.mtn2git_empty delete mode 100644 packages/nonworking/ode/files/config.h delete mode 100644 packages/nonworking/ode/ode_0.8.bb create mode 100644 packages/ode/.mtn2git_empty create mode 100644 packages/ode/files/.mtn2git_empty create mode 100644 packages/ode/ode_0.9.bb (limited to 'packages') diff --git a/packages/nonworking/ode/.mtn2git_empty b/packages/nonworking/ode/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/ode/files/.mtn2git_empty b/packages/nonworking/ode/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/ode/files/config.h b/packages/nonworking/ode/files/config.h deleted file mode 100644 index 8711bd91b2..0000000000 --- a/packages/nonworking/ode/files/config.h +++ /dev/null @@ -1,48 +0,0 @@ -/* per-machine configuration. this file is automatically generated. */ - -#ifndef _ODE_CONFIG_H_ -#define _ODE_CONFIG_H_ - -/* standard system headers */ -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -/* is this a pentium on a gcc-based platform? */ -#undef PENTIUM - -/* integer types (we assume int >= 32 bits) */ -typedef char int8; -typedef unsigned char uint8; -typedef short int16; -typedef unsigned short uint16; -typedef int int32; -typedef unsigned int uint32; - -/* an integer type that we can safely cast a pointer to and - * from without loss of bits. - */ -typedef unsigned int intP; - -/* select the base floating point type */ -#define dDOUBLE 1 - -/* the floating point infinity */ -#define dInfinity DBL_MAX - -/* available functions */ - -#ifdef __cplusplus -} -#endif -#endif diff --git a/packages/nonworking/ode/ode_0.8.bb b/packages/nonworking/ode/ode_0.8.bb deleted file mode 100644 index 9055681a36..0000000000 --- a/packages/nonworking/ode/ode_0.8.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "ODE is an Open Source Physics Engine." -SECTION = "libs" -HOMEPAGE = "http://www.ode.org" -LICENSE = "LGPL" -PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/opende/ode-src-${PV}.zip \ - file://config.h" - -inherit autotools - -#do_configure() { -# touch configurator.exe -# chmod a+rx configurator.exe -# install -m 0644 ${WORKDIR}/config.h include/ode/ -#} - -#do_compile() { -# oe_runmake CC="${CC}" CFLAGS="${CFLAGS}" LD="${LD}" LDFLAGS="${LDFLAGS}" RANLIB="${RANLIB}" AR="${AR} qf " ode-lib -#} - -#do_stage() { -# install -d ${STAGING_INCDIR}/ode/ -# install -m 0644 include/ode/*.h ${STAGING_INCDIR}/ode/ -# oe_libinstall -C lib -a libode ${STAGING_LIBDIR} -#} - -#do_install() { -# : -#} diff --git a/packages/ode/.mtn2git_empty b/packages/ode/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/ode/files/.mtn2git_empty b/packages/ode/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/ode/ode_0.9.bb b/packages/ode/ode_0.9.bb new file mode 100644 index 0000000000..9055681a36 --- /dev/null +++ b/packages/ode/ode_0.9.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "ODE is an Open Source Physics Engine." +SECTION = "libs" +HOMEPAGE = "http://www.ode.org" +LICENSE = "LGPL" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/opende/ode-src-${PV}.zip \ + file://config.h" + +inherit autotools + +#do_configure() { +# touch configurator.exe +# chmod a+rx configurator.exe +# install -m 0644 ${WORKDIR}/config.h include/ode/ +#} + +#do_compile() { +# oe_runmake CC="${CC}" CFLAGS="${CFLAGS}" LD="${LD}" LDFLAGS="${LDFLAGS}" RANLIB="${RANLIB}" AR="${AR} qf " ode-lib +#} + +#do_stage() { +# install -d ${STAGING_INCDIR}/ode/ +# install -m 0644 include/ode/*.h ${STAGING_INCDIR}/ode/ +# oe_libinstall -C lib -a libode ${STAGING_LIBDIR} +#} + +#do_install() { +# : +#} -- cgit v1.2.3 From def428fe2497719bd7dd6405df2fe8c5f1f63bca Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 13:29:47 +0000 Subject: rootfs_deb.bbclass: Fix apt.conf handling (from poky) --- packages/apt/apt-native_0.6.46.2.bb | 1 + packages/apt/apt-native_0.7.2.bb | 2 +- packages/apt/apt-native_0.7.3.bb | 2 +- packages/apt/files/apt.conf | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/apt/apt-native_0.6.46.2.bb b/packages/apt/apt-native_0.6.46.2.bb index 43f73889f7..3342618aa9 100644 --- a/packages/apt/apt-native_0.6.46.2.bb +++ b/packages/apt/apt-native_0.6.46.2.bb @@ -1,4 +1,5 @@ require apt-native.inc +PR = "r1" SRC_URI += "file://nodoc.patch;patch=1 \ file://noconfigure.patch;patch=1" diff --git a/packages/apt/apt-native_0.7.2.bb b/packages/apt/apt-native_0.7.2.bb index 3342618aa9..6db567f987 100644 --- a/packages/apt/apt-native_0.7.2.bb +++ b/packages/apt/apt-native_0.7.2.bb @@ -1,5 +1,5 @@ require apt-native.inc -PR = "r1" +PR = "r2" SRC_URI += "file://nodoc.patch;patch=1 \ file://noconfigure.patch;patch=1" diff --git a/packages/apt/apt-native_0.7.3.bb b/packages/apt/apt-native_0.7.3.bb index 6db567f987..7bf69c01af 100644 --- a/packages/apt/apt-native_0.7.3.bb +++ b/packages/apt/apt-native_0.7.3.bb @@ -1,5 +1,5 @@ require apt-native.inc -PR = "r2" +PR = "r3" SRC_URI += "file://nodoc.patch;patch=1 \ file://noconfigure.patch;patch=1" diff --git a/packages/apt/files/apt.conf b/packages/apt/files/apt.conf index 9e90616465..2bd9ddbfaf 100644 --- a/packages/apt/files/apt.conf +++ b/packages/apt/files/apt.conf @@ -1,4 +1,4 @@ -Dir "${STAGING_DIR}/" +Dir "${STAGING_DIR_NATIVE}/" { State "var/lib/apt/" { -- cgit v1.2.3 From 54ba0710aec882c5adac8d0de08e36136dc9414e Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 28 Feb 2008 13:39:05 +0000 Subject: python-pyode 1.2.0 bring back from nonworking --- packages/nonworking/python/python-pyode_1.2.0.bb | 17 ----------------- packages/python/python-pyode_1.2.0.bb | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 17 deletions(-) delete mode 100644 packages/nonworking/python/python-pyode_1.2.0.bb create mode 100644 packages/python/python-pyode_1.2.0.bb (limited to 'packages') diff --git a/packages/nonworking/python/python-pyode_1.2.0.bb b/packages/nonworking/python/python-pyode_1.2.0.bb deleted file mode 100644 index 95dc0228e3..0000000000 --- a/packages/nonworking/python/python-pyode_1.2.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "PyODE is a set of open-source Python bindings for The Open Dynamics Engine, \ -an open-source physics engine. PyODE also includes an XODE parser." -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "LGPL" -DEPENDS = "ode" -SRCNAME = "PyODE" - -SRC_URI = "${SOURCEFORGE_MIRROR}/pyode/${SRCNAME}-${PV}.tar.bz2" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils - -do_configure_prepend() { - ln -s ${STAGING_LIBDIR}/.. ../ode -} - diff --git a/packages/python/python-pyode_1.2.0.bb b/packages/python/python-pyode_1.2.0.bb new file mode 100644 index 0000000000..3c67db9fe5 --- /dev/null +++ b/packages/python/python-pyode_1.2.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "PyODE is a set of open-source Python bindings for The Open Dynamics Engine, \ +an open-source physics engine. PyODE also includes an XODE parser." +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "LGPL" +DEPENDS = "ode" +SRCNAME = "PyODE" + +SRC_URI = "${SOURCEFORGE_MIRROR}/pyode/${SRCNAME}-${PV}.tar.bz2 \ + file://install.patch;patch=1" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils + +do_configure_prepend() { + ln -s ${STAGING_LIBDIR}/.. ../ode +} + -- cgit v1.2.3 From 79987915a2c7f82f40648cb0fa0e85073fc7b123 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 28 Feb 2008 13:54:17 +0000 Subject: python-pycap 0.1.6 bring back from nonworking --- packages/nonworking/python/python-pycap_0.1.6.bb | 11 ----------- packages/python/python-pycap_0.1.6.bb | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 packages/nonworking/python/python-pycap_0.1.6.bb create mode 100644 packages/python/python-pycap_0.1.6.bb (limited to 'packages') diff --git a/packages/nonworking/python/python-pycap_0.1.6.bb b/packages/nonworking/python/python-pycap_0.1.6.bb deleted file mode 100644 index 48e62c4e91..0000000000 --- a/packages/nonworking/python/python-pycap_0.1.6.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Python Packet Capture Library" -SECTION = "devel/python" -PRIORITY = "optional" -RDEPENDS = "python-core" -DEPENDS = "libpcap-0.7.2 libnet-1.1.1" -SRCNAME = "pycap" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils diff --git a/packages/python/python-pycap_0.1.6.bb b/packages/python/python-pycap_0.1.6.bb new file mode 100644 index 0000000000..48e62c4e91 --- /dev/null +++ b/packages/python/python-pycap_0.1.6.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Python Packet Capture Library" +SECTION = "devel/python" +PRIORITY = "optional" +RDEPENDS = "python-core" +DEPENDS = "libpcap-0.7.2 libnet-1.1.1" +SRCNAME = "pycap" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils -- cgit v1.2.3 From 344116414547c82ad8e16f53fc2ad5d7ace477e3 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 28 Feb 2008 14:21:35 +0000 Subject: dbus [all] fix packaging, make the libdbus RRECOMMEND the actual message bus system --- packages/dbus/dbus.inc | 5 +++-- packages/dbus/dbus_1.0.2.bb | 2 +- packages/dbus/dbus_1.1.20.bb | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc index bca75856df..26a0e04585 100644 --- a/packages/dbus/dbus.inc +++ b/packages/dbus/dbus.inc @@ -22,7 +22,7 @@ CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session DEBIANNAME_${PN} = "dbus-1" -PACKAGES += "${PN}-lib" +PACKAGES =+ "${PN}-lib" FILES_${PN} = "\ ${bindir}/dbus-daemon* \ @@ -37,7 +37,8 @@ ${datadir}/dbus-1/services \ ${datadir}/dbus-1/system-services \ " FILES_${PN}-lib = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" +RRECOMMENDS_${PN}-lib = "${PN}" +FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool ${libdir}/" pkg_postinst_dbus() { #!/bin/sh diff --git a/packages/dbus/dbus_1.0.2.bb b/packages/dbus/dbus_1.0.2.bb index da0a298459..6a54a62d9a 100644 --- a/packages/dbus/dbus_1.0.2.bb +++ b/packages/dbus/dbus_1.0.2.bb @@ -1,4 +1,4 @@ require dbus.inc -PR = "r10" +PR = "r11" DEFAULT_PREFERENCE = "-1" diff --git a/packages/dbus/dbus_1.1.20.bb b/packages/dbus/dbus_1.1.20.bb index 247e465769..c951fc79ec 100644 --- a/packages/dbus/dbus_1.1.20.bb +++ b/packages/dbus/dbus_1.1.20.bb @@ -1,5 +1,5 @@ include dbus.inc -PR = "r0" +PR = "r1" SRC_URI += "file://fix-dbus-launch-x11.patch;patch=1" -- cgit v1.2.3 From cc1759e0dbf2f33f10ea6e620db4d543941f3e9c Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 28 Feb 2008 15:52:21 +0000 Subject: python-m2crypto 0.18 update to 0.18.2 and bring back from nonworking --- .../python/python-m2crypto/.mtn2git_empty | 0 .../nonworking/python/python-m2crypto/0.13p1.patch | 42 ---------------------- packages/nonworking/python/python-m2crypto_0.18.bb | 13 ------- packages/python/python-m2crypto/.mtn2git_empty | 0 packages/python/python-m2crypto/install.patch | 24 +++++++++++++ packages/python/python-m2crypto_0.18.2.bb | 18 ++++++++++ 6 files changed, 42 insertions(+), 55 deletions(-) delete mode 100644 packages/nonworking/python/python-m2crypto/.mtn2git_empty delete mode 100644 packages/nonworking/python/python-m2crypto/0.13p1.patch delete mode 100644 packages/nonworking/python/python-m2crypto_0.18.bb create mode 100644 packages/python/python-m2crypto/.mtn2git_empty create mode 100644 packages/python/python-m2crypto/install.patch create mode 100644 packages/python/python-m2crypto_0.18.2.bb (limited to 'packages') diff --git a/packages/nonworking/python/python-m2crypto/.mtn2git_empty b/packages/nonworking/python/python-m2crypto/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/python/python-m2crypto/0.13p1.patch b/packages/nonworking/python/python-m2crypto/0.13p1.patch deleted file mode 100644 index ad359185e6..0000000000 --- a/packages/nonworking/python/python-m2crypto/0.13p1.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- M2Crypto/SSL/Connection.py.org Wed Mar 31 08:49:57 2004 -+++ M2Crypto/SSL/Connection.py Wed Mar 31 08:50:45 2004 -@@ -143,11 +143,11 @@ - """Set this connection's underlying socket to _mode_.""" - self.socket.setblocking(mode) - if mode: -- self.send = self.write = self._write_bio -- self.recv = self.read = self._read_bio -+ self.send = self.write = Connection._write_bio -+ self.recv = self.read = Connection._read_bio - else: -- self.send = self.write = self._write_nbio -- self.recv = self.read = self._read_nbio -+ self.send = self.write = Connection._write_nbio -+ self.recv = self.read = Connection._read_nbio - - def fileno(self): - return self.socket.fileno() ---- M2Crypto/DSA.py.org Wed Mar 31 08:53:16 2004 -+++ M2Crypto/DSA.py Wed Mar 31 08:53:35 2004 -@@ -35,7 +35,7 @@ - - def __getattr__(self, name): - if name in ['p', 'q', 'g', 'pub', 'priv']: -- method = getattr(m2, 'm2.dsa_get_%s' % (name,)) -+ method = getattr(m2, 'dsa_get_%s' % (name,)) - assert m2.dsa_type_check(self.dsa), "'dsa' type error" - return method(self.dsa) - else: ---- M2Crypto/_version.py.org Wed Mar 31 12:25:21 2004 -+++ M2Crypto/_version.py Wed Mar 31 12:24:18 2004 -@@ -1,8 +1,8 @@ - """M2Crypto Version Info""" - --RCS_id='$Id: _version.py,v 1.2 2004/03/25 06:33:29 ngps Exp $' -+RCS_id='$Id: _version.py,v 1.3 2004/03/31 01:30:58 ngps Exp $' - - import string --version_info = (0, 13) -+version_info = (0, 13, 1) - version = string.join(map(lambda x: "%s" % x, version_info), ".") - diff --git a/packages/nonworking/python/python-m2crypto_0.18.bb b/packages/nonworking/python/python-m2crypto_0.18.bb deleted file mode 100644 index 009345e5a0..0000000000 --- a/packages/nonworking/python/python-m2crypto_0.18.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "A Python crypto and SSL toolkit" -SECTION = "devel/python" -PRIORITY = "optional" -DEPENDS = "openssl swig-native" -LICENSE = "BSD" -SRCNAME = "M2Crypto" - -SRC_URI = "http://sandbox.rulemaker.net/ngps/Dist/m2crypto-0.13.zip \ - file://0.13p1.patch;patch=1;pnum=0" -S = "${WORKDIR}/m2crypto-0.13" - -inherit distutils - diff --git a/packages/python/python-m2crypto/.mtn2git_empty b/packages/python/python-m2crypto/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/python/python-m2crypto/install.patch b/packages/python/python-m2crypto/install.patch new file mode 100644 index 0000000000..6c70ccf516 --- /dev/null +++ b/packages/python/python-m2crypto/install.patch @@ -0,0 +1,24 @@ +Index: m2crypto-0.18.2/setup.py +=================================================================== +--- m2crypto-0.18.2.orig/setup.py ++++ m2crypto-0.18.2/setup.py +@@ -38,7 +38,7 @@ class _M2CryptoBuildExt(build_ext.build_ + self.openssl = 'c:\\pkg' + else: + self.libraries = ['ssl', 'crypto'] +- self.openssl = '/usr' ++ self.openssl = os.environ.get( "STAGING_DIR" ) + + + def finalize_options(self): +@@ -47,8 +47,8 @@ class _M2CryptoBuildExt(build_ext.build_ + + build_ext.build_ext.finalize_options(self) + +- opensslIncludeDir = os.path.join(self.openssl, 'include') +- opensslLibraryDir = os.path.join(self.openssl, 'lib') ++ opensslIncludeDir = os.environ.get( "STAGING_INCDIR" ) ++ opensslLibraryDir = os.environ.get( "STAGING_LIBDIR" ) + + self.swig_opts = ['-I%s' % i for i in self.include_dirs + \ + [opensslIncludeDir]] diff --git a/packages/python/python-m2crypto_0.18.2.bb b/packages/python/python-m2crypto_0.18.2.bb new file mode 100644 index 0000000000..c83a2ec076 --- /dev/null +++ b/packages/python/python-m2crypto_0.18.2.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "A Python crypto and SSL toolkit" +SECTION = "devel/python" +PRIORITY = "optional" +DEPENDS = "openssl swig-native" +LICENSE = "BSD" +SRCNAME = "M2Crypto" +PR = "ml0" + +SRC_URI = "http://chandlerproject.org/pub/Projects/MeTooCrypto/m2crypto-${PV}.tar.gz \ + file://install.patch;patch=1" +S = "${WORKDIR}/m2crypto-0.18.2" + +inherit setuptools + +export STAGING_DIR := "${STAGING_DIR}" +export STAGING_INCDIR := "${STAGING_INCDIR}" +export STAGING_LIBDIR := "${STAGING_LIBDIR}" + -- cgit v1.2.3 From 78a12152c9703cb104fdcfc89d75531a8e79ddaf Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 28 Feb 2008 16:13:00 +0000 Subject: python-egenix-md-base 2.0.6 update to 3.0.0 and bring back from nonworking --- .../nonworking/python/python-egenix-mx-base_2.0.6.bb | 19 ------------------- packages/python/python-egenix-mx-base_3.0.0.bb | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 packages/nonworking/python/python-egenix-mx-base_2.0.6.bb create mode 100644 packages/python/python-egenix-mx-base_3.0.0.bb (limited to 'packages') diff --git a/packages/nonworking/python/python-egenix-mx-base_2.0.6.bb b/packages/nonworking/python/python-egenix-mx-base_2.0.6.bb deleted file mode 100644 index b31cd20cad..0000000000 --- a/packages/nonworking/python/python-egenix-mx-base_2.0.6.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "The eGenix.com mx Extensions for Python are a collection of professional quality Python software \ -tools which enhance Python's usability in many important areas such as ODBC database connectivity, fast text \ -processing, date/time processing and web site programming." -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "EGENIX" -SRCNAME = "egenix-mx-base" -PR = "r1" - -SRC_URI = "http://www.egenix.com/files/python/egenix-mx-base-${PV}.tar.gz \ - file://gcc4.patch;patch=1" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils - -export INCLUDE = "${STAGING_INCDIR}/${PYTHON_DIR}" -export LIB = "${STAGING_LIBDIR}" - -FILES_${PN} += "${datadir}" diff --git a/packages/python/python-egenix-mx-base_3.0.0.bb b/packages/python/python-egenix-mx-base_3.0.0.bb new file mode 100644 index 0000000000..8452ca6e7f --- /dev/null +++ b/packages/python/python-egenix-mx-base_3.0.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "The eGenix.com mx Extensions for Python are a collection of professional quality Python software \ +tools which enhance Python's usability in many important areas such as ODBC database connectivity, fast text \ +processing, date/time processing and web site programming." +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "EGENIX" +SRCNAME = "egenix-mx-base" +PR = "r0" + +SRC_URI = "http://downloads.egenix.com/python/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils + +export INCLUDE = "${STAGING_INCDIR}/${PYTHON_DIR}" +export LIB = "${STAGING_LIBDIR}" + +FILES_${PN} += "${datadir}" +FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/mx/*/*/.debug" -- cgit v1.2.3 From f8efb715c231cfc285f6bc8cbad4c1aa1c14037c Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 28 Feb 2008 16:35:43 +0000 Subject: remove obsolete stuff from nonworking (e17, efl, xfree86) --- packages/nonworking/e17/.mtn2git_empty | 0 packages/nonworking/e17/evidence | 29 ------ packages/nonworking/efl/.mtn2git_empty | 0 packages/nonworking/efl/e/.mtn2git_empty | 0 packages/nonworking/efl/e/fix-configure.patch | 47 ---------- packages/nonworking/efl/ecore-fb_0.9.9.038.bb | 31 ------ packages/nonworking/efl/ecore-native_0.9.9.038.bb | 6 -- packages/nonworking/efl/ecore-x11_0.9.9.038.bb | 30 ------ packages/nonworking/efl/ecore.inc | 46 --------- packages/nonworking/efl/ecore/.mtn2git_empty | 0 .../nonworking/efl/ecore/add-tslib-support.patch | 104 --------------------- .../efl/ecore/configure-abstract-sockets.patch | 16 ---- packages/nonworking/efl/ecore/configure.patch | 21 ----- .../efl/ecore/ecore_kernel_input_header.patch | 23 ----- .../nonworking/efl/ecore/fix-tslib-configure.patch | 12 --- .../nonworking/efl/ecore/remove-bad-code.patch | 36 ------- .../efl/ecore/remove-tslib-configure.patch | 15 --- packages/nonworking/efl/edb-native/.mtn2git_empty | 0 .../efl/edb-native/no-gtk-forkbomb.patch | 12 --- packages/nonworking/efl/edb-native_1.0.5.007.bb | 11 --- packages/nonworking/efl/edb-utils_1.0.5.007.bb | 19 ---- packages/nonworking/efl/edb_1.0.5.007.bb | 14 --- packages/nonworking/efl/edje-native_0.5.0.038.bb | 20 ---- packages/nonworking/efl/edje-utils_0.5.0.038.bb | 23 ----- packages/nonworking/efl/edje_0.5.0.038.bb | 32 ------- packages/nonworking/efl/eet-native_0.9.10.038.bb | 4 - packages/nonworking/efl/eet_0.9.10.038.bb | 9 -- packages/nonworking/efl/efl.bbclass | 52 ----------- packages/nonworking/efl/efreet-native_0.0.3.002.bb | 3 - packages/nonworking/efl/efreet_0.0.3.002.bb | 8 -- packages/nonworking/efl/embryo-native_0.9.1.038.bb | 7 -- packages/nonworking/efl/embryo-utils_0.9.1.038.bb | 18 ---- packages/nonworking/efl/embryo_0.9.1.038.bb | 11 --- packages/nonworking/efl/emotion_20061116.bb | 18 ---- packages/nonworking/efl/engrave_20060128.bb | 17 ---- packages/nonworking/efl/epdf_20060418.bb | 9 -- packages/nonworking/efl/epeg_0.9.0.008.bb | 5 - packages/nonworking/efl/epsilon/.mtn2git_empty | 0 packages/nonworking/efl/epsilon/compile-fix.patch | 15 --- .../efl/epsilon/server-is-not-client.patch | 11 --- packages/nonworking/efl/epsilon_0.3.0.008.bb | 17 ---- packages/nonworking/efl/esmart-fb_0.9.0.008.bb | 16 ---- packages/nonworking/efl/esmart-x11_0.9.0.008.bb | 24 ----- packages/nonworking/efl/esmart.inc | 51 ---------- packages/nonworking/efl/esmart/.mtn2git_empty | 0 packages/nonworking/efl/esmart/compile-fix.patch | 16 ---- .../efl/esmart/disable-x-only-features.patch | 25 ----- packages/nonworking/efl/esmart/ecore-fix.patch | 10 -- packages/nonworking/efl/esmart/include-stdio.patch | 22 ----- packages/nonworking/efl/etk_0.1.0.003.bb | 17 ---- packages/nonworking/efl/evas-fb_0.9.9.038.bb | 47 ---------- packages/nonworking/efl/evas-native_0.9.9.038.bb | 5 - packages/nonworking/efl/evas-x11_0.9.9.038.bb | 55 ----------- packages/nonworking/efl/evas.inc | 50 ---------- packages/nonworking/efl/evas/.mtn2git_empty | 0 packages/nonworking/efl/evas/fix-configure.patch | 36 ------- packages/nonworking/efl/evas/pagesize.patch | 13 --- packages/nonworking/efl/ewl/.mtn2git_empty | 0 packages/nonworking/efl/ewl/ewl-configure.patch | 15 --- packages/nonworking/efl/ewl/minmax.patch | 18 ---- packages/nonworking/efl/ewl/no-examples.patch | 22 ----- packages/nonworking/efl/ewl_0.5.1.008.bb | 29 ------ packages/nonworking/efl/files/.mtn2git_empty | 0 packages/nonworking/efl/files/pkg.m4 | 57 ----------- packages/nonworking/efl/imlib2-fb_1.3.0.001.bb | 6 -- packages/nonworking/efl/imlib2-native_1.3.0.001.bb | 8 -- packages/nonworking/efl/imlib2-x11_1.3.0.001.bb | 8 -- packages/nonworking/efl/imlib2.inc | 58 ------------ .../python/python-gsl-0.2.0/cross-compile.patch | 4 +- packages/nonworking/python/python-gsl_0.2.0.bb | 2 +- packages/nonworking/xfree86/.mtn2git_empty | 0 .../xfree86/xfree86-4.3.0/.mtn2git_empty | 0 .../dirty-3.2-xterm-breakage-fix.patch | 35 ------- packages/nonworking/xfree86/xfree86-4.3.0/host.def | 22 ----- .../xfree86-4.3.0/tinyx-kbd-enable-fix.patch | 37 -------- .../tinyx-tslib-reset-and-vt-switch-fixes.patch | 69 -------------- packages/nonworking/xfree86/xfree86_4.3.0.bb | 52 ----------- 77 files changed, 3 insertions(+), 1577 deletions(-) delete mode 100644 packages/nonworking/e17/.mtn2git_empty delete mode 100644 packages/nonworking/e17/evidence delete mode 100644 packages/nonworking/efl/.mtn2git_empty delete mode 100644 packages/nonworking/efl/e/.mtn2git_empty delete mode 100644 packages/nonworking/efl/e/fix-configure.patch delete mode 100644 packages/nonworking/efl/ecore-fb_0.9.9.038.bb delete mode 100644 packages/nonworking/efl/ecore-native_0.9.9.038.bb delete mode 100644 packages/nonworking/efl/ecore-x11_0.9.9.038.bb delete mode 100644 packages/nonworking/efl/ecore.inc delete mode 100644 packages/nonworking/efl/ecore/.mtn2git_empty delete mode 100644 packages/nonworking/efl/ecore/add-tslib-support.patch delete mode 100644 packages/nonworking/efl/ecore/configure-abstract-sockets.patch delete mode 100644 packages/nonworking/efl/ecore/configure.patch delete mode 100644 packages/nonworking/efl/ecore/ecore_kernel_input_header.patch delete mode 100644 packages/nonworking/efl/ecore/fix-tslib-configure.patch delete mode 100644 packages/nonworking/efl/ecore/remove-bad-code.patch delete mode 100644 packages/nonworking/efl/ecore/remove-tslib-configure.patch delete mode 100644 packages/nonworking/efl/edb-native/.mtn2git_empty delete mode 100644 packages/nonworking/efl/edb-native/no-gtk-forkbomb.patch delete mode 100644 packages/nonworking/efl/edb-native_1.0.5.007.bb delete mode 100644 packages/nonworking/efl/edb-utils_1.0.5.007.bb delete mode 100644 packages/nonworking/efl/edb_1.0.5.007.bb delete mode 100644 packages/nonworking/efl/edje-native_0.5.0.038.bb delete mode 100644 packages/nonworking/efl/edje-utils_0.5.0.038.bb delete mode 100644 packages/nonworking/efl/edje_0.5.0.038.bb delete mode 100644 packages/nonworking/efl/eet-native_0.9.10.038.bb delete mode 100644 packages/nonworking/efl/eet_0.9.10.038.bb delete mode 100644 packages/nonworking/efl/efl.bbclass delete mode 100644 packages/nonworking/efl/efreet-native_0.0.3.002.bb delete mode 100644 packages/nonworking/efl/efreet_0.0.3.002.bb delete mode 100644 packages/nonworking/efl/embryo-native_0.9.1.038.bb delete mode 100644 packages/nonworking/efl/embryo-utils_0.9.1.038.bb delete mode 100644 packages/nonworking/efl/embryo_0.9.1.038.bb delete mode 100644 packages/nonworking/efl/emotion_20061116.bb delete mode 100644 packages/nonworking/efl/engrave_20060128.bb delete mode 100644 packages/nonworking/efl/epdf_20060418.bb delete mode 100644 packages/nonworking/efl/epeg_0.9.0.008.bb delete mode 100644 packages/nonworking/efl/epsilon/.mtn2git_empty delete mode 100644 packages/nonworking/efl/epsilon/compile-fix.patch delete mode 100644 packages/nonworking/efl/epsilon/server-is-not-client.patch delete mode 100644 packages/nonworking/efl/epsilon_0.3.0.008.bb delete mode 100644 packages/nonworking/efl/esmart-fb_0.9.0.008.bb delete mode 100644 packages/nonworking/efl/esmart-x11_0.9.0.008.bb delete mode 100644 packages/nonworking/efl/esmart.inc delete mode 100644 packages/nonworking/efl/esmart/.mtn2git_empty delete mode 100644 packages/nonworking/efl/esmart/compile-fix.patch delete mode 100644 packages/nonworking/efl/esmart/disable-x-only-features.patch delete mode 100644 packages/nonworking/efl/esmart/ecore-fix.patch delete mode 100644 packages/nonworking/efl/esmart/include-stdio.patch delete mode 100644 packages/nonworking/efl/etk_0.1.0.003.bb delete mode 100644 packages/nonworking/efl/evas-fb_0.9.9.038.bb delete mode 100644 packages/nonworking/efl/evas-native_0.9.9.038.bb delete mode 100644 packages/nonworking/efl/evas-x11_0.9.9.038.bb delete mode 100644 packages/nonworking/efl/evas.inc delete mode 100644 packages/nonworking/efl/evas/.mtn2git_empty delete mode 100644 packages/nonworking/efl/evas/fix-configure.patch delete mode 100644 packages/nonworking/efl/evas/pagesize.patch delete mode 100644 packages/nonworking/efl/ewl/.mtn2git_empty delete mode 100644 packages/nonworking/efl/ewl/ewl-configure.patch delete mode 100644 packages/nonworking/efl/ewl/minmax.patch delete mode 100644 packages/nonworking/efl/ewl/no-examples.patch delete mode 100644 packages/nonworking/efl/ewl_0.5.1.008.bb delete mode 100644 packages/nonworking/efl/files/.mtn2git_empty delete mode 100644 packages/nonworking/efl/files/pkg.m4 delete mode 100644 packages/nonworking/efl/imlib2-fb_1.3.0.001.bb delete mode 100644 packages/nonworking/efl/imlib2-native_1.3.0.001.bb delete mode 100644 packages/nonworking/efl/imlib2-x11_1.3.0.001.bb delete mode 100644 packages/nonworking/efl/imlib2.inc delete mode 100644 packages/nonworking/xfree86/.mtn2git_empty delete mode 100644 packages/nonworking/xfree86/xfree86-4.3.0/.mtn2git_empty delete mode 100644 packages/nonworking/xfree86/xfree86-4.3.0/dirty-3.2-xterm-breakage-fix.patch delete mode 100644 packages/nonworking/xfree86/xfree86-4.3.0/host.def delete mode 100644 packages/nonworking/xfree86/xfree86-4.3.0/tinyx-kbd-enable-fix.patch delete mode 100644 packages/nonworking/xfree86/xfree86-4.3.0/tinyx-tslib-reset-and-vt-switch-fixes.patch delete mode 100644 packages/nonworking/xfree86/xfree86_4.3.0.bb (limited to 'packages') diff --git a/packages/nonworking/e17/.mtn2git_empty b/packages/nonworking/e17/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/e17/evidence b/packages/nonworking/e17/evidence deleted file mode 100644 index 84a47ff570..0000000000 --- a/packages/nonworking/e17/evidence +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "evidence, an enlightenemt file manager" -LICENSE = "GPL" -# can support dbus, avifile, libmpeg3 -DEPENDS = "pkgconfig gtk+ glib-2.0 ecore-x11 evas-x11 edb eet edje imlib2-x11 libpng epeg jpeg libpcre curl taglib libvorbis libogg libxine-x11 emotion freetype" -RDEPENDS += "examine" -PR = "r0" - -inherit e - -SRC_URI = "cvs://anonymous@evidence.cvs.sourceforge.net/cvsroot/evidence;module=evidence;date=${PV}" -S = "${WORKDIR}/evidence" - -EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ - --enable-ecore \ - --enable-ecore-ipc \ - --enable-canvas-evas2 \ - --enable-edje \ - --enable-x \ - --enable-tree-view \ - --enable-icon-view \ - --enable-browser-view \ - --with-libxine=${STAGING_LIBDIR}" - -do_compile_prepend() { - sed -i 's:LDFLAGS = :LDFLAGS = -L${STAGING_LIBDIR} :' ${S}/src/providers/vorbis/Makefile -} - -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*" - diff --git a/packages/nonworking/efl/.mtn2git_empty b/packages/nonworking/efl/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/efl/e/.mtn2git_empty b/packages/nonworking/efl/e/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/efl/e/fix-configure.patch b/packages/nonworking/efl/e/fix-configure.patch deleted file mode 100644 index 02560fd7ab..0000000000 --- a/packages/nonworking/efl/e/fix-configure.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -Nur e~/configure.in e/configure.in ---- e~/configure.in 2005-09-29 13:17:29.000000000 -0700 -+++ e/configure.in 2005-09-29 13:19:35.000000000 -0700 -@@ -114,9 +114,7 @@ - AC_PATH_XTRA - AC_CHECK_HEADER(X11/X.h, - [ -- x_dir=${x_dir:-/usr/X11R6} -- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} -- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" -+ x_libs="-lX11 -lXext"; - ],[ - AC_MSG_ERROR([Cannot find X headers and libraries.]) - ] -diff -Nur e~/src/bin/Makefile.am e/src/bin/Makefile.am ---- e~/src/bin/Makefile.am 2005-09-29 13:17:29.000000000 -0700 -+++ e/src/bin/Makefile.am 2005-09-29 13:19:35.000000000 -0700 -@@ -1,6 +1,5 @@ - MAINTAINERCLEANFILES = Makefile.in --INCLUDES = -I$(includedir) \ -- -I$(top_srcdir) \ -+INCLUDES = -I$(top_srcdir) \ - -I$(top_srcdir)/src/bin \ - -I$(top_srcdir)/src/lib \ - @e_cflags@ \ -diff -Nur e~/src/lib/Makefile.am e/src/lib/Makefile.am ---- e~/src/lib/Makefile.am 2005-09-29 13:17:29.000000000 -0700 -+++ e/src/lib/Makefile.am 2005-09-29 13:19:56.000000000 -0700 -@@ -1,6 +1,5 @@ - MAINTAINERCLEANFILES = Makefile.in --INCLUDES = -I$(includedir) \ -- -I$(top_srcdir)/src/bin \ -+INCLUDES = -I$(top_srcdir)/src/bin \ - @e_cflags@ - - lib_LTLIBRARIES = libe.la -diff -Nur e~/src/preload/Makefile.am e/src/preload/Makefile.am ---- e~/src/preload/Makefile.am 2005-09-29 13:17:29.000000000 -0700 -+++ e/src/preload/Makefile.am 2005-09-29 13:19:35.000000000 -0700 -@@ -2,7 +2,6 @@ - - INCLUDES = -I. \ - -I$(top_srcdir) \ -- -I$(includedir) \ - -I$(top_srcdir)src/preload \ - @x_cflags@ - pkgdir = $(libdir)/enlightenment/preload diff --git a/packages/nonworking/efl/ecore-fb_0.9.9.038.bb b/packages/nonworking/efl/ecore-fb_0.9.9.038.bb deleted file mode 100644 index b856d38bd9..0000000000 --- a/packages/nonworking/efl/ecore-fb_0.9.9.038.bb +++ /dev/null @@ -1,31 +0,0 @@ -require ecore.inc -PR = "r2" - -SRC_URI += "file://remove-bad-code.patch;patch=1" - -EXTRA_OECONF = "--enable-ecore-fb \ - --enable-ecore-job \ - --enable-ecore-file \ - --enable-poll \ - --enable-ecore-dbus \ - --enable-ecore-evas \ - --enable-ecore-evas-buffer \ - --enable-ecore-evas-fb \ - --disable-ecore-evas-x \ - --disable-ecore-evas-xrender \ - --disable-ecore-evas-gl \ - --enable-ecore-con \ - --enable-ecore-config \ - --enable-ecore-ipc \ - --enable-ecore-txt \ - --disable-ecore-x \ - --disable-curl \ - --without-curl-config \ - --enable-ecore-config \ - --enable-ecore-desktop \ - --disable-openssl" - -parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \ - Ecore_Txt Ecore_Fb Ecore_Con \ - Ecore_Ipc Ecore_Evas Ecore_Config \ - Ecore_Desktop" diff --git a/packages/nonworking/efl/ecore-native_0.9.9.038.bb b/packages/nonworking/efl/ecore-native_0.9.9.038.bb deleted file mode 100644 index 7d7ed2370a..0000000000 --- a/packages/nonworking/efl/ecore-native_0.9.9.038.bb +++ /dev/null @@ -1,6 +0,0 @@ -require ecore-fb_${PV}.bb -inherit native -# disable curl for now (see EXTRA_OECONF in ecore-fb), we may reenable it when we need it -# DEPENDS = "curl-native eet-native evas-native" -DEPENDS = "eet-native evas-native" -PROVIDES = "ecore-native" \ No newline at end of file diff --git a/packages/nonworking/efl/ecore-x11_0.9.9.038.bb b/packages/nonworking/efl/ecore-x11_0.9.9.038.bb deleted file mode 100644 index 1deb641326..0000000000 --- a/packages/nonworking/efl/ecore-x11_0.9.9.038.bb +++ /dev/null @@ -1,30 +0,0 @@ -require ecore.inc -DEPENDS += "evas-x11" -PR = "r3" - -SRC_URI += "file://configure-abstract-sockets.patch;patch=1" - -EXTRA_OECONF = "--disable-ecore-fb \ - --disable-ecore-dfb \ - --enable-ecore-job \ - --enable-ecore-file \ - --enable-ecore-dbus \ - --disable-ecore-evas-fb \ - --disable-ecore-evas-dfb \ - --enable-ecore-evas-x \ - --enable-ecore-evas-buffer \ - --disable-ecore-evas-gl \ - --enable-ecore-con \ - --enable-ecore-ipc \ - --enable-ecore-txt \ - --enable-ecore-x \ - --enable-ecore-config \ - --disable-openssl \ - --enable-ecore-desktop \ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR} " - -parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \ - Ecore_Txt Ecore_Fb Ecore_Con \ - Ecore_Ipc Ecore_Evas Ecore_Config \ - Ecore_X Ecore_Desktop" diff --git a/packages/nonworking/efl/ecore.inc b/packages/nonworking/efl/ecore.inc deleted file mode 100644 index 60c18cacc3..0000000000 --- a/packages/nonworking/efl/ecore.inc +++ /dev/null @@ -1,46 +0,0 @@ -DESCRIPTION = "Ecore is the core event abstraction layer for the enlightenment \ -foundation libraries. It makes makes doing selections, drag and drop, event loops, \ -timeouts and idle handlers fast, optimized, and convenient." -LEAD_SONAME = "libecore.so" -LICENSE = "MIT" -# can also have openssl, dbus, iconv -DEPENDS += "virtual/evas curl eet" -PROVIDES += "virtual/ecore" - -inherit efl - -SRC_URI = "http://enlightenment.freedesktop.org/files/ecore-${PV}.tar.gz \ - file://ecore_kernel_input_header.patch;patch=1 \ - ${E_CVS};module=e17/libs/ecore/m4;date=20070501" -# file://fix-tslib-configure.patch;patch=1 \ -# file://configure.patch;patch=1 \ - -S = "${WORKDIR}/ecore-${PV}" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore" - -EXTRA_OECONF = "" - -libraries = "" -headers = "" -parts = "" - -do_configure_prepend() { - if [ -e "${WORKDIR}/m4" ]; then - install -d "${S}/m4" - install "${WORKDIR}/m4/"*.m4 "${S}/m4" - aclocal -I m4 - fi -} - -do_stage_append() { - for p in ${parts}; do - dir=`echo $p|tr A-Z a-z` - install -m 0644 ${S}/src/lib/$dir/$p*.h ${STAGING_INCDIR}/ - oe_libinstall -C src/lib/$dir lib$dir ${STAGING_LIBDIR}/ - done - install -m 0644 ${S}/src/lib/ecore/Ecore_Data.h ${STAGING_INCDIR}/ -# install -m 0644 ${S}/ecore.m4 ${STAGING_DATADIR}/aclocal/ -} - -FILES_${PN} += "${libdir}/ecore_config_ipc_ecore.so.*" -FILES_${PN}-dev += "${libdir}/ecore_config_ipc_ecore.so" diff --git a/packages/nonworking/efl/ecore/.mtn2git_empty b/packages/nonworking/efl/ecore/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/efl/ecore/add-tslib-support.patch b/packages/nonworking/efl/ecore/add-tslib-support.patch deleted file mode 100644 index c125122a91..0000000000 --- a/packages/nonworking/efl/ecore/add-tslib-support.patch +++ /dev/null @@ -1,104 +0,0 @@ - -# -# tslib support for ecore, (C) Michael 'Mickey' Lauer -# - ---- ecore/src/lib/ecore_fb/ecore_fb.c~add-tslib-support.patch -+++ ecore/src/lib/ecore_fb/ecore_fb.c -@@ -4,6 +4,13 @@ - #include "Ecore_Fb.h" - #include "ecore_private.h" - -+ -+#ifdef HAVE_TSLIB -+#include -+#include -+#endif -+ -+ - #include - #include - #include -@@ -77,6 +84,11 @@ - unsigned char z; - }; - -+#ifdef HAVE_TSLIB -+struct tsdev *_ecore_fb_tslib_tsdev = NULL; -+struct ts_sample _ecore_fb_tslib_event; -+#endif -+ - static void _ecore_fb_size_get(int *w, int *h); - static int _ecore_fb_ts_fd_handler(void *data, Ecore_Fd_Handler *fd_handler); - static int _ecore_fb_kbd_fd_handler(void *data, Ecore_Fd_Handler *fd_handler); -@@ -269,10 +281,39 @@ - ecore_fb_init(const char *name __UNUSED__) - { - int prev_flags; -+#ifdef HAVE_TSLIB -+ char *tslib_tsdevice = NULL; -+#endif - - _ecore_fb_init_count++; - if (_ecore_fb_init_count > 1) return _ecore_fb_init_count; -+#ifdef HAVE_TSLIB -+ if ( ( tslib_tsdevice = getenv("TSLIB_TSDEVICE") ) != NULL ) -+ { -+ printf( "ECORE_FB: TSLIB_TSDEVICE = '%s'\n", tslib_tsdevice ); -+ _ecore_fb_tslib_tsdev = ts_open( tslib_tsdevice, 1 ); /* 1 = nonblocking, 0 = blocking */ -+ -+ if ( !_ecore_fb_tslib_tsdev ) -+ { -+ printf( "ECORE_FB: Can't ts_open (%s)\n", strerror( errno ) ); -+ return 0; -+ } -+ -+ if ( ts_config( _ecore_fb_tslib_tsdev ) ) -+ { -+ printf( "ECORE_FB: Can't ts_config (%s)\n", strerror( errno ) ); -+ return 0; -+ } -+ _ecore_fb_ts_fd = ts_fd( _ecore_fb_tslib_tsdev ); -+ if ( _ecore_fb_ts_fd < 0 ) -+ { -+ printf( "ECORE_FB: Can't open touchscreen (%s)\n", strerror( errno ) ); -+ return 0; -+ } -+ } -+#else - _ecore_fb_ts_fd = open("/dev/touchscreen/0", O_RDONLY); -+#endif - if (_ecore_fb_ts_fd >= 0) - { - prev_flags = fcntl(_ecore_fb_ts_fd, F_GETFL); -@@ -790,7 +831,21 @@ - char *ptr; - double t; - int did_triple = 0; -- -+ -+#ifdef HAVE_TSLIB -+ if ( _ecore_fb_ts_apply_cal ) -+ num = ts_read_raw( _ecore_fb_tslib_tsdev, &_ecore_fb_tslib_event, 1 ); -+ else -+ num = ts_read( _ecore_fb_tslib_tsdev, &_ecore_fb_tslib_event, 1 ); -+ if ( num != 1 ) -+ { -+ return 1; /* no more samples at this time */ -+ } -+ x = _ecore_fb_tslib_event.x; -+ y = _ecore_fb_tslib_event.y; -+ pressure = _ecore_fb_tslib_event.pressure; -+ v = 1; /* loop, there might be more samples */ -+#else - ptr = (char *)&(_ecore_fb_ts_event); - ptr += _ecore_fb_ts_event_byte_count; - num = sizeof(Ecore_Fb_Ts_Event) - _ecore_fb_ts_event_byte_count; -@@ -811,6 +866,7 @@ - y = _ecore_fb_ts_event.y; - } - pressure = _ecore_fb_ts_event.pressure; -+#endif - /* add event to queue */ - /* always add a move event */ - if ((pressure) || (prev_pressure)) diff --git a/packages/nonworking/efl/ecore/configure-abstract-sockets.patch b/packages/nonworking/efl/ecore/configure-abstract-sockets.patch deleted file mode 100644 index 359203b163..0000000000 --- a/packages/nonworking/efl/ecore/configure-abstract-sockets.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: ecore-0.9.9.038/configure.in -=================================================================== ---- ecore-0.9.9.038.orig/configure.in -+++ ecore-0.9.9.038/configure.in -@@ -541,10 +541,7 @@ AC_ARG_ENABLE(abstract-sockets, - [ want_abstract_sockets="yes"] - ) - if test "x$want_abstract_sockets" = "xyes"; then -- AC_ABSTRACT_SOCKET_TEST( -- [AC_DEFINE(HAVE_ABSTRACT_SOCKETS, 1, [Have abstract sockets namespace])], -- [] -- ) -+ HAVE_ABSTRACT_SOCKETS = 1 - fi - - ECORE_CHECK_MODULE([Con], [yes]) diff --git a/packages/nonworking/efl/ecore/configure.patch b/packages/nonworking/efl/ecore/configure.patch deleted file mode 100644 index 23d8193b44..0000000000 --- a/packages/nonworking/efl/ecore/configure.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- ecore-0.9.9.036/configure.in.bak 2006-11-13 14:01:10.000000000 -0800 -+++ ecore-0.9.9.036/configure.in 2006-11-13 14:02:15.000000000 -0800 -@@ -16,7 +16,6 @@ - AC_CHECK_SIZEOF(long, 4) - AM_ENABLE_SHARED - AM_PROG_LIBTOOL --AC_C___ATTRIBUTE__ - - if test "x${bindir}" = 'xNONE'; then - if test "x${prefix}" = "xNONE"; then -@@ -200,9 +199,7 @@ - AM_CONDITIONAL(BUILD_ECORE_X, true) - AC_DEFINE(BUILD_ECORE_X, 1, [Build Ecore_X Module]) - have_ecore_x="yes" -- x_dir=${x_dir:-/usr/X11R6} -- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} -- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" -+ x_libs="-lX11 -lXext" - ecore_x_libs="-lecore_x $x_libs"; - ],[ - AM_CONDITIONAL(BUILD_ECORE_X, false) diff --git a/packages/nonworking/efl/ecore/ecore_kernel_input_header.patch b/packages/nonworking/efl/ecore/ecore_kernel_input_header.patch deleted file mode 100644 index 99f57ddcff..0000000000 --- a/packages/nonworking/efl/ecore/ecore_kernel_input_header.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: ecore-0.9.9.036/src/lib/ecore_fb/ecore_fb_li.c -=================================================================== ---- ecore-0.9.9.036.orig/src/lib/ecore_fb/ecore_fb_li.c 2006-09-05 01:36:43.000000000 +0100 -+++ ecore-0.9.9.036/src/lib/ecore_fb/ecore_fb_li.c 2006-12-02 21:55:54.000000000 +0000 -@@ -1,6 +1,18 @@ - #include "Ecore_Fb.h" - #include "ecore_fb_private.h" - -+struct input_absinfo { -+ __s32 value; -+ __s32 minimum; -+ __s32 maximum; -+ __s32 fuzz; -+ __s32 flat; -+}; -+ -+ -+#define EV_SYN 0x00 -+#define EV_PWR 0x16 -+#define EV_FF_STATUS 0x17 - - /* Copyright (C) Brad Hards (1999-2002). - * this macro is used to tell if "bit" is set in "array" diff --git a/packages/nonworking/efl/ecore/fix-tslib-configure.patch b/packages/nonworking/efl/ecore/fix-tslib-configure.patch deleted file mode 100644 index 2c82b2741e..0000000000 --- a/packages/nonworking/efl/ecore/fix-tslib-configure.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur ecore-0.9.9.037~/configure.in ecore-0.9.9.037/configure.in ---- ecore-0.9.9.037~/configure.in 2007-01-14 20:21:42.000000000 -0800 -+++ ecore-0.9.9.037/configure.in 2007-01-14 20:22:18.000000000 -0800 -@@ -578,7 +578,7 @@ - if test "x$want_ecore_fb" = "xyes"; then - AC_CHECK_HEADER(tslib.h, - [ -- tslib_libs="-ltslib" -+ tslib_libs="-lts" - AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code]) - ] - ) diff --git a/packages/nonworking/efl/ecore/remove-bad-code.patch b/packages/nonworking/efl/ecore/remove-bad-code.patch deleted file mode 100644 index 87a8d16bd6..0000000000 --- a/packages/nonworking/efl/ecore/remove-bad-code.patch +++ /dev/null @@ -1,36 +0,0 @@ -Index: ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_private.h -=================================================================== ---- ecore-0.9.9.037.orig/src/lib/ecore_fb/ecore_fb_private.h -+++ ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_private.h -@@ -19,8 +19,8 @@ - #define kernel_ulong_t unsigned long - #define BITS_PER_LONG 32 - #include -- #undef kernel_ulong_t <-added -- #undef BITS_PER_LONG <-added -+ #undef kernel_ulong_t -+ #undef BITS_PER_LONG - #else - #include - #endif -Index: ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_li.c -=================================================================== ---- ecore-0.9.9.037.orig/src/lib/ecore_fb/ecore_fb_li.c -+++ ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_li.c -@@ -1,6 +1,6 @@ - #include "Ecore_Fb.h" - #include "ecore_fb_private.h" -- -+/* - struct input_absinfo { - __s32 value; - __s32 minimum; -@@ -8,7 +8,7 @@ struct input_absinfo { - __s32 fuzz; - __s32 flat; - }; -- -+*/ - - #define EV_SYN 0x00 - #define EV_PWR 0x16 diff --git a/packages/nonworking/efl/ecore/remove-tslib-configure.patch b/packages/nonworking/efl/ecore/remove-tslib-configure.patch deleted file mode 100644 index 40ed1c2c33..0000000000 --- a/packages/nonworking/efl/ecore/remove-tslib-configure.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ecore/configure.in.~1.125.~ 2005-11-29 01:13:26.000000000 -0800 -+++ ecore/configure.in 2006-01-12 11:21:42.000000000 -0800 -@@ -101,12 +101,6 @@ - AC_CHECK_FUNCS(gettimeofday) - - tslib_libs="" --AC_CHECK_HEADER(tslib.h, -- [ -- tslib_libs="-ltslib" -- AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_X Module]) -- ] --) - AC_SUBST(tslib_libs) - - AC_CHECK_HEADERS(netinet/in.h) diff --git a/packages/nonworking/efl/edb-native/.mtn2git_empty b/packages/nonworking/efl/edb-native/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/efl/edb-native/no-gtk-forkbomb.patch b/packages/nonworking/efl/edb-native/no-gtk-forkbomb.patch deleted file mode 100644 index 8fe226846e..0000000000 --- a/packages/nonworking/efl/edb-native/no-gtk-forkbomb.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur edb-1.0.5.007~/configure.in edb-1.0.5.007/configure.in ---- edb-1.0.5.007~/configure.in 2007-01-15 01:01:31.000000000 -0800 -+++ edb-1.0.5.007/configure.in 2007-01-15 01:01:40.000000000 -0800 -@@ -404,7 +404,7 @@ - ncurses_ok=no - gtk_ok=no - --GTK_CONFIG=`which gtk-config` -+GTK_CONFIG= - if test -x "$GTK_CONFIG"; then - AC_CHECK_LIB(gtk, gtk_init, gtk_ok=yes, gtk_ok=no, `$GTK_CONFIG --libs`) - fi diff --git a/packages/nonworking/efl/edb-native_1.0.5.007.bb b/packages/nonworking/efl/edb-native_1.0.5.007.bb deleted file mode 100644 index f3f94086ce..0000000000 --- a/packages/nonworking/efl/edb-native_1.0.5.007.bb +++ /dev/null @@ -1,11 +0,0 @@ -require edb_${PV}.bb -inherit native -DEPENDS = "zlib-native" - -SRC_URI += "file://no-gtk-forkbomb.patch;patch=1" - -EXTRA_OECONF += "--disable-gtk --disable-ncurses" - -do_stage_append () { - install -m 0755 tools/.libs/edb_ed ${STAGING_BINDIR} -} diff --git a/packages/nonworking/efl/edb-utils_1.0.5.007.bb b/packages/nonworking/efl/edb-utils_1.0.5.007.bb deleted file mode 100644 index 11fae0f565..0000000000 --- a/packages/nonworking/efl/edb-utils_1.0.5.007.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "EDB is a database convenience library wrapped around the \ -Berkeley DB 2.7.7 by Sleepycat Software." -DEPENDS = "zlib ncurses" -LICENSE = "BSD" -PR = "r4" - -inherit efl - -EXTRA_OECONF += "--disable-gtk" - -PACKAGES = "${PN}-dbg edb-utils" -FILES_${PN} = "${bindir}/edb_ed ${bindir}/edb_vt_ed ${bindir}/edb_gtk_ed" -RDEPENDS_${PN} += "ncurses" - -SRC_URI = "${E_URI}/edb-${PV}.tar.gz" -S = "${WORKDIR}/edb-${PV}" - -libraries = "" -headers = "" diff --git a/packages/nonworking/efl/edb_1.0.5.007.bb b/packages/nonworking/efl/edb_1.0.5.007.bb deleted file mode 100644 index 9632fc4acc..0000000000 --- a/packages/nonworking/efl/edb_1.0.5.007.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "EDB is a database convenience library wrapped around the \ -Berkeley DB 2.7.7 by Sleepycat Software." -DEPENDS = "zlib ncurses" -# can depend on gtk and tcl/tk -LICENSE = "BSD" -PR = "r4" - -inherit efl - -EXTRA_OECONF += "--disable-gtk" - -libdirectory = "src" - -FILES_${PN}-examples = "" \ No newline at end of file diff --git a/packages/nonworking/efl/edje-native_0.5.0.038.bb b/packages/nonworking/efl/edje-native_0.5.0.038.bb deleted file mode 100644 index 4e878ab204..0000000000 --- a/packages/nonworking/efl/edje-native_0.5.0.038.bb +++ /dev/null @@ -1,20 +0,0 @@ -require edje_${PV}.bb -PR = "r4" - -inherit native - -DEPENDS = "evas-native ecore-native eet-native embryo-native" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje" - -do_configure_prepend() { - sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c - sed -i 's:cpp -I:/usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c - sed -i 's:gcc -I:/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c -} - -do_install_append() { - edje_data_dir=`${S}/edje-config --datadir` - # could also use ${STAGING_DATADIR}/edje/include - install -d $edje_data_dir/include - install -m 0644 data/include/edje.inc $edje_data_dir/include -} diff --git a/packages/nonworking/efl/edje-utils_0.5.0.038.bb b/packages/nonworking/efl/edje-utils_0.5.0.038.bb deleted file mode 100644 index 966abe7654..0000000000 --- a/packages/nonworking/efl/edje-utils_0.5.0.038.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Edje is a complex graphical design & layout library." -DEPENDS = "edje embryo-utils gcc" -LICENSE = "MIT" -PR = "r6" - -inherit efl - -PACKAGES = "${PN}-dbg edje-utils" -FILES_${PN} = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include" -RDEPENDS_${PN} += "embryo-utils cpp cpp-symlinks gcc gcc-symlinks" - -SRC_URI = "${E_URI}/edje-${PV}.tar.gz \ - ${E_CVS};module=e17/libs/edje/m4;date=20060101" -S = "${WORKDIR}/edje-${PV}" - -libraries = "" -headers = "" - -do_configure_prepend() { - install -d "${S}/m4" - install "${WORKDIR}/m4/"*.m4 "${S}/m4" - aclocal -I m4 -} diff --git a/packages/nonworking/efl/edje_0.5.0.038.bb b/packages/nonworking/efl/edje_0.5.0.038.bb deleted file mode 100644 index d51dd119e4..0000000000 --- a/packages/nonworking/efl/edje_0.5.0.038.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "Edje is a complex graphical design & layout library." -# can also install vim data files -DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native" -LICENSE = "MIT" -PR = "r7" - -## package.bbclass kills packages when there are duplicates, this means -## that efl.bbclass can't have PACKAGES += and so the FILES for previous -## packages take precedence over -utils -#PACKAGES = "edje-utils" -#RPROVIDES_edje-utils += "libedje-utils" -#FILES_edje-utils = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include" -#RDEPENDS_edje-utils += "libembryo-utils cpp cpp-symlinks gcc gcc-symlinks" - -inherit efl - -SRC_URI += "${E_CVS};module=e17/libs/edje/m4;date=20060101" - -do_configure_prepend() { - install -d "${S}/m4" - install "${WORKDIR}/m4/"*.m4 "${S}/m4" - aclocal -I m4 -} - -LEAD_SONAME = "libedje.so" - -FILES_${PN}-examples = "${datadir}/edje/data/images \ - ${datadir}/edje/data/src \ - ${datadir}/edje/data/test \ - ${datadir}/edje/data/*.sh" - -FILES_${SRCNAME}-themes = "" diff --git a/packages/nonworking/efl/eet-native_0.9.10.038.bb b/packages/nonworking/efl/eet-native_0.9.10.038.bb deleted file mode 100644 index 9e2426ca9f..0000000000 --- a/packages/nonworking/efl/eet-native_0.9.10.038.bb +++ /dev/null @@ -1,4 +0,0 @@ -require eet_${PV}.bb -inherit native -DEPENDS = "zlib-native jpeg-native" - diff --git a/packages/nonworking/efl/eet_0.9.10.038.bb b/packages/nonworking/efl/eet_0.9.10.038.bb deleted file mode 100644 index 6e6032e098..0000000000 --- a/packages/nonworking/efl/eet_0.9.10.038.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "EET is a tiny library designed to write an \ -arbitary set of chunks of data to a file and optionally compress \ -each chunk (very much like a zip file) and allow fast \ -random-access reading of the file later on." -DEPENDS = "zlib jpeg" -LICENSE = "BSD" -PR = "r2" - -inherit efl diff --git a/packages/nonworking/efl/efl.bbclass b/packages/nonworking/efl/efl.bbclass deleted file mode 100644 index 808bf2eaae..0000000000 --- a/packages/nonworking/efl/efl.bbclass +++ /dev/null @@ -1,52 +0,0 @@ -inherit e - -SECTION = "e/libs" - -SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}" -SRC_URI = "${E_URI}/${SRCNAME}-${PV}.tar.gz" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -INHIBIT_AUTO_STAGE_INCLUDES = "1" -INHIBIT_NATIVE_STAGE_INSTALL = "1" - -libdirectory = "src/lib" -libraries = "lib${SRCNAME}" -headers = "${@bb.data.getVar('SRCNAME',d,1).capitalize()}.h" - -def efl_is_native(d): - import bb - return ["","-native"][bb.data.inherits_class('native', d)] - -do_stage_append () { - for i in ${libraries} - do - oe_libinstall -C ${libdirectory} $i ${STAGING_LIBDIR} - done - for i in ${headers} - do - install -m 0644 ${libdirectory}/$i ${STAGING_INCDIR} - done - - # Install binaries automatically for native builds - if [ "${@efl_is_native(d)}" = "-native" ] - then - - # Most EFL binaries start with the package name - for i in src/bin/${SRCNAME}* - do - if [ -x $i -a -f $i ] - then - - # Don't install anything with an extension (.so, etc) - if echo $i | grep -v \\. - then - ${HOST_SYS}-libtool --mode=install install -m 0755 $i ${STAGING_BINDIR} - fi - fi - done - fi -} - -PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-examples" -FILES_${PN}-dev += "${bindir}/${PN}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${libdir}/lib*.a" -FILES_${PN}-examples = "${bindir} ${datadir}" diff --git a/packages/nonworking/efl/efreet-native_0.0.3.002.bb b/packages/nonworking/efl/efreet-native_0.0.3.002.bb deleted file mode 100644 index 470d9e2dab..0000000000 --- a/packages/nonworking/efl/efreet-native_0.0.3.002.bb +++ /dev/null @@ -1,3 +0,0 @@ -require efreet_${PV}.bb -inherit native -DEPENDS = "ecore-native" diff --git a/packages/nonworking/efl/efreet_0.0.3.002.bb b/packages/nonworking/efl/efreet_0.0.3.002.bb deleted file mode 100644 index 2ef049eed7..0000000000 --- a/packages/nonworking/efl/efreet_0.0.3.002.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "An implementation of freedesktop.org specs for the EFL" -DEPENDS = "virtual/ecore" -LICENSE = "BSD" -PR = "r0" - -inherit efl - -headers += "efreet_base.h efreet_desktop.h efreet_icon.h efreet_ini.h efreet_menu.h efreet_private.h efreet_utils.h efreet_xml.h" diff --git a/packages/nonworking/efl/embryo-native_0.9.1.038.bb b/packages/nonworking/efl/embryo-native_0.9.1.038.bb deleted file mode 100644 index 76fe80fe3d..0000000000 --- a/packages/nonworking/efl/embryo-native_0.9.1.038.bb +++ /dev/null @@ -1,7 +0,0 @@ -require embryo_${PV}.bb -inherit native - -do_stage_append() { - install -d ${STAGING_DATADIR}/embryo/include - install -m 0644 include/default.inc ${STAGING_DATADIR}/embryo/include -} \ No newline at end of file diff --git a/packages/nonworking/efl/embryo-utils_0.9.1.038.bb b/packages/nonworking/efl/embryo-utils_0.9.1.038.bb deleted file mode 100644 index 78cc70394c..0000000000 --- a/packages/nonworking/efl/embryo-utils_0.9.1.038.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Embryo implements a C like scripting language used in various parts \ -of the Enlightenment project, namely Edje. Embryo's scripting language is based on \ -CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \ -Embryo allows scripting capabilities in places that otherwise wouldn't support \ -basic programming structures such as in Edje EDCs." -LICENSE = "MIT" -PR = "r4" - -inherit efl - -SRC_URI = "${E_URI}/embryo-${PV}.tar.gz" -S = "${WORKDIR}/embryo-${PV}" - -PACKAGES = "${PN}-dbg embryo-utils" -FILES_${PN} = "${bindir}/embryo ${bindir}/embryo_* ${datadir}/embryo/include" - -libraries = "" -headers = "" diff --git a/packages/nonworking/efl/embryo_0.9.1.038.bb b/packages/nonworking/efl/embryo_0.9.1.038.bb deleted file mode 100644 index 0009c0a149..0000000000 --- a/packages/nonworking/efl/embryo_0.9.1.038.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Embryo implements a C like scripting language used in various parts \ -of the Enlightenment project, namely Edje. Embryo's scripting language is based on \ -CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \ -Embryo allows scripting capabilities in places that otherwise wouldn't support \ -basic programming structures such as in Edje EDCs." -LICENSE = "MIT" -PR = "r4" - -inherit efl - -FILES_${PN}-examples = "${datadir}/${PN}/examples" \ No newline at end of file diff --git a/packages/nonworking/efl/emotion_20061116.bb b/packages/nonworking/efl/emotion_20061116.bb deleted file mode 100644 index 59a3fa7269..0000000000 --- a/packages/nonworking/efl/emotion_20061116.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Emotion is a multimedia library based on libxine" -LICENSE = "MIT" -DEPENDS = "eet virtual/evas edje virtual/ecore embryo gstreamer gst-plugins-base" -# virtual/libxine -#RPROVIDES += "emotion-themes emotion-plugins" -RDEPENDS += "emotion-themes emotion-plugins" - -PR = "r1" - -#FIXME: Needs patch not to build the examples when building against ecore-fb, because the examples depend on ecore-x11 - -inherit efl - -SRC_URI = "${E_CVS};module=e17/libs/emotion;date=${PV}" -S = "${WORKDIR}/emotion" - -PACKAGES += "emotion-plugins" -FILES_emotion-plugins = "${libdir}/xine/plugins/1.1.0/*.so ${libdir}/emotion/*.so" diff --git a/packages/nonworking/efl/engrave_20060128.bb b/packages/nonworking/efl/engrave_20060128.bb deleted file mode 100644 index 63eb24eb1f..0000000000 --- a/packages/nonworking/efl/engrave_20060128.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Engrave is an Edje Editing Library" -LICENSE = "MIT" -# also requires yacc and lex on host -DEPENDS = "virtual/evas virtual/ecore" - -inherit efl - -SRC_URI = "${E_CVS};module=e17/libs/engrave;date=${PV}" -S = "${WORKDIR}/engrave" - -do_stage_append() { - for i in src/lib/engrave*.h - do - install -m 0644 $i ${STAGING_INCDIR} - done -} - diff --git a/packages/nonworking/efl/epdf_20060418.bb b/packages/nonworking/efl/epdf_20060418.bb deleted file mode 100644 index 9f7bd0a255..0000000000 --- a/packages/nonworking/efl/epdf_20060418.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "EPDF is the EFL PDF rendering library based on poppler" -DEPENDS = "etk poppler" -LICENSE = "MIT" -PR = "r0" - -inherit efl - -SRC_URI = "${E_CVS};module=e17/proto/epdf;date=${PV}" -S = "${WORKDIR}/epdf" diff --git a/packages/nonworking/efl/epeg_0.9.0.008.bb b/packages/nonworking/efl/epeg_0.9.0.008.bb deleted file mode 100644 index c35ec63606..0000000000 --- a/packages/nonworking/efl/epeg_0.9.0.008.bb +++ /dev/null @@ -1,5 +0,0 @@ -DESCRIPTION = "Epeg is a small library for handling thumbnails." -LICENSE = "MIT" -DEPENDS = "jpeg" - -inherit efl diff --git a/packages/nonworking/efl/epsilon/.mtn2git_empty b/packages/nonworking/efl/epsilon/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/efl/epsilon/compile-fix.patch b/packages/nonworking/efl/epsilon/compile-fix.patch deleted file mode 100644 index 1c42cc59c4..0000000000 --- a/packages/nonworking/efl/epsilon/compile-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- epsilon-0.3.0.004/src/lib/exiftags/exif.c~compile-fix -+++ epsilon-0.3.0.004/src/lib/exiftags/exif.c -@@ -48,7 +48,6 @@ - #include - #include - #include --#include - #include - #include - diff --git a/packages/nonworking/efl/epsilon/server-is-not-client.patch b/packages/nonworking/efl/epsilon/server-is-not-client.patch deleted file mode 100644 index e96e528b9e..0000000000 --- a/packages/nonworking/efl/epsilon/server-is-not-client.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /tmp/epsilon_private.h 2006-12-01 12:06:30.000000000 +0100 -+++ epsilon-0.3.0.007/src/include/epsilon_private.h 2006-12-01 12:07:10.928254000 +0100 -@@ -41,7 +41,7 @@ - Epsilon_Message *epsilon_message_new(int clientid, char *path, char *dst, int status); - - int epsilon_ipc_client_send(Ecore_Con_Client *cl, Epsilon_Message *msg); --int epsilon_ipc_server_send(Ecore_Con_Client *cl, Epsilon_Message *msg); -+int epsilon_ipc_server_send(Ecore_Con_Server *srv, Epsilon_Message *msg); - - Epsilon_Message *epsilon_ipc_consume(Epsilon_Ipc_End *end); - diff --git a/packages/nonworking/efl/epsilon_0.3.0.008.bb b/packages/nonworking/efl/epsilon_0.3.0.008.bb deleted file mode 100644 index d3c1cba1e4..0000000000 --- a/packages/nonworking/efl/epsilon_0.3.0.008.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Epsilon is a flexable and powerful image thumbnailing library \ -that is complient with the freedesktop.org Thumbnail Managing Standard." -LICENSE = "GPL" -DEPENDS = "imlib2 epeg libpng evas ecore edje perl-native" -PR = "r0" - -inherit efl1 - -#SRC_URI += "file://compile-fix.patch;patch=1 \ -# ${E_CVS};module=e17/libs/epsilon/m4;date=20060101" -# file://server-is-not-client.patch;patch=1 \ - -#do_configure_prepend() { -# install -d "${S}/m4" -# install "${WORKDIR}/m4/"*.m4 "${S}/m4" -# aclocal -I m4 -#} diff --git a/packages/nonworking/efl/esmart-fb_0.9.0.008.bb b/packages/nonworking/efl/esmart-fb_0.9.0.008.bb deleted file mode 100644 index a2fab3ca09..0000000000 --- a/packages/nonworking/efl/esmart-fb_0.9.0.008.bb +++ /dev/null @@ -1,16 +0,0 @@ -require esmart.inc -PR = "r0" - -SRC_URI += "file://disable-x-only-features.patch;patch=1" - -myheaders = "esmart_container/Esmart_Container.h \ - esmart_draggies/Esmart_Draggies.h \ - esmart_file_dialog/Esmart_File_Dialog.h \ - esmart_text_entry/Esmart_Text_Entry.h \ - esmart_thumb/Esmart_Thumb.h" - -mylibraries = "esmart_container \ - esmart_draggies \ - esmart_file_dialog \ - esmart_text_entry \ - esmart_thumb" diff --git a/packages/nonworking/efl/esmart-x11_0.9.0.008.bb b/packages/nonworking/efl/esmart-x11_0.9.0.008.bb deleted file mode 100644 index 7b80b581a1..0000000000 --- a/packages/nonworking/efl/esmart-x11_0.9.0.008.bb +++ /dev/null @@ -1,24 +0,0 @@ -require esmart.inc -PR = "r2" - -SRC_URI += "file://include-stdio.patch;patch=1" - -myheaders = "esmart_container/Esmart_Container.h \ - esmart_draggies/Esmart_Draggies.h \ - esmart_file_dialog/Esmart_File_Dialog.h \ - esmart_text_entry/Esmart_Text_Entry.h \ - esmart_thumb/Esmart_Thumb.h \ - esmart_trans_x11/Esmart_Trans_X11.h" -# esmart_textarea/Esmart_Textarea.h \ - -mylibraries = "esmart_container \ - esmart_draggies \ - esmart_file_dialog \ - esmart_text_entry \ - esmart_thumb \ - esmart_trans_x11" -# esmart_textarea \ - -do_compile_prepend() { - find ${S} -type f -name "*.[ch]" | xargs sed -i 's:NULL:0:g' -} \ No newline at end of file diff --git a/packages/nonworking/efl/esmart.inc b/packages/nonworking/efl/esmart.inc deleted file mode 100644 index 9b8114de53..0000000000 --- a/packages/nonworking/efl/esmart.inc +++ /dev/null @@ -1,51 +0,0 @@ -DESCRIPTION = "ESmart is a collection of smart Evas objects" -LICENSE = "MIT" -DEPENDS = "virtual/evas virtual/ecore virtual/imlib2 epsilon edje libtool" -PROVIDES += "virtual/esmart" - -inherit efl - -SRC_URI = "http://enlightenment.freedesktop.org/files/esmart-${PV}.tar.gz \ - ${E_CVS};module=e17/libs/esmart/m4;date=20060101" - -do_configure_prepend() { - install -d "${S}/m4" - install "${WORKDIR}/m4/"*.m4 "${S}/m4" - aclocal -I m4 -} - -S = "${WORKDIR}/esmart-${PV}" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/esmart" - -headers = "" -libraries = "" - -myheaders = "" -mylibraries = "" - -do_stage_append() { - install -d ${STAGING_INCDIR}/Esmart/ - for i in ${myheaders}; do - install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/Esmart/ - done - oe_libinstall -C src/lib libsmart ${STAGING_LIBDIR}/ - for i in ${mylibraries}; do - oe_libinstall -C src/lib/$i lib$i ${STAGING_LIBDIR}/ - done -} - -PACKAGES =+ "libesmart-textentry \ - libesmart-thumb \ - libesmart-container \ - libesmart-container-plugins \ - libesmart-file-dialog \ - libesmart-draggies \ - libesmart-trans-x11" -FILES_libesmart-textentry = "${libdir}/libesmart_text_entry*.so*" -FILES_libesmart-thumb = "${libdir}/libesmart_thumb*.so*" -FILES_libesmart-container = "${libdir}/libesmart_container*" -DEPENDS_libesmart-container += "libesmart-container-plugins" -FILES_libesmart-container-plugins = "${libdir}/esmart/layout/*.so" -FILES_libesmart-file-dialog = "${libdir}/libesmart_file_dialog*.so*" -FILES_libesmart-draggies = "${libdir}/libesmart_draggies*.so*" -FILES_libesmart-trans-x11 = "${libdir}/libesmart_trans_x11*.so*" diff --git a/packages/nonworking/efl/esmart/.mtn2git_empty b/packages/nonworking/efl/esmart/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/efl/esmart/compile-fix.patch b/packages/nonworking/efl/esmart/compile-fix.patch deleted file mode 100644 index 08ca835aa7..0000000000 --- a/packages/nonworking/efl/esmart/compile-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- esmart-0.9.0.004/src/lib/esmart_container/esmart_container.c~compile-fix -+++ esmart-0.9.0.004/src/lib/esmart_container/esmart_container.c -@@ -30,7 +30,7 @@ - return _sort_func(o, oo); - } - --void esmart_container_sort(Evas_Object *container, int (*func)(Evas_Object *, Evas_Object *$)) -+void esmart_container_sort(Evas_Object *container, int (*func)(Evas_Object *, Evas_Object *)) - { - Container *cont; - diff --git a/packages/nonworking/efl/esmart/disable-x-only-features.patch b/packages/nonworking/efl/esmart/disable-x-only-features.patch deleted file mode 100644 index 68dd363f74..0000000000 --- a/packages/nonworking/efl/esmart/disable-x-only-features.patch +++ /dev/null @@ -1,25 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- esmart-0.9.0.007/src/lib/Makefile.am~disable-x-only-features.patch -+++ esmart-0.9.0.007/src/lib/Makefile.am -@@ -1,9 +1,7 @@ - SUBDIRS = \ - esmart_container \ -- esmart_draggies \ - esmart_text_entry \ - esmart_file_dialog \ -- esmart_thumb \ -- esmart_trans_x11 -+ esmart_thumb - - # esmart_textarea ---- esmart-0.9.0.007/src/Makefile.am~disable-x-only-features.patch -+++ esmart-0.9.0.007/src/Makefile.am -@@ -1,3 +1,3 @@ - MAINTAINERCLEANFILES = Makefile.in - --SUBDIRS = lib bin -+SUBDIRS = lib diff --git a/packages/nonworking/efl/esmart/ecore-fix.patch b/packages/nonworking/efl/esmart/ecore-fix.patch deleted file mode 100644 index 94deff0b95..0000000000 --- a/packages/nonworking/efl/esmart/ecore-fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- esmart-0.9.0.004/src/lib/esmart_trans_x11/esmart_trans_x11.c~ 2004-11-10 07:18:23.000000000 -0800 -+++ esmart-0.9.0.004/src/lib/esmart_trans_x11/esmart_trans_x11.c 2005-09-29 11:22:52.000000000 -0700 -@@ -9,6 +9,7 @@ - #include - #include - #include -+#include - #include - #include - diff --git a/packages/nonworking/efl/esmart/include-stdio.patch b/packages/nonworking/efl/esmart/include-stdio.patch deleted file mode 100644 index 20a490f421..0000000000 --- a/packages/nonworking/efl/esmart/include-stdio.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Nur esmart-0.9.0.004~/src/bin/esmart_file_dialog_test.c esmart-0.9.0.004/src/bin/esmart_file_dialog_test.c ---- esmart-0.9.0.004~/src/bin/esmart_file_dialog_test.c 2005-09-29 14:33:09.000000000 -0700 -+++ esmart-0.9.0.004/src/bin/esmart_file_dialog_test.c 2005-09-29 14:33:48.000000000 -0700 -@@ -8,6 +8,7 @@ - * $ esmart_file_dialog_test /path/to/my_custom/theme.eet - * to test a custom theme you've written for it - */ -+#include - #include - #include - #include -diff -Nur esmart-0.9.0.004~/src/lib/esmart_trans_x11/esmart_trans_x11.c esmart-0.9.0.004/src/lib/esmart_trans_x11/esmart_trans_x11.c ---- esmart-0.9.0.004~/src/lib/esmart_trans_x11/esmart_trans_x11.c 2005-09-29 14:33:09.000000000 -0700 -+++ esmart-0.9.0.004/src/lib/esmart_trans_x11/esmart_trans_x11.c 2005-09-29 14:33:19.000000000 -0700 -@@ -4,6 +4,7 @@ - * - ***************************************************************************/ - -+#include - #include - #include "config.h" - #include diff --git a/packages/nonworking/efl/etk_0.1.0.003.bb b/packages/nonworking/efl/etk_0.1.0.003.bb deleted file mode 100644 index e283adef23..0000000000 --- a/packages/nonworking/efl/etk_0.1.0.003.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foundation Libraries." -DEPENDS = "evas-x11 ecore-x11 edje" -LICENSE = "MIT" -PR = "r1" - -inherit efl - -SRC_URI = "http://enlightenment.freedesktop.org/files/etk-${PV}.tar.gz" - -do_stage() { - autotools_stage_all -} - -FILES_${PN} += "${libdir}/etk/engines/*.so" -FILES_${PN}-dev += "${libdir}/etk/engines/*.a ${libdir}/etk/engines/*.la" -FILES_${PN}-dbg += "${libdir}/etk/engines/*/.debug/" - diff --git a/packages/nonworking/efl/evas-fb_0.9.9.038.bb b/packages/nonworking/efl/evas-fb_0.9.9.038.bb deleted file mode 100644 index 4acc857982..0000000000 --- a/packages/nonworking/efl/evas-fb_0.9.9.038.bb +++ /dev/null @@ -1,47 +0,0 @@ -require evas.inc -PR = "r6" - -EXTRA_OECONF = "--enable-fb \ - --disable-directfb \ - --enable-buffer \ - --disable-software-qtopia \ - --disable-software-x11 \ - --disable-gl-x11 \ - --disable-xrender-x11 \ - --enable-image-loader-eet \ - --disable-image-loader-edb \ - --enable-image-loader-png \ - --enable-image-loader-jpeg \ - --enable-small-dither-mask \ - --enable-cpu-c \ - --enable-font-loader-eet \ - --enable-scale-sample \ - --enable-scale-smooth \ - --enable-convert-yuv \ - --enable-convert-8-rgb-332 \ - --enable-convert-8-rgb-666 \ - --enable-convert-8-rgb-232 \ - --enable-convert-8-rgb-222 \ - --enable-convert-8-rgb-221 \ - --enable-convert-8-rgb-121 \ - --enable-convert-8-rgb-111 \ - --enable-convert-16-rgb-565 \ - --enable-convert-16-rgb-555 \ - --enable-convert-16-rgb-444 \ - --enable-convert-16-rgb-ipq \ - --enable-convert-16-rgb-rot-0 \ - --enable-convert-16-rgb-rot-90 \ - --enable-convert-16-rgb-rot-270 \ - --enable-convert-24-rgb-888 \ - --enable-convert-24-bgr-888 \ - --enable-convert-32-rgb-8888 \ - --enable-convert-32-rgbx-8888 \ - --enable-convert-32-bgr-8888 \ - --enable-convert-32-bgrx-8888 \ - --enable-convert-32-rgb-rot-0 \ - --enable-convert-32-rgb-rot-90 \ - --enable-convert-32-rgb-rot-270" - -headers = "../modules/engines/buffer/Evas_Engine_Buffer.h \ - ../modules/engines/fb/Evas_Engine_FB.h \ - Evas.h" diff --git a/packages/nonworking/efl/evas-native_0.9.9.038.bb b/packages/nonworking/efl/evas-native_0.9.9.038.bb deleted file mode 100644 index 68dacbc809..0000000000 --- a/packages/nonworking/efl/evas-native_0.9.9.038.bb +++ /dev/null @@ -1,5 +0,0 @@ -require evas-fb_${PV}.bb -inherit native -DEPENDS = "freetype-native libpng-native jpeg-native eet-native" -PROVIDES = "evas-native" - diff --git a/packages/nonworking/efl/evas-x11_0.9.9.038.bb b/packages/nonworking/efl/evas-x11_0.9.9.038.bb deleted file mode 100644 index 4c5ef29515..0000000000 --- a/packages/nonworking/efl/evas-x11_0.9.9.038.bb +++ /dev/null @@ -1,55 +0,0 @@ -require evas.inc -DEPENDS += "edb virtual/libx11 libxext freetype" -PR = "r10" - -EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR} \ - --enable-fb \ - --disable-directfb \ - --enable-buffer \ - --disable-software-qtopia \ - --enable-software-x11 \ - --enable-software-16-x11 \ - --disable-gl-x11 \ - --enable-image-loader-eet \ - --enable-image-loader-edb \ - --enable-image-loader-png \ - --enable-image-loader-jpeg \ - --enable-small-dither-mask \ - --enable-cpu-c \ - --enable-font-loader-eet \ - --enable-scale-sample \ - --enable-scale-smooth \ - --enable-convert-yuv \ - --disable-image-loader-svg \ - --disable-convert-8-rgb-332 \ - --disable-convert-8-rgb-666 \ - --disable-convert-8-rgb-232 \ - --disable-convert-8-rgb-222 \ - --disable-convert-8-rgb-221 \ - --disable-convert-8-rgb-121 \ - --disable-convert-8-rgb-111 \ - --enable-convert-16-rgb-565 \ - --disable-convert-16-rgb-555 \ - --disable-convert-16-rgb-444 \ - --disable-convert-16-rgb-ipq \ - --enable-convert-16-rgb-rot-0 \ - --enable-convert-16-rgb-rot-90 \ - --enable-convert-16-rgb-rot-270 \ - --disable-convert-24-rgb-888 \ - --disable-convert-24-bgr-888 \ - --disable-convert-32-rgb-8888 \ - --disable-convert-32-rgbx-8888 \ - --enable-convert-32-bgr-8888 \ - --enable-convert-32-bgrx-8888 \ - --disable-convert-32-rgb-rot-0 \ - --disable-convert-32-rgb-rot-90 \ - --disable-convert-32-rgb-rot-270" - -headers = "../modules/engines/software_x11/Evas_Engine_Software_X11.h \ - ../modules/engines/software_16_x11/Evas_Engine_Software_16_X11.h \ - ../modules/engines/xrender_x11/Evas_Engine_XRender_X11.h \ - ../modules/engines/buffer/Evas_Engine_Buffer.h \ - ../modules/engines/fb/Evas_Engine_FB.h \ - Evas.h" - diff --git a/packages/nonworking/efl/evas.inc b/packages/nonworking/efl/evas.inc deleted file mode 100644 index a175099c31..0000000000 --- a/packages/nonworking/efl/evas.inc +++ /dev/null @@ -1,50 +0,0 @@ -DESCRIPTION = "Evas is a hardware-accelerated canvas API that can draw \ -anti-aliased text, smooth super and sub-images, alpha-blend, as well as drop \ -down to using normal X11 primitives such as pixmaps, lines and rectangles if \ -your CPU or graphics hardware are too slow." -LICENSE = "MIT" -# can also depend on valgrind (?) -DEPENDS = "freetype libpng jpeg eet" -PROVIDES += "virtual/evas" - -inherit efl lib_package - -export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config" - -SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \ - file://fix-configure.patch;patch=1 \ - ${E_CVS};module=e17/libs/evas/m4;date=20060101" -# file://pagesize.patch;patch=1 \ - -S = "${WORKDIR}/evas-${PV}" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas" - -EXTRA_OECONF = "" - -do_configure_prepend() { - if [ -e "${WORKDIR}/m4" ]; then - install -d "${S}/m4" - install "${WORKDIR}/m4/"*.m4 "${S}/m4" - aclocal -I m4 - fi -} - -#do_install_append() { -# find "${S}" -name .debug -type d | xargs -iBLAH rm -rf "BLAH" -#} - -do_stage_append() { - cd src - modules=`find modules -name ".libs"` - for module in $modules - do - install -d ${STAGING_LIBDIR}/evas/`dirname $module`/${TARGET_OS}-gnu-${TARGET_ARCH} - install -m 0755 $module/module.so ${STAGING_LIBDIR}/evas/`dirname $module`/${TARGET_OS}-gnu-${TARGET_ARCH}/module.so - done -} - -headers = "" -libraries = "libevas" -FILES_${PN} += "/usr/lib/evas/modules/*/*/*/*.so" -FILES_${PN}-dev += "/usr/lib/evas/modules/*/*/*/*.a /usr/lib/evas/modules/*/*/*/*.la" -FILES_${PN}-dbg += "/usr/lib/evas/modules/*/*/*/.debug/" diff --git a/packages/nonworking/efl/evas/.mtn2git_empty b/packages/nonworking/efl/evas/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/efl/evas/fix-configure.patch b/packages/nonworking/efl/evas/fix-configure.patch deleted file mode 100644 index abf9b94bdf..0000000000 --- a/packages/nonworking/efl/evas/fix-configure.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Nur evas-0.9.9.037~/configure.in evas-0.9.9.037/configure.in ---- evas-0.9.9.037~/configure.in 2007-01-14 20:09:57.000000000 -0800 -+++ evas-0.9.9.037/configure.in 2007-01-14 20:11:09.000000000 -0800 -@@ -161,9 +161,7 @@ - AC_CHECK_HEADER(X11/X.h, - [ - AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend]) -- x_dir=${x_dir:-/usr/X11R6} -- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} -- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" -+ x_libs="-lX11 -lXext" - ], - [ - AC_MSG_RESULT(disabling software X11 engine) -@@ -407,10 +405,10 @@ - AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend]) - AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, true) - AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support]) -- x_dir=${x_dir:-/usr/X11R6}; -+ x_dir=${x_dir:-}; - x_cflags=${x_cflags:--I$x_dir/include} - x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}" -- gl_cflags="-I/usr/include" -+ gl_cflags="" - gl_libs="-lGL -lGLU -lpthread" - gl_dir="" - ], [ -@@ -471,7 +469,7 @@ - AC_DEFINE(BUILD_ENGINE_CAIRO_X11, 1, [Cairo X11 Rendering Backend]) - AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, true) - AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support]) -- x_dir="/usr/X11R6"; -+ x_dir=""; - x_cflags="-I"$x_dir"/include" - x_libs="-L"$x_dir"/lib -lX11 -lXext" - ], [ diff --git a/packages/nonworking/efl/evas/pagesize.patch b/packages/nonworking/efl/evas/pagesize.patch deleted file mode 100644 index 5efd16a96e..0000000000 --- a/packages/nonworking/efl/evas/pagesize.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/modules/engines/fb/evas_fb_main.c b/src/modules/engines/fb/evas_fb_main.c -index e26c171..75e0743 100644 ---- a/src/modules/engines/fb/evas_fb_main.c -+++ b/src/modules/engines/fb/evas_fb_main.c -@@ -530,7 +530,7 @@ fb_postinit(FB_Mode *mode) - fb_cleanup(); - exit(1); - } -- mode->mem_offset = (unsigned)(fb_fix.smem_start) & (~PAGE_MASK); -+ mode->mem_offset = (unsigned)(fb_fix.smem_start) & (getpagesize()-1); - mode->mem = (unsigned char *)mmap(NULL, fb_fix.smem_len + mode->mem_offset, - PROT_WRITE | PROT_READ, MAP_SHARED, fb, 0); - if ((int)mode->mem == -1) diff --git a/packages/nonworking/efl/ewl/.mtn2git_empty b/packages/nonworking/efl/ewl/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/efl/ewl/ewl-configure.patch b/packages/nonworking/efl/ewl/ewl-configure.patch deleted file mode 100644 index a754e0f819..0000000000 --- a/packages/nonworking/efl/ewl/ewl-configure.patch +++ /dev/null @@ -1,15 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- ewl-0.0.4.003/configure.in~fix-configure -+++ ewl-0.0.4.003/configure.in -@@ -13,7 +13,6 @@ - AC_C_CONST - AM_ENABLE_SHARED - AM_PROG_LIBTOOL --AC_C___ATTRIBUTE__ - - dnl Check for Solaris or other OS - case "$host" in diff --git a/packages/nonworking/efl/ewl/minmax.patch b/packages/nonworking/efl/ewl/minmax.patch deleted file mode 100644 index cd8723e9a3..0000000000 --- a/packages/nonworking/efl/ewl/minmax.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Nur ewl-0.0.4.004~/src/lib/Ewl.h.in ewl-0.0.4.004/src/lib/Ewl.h.in ---- ewl-0.0.4.004~/src/lib/Ewl.h.in 2005-09-29 18:26:11.000000000 -0700 -+++ ewl-0.0.4.004/src/lib/Ewl.h.in 2005-09-29 18:26:55.000000000 -0700 -@@ -254,6 +254,14 @@ - extern"C" { - #endif - -+#ifndef MAX -+#define MAX(a, b) (a > b ? a : b) -+#endif -+ -+#ifndef MIN -+#define MIN(a, b) (a < b ? a : b) -+#endif -+ - #include - #include - #include diff --git a/packages/nonworking/efl/ewl/no-examples.patch b/packages/nonworking/efl/ewl/no-examples.patch deleted file mode 100644 index 402c50894c..0000000000 --- a/packages/nonworking/efl/ewl/no-examples.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Nur ewl-0.0.4.004~/src/Makefile.am ewl-0.0.4.004/src/Makefile.am ---- ewl-0.0.4.004~/src/Makefile.am 2005-09-29 18:21:52.000000000 -0700 -+++ ewl-0.0.4.004/src/Makefile.am 2005-09-29 18:22:17.000000000 -0700 -@@ -1,5 +1,5 @@ - --SUBDIRS = lib bin -+SUBDIRS = lib - - MAINTAINERCLEANFILES = Makefile.in - -diff -Nur ewl-0.0.4.004~/src/Makefile.in ewl-0.0.4.004/src/Makefile.in ---- ewl-0.0.4.004~/src/Makefile.in 2005-09-29 18:21:52.000000000 -0700 -+++ ewl-0.0.4.004/src/Makefile.in 2005-09-29 18:22:07.000000000 -0700 -@@ -108,7 +108,7 @@ - ewl_media_include = @ewl_media_include@ - requirements = @requirements@ - --SUBDIRS = lib bin -+SUBDIRS = lib - - MAINTAINERCLEANFILES = Makefile.in - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/packages/nonworking/efl/ewl_0.5.1.008.bb b/packages/nonworking/efl/ewl_0.5.1.008.bb deleted file mode 100644 index 3a9313cb59..0000000000 --- a/packages/nonworking/efl/ewl_0.5.1.008.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "The Enlightened Widget Library, \ -a simple-to-use general purpose widget library based on the enlightenment foundation libraries." -DEPENDS = "edb virtual/evas virtual/ecore edje" -# emotion -RDEPENDS += "ewl-themes" -LICENSE = "MIT" -PR = "r1" - -inherit efl - -SRC_URI += "file://ewl-configure.patch;patch=1 \ - file://no-examples.patch;patch=1 \ - file://minmax.patch;patch=1 \ - ${E_CVS};module=e17/libs/evas/m4;date=20060501" - -do_configure_prepend() { - if [ -e "${WORKDIR}/m4" ]; then - install -d "${S}/m4" - install "${WORKDIR}/m4/"*.m4 "${S}/m4" - aclocal -I m4 - fi -} - -do_stage_append() { - for i in src/lib/ewl_*.h - do - install -m 0644 $i ${STAGING_INCDIR} - done -} diff --git a/packages/nonworking/efl/files/.mtn2git_empty b/packages/nonworking/efl/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/efl/files/pkg.m4 b/packages/nonworking/efl/files/pkg.m4 deleted file mode 100644 index c80e0acfc4..0000000000 --- a/packages/nonworking/efl/files/pkg.m4 +++ /dev/null @@ -1,57 +0,0 @@ - -dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) -dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page -dnl also defines GSTUFF_PKG_ERRORS on error -AC_DEFUN(PKG_CHECK_MODULES, [ - succeeded=no - - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" - echo "*** to the full path to pkg-config." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - AC_MSG_CHECKING(for $2) - - if $PKG_CONFIG --exists "$2" ; then - AC_MSG_RESULT(yes) - succeeded=yes - - AC_MSG_CHECKING($1_CFLAGS) - $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` - AC_MSG_RESULT($$1_CFLAGS) - - AC_MSG_CHECKING($1_LIBS) - $1_LIBS=`$PKG_CONFIG --libs "$2"` - AC_MSG_RESULT($$1_LIBS) - else - $1_CFLAGS="" - $1_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` - ifelse([$4], ,echo $$1_PKG_ERRORS,) - fi - - AC_SUBST($1_CFLAGS) - AC_SUBST($1_LIBS) - else - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi - - if test $succeeded = yes; then - ifelse([$3], , :, [$3]) - else - ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) - fi -]) - - diff --git a/packages/nonworking/efl/imlib2-fb_1.3.0.001.bb b/packages/nonworking/efl/imlib2-fb_1.3.0.001.bb deleted file mode 100644 index f2ee48f5d9..0000000000 --- a/packages/nonworking/efl/imlib2-fb_1.3.0.001.bb +++ /dev/null @@ -1,6 +0,0 @@ -require imlib2.inc -PR = "r2" - -EXTRA_OECONF = "--without-x \ - --disable-mmx" - diff --git a/packages/nonworking/efl/imlib2-native_1.3.0.001.bb b/packages/nonworking/efl/imlib2-native_1.3.0.001.bb deleted file mode 100644 index 65c5b672b2..0000000000 --- a/packages/nonworking/efl/imlib2-native_1.3.0.001.bb +++ /dev/null @@ -1,8 +0,0 @@ -require imlib2.inc -inherit native -PROVIDES = "imlib2-native" -DEPENDS = "freetype-native libpng-native jpeg-native" -PR = "r2" - -EXTRA_OECONF = "--disable-mmx \ - --without-x" diff --git a/packages/nonworking/efl/imlib2-x11_1.3.0.001.bb b/packages/nonworking/efl/imlib2-x11_1.3.0.001.bb deleted file mode 100644 index 67ed947e08..0000000000 --- a/packages/nonworking/efl/imlib2-x11_1.3.0.001.bb +++ /dev/null @@ -1,8 +0,0 @@ -require imlib2.inc -DEPENDS += "virtual/libx11 libxext" -PR = "r3" - -EXTRA_OECONF = "--disable-mmx \ - --with-x \ - --x-includes=${STAGING_INCDIR} \ - --x-libraries=${STAGING_LIBDIR}" diff --git a/packages/nonworking/efl/imlib2.inc b/packages/nonworking/efl/imlib2.inc deleted file mode 100644 index 6a040c5386..0000000000 --- a/packages/nonworking/efl/imlib2.inc +++ /dev/null @@ -1,58 +0,0 @@ -DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipulation." -LICENSE = "BSD" -# can also depend on tiff34, ungif or gif, z, bz2, id3tag -DEPENDS = "freetype libpng jpeg" -PROVIDES += "virtual/imlib2" - -inherit efl - -SRC_URI = "http://enlightenment.freedesktop.org/files/imlib2-${PV}.tar.gz" -S = "${WORKDIR}/imlib2-${PV}" - -libraries = "" -headers = "" - -do_stage_append() { - oe_libinstall -C src/lib libImlib2 ${STAGING_LIBDIR}/ - install -m 0644 ${S}/src/lib/Imlib2.h ${STAGING_INCDIR}/ - - install -d ${STAGING_LIBDIR}/imlib2/loaders - for i in src/modules/loaders/.libs/*.so - do - install -m 0755 $i ${STAGING_LIBDIR}/imlib2/loaders - done - - install -d ${STAGING_LIBDIR}/imlib2/filters - for i in src/modules/filters/.libs/*.so - do - install -m 0755 $i ${STAGING_LIBDIR}/imlib2/filters - done -} - -do_install() { - install -d "${D}${includedir}" - oe_libinstall -C src/lib libImlib2 ${D}${libdir}/ - install -m 0644 ${S}/src/lib/Imlib2.h ${D}${includedir}/ - - install -d ${D}${libdir}/imlib2/loaders - for i in src/modules/loaders/.libs/*.so - do - install -m 0755 $i ${D}${libdir}/imlib2/loaders - done - - install -d ${D}${libdir}/imlib2/filters - for i in src/modules/filters/.libs/*.so - do - install -m 0755 $i ${D}${libdir}/imlib2/filters - done -} - -PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters" -FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so" -FILES_${PN}-dbg = "${libdir}/.debug/" -FILES_${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}" -FILES_imlib2-bin = "${bindir}" -FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so" -FILES_imlib2-filters = "${libdir}/imlib2/filters/*.so" -FILES_imlib2-loaders-dbg += "${libdir}/imlib2/loaders/.debug" -FILES_imlib2-filters-dbg += "${libdir}/imlib2/filters/.debug" diff --git a/packages/nonworking/python/python-gsl-0.2.0/cross-compile.patch b/packages/nonworking/python/python-gsl-0.2.0/cross-compile.patch index 69f68c7dc0..1c90d59c54 100644 --- a/packages/nonworking/python/python-gsl-0.2.0/cross-compile.patch +++ b/packages/nonworking/python/python-gsl-0.2.0/cross-compile.patch @@ -11,8 +11,8 @@ - self.prefix = self.get_gsl_info('--prefix').strip() - self.cflags = self.get_gsl_info('--cflags').strip() -+ self.prefix = os.getenv( "STAGING" )+"/target" -+ self.cflags = self.get_gsl_info('--cflags').strip() + " -I%s/python2.3/include" % os.getenv( "STAGING" ) ++ self.prefix = os.getenv( "STAGING_DIR" )+"/target" ++ self.cflags = self.get_gsl_info('--cflags').strip() + " -I%s/python2.5/include" % os.getenv( "STAGING_DIR" ) self.libs = self.get_gsl_info('--libs').strip() self.version = self._split_version(self.get_gsl_info('--version').strip()) diff --git a/packages/nonworking/python/python-gsl_0.2.0.bb b/packages/nonworking/python/python-gsl_0.2.0.bb index a0bc000182..38bd9e273f 100644 --- a/packages/nonworking/python/python-gsl_0.2.0.bb +++ b/packages/nonworking/python/python-gsl_0.2.0.bb @@ -11,4 +11,4 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils -#export STAGING=${STAGING_DIR} +export STAGING_DIR := "${STAGING_DIR}" diff --git a/packages/nonworking/xfree86/.mtn2git_empty b/packages/nonworking/xfree86/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/xfree86/xfree86-4.3.0/.mtn2git_empty b/packages/nonworking/xfree86/xfree86-4.3.0/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/xfree86/xfree86-4.3.0/dirty-3.2-xterm-breakage-fix.patch b/packages/nonworking/xfree86/xfree86-4.3.0/dirty-3.2-xterm-breakage-fix.patch deleted file mode 100644 index dbddb41bee..0000000000 --- a/packages/nonworking/xfree86/xfree86-4.3.0/dirty-3.2-xterm-breakage-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- xc/programs/xterm/util.c.orig 2003-03-18 00:24:46.000000000 +0000 -+++ xc/programs/xterm/util.c 2003-03-18 00:21:37.000000000 +0000 -@@ -1336,7 +1336,7 @@ - } - #endif - ReverseOldColors(); -- update_reversevideo(); -+ // update_reversevideo(); - } - - void -@@ -2111,10 +2111,12 @@ - { -+ /* - update_delete_del(); - update_old_fkeys(); - update_hp_fkeys(); - update_sco_fkeys(); - update_sun_fkeys(); - update_sun_kbd(); -+ */ - } - - void -@@ -2145,8 +2147,8 @@ - } - - if (save != term->keyboard.type) { -- update_keyboard_type(); -- } -+ //update_keyboard_type(); -+ } - } - - void diff --git a/packages/nonworking/xfree86/xfree86-4.3.0/host.def b/packages/nonworking/xfree86/xfree86-4.3.0/host.def deleted file mode 100644 index 586c04f5f2..0000000000 --- a/packages/nonworking/xfree86/xfree86-4.3.0/host.def +++ /dev/null @@ -1,22 +0,0 @@ -#define KDriveXServer YES -#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=2 -DXResExtension -fexpensive-optimizations -fomit-frame-pointer -O2 -march=armv4 -mtune=xscale -mapcs-32 -#define TinyXServer YES -#define CrossCompiling YES -#define TouchScreen YES -#define ItsyCompilerBug YES -#undef BuildRandR -#define BuildRandR YES -#define BuildXInputLib YES -#define ProjectRoot /usr/X11R6 -#define Freetype2Dir $(TOP)/extras/freetype2 -#define Freetype2LibDir $(TOP)/exports/lib -#define BuildXTrueType YES -#define BuildScreenSaverExt YES -#define BuildScreenSaverLibrary YES -#define SharedLibXss YES -#define ServerXdmcpDefines -#define XfbdevServer YES -#define HasTsLib YES -#define BuildXResExt YES -#define XResExtension YES -#define BuildXcursorgen NO diff --git a/packages/nonworking/xfree86/xfree86-4.3.0/tinyx-kbd-enable-fix.patch b/packages/nonworking/xfree86/xfree86-4.3.0/tinyx-kbd-enable-fix.patch deleted file mode 100644 index 2c5355c9e4..0000000000 --- a/packages/nonworking/xfree86/xfree86-4.3.0/tinyx-kbd-enable-fix.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- xc/programs/Xserver/hw/kdrive/linux/keyboard.c.orig 2001-11-08 10:26:24.000000000 +0000 -+++ xc/programs/Xserver/hw/kdrive/linux/keyboard.c 2003-03-11 21:13:09.000000000 +0000 -@@ -397,12 +397,13 @@ - static struct termios LinuxTermios; - static int LinuxKbdType; - --void -+int - LinuxKeyboardEnable (int fd, void *closure) - { - struct termios nTty; - unsigned char buf[256]; - int n; -+ int fd_orig_flags; - - ioctl (fd, KDGKBMODE, &LinuxKbdTrans); - tcgetattr (fd, &LinuxTermios); -@@ -420,9 +421,18 @@ - tcsetattr(fd, TCSANOW, &nTty); - /* - * Flush any pending keystrokes -+ * -+ * Also set to nonblock, just to be safe - */ -+ fd_orig_flags = fcntl( fd , F_GETFL, 0 ); -+ fcntl ( fd, F_SETFL, fd_orig_flags | O_NONBLOCK ); -+ - while ((n = read (fd, buf, sizeof (buf))) > 0) -- ; -+ ; -+ -+ fcntl ( fd , F_SETFL, fd_orig_flags ); -+ -+ return fd; - } - - void diff --git a/packages/nonworking/xfree86/xfree86-4.3.0/tinyx-tslib-reset-and-vt-switch-fixes.patch b/packages/nonworking/xfree86/xfree86-4.3.0/tinyx-tslib-reset-and-vt-switch-fixes.patch deleted file mode 100644 index dc1cc86343..0000000000 --- a/packages/nonworking/xfree86/xfree86-4.3.0/tinyx-tslib-reset-and-vt-switch-fixes.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- xc/programs/Xserver/hw/kdrive/linux/tslib.c.orig 2002-11-05 05:28:06.000000000 +0000 -+++ xc/programs/Xserver/hw/kdrive/linux/tslib.c 2003-03-11 21:11:37.000000000 +0000 -@@ -119,6 +119,29 @@ - int TsInputType; - - int -+TslibEnable (int not_needed_fd, void *closure) -+{ -+ KdMouseInfo *mi = closure; -+ int fd = 0; -+ -+ if(!(tsDev = ts_open(mi->name, 0))) { -+ fprintf(stderr, "%s() failed to open %s\n", __func__, mi->name ); -+ return -1; /* XXX Not sure what to return here */ -+ } -+ -+ ts_config(tsDev); -+ fd=ts_fd(tsDev); -+ -+ return fd; -+} -+ -+void -+TslibDisable (int fd, void *closure) -+{ -+ ts_close(tsDev); -+} -+ -+int - TslibInit (void) - { - int i; -@@ -128,7 +151,7 @@ - - if (!TsInputType) - TsInputType = KdAllocInputType (); -- -+ - for (mi = kdMouseInfo; mi; mi = next) - { - next = mi->next; -@@ -148,14 +171,25 @@ - break; - } - } -+ } else { -+ -+ if(!(tsDev = ts_open(mi->name,0))) -+ continue; -+ ts_config(tsDev); -+ fd=ts_fd(tsDev); -+ - } - - if (fd > 0 && tsDev != 0) - { - mi->driver = (void *) fd; - mi->inputType = TsInputType; -- if (KdRegisterFd (TsInputType, fd, TsRead, (void *) mi)) -- n++; -+ if (KdRegisterFd (TsInputType, fd, TsRead, (void *) mi)) -+ n++; -+ -+ /* Set callbacks for vt switches etc */ -+ KdRegisterFdEnableDisable (fd, TslibEnable, TslibDisable); -+ - } - else - if (fd > 0) close(fd); diff --git a/packages/nonworking/xfree86/xfree86_4.3.0.bb b/packages/nonworking/xfree86/xfree86_4.3.0.bb deleted file mode 100644 index 4c7c966593..0000000000 --- a/packages/nonworking/xfree86/xfree86_4.3.0.bb +++ /dev/null @@ -1,52 +0,0 @@ -SECTION = "base" -PRIORITY = "required" -DEPENDS = "zlib tslib ncurses" - -SRC_URI = "ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-1.tgz;" -SRC_URI_append =" ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-2.tgz;" -SRC_URI_append =" ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-3.tgz;" -SRC_URI_append =" file://${FILESDIR}/tinyx-kbd-enable-fix.patch;patch=1" -SRC_URI_append =" file://${FILESDIR}/tinyx-tslib-reset-and-vt-switch-fixes.patch;patch=1" -SRC_URI_append =" file://${FILESDIR}/dirty-3.2-xterm-breakage-fix.patch;patch=1" - -S = "${WORKDIR}/xc" - - -do_configure() { - rm -fr ${WORKDIR}/XXcompiler; - mkdir -p ${WORKDIR}/XXcompiler - pushd ./ - cd ${CROSS_DIR}/bin/; - echo ${CC} - for i in *; do - echo " linking ${WORKDIR}/XXcompiler/$i to $i"; - ln -s ${CROSS_DIR}/bin/$i ${WORKDIR}/XXcompiler/$i ; - toolname=`echo $i | sed s/${TARGET_ARCH}-${TARGET_OS}-//` - echo `echo $i | sed s/${TARGET_ARCH}-${TARGET_OS}-//` - echo " linking ${WORKDIR}/XXcompiler/$i to $toolname"; - ln -s ${CROSS_DIR}/bin/$i ${WORKDIR}/XXcompiler/$toolname; - done - echo "#!/bin/sh" > ${WORKDIR}/XXcompiler/cc - echo "${CC} \$*" >> ${WORKDIR}/XXcompiler/cc - chmod 755 ${WORKDIR}/XXcompiler/cc - popd ; - - -} - -XCURSORGEN=/usr/local/X11R6/bin/xcursorgen -EXTRA_OEMAKE="-C ${S} CC='${BUILD_CC}' \ - CROSSCOMPILEDIR='${WORKDIR}/XXcompiler' \ - EXTRA_LDOPTIONS='${LDFLAGS}' \ - EXTRA_INCLUDES='-I${STAGING_INCDIR}' " -do_compile() { - sed -e "s/^\#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=2 -DXResExtension.*/\#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=2 -DXResExtension ${FULL_OPTIMIZATION}/" < ${FILESDIR}/host.def > ${S}/config/cf/host.def; - - oe_runmake World - -} - -do_install() { - oe_runmake DESTDIR=${D} install - -} -- cgit v1.2.3 From b8d5c1e7a523301b353b1701ba1a757b0918f8eb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Feb 2008 18:11:20 +0000 Subject: obsolete: Drop old premodular xlibs and xproto --- packages/obsolete/compositeext/.mtn2git_empty | 0 packages/obsolete/compositeext/compositeext_2.0.bb | 16 --------- packages/obsolete/compositeext/compositeext_cvs.bb | 19 ---------- packages/obsolete/damageext/.mtn2git_empty | 0 .../damageext/damageext-1.0/.mtn2git_empty | 0 .../obsolete/damageext/damageext-1.0/autofoo.patch | 18 ---------- packages/obsolete/damageext/damageext_1.0.bb | 18 ---------- packages/obsolete/damageext/damageext_cvs.bb | 19 ---------- packages/obsolete/damageext/files/.mtn2git_empty | 0 packages/obsolete/damageext/files/autofoo.patch | 28 --------------- packages/obsolete/fixesext/.mtn2git_empty | 0 packages/obsolete/fixesext/fixesext_2.0.1.bb | 16 --------- packages/obsolete/fixesext/fixesext_cvs.bb | 19 ---------- .../freedesktop-premodular-xlibs/.mtn2git_empty | 0 .../freedesktop-premodular-xlibs/diet-x11_6.2.1.bb | 10 ------ .../freedesktop-premodular-xlibs/libx11_6.2.1.bb | 41 ---------------------- .../freedesktop-premodular-xlibs/libxau_0.1.1.bb | 18 ---------- .../libxcursor_1.1.2.bb | 18 ---------- .../freedesktop-premodular-xlibs/libxdmcp_0.1.3.bb | 18 ---------- .../freedesktop-premodular-xlibs/libxext_cvs.bb | 18 ---------- .../libxfixes_2.0.1.bb | 16 --------- .../freedesktop-premodular-xlibs/libxft_2.1.6.bb | 28 --------------- .../libxrender_0.8.4.bb | 16 --------- .../xextensions_1.0.1.bb | 13 ------- .../freedesktop-premodular-xlibs/xtrans_0.1.bb | 15 -------- packages/obsolete/panoramixext/.mtn2git_empty | 0 packages/obsolete/panoramixext/panoramixext_1.1.bb | 17 --------- packages/obsolete/panoramixext/panoramixext_cvs.bb | 19 ---------- packages/obsolete/resourceext/.mtn2git_empty | 0 packages/obsolete/resourceext/resourceext_1.0.bb | 16 --------- packages/obsolete/resourceext/resourceext_cvs.bb | 18 ---------- packages/obsolete/xcalibrateext/.mtn2git_empty | 0 .../obsolete/xcalibrateext/xcalibrateext_cvs.bb | 13 ------- packages/obsolete/xxf86dgaext/.mtn2git_empty | 0 packages/obsolete/xxf86dgaext/xxf86dgaext_cvs.bb | 13 ------- packages/obsolete/xxf86vmext/.mtn2git_empty | 0 packages/obsolete/xxf86vmext/xxf86vmext_cvs.bb | 13 ------- 37 files changed, 473 deletions(-) delete mode 100644 packages/obsolete/compositeext/.mtn2git_empty delete mode 100644 packages/obsolete/compositeext/compositeext_2.0.bb delete mode 100644 packages/obsolete/compositeext/compositeext_cvs.bb delete mode 100644 packages/obsolete/damageext/.mtn2git_empty delete mode 100644 packages/obsolete/damageext/damageext-1.0/.mtn2git_empty delete mode 100644 packages/obsolete/damageext/damageext-1.0/autofoo.patch delete mode 100644 packages/obsolete/damageext/damageext_1.0.bb delete mode 100644 packages/obsolete/damageext/damageext_cvs.bb delete mode 100644 packages/obsolete/damageext/files/.mtn2git_empty delete mode 100644 packages/obsolete/damageext/files/autofoo.patch delete mode 100644 packages/obsolete/fixesext/.mtn2git_empty delete mode 100644 packages/obsolete/fixesext/fixesext_2.0.1.bb delete mode 100644 packages/obsolete/fixesext/fixesext_cvs.bb delete mode 100644 packages/obsolete/freedesktop-premodular-xlibs/.mtn2git_empty delete mode 100644 packages/obsolete/freedesktop-premodular-xlibs/diet-x11_6.2.1.bb delete mode 100644 packages/obsolete/freedesktop-premodular-xlibs/libx11_6.2.1.bb delete mode 100644 packages/obsolete/freedesktop-premodular-xlibs/libxau_0.1.1.bb delete mode 100644 packages/obsolete/freedesktop-premodular-xlibs/libxcursor_1.1.2.bb delete mode 100644 packages/obsolete/freedesktop-premodular-xlibs/libxdmcp_0.1.3.bb delete mode 100644 packages/obsolete/freedesktop-premodular-xlibs/libxext_cvs.bb delete mode 100644 packages/obsolete/freedesktop-premodular-xlibs/libxfixes_2.0.1.bb delete mode 100644 packages/obsolete/freedesktop-premodular-xlibs/libxft_2.1.6.bb delete mode 100644 packages/obsolete/freedesktop-premodular-xlibs/libxrender_0.8.4.bb delete mode 100644 packages/obsolete/freedesktop-premodular-xlibs/xextensions_1.0.1.bb delete mode 100644 packages/obsolete/freedesktop-premodular-xlibs/xtrans_0.1.bb delete mode 100644 packages/obsolete/panoramixext/.mtn2git_empty delete mode 100644 packages/obsolete/panoramixext/panoramixext_1.1.bb delete mode 100644 packages/obsolete/panoramixext/panoramixext_cvs.bb delete mode 100644 packages/obsolete/resourceext/.mtn2git_empty delete mode 100644 packages/obsolete/resourceext/resourceext_1.0.bb delete mode 100644 packages/obsolete/resourceext/resourceext_cvs.bb delete mode 100644 packages/obsolete/xcalibrateext/.mtn2git_empty delete mode 100644 packages/obsolete/xcalibrateext/xcalibrateext_cvs.bb delete mode 100644 packages/obsolete/xxf86dgaext/.mtn2git_empty delete mode 100644 packages/obsolete/xxf86dgaext/xxf86dgaext_cvs.bb delete mode 100644 packages/obsolete/xxf86vmext/.mtn2git_empty delete mode 100644 packages/obsolete/xxf86vmext/xxf86vmext_cvs.bb (limited to 'packages') diff --git a/packages/obsolete/compositeext/.mtn2git_empty b/packages/obsolete/compositeext/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/obsolete/compositeext/compositeext_2.0.bb b/packages/obsolete/compositeext/compositeext_2.0.bb deleted file mode 100644 index b9b634d391..0000000000 --- a/packages/obsolete/compositeext/compositeext_2.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -SECTION = "libs" -LICENSE= "BSD-X" -DEPENDS = "xextensions fixesext" -DESCRIPTION = "X Composite extension headers and specification" - -SRC_URI = "${XLIBS_MIRROR}/compositeext-${PV}.tar.bz2" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/packages/obsolete/compositeext/compositeext_cvs.bb b/packages/obsolete/compositeext/compositeext_cvs.bb deleted file mode 100644 index 8f0f4f9f46..0000000000 --- a/packages/obsolete/compositeext/compositeext_cvs.bb +++ /dev/null @@ -1,19 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE= "BSD-X" -SECTION = "libs" -DEPENDS = "xextensions fixesext" -DESCRIPTION = "X Composite extension headers and specification" -DEFAULT_PREFERENCE = "1" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=CompositeExt" -S = "${WORKDIR}/CompositeExt" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/packages/obsolete/damageext/.mtn2git_empty b/packages/obsolete/damageext/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/obsolete/damageext/damageext-1.0/.mtn2git_empty b/packages/obsolete/damageext/damageext-1.0/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/obsolete/damageext/damageext-1.0/autofoo.patch b/packages/obsolete/damageext/damageext-1.0/autofoo.patch deleted file mode 100644 index e36fb1d74b..0000000000 --- a/packages/obsolete/damageext/damageext-1.0/autofoo.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- damageext-1.0/configure.ac~autofoo 2003-11-25 22:47:58.000000000 -0500 -+++ damageext-1.0/configure.ac 2005-01-16 11:47:08.123775952 -0500 -@@ -25,9 +25,9 @@ - - AC_PREREQ([2.57]) - AC_INIT([damageext], [1.0], [keithp@keithp.com], damageext) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE --AC_CONFIG_AUX_DIR(.) - - PKG_CHECK_MODULES(FIXESEXT, fixesext) - diff --git a/packages/obsolete/damageext/damageext_1.0.bb b/packages/obsolete/damageext/damageext_1.0.bb deleted file mode 100644 index 3b431a8688..0000000000 --- a/packages/obsolete/damageext/damageext_1.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "libs" -LICENSE = "MIT-X" -DEPENDS = "xextensions fixesext" -DESCRIPTION = "X Damage extension headers and specification" -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/damageext-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/packages/obsolete/damageext/damageext_cvs.bb b/packages/obsolete/damageext/damageext_cvs.bb deleted file mode 100644 index e9ffa7d2b1..0000000000 --- a/packages/obsolete/damageext/damageext_cvs.bb +++ /dev/null @@ -1,19 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "MIT-X" -SECTION = "libs" -DEPENDS = "xextensions fixesext" -DESCRIPTION = "X Damage extension headers and specification" -PR = "r1" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=DamageExt" -S = "${WORKDIR}/DamageExt" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/packages/obsolete/damageext/files/.mtn2git_empty b/packages/obsolete/damageext/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/obsolete/damageext/files/autofoo.patch b/packages/obsolete/damageext/files/autofoo.patch deleted file mode 100644 index 48c05cd836..0000000000 --- a/packages/obsolete/damageext/files/autofoo.patch +++ /dev/null @@ -1,28 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- DamageExt/configure.ac~autofoo.patch 2003-11-25 22:47:58.000000000 -0500 -+++ DamageExt/configure.ac 2005-01-16 11:50:07.183554728 -0500 -@@ -25,9 +25,9 @@ - - AC_PREREQ([2.57]) - AC_INIT([damageext], [1.0], [keithp@keithp.com], damageext) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE --AC_CONFIG_AUX_DIR(.) - - PKG_CHECK_MODULES(FIXESEXT, fixesext) - ---- DamageExt/ChangeLog~autofoo.patch 2004-02-03 15:44:42.000000000 -0500 -+++ DamageExt/ChangeLog 2005-01-16 11:52:45.455493736 -0500 -@@ -1,3 +1,7 @@ -+2005-01-16 Chris Larson -+ -+ * configure.ac: Fix to work with automake 1.9.x. -+ - 2004-02-03 Jim Gettys - - * AUTHORS: Add AUTHORS to file diff --git a/packages/obsolete/fixesext/.mtn2git_empty b/packages/obsolete/fixesext/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/obsolete/fixesext/fixesext_2.0.1.bb b/packages/obsolete/fixesext/fixesext_2.0.1.bb deleted file mode 100644 index feb53d60eb..0000000000 --- a/packages/obsolete/fixesext/fixesext_2.0.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -SECTION = "libs" -LICENSE= "BSD-X" -DEPENDS = "xextensions" -DESCRIPTION = "X Fixes extension headers and specification." - -SRC_URI = "${XLIBS_MIRROR}/fixesext-${PV}.tar.bz2" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/packages/obsolete/fixesext/fixesext_cvs.bb b/packages/obsolete/fixesext/fixesext_cvs.bb deleted file mode 100644 index 4ddbc96c64..0000000000 --- a/packages/obsolete/fixesext/fixesext_cvs.bb +++ /dev/null @@ -1,19 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE= "BSD-X" -SECTION = "libs" -DEPENDS = "xextensions" -DESCRIPTION = "X Fixes extension headers and specification." -DEFAULT_PREFERENCE = "1" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=FixesExt" -S = "${WORKDIR}/FixesExt" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/packages/obsolete/freedesktop-premodular-xlibs/.mtn2git_empty b/packages/obsolete/freedesktop-premodular-xlibs/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/obsolete/freedesktop-premodular-xlibs/diet-x11_6.2.1.bb b/packages/obsolete/freedesktop-premodular-xlibs/diet-x11_6.2.1.bb deleted file mode 100644 index b58c45026c..0000000000 --- a/packages/obsolete/freedesktop-premodular-xlibs/diet-x11_6.2.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -SECTION = "x11/base" -require libx11_${PV}.bb - -EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb" -CFLAGS += "-D_GNU_SOURCE" - -SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1 \ - file://xim.patch;patch=1" - - diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libx11_6.2.1.bb b/packages/obsolete/freedesktop-premodular-xlibs/libx11_6.2.1.bb deleted file mode 100644 index 4ed4c6dd0c..0000000000 --- a/packages/obsolete/freedesktop-premodular-xlibs/libx11_6.2.1.bb +++ /dev/null @@ -1,41 +0,0 @@ -SECTION = "x11/libs" -LICENSE = "XFree86" -PRIORITY = "optional" -DEPENDS = "xproto xextensions libxau xtrans libxdmcp" -PROVIDES = "virtual/libx11" -RPROVIDES = "virtual/libx11" -DESCRIPTION = "Base X libs." -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" -FILES_${PN}-locale += "${datadir}/X11/locale" -PR = "r4" - -SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \ - file://errordb-keysymdb-path-fix.patch;patch=1 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libX11-${PV}" - -inherit autotools pkgconfig - -do_compile() { - ( - unset CC LD CXX CCLD -# unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake -C src/util 'CFLAGS= -D_GNU_SOURCE' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys - ) - oe_runmake -} - -do_stage() { - install -c -m 644 include/X11/XKBlib.h ${STAGING_INCDIR}/X11/XKBlib.h - install -c -m 644 include/X11/Xcms.h ${STAGING_INCDIR}/X11/Xcms.h - install -c -m 644 include/X11/Xlib.h ${STAGING_INCDIR}/X11/Xlib.h - install -c -m 644 include/X11/Xlibint.h ${STAGING_INCDIR}/X11/Xlibint.h - install -c -m 644 include/X11/Xlocale.h ${STAGING_INCDIR}/X11/Xlocale.h - install -c -m 644 include/X11/Xresource.h ${STAGING_INCDIR}/X11/Xresource.h - install -c -m 644 include/X11/Xutil.h ${STAGING_INCDIR}/X11/Xutil.h - install -c -m 644 include/X11/cursorfont.h ${STAGING_INCDIR}/X11/cursorfont.h - install -c -m 644 include/X11/region.h ${STAGING_INCDIR}/X11/region.h - - oe_libinstall -a -so -C src libX11 ${STAGING_LIBDIR} -} - diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxau_0.1.1.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxau_0.1.1.bb deleted file mode 100644 index c1b47cb77a..0000000000 --- a/packages/obsolete/freedesktop-premodular-xlibs/libxau_0.1.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "x11/libs" -LICENSE= "MIT" -PRIORITY = "optional" -DEPENDS = "xproto" -PROVIDES = "xau" -DESCRIPTION = "Authorization Protocol for X." -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/libXau-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXau-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} - diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxcursor_1.1.2.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxcursor_1.1.2.bb deleted file mode 100644 index 2571939b54..0000000000 --- a/packages/obsolete/freedesktop-premodular-xlibs/libxcursor_1.1.2.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "x11/libs" -LICENSE= "BSD-X" -PRIORITY = "optional" -DESCRIPTION = "X Cursor library" -DEPENDS = "libxfixes" -PR = "r2" - -SRC_URI = "${XLIBS_MIRROR}/libXcursor-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXcursor-${PV}" -FILES_${PN} += "${libdir}/libXcursor.so" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} - diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxdmcp_0.1.3.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxdmcp_0.1.3.bb deleted file mode 100644 index d5f01f4e36..0000000000 --- a/packages/obsolete/freedesktop-premodular-xlibs/libxdmcp_0.1.3.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE= "MIT" -DEPENDS = "xproto" -PROVIDES = "xdmcp" -DESCRIPTION = "X Display Manager Control Protocol library." -PR = "r1" -S = "${WORKDIR}/libXdmcp-${PV}" - -SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} - diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxext_cvs.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxext_cvs.bb deleted file mode 100644 index d5343fd798..0000000000 --- a/packages/obsolete/freedesktop-premodular-xlibs/libxext_cvs.bb +++ /dev/null @@ -1,18 +0,0 @@ -# "+" is missing due to bug in Familiar -PV = "0.0cvs${SRCDATE}" -PR = "r1" -LICENSE= "MIT" -DESCRIPTION = "X Server Extension library" -SECTION = "x11/libs" -PRIORITY = "optional" -DEPENDS = "xproto virtual/libx11 xextensions" -PROVIDES = "xext" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext" -S = "${WORKDIR}/Xext" - -inherit autotools pkgconfig -do_stage() { - autotools_stage_all -} - diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxfixes_2.0.1.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxfixes_2.0.1.bb deleted file mode 100644 index 58643ed470..0000000000 --- a/packages/obsolete/freedesktop-premodular-xlibs/libxfixes_2.0.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -SECTION = "x11/libs" -LICENSE= "BSD-X" -DEPENDS = "virtual/libx11 fixesext" -DESCRIPTION = "X Fixes extension library." -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/libXfixes-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXfixes-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} - diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxft_2.1.6.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxft_2.1.6.bb deleted file mode 100644 index f0116aca4b..0000000000 --- a/packages/obsolete/freedesktop-premodular-xlibs/libxft_2.1.6.bb +++ /dev/null @@ -1,28 +0,0 @@ -SECTION = "x11/libs" -LICENSE = "MIT-X" -DEPENDS = "virtual/libx11 xproto libxrender freetype fontconfig" -DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." -PROVIDES = "xft" -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/libXft-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXft-${PV}" - -FILES_${PN} = ${libdir}/lib*.so.* -FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \ - ${libdir}/*.a ${libdir}/pkgconfig \ - ${datadir}/aclocal ${bindir} ${sbindir} - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} - -python do_package() { - if bb.data.getVar('DEBIAN_NAMES', d, 1): - bb.data.setVar('PKG_${PN}', 'libxft2', d) - bb.build.exec_func('package_do_package', d) -} - diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxrender_0.8.4.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxrender_0.8.4.bb deleted file mode 100644 index 9da41bfe75..0000000000 --- a/packages/obsolete/freedesktop-premodular-xlibs/libxrender_0.8.4.bb +++ /dev/null @@ -1,16 +0,0 @@ -SECTION = "libs" -DEPENDS = "renderext virtual/libx11" -DESCRIPTION = "X Render extension library." -LICENSE = "BSD" -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/libXrender-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXrender-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} - diff --git a/packages/obsolete/freedesktop-premodular-xlibs/xextensions_1.0.1.bb b/packages/obsolete/freedesktop-premodular-xlibs/xextensions_1.0.1.bb deleted file mode 100644 index ab8895e0a5..0000000000 --- a/packages/obsolete/freedesktop-premodular-xlibs/xextensions_1.0.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -SECTION = "x11/libs" -LICENSE= "BSD-X" -DESCRIPTION = "various extension headers." - -SRC_URI = "${XLIBS_MIRROR}/xextensions-${PV}.tar.bz2" -S = "${WORKDIR}/xextensions-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} - diff --git a/packages/obsolete/freedesktop-premodular-xlibs/xtrans_0.1.bb b/packages/obsolete/freedesktop-premodular-xlibs/xtrans_0.1.bb deleted file mode 100644 index f6afd506e2..0000000000 --- a/packages/obsolete/freedesktop-premodular-xlibs/xtrans_0.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -SECTION = "x11/libs" -LICENSE = "MIT" -DESCRIPTION = "network API translation layer to \ -insulate X applications and libraries from OS \ -network vageries." - -SRC_URI = "${XLIBS_MIRROR}/libXtrans-0.1.tar.bz2" -S = "${WORKDIR}/libXtrans-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} - diff --git a/packages/obsolete/panoramixext/.mtn2git_empty b/packages/obsolete/panoramixext/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/obsolete/panoramixext/panoramixext_1.1.bb b/packages/obsolete/panoramixext/panoramixext_1.1.bb deleted file mode 100644 index 2da504779f..0000000000 --- a/packages/obsolete/panoramixext/panoramixext_1.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -SECTION = "libs" -LICENSE= "MIT" -PRIORITY = "optional" -DESCRIPTION = "PanoramiX extension headers" - -SRC_URI = "${XLIBS_MIRROR}/panoramixext-${PV}.tar.bz2" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DIR}/man -} diff --git a/packages/obsolete/panoramixext/panoramixext_cvs.bb b/packages/obsolete/panoramixext/panoramixext_cvs.bb deleted file mode 100644 index 08cc0cc51e..0000000000 --- a/packages/obsolete/panoramixext/panoramixext_cvs.bb +++ /dev/null @@ -1,19 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE= "MIT" -SECTION = "libs" -PRIORITY = "optional" -DESCRIPTION = "PanoramiX extension headers" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=PanoramiXExt" -S = "${WORKDIR}/PanoramiXExt" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DIR}/man -} diff --git a/packages/obsolete/resourceext/.mtn2git_empty b/packages/obsolete/resourceext/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/obsolete/resourceext/resourceext_1.0.bb b/packages/obsolete/resourceext/resourceext_1.0.bb deleted file mode 100644 index 55780b1d22..0000000000 --- a/packages/obsolete/resourceext/resourceext_1.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -SECTION = "libs" -LICENSE = "Xorg" -DEPENDS = "xextensions" -DESCRIPTION = "X Resource usage extension headers" - -SRC_URI = "${XLIBS_MIRROR}/resourceext-${PV}.tar.bz2" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/packages/obsolete/resourceext/resourceext_cvs.bb b/packages/obsolete/resourceext/resourceext_cvs.bb deleted file mode 100644 index b0fe23392e..0000000000 --- a/packages/obsolete/resourceext/resourceext_cvs.bb +++ /dev/null @@ -1,18 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -SECTION = "libs" -LICENSE = "Xorg" -DEPENDS = "xextensions" -DESCRIPTION = "X Resource usage extension headers" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=ResourceExt" -S = "${WORKDIR}/ResourceExt" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/packages/obsolete/xcalibrateext/.mtn2git_empty b/packages/obsolete/xcalibrateext/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/obsolete/xcalibrateext/xcalibrateext_cvs.bb b/packages/obsolete/xcalibrateext/xcalibrateext_cvs.bb deleted file mode 100644 index 4e47c1677e..0000000000 --- a/packages/obsolete/xcalibrateext/xcalibrateext_cvs.bb +++ /dev/null @@ -1,13 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -SECTION = "x11/libs" -LICENSE = "BSD-X" -DESCRIPTION = "XCalibrate extension headers" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrateExt" -S = "${WORKDIR}/XCalibrateExt" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/obsolete/xxf86dgaext/.mtn2git_empty b/packages/obsolete/xxf86dgaext/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/obsolete/xxf86dgaext/xxf86dgaext_cvs.bb b/packages/obsolete/xxf86dgaext/xxf86dgaext_cvs.bb deleted file mode 100644 index 30788049c7..0000000000 --- a/packages/obsolete/xxf86dgaext/xxf86dgaext_cvs.bb +++ /dev/null @@ -1,13 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "Xorg" -SECTION = "x11/libs" -DESCRIPTION = "Xxf86dga extension headers" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XF86DGAExt" -S = "${WORKDIR}/XF86DGAExt" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/obsolete/xxf86vmext/.mtn2git_empty b/packages/obsolete/xxf86vmext/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/obsolete/xxf86vmext/xxf86vmext_cvs.bb b/packages/obsolete/xxf86vmext/xxf86vmext_cvs.bb deleted file mode 100644 index 06145e2905..0000000000 --- a/packages/obsolete/xxf86vmext/xxf86vmext_cvs.bb +++ /dev/null @@ -1,13 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "MIT" -SECTION = "x11/libs" -DESCRIPTION = "Xxf86vm extension headers" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XF86VMExt" -S = "${WORKDIR}/XF86VMExt" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} -- cgit v1.2.3 From 0177a3d932dbb84f89b19628331ef9b4968e105c Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 29 Feb 2008 00:22:15 +0000 Subject: udev 118 simplify init script, closes #3886 --- packages/udev/udev-118/init | 86 ++++++++------------------------------------- packages/udev/udev_118.bb | 4 +-- 2 files changed, 17 insertions(+), 73 deletions(-) (limited to 'packages') diff --git a/packages/udev/udev-118/init b/packages/udev/udev-118/init index 73c655a0ee..a6b8fa174f 100644 --- a/packages/udev/udev-118/init +++ b/packages/udev/udev-118/init @@ -30,7 +30,7 @@ mount_tmpfs() { # directory which is guaranteed to be available. mount -n -o bind /dev /etc/udev - if ! mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs tmpfs /dev; then + if ! mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs udev /dev; then umount /etc/udev echo "udev requires tmpfs support, not started." exit 1 @@ -55,6 +55,7 @@ mount_tmpfs() { # I hate this hack. -- Md make_extra_nodes() { + mknod -m 666 /dev/null c 1 3 if [ "$(echo /lib/udev/devices/*)" != "/lib/udev/devices/*" ]; then cp -a /lib/udev/devices/* /dev/ fi @@ -75,18 +76,11 @@ make_extra_nodes() { supported_kernel() { case "$(uname -r)" in 2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;; - 2.6.1[01]|2.6.1[01][!0-9]*) return 1 ;; + 2.6.1[0134]|2.6.1[01234][!0-9]*) return 1 ;; esac return 0 } -set_hotplug_handler() { - case "$(uname -r)" in - 2.6.1[0-4]|2.6.1[0-4][!0-9]*) HANDLER='/sbin/udevsend' ;; - esac - echo $HANDLER > /proc/sys/kernel/hotplug -} - # shell version of /usr/bin/tty my_tty() { [ -x /bin/readlink ] || return 0 @@ -94,24 +88,6 @@ my_tty() { readlink --silent /proc/self/fd/0 || true } -warn_if_interactive() { - if [ "$RUNLEVEL" = "S" -a "$PREVLEVEL" = "N" ]; then - return - fi - - TTY=$(my_tty) - if [ -z "$TTY" -o "$TTY" = "/dev/console" ]; then - return - fi - - printf "\n\n\nIt has been detected that the command\n\n\t$0 $*\n\n" - printf "has been run from an interactive shell.\n" - printf "It will probably not do what you expect, so this script will wait\n" - printf "60 seconds before continuing. Press ^C to stop it.\n" - printf "RUNNING THIS COMMAND IS HIGHLY DISCOURAGED!\n\n\n\n" - sleep 60 -} - ############################################################################## PATH="/sbin:/bin:/usr/bin" @@ -120,13 +96,11 @@ PATH="/sbin:/bin:/usr/bin" # defaults tmpfs_size="2M" -udev_root="/dev" -udevd_timeout=30 . /etc/udev/udev.conf if ! supported_kernel; then - echo "udev requires a kernel >= 2.6.12, not started." + echo "udev requires a kernel >= 2.6.15, not started." exit 1 fi @@ -145,61 +119,31 @@ if [ ! -d /sys/class/ ]; then exit 1 fi -if [ ! -e /proc/sys/kernel/hotplug ]; then - echo "udev requires hotplug support, not started." - exit 1 -fi - ############################################################################## # When modifying this script, do not forget that between the time that # the new /dev has been mounted and udevsynthesize has been run there will be # no /dev/null. This also means that you cannot use the "&" shell command. - case "$1" in start) - if [ -e "$udev_root/.udev/" ]; then - if mountpoint -q /dev/; then - TMPFS_MOUNTED=1 - else - echo ".udev/ already exists on the static $udev_root!" - fi - else - warn_if_interactive - fi + unmount_devpts + mount_tmpfs + [ -d /proc/1 ] || mount -n /proc - echo "Starting the hotplug events dispatcher" "udevd" - udevd --daemon - - set_hotplug_handler + # /dev/null must be created before udevd is started + make_extra_nodes - if [ -z "$TMPFS_MOUNTED" ]; then - unmount_devpts - mount_tmpfs - [ -d /proc/1 ] || mount -n /proc + # It's all over netlink now + if [ -e /proc/sys/kernel/hotplug ]; then + echo "" > /proc/sys/kernel/hotplug fi - # if this directory is not present /dev will not be updated by udev - mkdir -p /dev/.udev/ /dev/.udev/db/ /dev/.udev/queue/ /dev/.udevdb/ - # /dev/null must be created before udevd is started - make_extra_nodes + echo "Starting the hotplug events dispatcher" "udevd" + udevd --daemon echo "Synthesizing the initial hotplug events" udevtrigger - - # wait for the udevd childs to finish - echo "Waiting for /dev to be fully populated" - while [ -d /dev/.udev/queue/ ]; do - sleep 1 - udevd_timeout=$(($udevd_timeout - 1)) - if [ $udevd_timeout -eq 0 ]; then - # ps axf - break - fi - done - if [ $udevd_timeout -eq 0 ]; then - echo 'timeout' - fi + udevsettle ;; stop) diff --git a/packages/udev/udev_118.bb b/packages/udev/udev_118.bb index a4c12877f5..18479a3d13 100644 --- a/packages/udev/udev_118.bb +++ b/packages/udev/udev_118.bb @@ -3,9 +3,9 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod the hotplug package and requires a kernel not older than 2.6.12." RPROVIDES_${PN} = "hotplug" -PR = "r0" +PR = "r2" -DEFAULT_PREFERENCE = "-115" +DEFAULT_PREFERENCE = "-118" SRC_URI = "\ http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ -- cgit v1.2.3 From eae4302b595419382bd989df650c90b575f01312 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 29 Feb 2008 00:29:55 +0000 Subject: linux-handhelds-2.6.inc: COMPATIBLE_MACHINE += eseries, closes #3175 --- packages/linux/linux-handhelds-2.6.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc index 845c11d7d6..c6bb6bae69 100644 --- a/packages/linux/linux-handhelds-2.6.inc +++ b/packages/linux/linux-handhelds-2.6.inc @@ -3,7 +3,7 @@ DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer h LICENSE = "GPL" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE ?= '(asus620|asus730|aximx50|aximx50v|h1910|h2200|h3600|h3800|h3900|h4000|h5000|htcalpine|htcapache|htcblueangel|htchermes|htchimalaya|htcsable|htcuniversal|htcwallaby|hx4700|ghi270|looxc550|jornada56x|magician|rx1950|rx3000)' +COMPATIBLE_MACHINE ?= "(asus620|asus730|aximx50|aximx50v|eseries|h1910|h2200|h3600|h3800|h3900|h4000|h5000|htcalpine|htcapache|htcblueangel|htchermes|htchimalaya|htcsable|htcuniversal|htcwallaby|hx4700|ghi270|looxc550|jornada56x|magician|rx1950|rx3000)" # SRC_URI *must* be overriden in includer, but this is a good reference SRC_URI ?= "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ -- cgit v1.2.3 From 7c9083bf79adef3dcc421be732f74c35e68aff9f Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Fri, 29 Feb 2008 00:39:46 +0000 Subject: linux-rt-2.6.24: Update to 2.6.24.3-rt3. Add missing include patch. Add MPC8313E-RDB LED driver. Fix LED numbering order. --- .../linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig | 24 +-- .../mpc8313e-rdb/mpc8313e-rdb-leds.patch | 207 +++++++++++++++++++++ .../linux-rt-2.6.24/sysctl_missing_include.patch | 12 ++ packages/linux/linux-rt_2.6.24.bb | 13 +- 4 files changed, 236 insertions(+), 20 deletions(-) create mode 100644 packages/linux/linux-rt-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch create mode 100644 packages/linux/linux-rt-2.6.24/sysctl_missing_include.patch (limited to 'packages') diff --git a/packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig b/packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig index 23787a16b4..11b37d3ec1 100644 --- a/packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig +++ b/packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.24-rt1 -# Fri Feb 15 20:51:04 2008 +# Linux kernel version: 2.6.24.3-rt3 +# Fri Feb 29 00:48:47 2008 # # CONFIG_PPC64 is not set @@ -73,8 +73,6 @@ CONFIG_SYSVIPC_SYSCTL=y CONFIG_LOG_BUF_SHIFT=14 # CONFIG_CGROUPS is not set # CONFIG_FAIR_GROUP_SCHED is not set -# CONFIG_FAIR_USER_SCHED is not set -# CONFIG_FAIR_CGROUP_SCHED is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_RELAY is not set CONFIG_BLK_DEV_INITRD=y @@ -594,9 +592,6 @@ CONFIG_MTD_CFI=y # CONFIG_MTD_JEDECPROBE is not set CONFIG_MTD_GEN_PROBE=y # CONFIG_MTD_CFI_ADV_OPTIONS is not set -# CONFIG_MTD_CFI_NOSWAP is not set -# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set -# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set CONFIG_MTD_MAP_BANK_WIDTH_1=y CONFIG_MTD_MAP_BANK_WIDTH_2=y CONFIG_MTD_MAP_BANK_WIDTH_4=y @@ -1349,11 +1344,12 @@ CONFIG_MMC_BLOCK_BOUNCE=y # CONFIG_MMC_TIFM_SD is not set # CONFIG_MMC_SPI is not set CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y +CONFIG_LEDS_CLASS=m # # LED drivers # +CONFIG_LEDS_MPC8313E_RDB=m # # LED Triggers @@ -1645,11 +1641,6 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set -# CONFIG_EVENT_TRACE is not set -# CONFIG_FUNCTION_TRACE is not set -# CONFIG_WAKEUP_TIMING is not set -# CONFIG_CRITICAL_PREEMPT_TIMING is not set -# CONFIG_CRITICAL_IRQSOFF_TIMING is not set # CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_INFO is not set @@ -1660,7 +1651,12 @@ CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_BOOT_PRINTK_DELAY is not set # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_FAULT_INJECTION is not set -CONFIG_HAVE_MCOUNT=y +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_PREEMPT_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_EVENT_TRACER is not set +# CONFIG_CONTEXT_SWITCH_TRACER is not set +# CONFIG_PREEMPT_TRACE is not set # CONFIG_SAMPLES is not set CONFIG_TRACE_IRQFLAGS_SUPPORT=y # CONFIG_DEBUG_STACKOVERFLOW is not set diff --git a/packages/linux/linux-rt-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch b/packages/linux/linux-rt-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch new file mode 100644 index 0000000000..157df51c04 --- /dev/null +++ b/packages/linux/linux-rt-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch @@ -0,0 +1,207 @@ +Index: linux-2.6.24.3/drivers/leds/Kconfig +=================================================================== +--- linux-2.6.24.3.orig/drivers/leds/Kconfig 2008-02-26 01:20:20.000000000 +0100 ++++ linux-2.6.24.3/drivers/leds/Kconfig 2008-02-29 00:43:28.000000000 +0100 +@@ -114,6 +114,12 @@ + help + This option enables support for the CM-X270 LEDs. + ++config LEDS_MPC8313E_RDB ++ tristate "LED Support for MPC8313E-RDB LEDs" ++ depends on LEDS_CLASS && PPC_83xx ++ help ++ This option enables support for the LEDs on MPC8313E-RDB board. ++ + comment "LED Triggers" + + config LEDS_TRIGGERS +Index: linux-2.6.24.3/drivers/leds/leds-mpc8313e-rdb.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.24.3/drivers/leds/leds-mpc8313e-rdb.c 2008-02-29 01:36:07.000000000 +0100 +@@ -0,0 +1,173 @@ ++/* ++ * drivers/leds/leds-mpc8313e-rdb.c ++ * Copyright (C) 2007-2008 Jeremy Laine ++ * Copyright (C) 2007-2008 Leon Woestenberg ++ * ++ * This file is subject to the terms and conditions of the GNU General Public ++ * License. See the file COPYING in the main directory of this archive for ++ * more details. ++ * ++ * MPC8313E-RDB LEDs driver ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/* note the board is not wired for read access from the LED buffer */ ++#define LEDS_BASE 0xfa000000 ++#define LEDS_SIZE 0x2 ++ ++static struct platform_device *leds_pdev = NULL; ++static struct resource *led_mem = NULL; ++static void *led_io = NULL; ++static u8 led_state = 0xff; ++ ++struct mpc8313_led { ++ struct led_classdev cdev; ++ u8 bitmask; ++}; ++ ++static void mpc8313leds_set(struct led_classdev *led_cdev, enum led_brightness value) ++{ ++ struct mpc8313_led *led_dev = container_of(led_cdev, struct mpc8313_led, cdev); ++ if (value) ++ led_state &= ~led_dev->bitmask; ++ else ++ led_state |= led_dev->bitmask; ++ iowrite8(led_state, led_io); ++} ++ ++/* led0 is red, led1 is yellow, led2-7 are green */ ++static struct mpc8313_led mpc8313_leds[] = { ++ { ++ .cdev = { ++ .name = "mpc8313:led0", ++ .brightness_set = mpc8313leds_set, ++ }, ++ .bitmask = 128, ++ }, ++ { ++ .cdev = { ++ .name = "mpc8313:led1", ++ .brightness_set = mpc8313leds_set, ++ }, ++ .bitmask = 64, ++ }, ++ { ++ .cdev = { ++ .name = "mpc8313:led2", ++ .brightness_set = mpc8313leds_set, ++ }, ++ .bitmask = 32, ++ }, ++ { ++ .cdev = { ++ .name = "mpc8313:led3", ++ .brightness_set = mpc8313leds_set, ++ }, ++ .bitmask = 16, ++ }, ++ { ++ .cdev = { ++ .name = "mpc8313:led4", ++ .brightness_set = mpc8313leds_set, ++ }, ++ .bitmask = 8, ++ }, ++ { ++ .cdev = { ++ .name = "mpc8313:led5", ++ .brightness_set = mpc8313leds_set, ++ }, ++ .bitmask = 4, ++ }, ++ { ++ .cdev = { ++ .name = "mpc8313:led6", ++ .brightness_set = mpc8313leds_set, ++ }, ++ .bitmask = 2, ++ }, ++ { ++ .cdev = { ++ .name = "mpc8313:led7", ++ .brightness_set = mpc8313leds_set, ++ }, ++ .bitmask = 1, ++ }, ++}; ++ ++static int mpc8313leds_probe(struct platform_device *pdev) ++{ ++ int i; ++ int ret; ++ ++ for (i = ret = 0; ret >= 0 && i < ARRAY_SIZE(mpc8313_leds); i++) { ++ ret = led_classdev_register(&pdev->dev, ++ &mpc8313_leds[i].cdev); ++ } ++ ++ if (ret < 0 && i > 1) { ++ for (i = i - 2; i >= 0; i--) ++ led_classdev_unregister(&mpc8313_leds[i].cdev); ++ } ++ ++ return ret; ++} ++ ++static int mpc8313leds_remove(struct platform_device *pdev) ++{ ++ int i; ++ ++ for (i = ARRAY_SIZE(mpc8313_leds) - 1; i >= 0; i--) ++ led_classdev_unregister(&mpc8313_leds[i].cdev); ++ ++ return 0; ++} ++ ++static struct platform_driver mpc8313leds_driver = { ++ .driver = { ++ .name = "mpc8313-leds", ++ .owner = THIS_MODULE, ++ }, ++ .probe = mpc8313leds_probe, ++ .remove = mpc8313leds_remove, ++}; ++ ++static int __init mpc8313leds_init(void) ++{ ++ if (!(led_mem = request_mem_region(LEDS_BASE, LEDS_SIZE, "mpc8313-leds"))) ++ return -ENOMEM; ++ if (!(led_io = ioremap(LEDS_BASE, LEDS_SIZE))) ++ { ++ release_mem_region(LEDS_BASE, LEDS_SIZE); ++ led_mem = NULL; ++ return -ENOMEM; ++ } ++ iowrite8(led_state, led_io); ++ ++ leds_pdev = platform_device_register_simple("mpc8313-leds", -1, NULL, 0); ++ ++ return platform_driver_register(&mpc8313leds_driver); ++} ++ ++static void __exit mpc8313leds_exit(void) ++{ ++ if (led_mem) release_mem_region(LEDS_BASE, LEDS_SIZE); ++ led_mem = NULL; ++ platform_driver_unregister(&mpc8313leds_driver); ++ ++ platform_device_unregister(leds_pdev); ++} ++ ++module_init(mpc8313leds_init); ++module_exit(mpc8313leds_exit); ++ ++MODULE_AUTHOR("Jeremy Laine "); ++MODULE_DESCRIPTION("MPC8313E-RDB LED driver"); ++MODULE_LICENSE("GPL"); +Index: linux-2.6.24.3/drivers/leds/Makefile +=================================================================== +--- linux-2.6.24.3.orig/drivers/leds/Makefile 2008-02-26 01:20:20.000000000 +0100 ++++ linux-2.6.24.3/drivers/leds/Makefile 2008-02-29 00:43:28.000000000 +0100 +@@ -19,6 +19,7 @@ + obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o + obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o + obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o ++obj-$(CONFIG_LEDS_MPC8313E_RDB) += leds-mpc8313e-rdb.o + + # LED Triggers + obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o diff --git a/packages/linux/linux-rt-2.6.24/sysctl_missing_include.patch b/packages/linux/linux-rt-2.6.24/sysctl_missing_include.patch new file mode 100644 index 0000000000..2949374818 --- /dev/null +++ b/packages/linux/linux-rt-2.6.24/sysctl_missing_include.patch @@ -0,0 +1,12 @@ +Index: linux-2.6.24.3/kernel/sysctl.c +=================================================================== +--- linux-2.6.24.3.orig/kernel/sysctl.c 2008-02-29 00:52:45.000000000 +0100 ++++ linux-2.6.24.3/kernel/sysctl.c 2008-02-29 00:52:59.000000000 +0100 +@@ -47,6 +47,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/packages/linux/linux-rt_2.6.24.bb b/packages/linux/linux-rt_2.6.24.bb index b9f374099e..61fd734632 100644 --- a/packages/linux/linux-rt_2.6.24.bb +++ b/packages/linux/linux-rt_2.6.24.bb @@ -6,18 +6,19 @@ DEFAULT_PREFERENCE_mpc8313e-rdb = "1" DEPENDS_append_mpc8313e-rdb = " dtc-native" -PR = "r2" +PR = "r3" -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ - ${KERNELORG_MIRROR}/pub/linux/kernel/projects/rt/patch-2.6.24-rt1.bz2;patch=1 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.3.tar.bz2 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/projects/rt/patch-2.6.24.3-rt3.bz2;patch=1;p=1 \ http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \ + file://sysctl_missing_include.patch;patch=1 \ file://powerpc-clockres.patch;patch=1 \ file://defconfig" -S = "${WORKDIR}/linux-2.6.24" +S = "${WORKDIR}/linux-2.6.24.3" -#SRC_URI_append_mpc8313e-rdb = "\ -# file://mpc8313e-rdb-leds.patch;patch=1" +SRC_URI_append_mpc8313e-rdb = "\ + file://mpc8313e-rdb-leds.patch;patch=1" # file://mpc831x-nand.patch;patch=1 \ # file://mpc8313e-rdb-rtc.patch;patch=1 " -- cgit v1.2.3 From c1afe9c5b50992c1df9f564965a24d48f3030795 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Fri, 29 Feb 2008 00:40:40 +0000 Subject: linux-2.6.24: Fix MPC8313E-RDB LED numbering order. --- .../mpc8313e-rdb/mpc8313e-rdb-leds.patch | 45 ++++++++++++---------- 1 file changed, 25 insertions(+), 20 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch b/packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch index 5336905a66..157df51c04 100644 --- a/packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch +++ b/packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch @@ -1,6 +1,7 @@ -diff -urN linux-2.6.24.orig/drivers/leds/Kconfig linux-2.6.24/drivers/leds/Kconfig ---- linux-2.6.24.orig/drivers/leds/Kconfig 2008-01-24 23:58:37.000000000 +0100 -+++ linux-2.6.24/drivers/leds/Kconfig 2008-02-08 08:12:01.000000000 +0100 +Index: linux-2.6.24.3/drivers/leds/Kconfig +=================================================================== +--- linux-2.6.24.3.orig/drivers/leds/Kconfig 2008-02-26 01:20:20.000000000 +0100 ++++ linux-2.6.24.3/drivers/leds/Kconfig 2008-02-29 00:43:28.000000000 +0100 @@ -114,6 +114,12 @@ help This option enables support for the CM-X270 LEDs. @@ -14,14 +15,15 @@ diff -urN linux-2.6.24.orig/drivers/leds/Kconfig linux-2.6.24/drivers/leds/Kconf comment "LED Triggers" config LEDS_TRIGGERS -diff -urN linux-2.6.24.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.24/drivers/leds/leds-mpc8313e-rdb.c ---- linux-2.6.24.orig/drivers/leds/leds-mpc8313e-rdb.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.24/drivers/leds/leds-mpc8313e-rdb.c 2008-02-08 08:12:01.000000000 +0100 -@@ -0,0 +1,171 @@ +Index: linux-2.6.24.3/drivers/leds/leds-mpc8313e-rdb.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.24.3/drivers/leds/leds-mpc8313e-rdb.c 2008-02-29 01:36:07.000000000 +0100 +@@ -0,0 +1,173 @@ +/* + * drivers/leds/leds-mpc8313e-rdb.c -+ * Copyright (C) 2007 Jeremy Laine -+ * Copyright (C) 2007 Leon Woestenberg ++ * Copyright (C) 2007-2008 Jeremy Laine ++ * Copyright (C) 2007-2008 Leon Woestenberg + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive for @@ -38,6 +40,7 @@ diff -urN linux-2.6.24.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.24/driver +#include +#include + ++/* note the board is not wired for read access from the LED buffer */ +#define LEDS_BASE 0xfa000000 +#define LEDS_SIZE 0x2 + @@ -61,62 +64,63 @@ diff -urN linux-2.6.24.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.24/driver + iowrite8(led_state, led_io); +} + ++/* led0 is red, led1 is yellow, led2-7 are green */ +static struct mpc8313_led mpc8313_leds[] = { + { + .cdev = { + .name = "mpc8313:led0", + .brightness_set = mpc8313leds_set, + }, -+ .bitmask = 1, ++ .bitmask = 128, + }, + { + .cdev = { + .name = "mpc8313:led1", + .brightness_set = mpc8313leds_set, + }, -+ .bitmask = 2, ++ .bitmask = 64, + }, + { + .cdev = { + .name = "mpc8313:led2", + .brightness_set = mpc8313leds_set, + }, -+ .bitmask = 4, ++ .bitmask = 32, + }, + { + .cdev = { + .name = "mpc8313:led3", + .brightness_set = mpc8313leds_set, + }, -+ .bitmask = 8, ++ .bitmask = 16, + }, + { + .cdev = { + .name = "mpc8313:led4", + .brightness_set = mpc8313leds_set, + }, -+ .bitmask = 16, ++ .bitmask = 8, + }, + { + .cdev = { + .name = "mpc8313:led5", + .brightness_set = mpc8313leds_set, + }, -+ .bitmask = 32, ++ .bitmask = 4, + }, + { + .cdev = { + .name = "mpc8313:led6", + .brightness_set = mpc8313leds_set, + }, -+ .bitmask = 64, ++ .bitmask = 2, + }, + { + .cdev = { + .name = "mpc8313:led7", + .brightness_set = mpc8313leds_set, + }, -+ .bitmask = 128, ++ .bitmask = 1, + }, +}; + @@ -189,9 +193,10 @@ diff -urN linux-2.6.24.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.24/driver +MODULE_AUTHOR("Jeremy Laine "); +MODULE_DESCRIPTION("MPC8313E-RDB LED driver"); +MODULE_LICENSE("GPL"); -diff -urN linux-2.6.24.orig/drivers/leds/Makefile linux-2.6.24/drivers/leds/Makefile ---- linux-2.6.24.orig/drivers/leds/Makefile 2008-01-24 23:58:37.000000000 +0100 -+++ linux-2.6.24/drivers/leds/Makefile 2008-02-08 08:12:38.000000000 +0100 +Index: linux-2.6.24.3/drivers/leds/Makefile +=================================================================== +--- linux-2.6.24.3.orig/drivers/leds/Makefile 2008-02-26 01:20:20.000000000 +0100 ++++ linux-2.6.24.3/drivers/leds/Makefile 2008-02-29 00:43:28.000000000 +0100 @@ -19,6 +19,7 @@ obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o -- cgit v1.2.3 From 58774a22204d4e4edb46e9473876f68fe43c6209 Mon Sep 17 00:00:00 2001 From: Derek Young Date: Fri, 29 Feb 2008 05:23:29 +0000 Subject: gcc-cross_4.2.2 -> resynchronize PR to match recently modified gcc_4.2.2 --- packages/gcc/gcc-cross_4.2.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb index d63d055bc7..c461245ec5 100644 --- a/packages/gcc/gcc-cross_4.2.2.bb +++ b/packages/gcc/gcc-cross_4.2.2.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r4" +PR = "r5" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" -- cgit v1.2.3 From c3af04983b75e4b8a99f28c6e979a9a73c5c87a1 Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 29 Feb 2008 10:50:43 +0000 Subject: asterisk: add unset RANLIB to make the build success. --- packages/asterisk/asterisk_1.4.17.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/asterisk/asterisk_1.4.17.bb b/packages/asterisk/asterisk_1.4.17.bb index cecb403262..46bc90b25f 100644 --- a/packages/asterisk/asterisk_1.4.17.bb +++ b/packages/asterisk/asterisk_1.4.17.bb @@ -78,7 +78,7 @@ do_configure () { do_compile() { ( #make sure that menuselect gets build using host toolchain - unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS RANLIB cd menuselect ./configure oe_runmake -- cgit v1.2.3 From 5ebc5e03c1014c0626a4abe5da68fb80a1268421 Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 29 Feb 2008 10:53:04 +0000 Subject: busybox: 1.9.1 add cmp into openmoko distribution --- .../busybox/busybox-1.9.1/openmoko/.mtn2git_empty | 0 packages/busybox/busybox-1.9.1/openmoko/defconfig | 777 +++++++++++++++++++++ 2 files changed, 777 insertions(+) create mode 100644 packages/busybox/busybox-1.9.1/openmoko/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.9.1/openmoko/defconfig (limited to 'packages') diff --git a/packages/busybox/busybox-1.9.1/openmoko/.mtn2git_empty b/packages/busybox/busybox-1.9.1/openmoko/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/busybox/busybox-1.9.1/openmoko/defconfig b/packages/busybox/busybox-1.9.1/openmoko/defconfig new file mode 100644 index 0000000000..d0505e4481 --- /dev/null +++ b/packages/busybox/busybox-1.9.1/openmoko/defconfig @@ -0,0 +1,777 @@ +# +# Automatically generated make config: don't edit +# Busybox version: 1.9.1 +# Thu Feb 14 11:54:00 2008 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +# CONFIG_NITPICK is not set +# CONFIG_DESKTOP is not set +# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y +# CONFIG_FEATURE_VERBOSE_USAGE is not set +CONFIG_FEATURE_COMPRESS_USAGE=y +# CONFIG_FEATURE_INSTALLER is not set +CONFIG_LOCALE_SUPPORT=y +CONFIG_GETOPT_LONG=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_PIDFILE=y +CONFIG_FEATURE_SUID=y +CONFIG_FEATURE_SUID_CONFIG=y +CONFIG_FEATURE_SUID_CONFIG_QUIET=y +# CONFIG_SELINUX is not set +# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" +CONFIG_FEATURE_SYSLOG=y +CONFIG_FEATURE_HAVE_RPC=y + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_INDIVIDUAL is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_WERROR is not set +CONFIG_NO_DEBUG_LIB=y +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set +# CONFIG_INCLUDE_SUSv2 is not set + +# +# Installation Options +# +# CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set +# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set +# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set +CONFIG_PREFIX="./_install" + +# +# Busybox Library Tuning +# +CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SIZE_VS_SPEED=2 +CONFIG_FEATURE_FAST_TOP=y +# CONFIG_FEATURE_ETC_NETWORKS is not set +CONFIG_FEATURE_EDITING=y +CONFIG_FEATURE_EDITING_MAX_LEN=1024 +CONFIG_FEATURE_EDITING_FANCY_KEYS=y +# CONFIG_FEATURE_EDITING_VI is not set +CONFIG_FEATURE_EDITING_HISTORY=15 +CONFIG_FEATURE_EDITING_SAVEHISTORY=y +CONFIG_FEATURE_TAB_COMPLETION=y +CONFIG_FEATURE_USERNAME_COMPLETION=y +CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_AR=y +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set +CONFIG_BUNZIP2=y +# CONFIG_BZIP2 is not set +CONFIG_CPIO=y +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set +CONFIG_GZIP=y +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +# CONFIG_FEATURE_RPM_BZ2 is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_BZIP2=y +# CONFIG_FEATURE_TAR_LZMA is not set +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_GZIP=y +# CONFIG_FEATURE_TAR_COMPRESS is not set +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set +# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +# CONFIG_UNCOMPRESS is not set +# CONFIG_UNLZMA is not set +# CONFIG_FEATURE_LZMA_FAST is not set +CONFIG_UNZIP=y + +# +# Common options for cpio and tar +# +# CONFIG_FEATURE_UNARCHIVE_TAPE is not set +# CONFIG_FEATURE_DEB_TAR_GZ is not set +# CONFIG_FEATURE_DEB_TAR_BZ2 is not set +# CONFIG_FEATURE_DEB_TAR_LZMA is not set + +# +# Coreutils +# +CONFIG_BASENAME=y +# CONFIG_CAL is not set +CONFIG_CAT=y +# CONFIG_CATV is not set +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_CHROOT=y +# CONFIG_CKSUM is not set +# CONFIG_COMM is not set +CONFIG_CP=y +CONFIG_CUT=y +CONFIG_DATE=y +# CONFIG_FEATURE_DATE_ISOFMT is not set +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +# CONFIG_FEATURE_DD_IBS_OBS is not set +CONFIG_DF=y +# CONFIG_FEATURE_DF_INODE is not set +CONFIG_DIRNAME=y +# CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_FEATURE_ENV_LONG_OPTIONS=y +# CONFIG_EXPAND is not set +# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set +CONFIG_EXPR=y +# CONFIG_EXPR_MATH_SUPPORT_64 is not set +CONFIG_FALSE=y +# CONFIG_FOLD is not set +CONFIG_HEAD=y +# CONFIG_FEATURE_FANCY_HEAD is not set +# CONFIG_HOSTID is not set +CONFIG_ID=y +# CONFIG_INSTALL is not set +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set +# CONFIG_LENGTH is not set +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set +# CONFIG_NICE is not set +CONFIG_NOHUP=y +CONFIG_OD=y +# CONFIG_PRINTENV is not set +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_SEQ=y +# CONFIG_SHA1SUM is not set +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +# CONFIG_SPLIT is not set +# CONFIG_FEATURE_SPLIT_FANCY is not set +# CONFIG_STAT is not set +# CONFIG_FEATURE_STAT_FORMAT is not set +CONFIG_STTY=y +# CONFIG_SUM is not set +CONFIG_SYNC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set +CONFIG_TEST=y +# CONFIG_FEATURE_TEST_64 is not set +CONFIG_TOUCH=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +# CONFIG_FEATURE_TR_EQUIV is not set +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +# CONFIG_UNEXPAND is not set +# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set +CONFIG_UNIQ=y +CONFIG_USLEEP=y +# CONFIG_UUDECODE is not set +# CONFIG_UUENCODE is not set +CONFIG_WC=y +# CONFIG_FEATURE_WC_LARGE is not set +CONFIG_WHO=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +CONFIG_CHVT=y +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y +# CONFIG_KBD_MODE is not set +CONFIG_LOADFONT=y +CONFIG_LOADKMAP=y +CONFIG_OPENVT=y +CONFIG_RESET=y +# CONFIG_RESIZE is not set +# CONFIG_FEATURE_RESIZE_PRINT is not set +CONFIG_SETCONSOLE=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +# CONFIG_SETKEYCODES is not set +# CONFIG_SETLOGCONS is not set + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +# CONFIG_PIPE_PROGRESS is not set +CONFIG_RUN_PARTS=y +CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y +# CONFIG_FEATURE_RUN_PARTS_FANCY is not set +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_AWK=y +CONFIG_FEATURE_AWK_MATH=y +CONFIG_CMP=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_BINARY=y +CONFIG_FEATURE_DIFF_DIR=y +# CONFIG_FEATURE_DIFF_MINIMAL is not set +# CONFIG_ED is not set +CONFIG_PATCH=y +CONFIG_SED=y +CONFIG_VI=y +CONFIG_FEATURE_VI_MAX_LEN=1024 +CONFIG_FEATURE_VI_8BIT=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +CONFIG_FEATURE_VI_USE_SIGNALS=y +# CONFIG_FEATURE_VI_DOT_CMD is not set +# CONFIG_FEATURE_VI_READONLY is not set +# CONFIG_FEATURE_VI_SETOPTS is not set +# CONFIG_FEATURE_VI_SET is not set +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y +CONFIG_FEATURE_ALLOW_EXEC=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_MAXDEPTH=y +CONFIG_FEATURE_FIND_NEWER=y +# CONFIG_FEATURE_FIND_INUM is not set +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_FEATURE_FIND_USER=y +CONFIG_FEATURE_FIND_GROUP=y +CONFIG_FEATURE_FIND_NOT=y +CONFIG_FEATURE_FIND_DEPTH=y +CONFIG_FEATURE_FIND_PAREN=y +CONFIG_FEATURE_FIND_SIZE=y +CONFIG_FEATURE_FIND_PRUNE=y +# CONFIG_FEATURE_FIND_DELETE is not set +CONFIG_FEATURE_FIND_PATH=y +CONFIG_FEATURE_FIND_REGEX=y +# CONFIG_FEATURE_FIND_CONTEXT is not set +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set +# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set +# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set +# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set + +# +# Init Utilities +# +# CONFIG_INIT is not set +# CONFIG_DEBUG_INIT is not set +# CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_INIT_SYSLOG is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +# CONFIG_HALT is not set +# CONFIG_MESG is not set + +# +# Login/Password Management Utilities +# +# CONFIG_FEATURE_SHADOWPASSWDS is not set +# CONFIG_USE_BB_SHADOW is not set +# CONFIG_USE_BB_PWD_GRP is not set +CONFIG_ADDGROUP=y +CONFIG_FEATURE_ADDUSER_TO_GROUP=y +CONFIG_DELGROUP=y +CONFIG_FEATURE_DEL_USER_FROM_GROUP=y +CONFIG_ADDUSER=y +CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y +CONFIG_DELUSER=y +CONFIG_GETTY=y +CONFIG_FEATURE_UTMP=y +CONFIG_FEATURE_WTMP=y +CONFIG_LOGIN=y +# CONFIG_PAM is not set +# CONFIG_LOGIN_SCRIPTS is not set +CONFIG_FEATURE_NOLOGIN=y +CONFIG_FEATURE_SECURETTY=y +CONFIG_PASSWD=y +CONFIG_FEATURE_PASSWD_WEAK_CHECK=y +# CONFIG_CRYPTPW is not set +# CONFIG_CHPASSWD is not set +CONFIG_SU=y +CONFIG_FEATURE_SU_SYSLOG=y +CONFIG_FEATURE_SU_CHECKS_SHELLS=y +# CONFIG_SULOGIN is not set +CONFIG_VLOCK=y + +# +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +CONFIG_FSCK=y +# CONFIG_LSATTR is not set + +# +# Linux Module Utilities +# +CONFIG_INSMOD=y +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_RMMOD=y +CONFIG_LSMOD=y +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y +CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +# CONFIG_FEATURE_2_4_MODULES is not set +CONFIG_FEATURE_2_6_MODULES=y +# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set + +# +# Linux System Utilities +# +CONFIG_DMESG=y +CONFIG_FEATURE_DMESG_PRETTY=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +CONFIG_FDISK=y +CONFIG_FDISK_SUPPORT_LARGE_DISKS=y +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FREERAMDISK is not set +CONFIG_FSCK_MINIX=y +CONFIG_MKFS_MINIX=y + +# +# Minix filesystem support +# +CONFIG_FEATURE_MINIX2=y +# CONFIG_GETOPT is not set +CONFIG_HEXDUMP=y +# CONFIG_HD is not set +# CONFIG_FEATURE_HEXDUMP_REVERSE is not set +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set +CONFIG_LOSETUP=y +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_FEATURE_MDEV_EXEC is not set +# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set +CONFIG_MKSWAP=y +# CONFIG_FEATURE_MKSWAP_V0 is not set +CONFIG_MORE=y +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_MOUNT=y +# CONFIG_FEATURE_MOUNT_HELPERS is not set +CONFIG_FEATURE_MOUNT_NFS=y +# CONFIG_FEATURE_MOUNT_CIFS is not set +CONFIG_FEATURE_MOUNT_FLAGS=y +CONFIG_FEATURE_MOUNT_FSTAB=y +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +# CONFIG_READPROFILE is not set +# CONFIG_SETARCH is not set +CONFIG_SWAPONOFF=y +CONFIG_SWITCH_ROOT=y +CONFIG_UMOUNT=y +# CONFIG_FEATURE_UMOUNT_ALL is not set + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set + +# +# Miscellaneous Utilities +# +# CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set +# CONFIG_CHRT is not set +# CONFIG_CROND is not set +# CONFIG_DEBUG_CROND_OPTION is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +# CONFIG_CRONTAB is not set +CONFIG_DC=y +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +# CONFIG_EJECT is not set +# CONFIG_LAST is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +# CONFIG_FEATURE_LESS_FLAGCS is not set +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_HDPARM is not set +# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set +# CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MICROCOM is not set +# CONFIG_MOUNTPOINT is not set +# CONFIG_MT is not set +# CONFIG_RAIDAUTORUN is not set +# CONFIG_READAHEAD is not set +# CONFIG_RUNLEVEL is not set +# CONFIG_RX is not set +CONFIG_STRINGS=y +# CONFIG_SETSID is not set +# CONFIG_TASKSET is not set +# CONFIG_FEATURE_TASKSET_FANCY is not set +CONFIG_TIME=y +# CONFIG_TTYSIZE is not set +# CONFIG_WATCHDOG is not set + +# +# Networking Utilities +# +CONFIG_FEATURE_IPV6=y +CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y +# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +# CONFIG_ARP is not set +# CONFIG_ARPING is not set +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set +CONFIG_HOSTNAME=y +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_RANGES is not set +# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set +# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set +# CONFIG_FEATURE_HTTPD_PROXY is not set +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set +CONFIG_FEATURE_IFCONFIG_HW=y +# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set +CONFIG_IFUPDOWN=y +CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" +# CONFIG_FEATURE_IFUPDOWN_IP is not set +# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set +CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN=y +CONFIG_FEATURE_IFUPDOWN_IPV4=y +CONFIG_FEATURE_IFUPDOWN_IPV6=y +CONFIG_FEATURE_IFUPDOWN_MAPPING=y +# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set +# CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +CONFIG_IP=y +CONFIG_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_TUNNEL=y +# CONFIG_FEATURE_IP_RULE is not set +# CONFIG_FEATURE_IP_SHORT_FORMS is not set +# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_IPTUNNEL is not set +# CONFIG_IPRULE is not set +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +# CONFIG_NAMEIF is not set +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set +CONFIG_NC=y +# CONFIG_NC_SERVER is not set +# CONFIG_NC_EXTRA is not set +CONFIG_NETSTAT=y +# CONFIG_FEATURE_NETSTAT_WIDE is not set +CONFIG_NSLOOKUP=y +CONFIG_PING=y +CONFIG_PING6=y +# CONFIG_PSCAN is not set +CONFIG_FEATURE_FANCY_PING=y +CONFIG_ROUTE=y +# CONFIG_SLATTACH is not set +CONFIG_TELNET=y +# CONFIG_FEATURE_TELNET_TTYPE is not set +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +# CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_STANDALONE is not set +CONFIG_TFTP=y +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set +# CONFIG_DEBUG_TFTP is not set +CONFIG_TRACEROUTE=y +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +CONFIG_APP_UDHCPD=y +# CONFIG_APP_DHCPRELAY is not set +CONFIG_APP_DUMPLEASES=y +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +CONFIG_APP_UDHCPC=y +CONFIG_FEATURE_UDHCPC_ARPING=y +# CONFIG_FEATURE_UDHCP_DEBUG is not set +# CONFIG_FEATURE_RFC3397 is not set +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 +# CONFIG_VCONFIG is not set +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +# CONFIG_ZCIP is not set + +# +# Process Utilities +# +CONFIG_FREE=y +CONFIG_FUSER=y +CONFIG_KILL=y +CONFIG_KILLALL=y +# CONFIG_KILLALL5 is not set +# CONFIG_NMETER is not set +# CONFIG_PGREP is not set +CONFIG_PIDOF=y +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set +# CONFIG_PKILL is not set +CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y +# CONFIG_FEATURE_TOP_DECIMALS is not set +# CONFIG_FEATURE_TOPMEM is not set +CONFIG_UPTIME=y +CONFIG_WATCH=y + +# +# Shells +# +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_MSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +CONFIG_ASH=y + +# +# Ash Shell Options +# +CONFIG_ASH_JOB_CONTROL=y +CONFIG_ASH_READ_NCHARS=y +CONFIG_ASH_READ_TIMEOUT=y +CONFIG_ASH_ALIAS=y +CONFIG_ASH_MATH_SUPPORT=y +# CONFIG_ASH_MATH_SUPPORT_64 is not set +CONFIG_ASH_GETOPTS=y +# CONFIG_ASH_BUILTIN_ECHO is not set +CONFIG_ASH_BUILTIN_TEST=y +# CONFIG_ASH_CMDCMD is not set +# CONFIG_ASH_MAIL is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_ASH_RANDOM_SUPPORT is not set +CONFIG_ASH_EXPAND_PRMT=y +# CONFIG_HUSH is not set +# CONFIG_HUSH_HELP is not set +# CONFIG_HUSH_INTERACTIVE is not set +# CONFIG_HUSH_JOB is not set +# CONFIG_HUSH_TICK is not set +# CONFIG_HUSH_IF is not set +# CONFIG_HUSH_LOOPS is not set +# CONFIG_LASH is not set +# CONFIG_MSH is not set + +# +# Bourne Shell Options +# +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE is not set +# CONFIG_CTTYHACK is not set + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +CONFIG_KLOGD=y +CONFIG_LOGGER=y + +# +# Runit Utilities +# +# CONFIG_RUNSV is not set +# CONFIG_RUNSVDIR is not set +# CONFIG_SV is not set +# CONFIG_SVLOGD is not set +# CONFIG_CHPST is not set +# CONFIG_SETUIDGID is not set +# CONFIG_ENVUIDGID is not set +# CONFIG_ENVDIR is not set +# CONFIG_SOFTLIMIT is not set +# CONFIG_CHCON is not set +# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set +# CONFIG_GETENFORCE is not set +# CONFIG_GETSEBOOL is not set +# CONFIG_LOAD_POLICY is not set +# CONFIG_MATCHPATHCON is not set +# CONFIG_RESTORECON is not set +# CONFIG_RUNCON is not set +# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set +# CONFIG_SELINUXENABLED is not set +# CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +# CONFIG_SETSEBOOL is not set +# CONFIG_SESTATUS is not set + +# +# ipsvd utilities +# +# CONFIG_TCPSVD is not set +# CONFIG_UDPSVD is not set -- cgit v1.2.3 From 2aa3d0842e9cde0ca04d41771b2c5c49e911ffe8 Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 29 Feb 2008 11:03:16 +0000 Subject: gnash: create gnash.inc * add gnash 0.8.1 --- packages/gnash/gnash.inc | 79 ++++++++++++++++++++++++++++++++++++++++++ packages/gnash/gnash_0.8.0.bb | 80 +------------------------------------------ packages/gnash/gnash_0.8.1.bb | 1 + 3 files changed, 81 insertions(+), 79 deletions(-) create mode 100644 packages/gnash/gnash.inc create mode 100644 packages/gnash/gnash_0.8.1.bb (limited to 'packages') diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc new file mode 100644 index 0000000000..197cea06b6 --- /dev/null +++ b/packages/gnash/gnash.inc @@ -0,0 +1,79 @@ +DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features" + +LICENSE = "GPL-2" +HOMEPAGE = "http://www.gnu.org/software/gnash" + +DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl" + +SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2" + + +EXTRA_OECONF = "--enable-gui=gtk \ + --enable-renderer=cairo \ + --enable-media=none \ + --disable-klash \ + --enable-z \ + --enable-jpeg \ + --disable-glext \ + --enable-Xft \ + --enable-expat \ + --enable-mad \ + --enable-cairo \ + --disable-plugin \ + --disable-cygnal \ + --with-boost-incl=${STAGING_INCDIR} \ + --with-boost-lib=${STAGING_LIBDIR} \ + --with-libxml-incl=${STAGING_INCDIR}/libxml2 \ + --with-libxml-lib=${STAGING_LIBDIR} \ + --with-glib-incl=${STAGING_INCDIR}/glib-2.0 \ +# --with-glib-lib=${STAGING_LIBDIR} \ + --with-gtk2-incl=${STAGING_INCDIR}/gtk-2.0 \ + --with-pango-incl=${STAGING_INCDIR}/pango-1.0 \ +# --with-pango-lib=${STAGING_LIBDIR} \ + --with-sdl-incl=${STAGING_INCDIR}/SDL \ + --with-atk-incl=${STAGING_INCDIR}/atk-1.0 \ + --with-Xft-incl=${STAGING_INCDIR}/X11 \ + --with-expat-incl=${STAGING_INCDIR} \ + --with-mad-incl=${STAGING_INCDIR} \ + --with-cairo-incl=${STAGING_INCDIR}/cairo \ + --with-curl-incl=${STAGING_INCDIR} \ + --with-curl-lib=${STAGING_LIBDIR} \ + " + +inherit autotools pkgconfig + +LDFLAGS += " -L${STAGING_LIBDIR} -lcurl -lboost_date_time -lboost_filesystem -lboost_iostreams -lboost_signals -lboost_thread-mt " +CFLAGS += " -I${STAGING_INCDIR} -I${STAGING_LIBDIR}/gtk-2.0/include/ " + +do_configure_append() { + for i in `find . -name Makefile` ; do + sed -i s:I/usr/include:I${STAGING_INCDIR}:g $i + done +} + + +PARALLEL_MAKE = "" + +do_compile() { + oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \ + 'ZLIB_INCLUDE=${STAGING_INCDIR}' \ + 'ZLIB_LIBS=${STAGING_LIBDIR}' \ + 'PNG_INCLUDE=${STAGING_INCDIR}' \ + 'PNG_LIBS=${STAGING_LIBDIR}' +} + + +PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver " + +FILES_libgnashamf = "${libdir}/libgnashamf-${PV}.so" +FILES_libgnashbackend = "${libdir}/libgnashbackend-${PV}.so" +FILES_libgnashbase = "${libdir}/libgnashbase-${PV}.so" +FILES_libgnashgeo = "${libdir}/libgnashgeo-${PV}.so" +FILES_libgnashgui = "${libdir}/libgnashgui-${PV}.so" +FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so" +FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so" + +do_stage() { + autotools_stage_all +} + diff --git a/packages/gnash/gnash_0.8.0.bb b/packages/gnash/gnash_0.8.0.bb index 197cea06b6..da4b281e94 100644 --- a/packages/gnash/gnash_0.8.0.bb +++ b/packages/gnash/gnash_0.8.0.bb @@ -1,79 +1 @@ -DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features" - -LICENSE = "GPL-2" -HOMEPAGE = "http://www.gnu.org/software/gnash" - -DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl" - -SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2" - - -EXTRA_OECONF = "--enable-gui=gtk \ - --enable-renderer=cairo \ - --enable-media=none \ - --disable-klash \ - --enable-z \ - --enable-jpeg \ - --disable-glext \ - --enable-Xft \ - --enable-expat \ - --enable-mad \ - --enable-cairo \ - --disable-plugin \ - --disable-cygnal \ - --with-boost-incl=${STAGING_INCDIR} \ - --with-boost-lib=${STAGING_LIBDIR} \ - --with-libxml-incl=${STAGING_INCDIR}/libxml2 \ - --with-libxml-lib=${STAGING_LIBDIR} \ - --with-glib-incl=${STAGING_INCDIR}/glib-2.0 \ -# --with-glib-lib=${STAGING_LIBDIR} \ - --with-gtk2-incl=${STAGING_INCDIR}/gtk-2.0 \ - --with-pango-incl=${STAGING_INCDIR}/pango-1.0 \ -# --with-pango-lib=${STAGING_LIBDIR} \ - --with-sdl-incl=${STAGING_INCDIR}/SDL \ - --with-atk-incl=${STAGING_INCDIR}/atk-1.0 \ - --with-Xft-incl=${STAGING_INCDIR}/X11 \ - --with-expat-incl=${STAGING_INCDIR} \ - --with-mad-incl=${STAGING_INCDIR} \ - --with-cairo-incl=${STAGING_INCDIR}/cairo \ - --with-curl-incl=${STAGING_INCDIR} \ - --with-curl-lib=${STAGING_LIBDIR} \ - " - -inherit autotools pkgconfig - -LDFLAGS += " -L${STAGING_LIBDIR} -lcurl -lboost_date_time -lboost_filesystem -lboost_iostreams -lboost_signals -lboost_thread-mt " -CFLAGS += " -I${STAGING_INCDIR} -I${STAGING_LIBDIR}/gtk-2.0/include/ " - -do_configure_append() { - for i in `find . -name Makefile` ; do - sed -i s:I/usr/include:I${STAGING_INCDIR}:g $i - done -} - - -PARALLEL_MAKE = "" - -do_compile() { - oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \ - 'ZLIB_INCLUDE=${STAGING_INCDIR}' \ - 'ZLIB_LIBS=${STAGING_LIBDIR}' \ - 'PNG_INCLUDE=${STAGING_INCDIR}' \ - 'PNG_LIBS=${STAGING_LIBDIR}' -} - - -PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver " - -FILES_libgnashamf = "${libdir}/libgnashamf-${PV}.so" -FILES_libgnashbackend = "${libdir}/libgnashbackend-${PV}.so" -FILES_libgnashbase = "${libdir}/libgnashbase-${PV}.so" -FILES_libgnashgeo = "${libdir}/libgnashgeo-${PV}.so" -FILES_libgnashgui = "${libdir}/libgnashgui-${PV}.so" -FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so" -FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so" - -do_stage() { - autotools_stage_all -} - +require gnash.inc diff --git a/packages/gnash/gnash_0.8.1.bb b/packages/gnash/gnash_0.8.1.bb new file mode 100644 index 0000000000..da4b281e94 --- /dev/null +++ b/packages/gnash/gnash_0.8.1.bb @@ -0,0 +1 @@ +require gnash.inc -- cgit v1.2.3 From 470cd7c509ebd6885078208fbed76c5d19481b3d Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 29 Feb 2008 11:06:25 +0000 Subject: gpsdrive: add 2.10pre4 * http://bugs.openembedded.org/show_bug.cgi?id=3670 * plus some polishment --- packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty | 0 .../gpsdrive-2.10pre4-openstreetmap-download.patch | 128 +++++++++++++++++++++ .../gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch | 18 +++ .../gpsdrive-remove-hardcoded-paths.patch | 96 ++++++++++++++++ .../gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop | 10 ++ packages/gpsdrive/gpsdrive_2.10pre4.bb | 42 +++++++ 6 files changed, 294 insertions(+) create mode 100644 packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty create mode 100644 packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch create mode 100644 packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch create mode 100644 packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch create mode 100644 packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop create mode 100644 packages/gpsdrive/gpsdrive_2.10pre4.bb (limited to 'packages') diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty b/packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch new file mode 100644 index 0000000000..878cb1dba9 --- /dev/null +++ b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch @@ -0,0 +1,128 @@ +diff -ur gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl gpsdrive-2.10pre4/scripts/gpsfetchmap.pl +--- gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl 2007-12-28 18:49:44.000000000 +0100 ++++ gpsdrive-2.10pre4/scripts/gpsfetchmap.pl 2008-01-04 19:01:35.000000000 +0100 +@@ -35,6 +35,7 @@ + modified (Jul 2005) by Jaroslaw Zachwieja + modified (Dec 2005) by David Pollard + modified (Jul 2007) by Maciek Kaliszewski ++modified (Jan 2008) by Gernot Hillier (added Openstreetmap support) + Version svn-$Version + "; + +@@ -176,6 +177,25 @@ + 15812 => 3 , + 7906 => 2, + 3953 => 1 ++ }, ++ openstreetmap_tah => { ++ 256*576000 => 1, ++ 128*576000 => 2, ++ 64*576000 => 3, ++ 32*576000 => 4, ++ 16*576000 => 5, ++ 8*576000 => 6, ++ 4*576000 => 7, ++ 2*576000 => 8, ++ 576000 => 9, ++ 288000 => 10, ++ 144000 => 11, ++ 72000 => 12, ++ 36000 => 13, ++ 18000 => 14, ++ 9000 => 15, ++ 4500 => 16, ++ 2250 => 17 + } + }; + +@@ -331,7 +351,6 @@ + exit(); + } + +- + # Verify that we have the options that we need + pod2usage(1) if (&error_check); + +@@ -417,6 +436,13 @@ + print "+-----------------------------------------------------------+\n"; + print "| Landsat Maps are Copyright, ..... |\n"; + print "| They are free for non commercial use. |\n"; ++}elsif ( $mapserver eq 'openstreetmap_tah' ){ ++ print "+-----------------------------------------------------------+\n"; ++ print "| OpenStreetmap Maps are Copyright by the OpenStreetmap |\n"; ++ print "| project. |\n"; ++ print "| They are free for use under the terms of the |\n"; ++ print "| Creative Commons \"Attribution-Share Alike 2.0 Generic\" |\n"; ++ print "| license. See http://www.openstreetmap.org for details. |\n"; + } elsif ( ! $force) { + print "You are violating the map servers copyright!\n"; + print "Are you sure you want to continue? [y|n] "; +@@ -700,6 +726,11 @@ + { + ($url,$mapscale)=googlemap_url($lati,$long,$scale); + } ++ elsif ( $mapserver eq 'openstreetmap_tah') ++ { ++ $filename=~s/\.gif/.png/; ++ ($url,$mapscale)=openstreetmap_tah_url($lati,$long,$scale); ++ } + else + { + print "Unknown map sever :", $mapserver, "\n"; +@@ -935,6 +966,37 @@ + return ($url,$mapscale); + } + ++############################################################################# ++sub openstreetmap_tah_url($$$){ ++ my $lati = shift; ++ my $long = shift; ++ my $scale = shift; ++ ++ my $mapscale = $scale; ++ my $zoom = undef; ++ for my $s ( sort keys %{$Scale2Zoom->{openstreetmap_tah}} ) { ++ next unless $s == $scale; ++ $zoom = $Scale2Zoom->{openstreetmap_tah}->{$s}; ++ $mapscale = $s; ++ last; ++ } ++ ++ unless ( $zoom ) { ++ print "Error calculating Zoomlevel for Scale: $scale\n"; ++ return (undef,undef); ++ } ++ ++ if ($debug) { ++ print "\n"; ++ print "Using openstreetmap_tah zoom ", $zoom, " for requested scale ", $scale, ":1 actual scale ", $mapscale, ":1\n"; ++ print "lat: $lati\n"; ++ print "lon: $long\n"; ++ } ++ ++ my $url = "http://tah.openstreetmap.org/MapOf/?lat=$lati&long=$long&z=$zoom&w=1280&h=1024&format=png"; ++# print "$url\n"; ++ return ($url,$mapscale); ++} + + ############################################################################# + sub eniro_url($$$){ +@@ -2284,7 +2346,7 @@ + =item B<--mapserver > + + Mapserver to download from. Default: 'expedia'. +-Currently can use: landsat or expedia. ++Currently usable: landsat, expedia or openstreetmap_tah. + + geoscience, gov_au, incrementp, googlesat, googlemap and eniro have download stubs, + but they are !!!NOT!!!! in the right scale. +@@ -2294,6 +2356,9 @@ + + landsat covers the whole world with satelite Photos + ++openstreetmap_tah: Free maps from the OpenStreetmap Tiles@Home project, see ++ http://www.openstreetmap.org and http://tah.openstreetmap.org. ++ + gov_au is for Australia + + incrementp for japanese Maps diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch new file mode 100644 index 0000000000..c51c80931c --- /dev/null +++ b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch @@ -0,0 +1,18 @@ +Index: src/map_handler.c +=================================================================== +--- aa/src/map_handler.c (Revision 1699) ++++ aa/src/map_handler.c (Revision 1700) +@@ -660,9 +660,12 @@ + if (maploaded) + gdk_pixbuf_unref (image); + ++#ifdef MAPNIK + if ( !strcmp (filename,"mapnik") ) { + limage = gdk_pixbuf_new_from_data(get_mapnik_imagedata(), GDK_COLORSPACE_RGB, FALSE, 8, 1280, 1024, 1280 * 3, NULL, NULL); +- } else { ++ } else ++#endif ++ { + limage = gdk_pixbuf_new_from_file (filename, NULL); + if (limage == NULL) + { diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch new file mode 100644 index 0000000000..c8c0fe9c6a --- /dev/null +++ b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch @@ -0,0 +1,96 @@ +diff -ur gpsdrive-2.10pre4.orig/src/Makefile.am gpsdrive-2.10pre4/src/Makefile.am +--- gpsdrive-2.10pre4.orig/src/Makefile.am 2007-12-28 18:49:44.000000000 +0100 ++++ gpsdrive-2.10pre4/src/Makefile.am 2007-12-28 18:50:29.000000000 +0100 +@@ -14,14 +14,14 @@ + -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" \ + -DLIBDIR=\"${libdir}\" \ + -DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" \ +- ${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}\ +- -I/usr/include/ \ +- -I/usr/local/include \ +- -I/opt/boost_1_35/include/boost-1_35 \ +- -I/usr/local/include/freetype2 \ +- -I/usr/include/freetype2 \ ++ ${NOGARMIN} ${NOPLUGINS} ${AMAPNIK} ++# -I/usr/include/ \ ++# -I/usr/local/include \ ++# -I/opt/boost_1_35/include/boost-1_35 \ ++# -I/usr/local/include/freetype2 \ ++# -I/usr/include/freetype2 \ + -I. \ +- -L/usr/local/lib ++# -L/usr/local/lib + + # -I/usr/include/dbus-1.0/ + +diff -ur gpsdrive-2.10pre4.orig/configure gpsdrive-2.10pre4/configure +--- gpsdrive-2.10pre4.orig/configure 2007-12-28 18:49:44.000000000 +0100 ++++ gpsdrive-2.10pre4/configure 2008-01-06 14:49:11.000000000 +0100 +@@ -35950,10 +35950,13 @@ + # Yep, its ebil, but I does not know better... + #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"` + # default on debian should be: /usr/share/perl5/ +-PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"` ++#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"` + #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"` +-PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"` ++#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"` + ++# hard code path for OpenEmbedded environment as I don't know a way ++# to detect it automatically ++PERL_PACKAGE_DIR="/usr/share/perl5" + + ac_perl_modules="File::Basename " + # Make sure we have perl +@@ -37840,11 +37843,11 @@ + # AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore') + #fi + +-if test -f /usr/include/mysql/mysql.h; then +- CFLAGS="$CFLAGS -I/usr/include/mysql" +-else +- CFLAGS="$CFLAGS -Imysql" +-fi ++#if test -f /usr/include/mysql/mysql.h; then ++# CFLAGS="$CFLAGS -I/usr/include/mysql" ++#else ++# CFLAGS="$CFLAGS -Imysql" ++#fi + + CFLAGS="$CFLAGS $OPT_CFLAGS" + CXXFLAGS="$CXXFLAGS $OPT_CFLAGS" +diff -ur gpsdrive-2.10pre4.orig/configure.ac gpsdrive-2.10pre4/configure.ac +--- gpsdrive-2.10pre4.orig/configure.ac 2007-12-28 18:49:44.000000000 +0100 ++++ gpsdrive-2.10pre4/configure.ac 2008-01-06 14:48:50.000000000 +0100 +@@ -662,9 +662,12 @@ + # Yep, its ebil, but I does not know better... + #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"` + # default on debian should be: /usr/share/perl5/ +-PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"` ++#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"` + #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"` +-PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"` ++#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"` ++# hard code path for OpenEmbedded environment as I don't know a way ++# to detect it automatically ++PERL_PACKAGE_DIR="/usr/share/perl5" + AC_SUBST(PERL_PACKAGE_DIR) + + AC_PROG_PERL_MODULES(File::Basename , , AC_MSG_ERROR(Need Perl module File::Basename)) +@@ -719,11 +722,11 @@ + # AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore') + #fi + +-if test -f /usr/include/mysql/mysql.h; then +- CFLAGS="$CFLAGS -I/usr/include/mysql" +-else +- CFLAGS="$CFLAGS -Imysql" +-fi ++#if test -f /usr/include/mysql/mysql.h; then ++# CFLAGS="$CFLAGS -I/usr/include/mysql" ++#else ++# CFLAGS="$CFLAGS -Imysql" ++#fi + + CFLAGS="$CFLAGS $OPT_CFLAGS" + CXXFLAGS="$CXXFLAGS $OPT_CFLAGS" diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop new file mode 100644 index 0000000000..96e8155861 --- /dev/null +++ b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=GPSDrive +Comment=GPS map software +Exec=gpsdrive -M pda -1 +Icon=gpsicon +Terminal=false +Type=Application +Categories=Graphics;Network;Geography;Application;Other +StartupNotify=true diff --git a/packages/gpsdrive/gpsdrive_2.10pre4.bb b/packages/gpsdrive/gpsdrive_2.10pre4.bb new file mode 100644 index 0000000000..071a5691e3 --- /dev/null +++ b/packages/gpsdrive/gpsdrive_2.10pre4.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "GPS navigation/map display software" +SECTION = "x11" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "virtual/libc gtk+ libpcre gpsd libwww-perl-native mysql" +RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd libwww-perl" +PR = "r1" + +SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \ + file://gpsdrive_2.10pre4.desktop \ + file://gpsdrive-remove-hardcoded-paths.patch;patch=1 \ + file://gpsdrive-ifdef-mapnik.patch;patch=1 \ + file://gpsdrive-2.10pre4-openstreetmap-download.patch;patch=1" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-garmin" + +do_install_append () { + mkdir -p ${D}${datadir}/applications + install -m 0644 ${WORKDIR}/gpsdrive_2.10pre4.desktop ${D}${datadir}/applications/gpsdrive.desktop + mkdir -p ${D}${datadir}/pixmaps + cp ${D}${datadir}/${PN}/pixmaps/gpsicon.png ${D}${datadir}/pixmaps + # remove stuff we don't want to package + rm ${D}${datadir}/${PN}/gpsdrive.desktop # we have our own one + rm -rf ${D}${datadir}/${PN}/DSL # for Damn Small Linux + rm -rf ${D}${datadir}/${PN}/gentoo # for Gentoo +} + +PACKAGES += "gpsdrive-maps gpsdrive-map-icons-classic gpsdrive-map-icons-other gpsdrive-addons" + +FILES_${PN} = "${bindir}/gpsdrive ${datadir}/applications ${datadir}/map-icons/icons.xml" +FILES_${PN} += "${datadir}/pixmaps ${datadir}/${PN}/pixmaps ${datadir}/${PN}/poi" +FILES_${PN}-addons = "${bindir}/*.pl ${bindir}/friendsd2 ${bindir}/geo* ${bindir}/*.sh ${bindir}/*.py ${bindir}/gpsreplay ${bindir}/gpssmswatch ${bindir}/wp* ${datadir}/mapnik ${datadir}/perl*/Geo ${datadir}/perl*/Utils" +FILES_${PN}-map-icons-classic = "${datadir}/map-icons/classic.small" +FILES_${PN}-map-icons-other = "${datadir}/map-icons/classic.big ${datadir}/map-icons/japan ${datadir}/map-icons/nickw ${datadir}/map-icons/square.big ${datadir}/map-icons/square.small ${datadir}/map-icons/svg" +FILES_${PN}-maps = "${datadir}/${PN}/maps ${datadir}/${PN}/map_koord.txt" +FILES_${PN}-doc = "${datadir}/man ${datadir}/${PN}/Documentation" + +CFLAGS += "-D_GNU_SOURCE" + +DEFAULT_PREFERENCE = "1" -- cgit v1.2.3 From 7d6159396d33d1bb43db509c086d41641267ec4c Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 29 Feb 2008 11:20:53 +0000 Subject: gsm: update gsmd initscript for gta01 and gta02 * use the same gsmd initscript for gta01 and gta02 * this only works with kernel 2.6.24 --- packages/gsm/files/fic-gta01/.mtn2git_empty | 0 packages/gsm/files/fic-gta01/gsmd | 49 ----------------------------- packages/gsm/files/gsmd | 3 +- 3 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 packages/gsm/files/fic-gta01/.mtn2git_empty delete mode 100644 packages/gsm/files/fic-gta01/gsmd (limited to 'packages') diff --git a/packages/gsm/files/fic-gta01/.mtn2git_empty b/packages/gsm/files/fic-gta01/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gsm/files/fic-gta01/gsmd b/packages/gsm/files/fic-gta01/gsmd deleted file mode 100644 index d8323e202c..0000000000 --- a/packages/gsm/files/fic-gta01/gsmd +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# gsmd This shell script starts and stops gsmd. -# -# chkconfig: 345 90 40 -# description: Gsmd manages access to a serial- or USB-connected GSM -# processname: gsmd - -PATH=/bin:/usr/bin:/sbin:/usr/sbin - -[ -f /etc/default/rcS ] && . /etc/default/rcS -[ -f /etc/default/gsmd ] && . /etc/default/gsmd - -case "$1" in - start) - stty -F "$GSM_DEV" -crtscts - [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 ) - stty -F "$GSM_DEV" -echo - [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 ) - [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 ) - [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 ) - - echo -n "Starting GSM daemon: " - start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS >/tmp/gsm.log 2>&1 & - - if [ $? = 0 ]; then - echo "gsmd." - else - echo "(failed.)" - fi - ;; - stop) - echo -n "Stopping GSM daemon: " - start-stop-daemon -K -x /usr/sbin/gsmd - stty -F "$GSM_DEV" -crtscts - [ -n "$GSM_POW" ] && echo "0" >$GSM_POW - echo "gsmd." - ;; - restart|force-reload) - $0 stop - $0 start - ;; - *) - echo "Usage: /etc/init.d/gsmd {start|stop|restart|force-reload}" - exit 1 - ;; -esac - -exit 0 diff --git a/packages/gsm/files/gsmd b/packages/gsm/files/gsmd index 72f66a17ad..fadae76aee 100644 --- a/packages/gsm/files/gsmd +++ b/packages/gsm/files/gsmd @@ -13,8 +13,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin case "$1" in start) - [ -n "$GSM_DL" ] && echo "1" >$GSM_DL; - + [ -n "$GSM_DL" ] && ( echo "1" >$GSM_DL; sleep 1 ) [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 ) [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 ) [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 ) -- cgit v1.2.3 From ed8ec27c2b1823b6b33af47e9595beb0f473a33d Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 29 Feb 2008 11:27:04 +0000 Subject: multitap-pad: multi-tap input method for GTK --- packages/multitap-pad/.mtn2git_empty | 0 packages/multitap-pad/files/.mtn2git_empty | 0 packages/multitap-pad/files/80multitappad | 20 +++++++++++++ packages/multitap-pad/multitap-pad_svn.bb | 47 ++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+) create mode 100644 packages/multitap-pad/.mtn2git_empty create mode 100644 packages/multitap-pad/files/.mtn2git_empty create mode 100644 packages/multitap-pad/files/80multitappad create mode 100644 packages/multitap-pad/multitap-pad_svn.bb (limited to 'packages') diff --git a/packages/multitap-pad/.mtn2git_empty b/packages/multitap-pad/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/multitap-pad/files/.mtn2git_empty b/packages/multitap-pad/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/multitap-pad/files/80multitappad b/packages/multitap-pad/files/80multitappad new file mode 100644 index 0000000000..d2b12ea7cc --- /dev/null +++ b/packages/multitap-pad/files/80multitappad @@ -0,0 +1,20 @@ +#!/bin/sh + +CMD="" + +if [ "$DISPLAY_CAN_ROTATE" = "1" ]; then + if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then + CMD="multitap-pad -d -o landscape" + elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then + CMD="multitap-pad -d -o portrait" + fi +else + CMD="multitap-pad -d" +fi + + +# Delay to make sure the window manager is active + +if [ "$CMD" ]; then + (sleep 2 && $CMD) & +fi diff --git a/packages/multitap-pad/multitap-pad_svn.bb b/packages/multitap-pad/multitap-pad_svn.bb new file mode 100644 index 0000000000..7543a44d72 --- /dev/null +++ b/packages/multitap-pad/multitap-pad_svn.bb @@ -0,0 +1,47 @@ +DESCRIPTION = "Multi-tap input method for GTK" +LICENSE = "GPL" +DEPENDS = "libfakekey gtk+ matchbox-panel-2" +RCONFLICTS = matchbox-keyboard-inputmethod +SECTION = "x11" +PV = "0.0+svnr${SRCREV}" + +SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http \ + file://80multitappad" + +inherit autotools pkgconfig + +S = "${WORKDIR}/${PN}" + +FILES_${PN} = "${bindir}/* \ + ${libdir} \ + ${sysconfdir} \ + ${datadir}" + +FILES_${PN}-dbg += " ${libdir}/gtk-2.0/2.10.0/immodules/.debug \ + ${libdir}/matchbox-panel/.debug" + +FILES_${PN}-dev += " ${libdir}/gtk-2.0/2.10.0/immodules/*.a \ + ${libdir}/gtk-2.0/2.10.0/immodules/*.la \ + ${libdir}/matchbox-panel/*.a \ + ${libdir}/matchbox-panel/*.la" + +do_install_append () { + install -d ${D}/${sysconfdir}/X11/Xsession.d/ + install -m 755 ${WORKDIR}/80multitappad ${D}/${sysconfdir}/X11/Xsession.d/ +} + +pkg_postinst_multitap-pad () { +if [ "x$D" != "x" ]; then + exit 1 +fi + +gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules +} + +pkg_postrm_multitap-pad () { +if [ "x$D" != "x" ]; then + exit 1 +fi + +gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules +} -- cgit v1.2.3 From f87430bac06825f8b9b0d4371705e9b9cf7bcfe2 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Fri, 29 Feb 2008 11:27:51 +0000 Subject: alsa-state/fic-gta02/* : merge state files with openmoko versions --- packages/alsa/alsa-state/fic-gta02/asound.state | 8 +- .../alsa/alsa-state/fic-gta02/gsmhandset.state | 859 +++++++++++++++++++++ packages/alsa/alsa-state/fic-gta02/stereoout.state | 8 +- 3 files changed, 867 insertions(+), 8 deletions(-) create mode 100644 packages/alsa/alsa-state/fic-gta02/gsmhandset.state (limited to 'packages') diff --git a/packages/alsa/alsa-state/fic-gta02/asound.state b/packages/alsa/alsa-state/fic-gta02/asound.state index df824b66b6..7a8405a16e 100644 --- a/packages/alsa/alsa-state/fic-gta02/asound.state +++ b/packages/alsa/alsa-state/fic-gta02/asound.state @@ -26,8 +26,8 @@ state.neo1973gta02 { comment.range '0 - 127' iface MIXER name 'Headphone Playback Volume' - value.0 121 - value.1 121 + value.0 127 + value.1 127 } control.4 { comment.access 'read write' @@ -36,8 +36,8 @@ state.neo1973gta02 { comment.range '0 - 127' iface MIXER name 'Speaker Playback Volume' - value.0 121 - value.1 121 + value.0 0 + value.1 0 } control.5 { comment.access 'read write' diff --git a/packages/alsa/alsa-state/fic-gta02/gsmhandset.state b/packages/alsa/alsa-state/fic-gta02/gsmhandset.state new file mode 100644 index 0000000000..348b109d8d --- /dev/null +++ b/packages/alsa/alsa-state/fic-gta02/gsmhandset.state @@ -0,0 +1,859 @@ +state.neo1973gta02 { + control.1 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 255' + iface MIXER + name 'PCM Volume' + value.0 255 + value.1 255 + } + control.2 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 255' + iface MIXER + name 'ADC Capture Volume' + value.0 195 + value.1 195 + } + control.3 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 127' + iface MIXER + name 'Headphone Playback Volume' + value.0 121 + value.1 121 + } + control.4 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 127' + iface MIXER + name 'Speaker Playback Volume' + value.0 127 + value.1 127 + } + control.5 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 127' + iface MIXER + name 'Mono Playback Volume' + value 115 + } + control.6 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 7' + iface MIXER + name 'Bypass Playback Volume' + value.0 2 + value.1 2 + } + control.7 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 7' + iface MIXER + name 'Sidetone Playback Volume' + value.0 2 + value.1 2 + } + control.8 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 7' + iface MIXER + name 'Voice Playback Volume' + value.0 2 + value.1 2 + } + control.9 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Headphone Playback ZC Switch' + value.0 false + value.1 true + } + control.10 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Speaker Playback ZC Switch' + value.0 false + value.1 true + } + control.11 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 7' + iface MIXER + name 'Mono Bypass Playback Volume' + value 3 + } + control.12 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 7' + iface MIXER + name 'Mono Sidetone Playback Volume' + value 1 + } + control.13 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 7' + iface MIXER + name 'Mono Voice Playback Volume' + value 1 + } + control.14 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mono Playback ZC Switch' + value false + } + control.15 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Linear Control' + comment.item.1 'Adaptive Boost' + iface MIXER + name 'Bass Boost' + value 'Linear Control' + } + control.16 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 '130Hz @ 48kHz' + comment.item.1 '200Hz @ 48kHz' + comment.item.2 '100Hz @ 16kHz' + comment.item.3 '400Hz @ 48kHz' + comment.item.4 '100Hz @ 8kHz' + comment.item.5 '200Hz @ 8kHz' + iface MIXER + name 'Bass Filter' + value '130Hz @ 48kHz' + } + control.17 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 15' + iface MIXER + name 'Bass Volume' + value 0 + } + control.18 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 15' + iface MIXER + name 'Treble Volume' + value 7 + } + control.19 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 '8kHz' + comment.item.1 '4kHz' + iface MIXER + name 'Treble Cut-off' + value '8kHz' + } + control.20 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 7' + iface MIXER + name 'Sidetone Capture Volume' + value.0 2 + value.1 2 + } + control.21 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 7' + iface MIXER + name 'Voice Sidetone Capture Volume' + value 2 + } + control.22 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 63' + iface MIXER + name 'Capture Volume' + value.0 24 + value.1 24 + } + control.23 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Capture ZC Switch' + value.0 false + value.1 false + } + control.24 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Capture Switch' + value.0 true + value.1 true + } + control.25 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 '3.4Hz @ 48kHz' + comment.item.1 '82Hz @ 16k' + comment.item.2 '82Hz @ 8kHz' + comment.item.3 '170Hz @ 8kHz' + iface MIXER + name 'Capture Filter Select' + value '3.4Hz @ 48kHz' + } + control.26 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 HiFi + comment.item.1 Voice + iface MIXER + name 'Capture Filter Cut-off' + value HiFi + } + control.27 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Capture Filter Switch' + value false + } + control.28 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 7' + iface MIXER + name 'ALC Capture Target Volume' + value 3 + } + control.29 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 7' + iface MIXER + name 'ALC Capture Max Volume' + value 1 + } + control.30 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Off + comment.item.1 Right + comment.item.2 Left + comment.item.3 Stereo + iface MIXER + name 'ALC Capture Function' + value Stereo + } + control.31 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'ALC Capture ZC Switch' + value false + } + control.32 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 15' + iface MIXER + name 'ALC Capture Hold Time' + value 7 + } + control.33 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 15' + iface MIXER + name 'ALC Capture Decay Time' + value 12 + } + control.34 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 15' + iface MIXER + name 'ALC Capture Attack Time' + value 2 + } + control.35 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + iface MIXER + name 'ALC Capture NG Threshold' + value 0 + } + control.36 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Constant PGA Gain' + comment.item.1 'Mute ADC Output' + iface MIXER + name 'ALC Capture NG Type' + value 'Constant PGA Gain' + } + control.37 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'ALC Capture NG Switch' + value false + } + control.38 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Capture + comment.item.1 Playback + iface MIXER + name '3D Function' + value Capture + } + control.39 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 '2.2kHz' + comment.item.1 '1.5kHz' + iface MIXER + name '3D Upper Cut-off' + value '2.2kHz' + } + control.40 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 '200Hz' + comment.item.1 '500Hz' + iface MIXER + name '3D Lower Cut-off' + value '200Hz' + } + control.41 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 15' + iface MIXER + name '3D Volume' + value 0 + } + control.42 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name '3D Switch' + value false + } + control.43 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Capture 6dB Attenuate' + value false + } + control.44 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Playback 6dB Attenuate' + value false + } + control.45 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 None + comment.item.1 '32kHz' + comment.item.2 '44.1kHz' + comment.item.3 '48kHz' + iface MIXER + name De-emphasis + value None + } + control.46 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Stereo + comment.item.1 Left + comment.item.2 Right + comment.item.3 Mono + iface MIXER + name 'Playback Mono Mix' + value Stereo + } + control.47 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Non Inverted' + comment.item.1 Inverted + iface MIXER + name 'Playback Phase' + value 'Non Inverted' + } + control.48 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 3' + iface MIXER + name 'Mic2 Capture Volume' + value 0 + } + control.49 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 3' + iface MIXER + name 'Mic1 Capture Volume' + value 0 + } + control.50 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'DAI 0' + comment.item.1 'DAI 1' + comment.item.2 'DAI 2' + comment.item.3 'DAI 3' + iface MIXER + name 'DAI Mode' + value 'DAI 0' + } + control.51 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Stereo + comment.item.1 'Left ADC' + comment.item.2 'Right ADC' + comment.item.3 'Channel Swap' + iface MIXER + name 'ADC Data Select' + value Stereo + } + control.52 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Mic 1' + comment.item.1 'Mic 2' + comment.item.2 'Mic 3' + iface MIXER + name 'Mic Selection Mux' + value 'Mic 1' + } + control.53 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'RXP - RXN' + comment.item.1 'RXP + RXN' + comment.item.2 RXP + comment.item.3 RXN + iface MIXER + name 'Rx Mixer' + value 'RXP - RXN' + } + control.54 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Line 1 + 2' + comment.item.1 'Line 1 - 2' + comment.item.2 'Line 1' + comment.item.3 'Line 2' + iface MIXER + name 'Line Mixer' + value 'Line 1 + 2' + } + control.55 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Line Mix' + comment.item.1 'Rx Mix' + iface MIXER + name 'Line Mono Mux' + value 'Line Mix' + } + control.56 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Line 2' + comment.item.1 'Rx Mix' + iface MIXER + name 'Line Right Mux' + value 'Rx Mix' + } + control.57 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Line 1' + comment.item.1 'Rx Mix' + iface MIXER + name 'Line Left Mux' + value 'Rx Mix' + } + control.58 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'ALC Mixer Line Capture Switch' + value false + } + control.59 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'ALC Mixer Mic2 Capture Switch' + value true + } + control.60 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'ALC Mixer Mic1 Capture Switch' + value false + } + control.61 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'ALC Mixer Rx Capture Switch' + value false + } + control.62 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Left PGA' + comment.item.1 'Mic 1' + comment.item.2 'Mic 2' + comment.item.3 'Right PGA' + iface MIXER + name 'Mic Sidetone Mux' + value 'Left PGA' + } + control.63 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 PGA + comment.item.1 'Line or RXP-RXN' + comment.item.2 Sidetone + iface MIXER + name 'Capture Right Mux' + value PGA + } + control.64 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 PGA + comment.item.1 'Line or RXP-RXN' + comment.item.2 Line + iface MIXER + name 'Capture Left Mux' + value PGA + } + control.65 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Stereo + comment.item.1 'Analogue Mix Left' + comment.item.2 'Analogue Mix Right' + comment.item.3 'Digital Mono Mix' + iface MIXER + name 'Capture Right Mixer' + value Stereo + } + control.66 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Stereo + comment.item.1 'Analogue Mix Left' + comment.item.2 'Analogue Mix Right' + comment.item.3 'Digital Mono Mix' + iface MIXER + name 'Capture Left Mixer' + value Stereo + } + control.67 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Playback Mixer Voice Capture Sw' + value false + } + control.68 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Playback Mixer Left Capture Swi' + value false + } + control.69 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Playback Mixer Right Capture Sw' + value false + } + control.70 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 VREF + comment.item.1 'Capture ST' + comment.item.2 LOUT2 + iface MIXER + name 'Out4 Mux' + value VREF + } + control.71 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 VREF + comment.item.1 ROUT2 + comment.item.2 'Left + Right' + iface MIXER + name 'Out3 Mux' + value VREF + } + control.72 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Inverted Mono 1' + comment.item.1 Left + comment.item.2 Right + comment.item.3 'Left + Right' + iface MIXER + name 'Mono 2 Mux' + value 'Inverted Mono 1' + } + control.73 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mono Mixer Left Playback Switch' + value false + } + control.74 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mono Mixer Right Playback Switc' + value false + } + control.75 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mono Mixer Voice Playback Switc' + value false + } + control.76 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mono Mixer Sidetone Playback Sw' + value true + } + control.77 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mono Mixer Bypass Playback Swit' + value false + } + control.78 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Right Mixer Voice Playback Swit' + value false + } + control.79 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Right Mixer Sidetone Playback S' + value true + } + control.80 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Right Mixer Right Playback Swit' + value false + } + control.81 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Right Mixer Bypass Playback Swi' + value false + } + control.82 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Left Mixer Voice Playback Switc' + value false + } + control.83 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Left Mixer Sidetone Playback Sw' + value false + } + control.84 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Left Mixer Left Playback Switch' + value false + } + control.85 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Left Mixer Bypass Playback Swit' + value true + } + control.86 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'DAPM Stereo Out Switch' + value true + } + control.87 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'DAPM GSM Line Out Switch' + value true + } + control.88 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'DAPM GSM Line In Switch' + value false + } + control.89 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'DAPM Headset Mic Switch' + value false + } + control.90 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'DAPM Handset Mic Switch' + value true + } + control.91 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'DAPM Handset Spk Switch' + value true + } +} diff --git a/packages/alsa/alsa-state/fic-gta02/stereoout.state b/packages/alsa/alsa-state/fic-gta02/stereoout.state index df824b66b6..7a8405a16e 100644 --- a/packages/alsa/alsa-state/fic-gta02/stereoout.state +++ b/packages/alsa/alsa-state/fic-gta02/stereoout.state @@ -26,8 +26,8 @@ state.neo1973gta02 { comment.range '0 - 127' iface MIXER name 'Headphone Playback Volume' - value.0 121 - value.1 121 + value.0 127 + value.1 127 } control.4 { comment.access 'read write' @@ -36,8 +36,8 @@ state.neo1973gta02 { comment.range '0 - 127' iface MIXER name 'Speaker Playback Volume' - value.0 121 - value.1 121 + value.0 0 + value.1 0 } control.5 { comment.access 'read write' -- cgit v1.2.3 From 71223ff7ddba5c6e5b0376ff61b7cb6fa3704253 Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 29 Feb 2008 11:32:08 +0000 Subject: openmoko-dialer2: add machine specific patch for backlight and vibrator * this should be done in external config but for now we use patch * gta01 and gta02 use different names for backlight and vibrator under /sys * this only works with kernel 2.6.24 --- .../openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty | 0 .../openmoko-dialer2/fic-gta01/kernel-2.6.24.patch | 13 +++++++++++++ .../openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty | 0 .../openmoko-dialer2/fic-gta02/kernel-2.6.24.patch | 15 +++++++++++++++ packages/openmoko2/openmoko-dialer2_svn.bb | 5 ++++- 5 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 packages/openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty create mode 100644 packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch create mode 100644 packages/openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty create mode 100644 packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch (limited to 'packages') diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty b/packages/openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch b/packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch new file mode 100644 index 0000000000..c6f34f4131 --- /dev/null +++ b/packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch @@ -0,0 +1,13 @@ +Index: openmoko-dialer2/src/phone-kit/moko-notify.c +=================================================================== +--- openmoko-dialer2/src/phone-kit/moko-notify.c.orig 2008-02-14 17:47:23.000000000 +0800 ++++ openmoko-dialer2/src/phone-kit/moko-notify.c 2008-02-14 17:48:19.000000000 +0800 +@@ -38,7 +38,7 @@ + + #define DEFAULT_RINGTONE "/default_ringtone.ogg" + #define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl" +-#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator" ++#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator" + + struct _MokoNotifyPrivate + { diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty b/packages/openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch b/packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch new file mode 100644 index 0000000000..72c516f5d6 --- /dev/null +++ b/packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch @@ -0,0 +1,15 @@ +Index: openmoko-dialer2/src/phone-kit/moko-notify.c +=================================================================== +--- openmoko-dialer2/src/phone-kit/moko-notify.c (revision 4051) ++++ openmoko-dialer2/src/phone-kit/moko-notify.c (working copy) +@@ -37,8 +37,8 @@ + MOKO_TYPE_NOTIFY, MokoNotifyPrivate)) + + #define DEFAULT_RINGTONE "/default_ringtone.ogg" +-#define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl" +-#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator" ++#define SYS_BRIGHTNESS "/sys/class/backlight/pcf50633-bl" ++#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator" + + struct _MokoNotifyPrivate + { diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb index 3378e43503..4f15ac07dc 100644 --- a/packages/openmoko2/openmoko-dialer2_svn.bb +++ b/packages/openmoko2/openmoko-dialer2_svn.bb @@ -2,11 +2,14 @@ DESCRIPTION = "The OpenMoko Dialer" SECTION = "openmoko/pim" DEPENDS = "libgsmd libjana libmokoui2 libmokojournal2 pulseaudio libnotify" PV = "0.1.0+svnr${SRCREV}" -PR = "r6" +PR = "r7" PE = "1" inherit openmoko2 +SRC_URI_append_fic-gta01 = " file://kernel-2.6.24.patch;patch=1" +SRC_URI_append_fic-gta02 = " file://kernel-2.6.24.patch;patch=1" + EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}" FILES_${PN} += "${datadir}/openmoko-dialer/ ${datadir}/dbus-1/services/" -- cgit v1.2.3 From d4042c62511291230da65d7b848d253182bc16e8 Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 29 Feb 2008 11:45:30 +0000 Subject: openmoko-panel-memory: shows an out-of-memory warning in the OpenMoko panel --- packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb (limited to 'packages') diff --git a/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb new file mode 100644 index 0000000000..8e8af7a086 --- /dev/null +++ b/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb @@ -0,0 +1,7 @@ +DESCRIPTION = "Shows an out-of-memory warning in the OpenMoko panel" +DEPENDS = "libnotify" +RDEPENDS = "openmoko-dialer2" +PV = "0.0.0+svn${SVNREV}" +PR = "r0" + +inherit openmoko-panel-plugin -- cgit v1.2.3 From 3992945511a89dcd8166d5b22ce79cd81fab2fb2 Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 29 Feb 2008 11:47:58 +0000 Subject: openmoko-session2: add openmoko-panel-memory --- packages/openmoko2/openmoko-session2.bb | 2 +- packages/openmoko2/openmoko-session2/etc/matchbox/session | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index 3d8c9109e1..02489f5621 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -4,7 +4,7 @@ SECTION = "x11" RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2" RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2" RCONFLICTS_${PN} = "openmoko-session matchbox-common" -PR = "r63" +PR = "r64" SRC_URI = "\ file://etc \ diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session index 9eea32a45d..f4d1ee9b11 100755 --- a/packages/openmoko2/openmoko-session2/etc/matchbox/session +++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session @@ -7,6 +7,6 @@ phone-kit & matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ & matchbox-panel-2 --start-applets systray,startup \ - --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,keyboard --titlebar & + --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-memory,keyboard --titlebar & exec neod -- cgit v1.2.3 From d29e54a446a828eb8459372e93dfe5fb6e9c0158 Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 29 Feb 2008 11:49:18 +0000 Subject: task-openmoko-phone: include openmoko-panel-memory --- packages/tasks/task-openmoko-phone.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/tasks/task-openmoko-phone.bb b/packages/tasks/task-openmoko-phone.bb index 49e4e66859..474efff79d 100644 --- a/packages/tasks/task-openmoko-phone.bb +++ b/packages/tasks/task-openmoko-phone.bb @@ -1,7 +1,7 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r72" +PR = "r73" inherit task @@ -14,5 +14,6 @@ RDEPENDS_task-openmoko-phone = "\ libgsmd-tools \ openmoko-dialer2 \ openmoko-panel-gsm \ + openmoko-panel-memory \ # ppp \ " -- cgit v1.2.3 From 8c2682316522129307c940dddc241bfd9dfa9be7 Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 29 Feb 2008 11:55:20 +0000 Subject: perl: add libwww-perl and native --- packages/perl/libwww-perl-native_5.808.bb | 5 +++++ packages/perl/libwww-perl_5.808.bb | 12 ++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 packages/perl/libwww-perl-native_5.808.bb create mode 100644 packages/perl/libwww-perl_5.808.bb (limited to 'packages') diff --git a/packages/perl/libwww-perl-native_5.808.bb b/packages/perl/libwww-perl-native_5.808.bb new file mode 100644 index 0000000000..68fdcbbbe5 --- /dev/null +++ b/packages/perl/libwww-perl-native_5.808.bb @@ -0,0 +1,5 @@ +SECTION = "libs" + +inherit native + +require libwww-perl_${PV}.bb diff --git a/packages/perl/libwww-perl_5.808.bb b/packages/perl/libwww-perl_5.808.bb new file mode 100644 index 0000000000..2bea48a2d0 --- /dev/null +++ b/packages/perl/libwww-perl_5.808.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "libwww-perl provides a simple and consistent API to the World Wide Web" +SECTION = "libs" +LICENSE = "Artistic" +DEPENDS = "liburi-perl-native" +RDEPENDS = "liburi-perl" +PR = "r1" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-${PV}.tar.gz" + +S = "${WORKDIR}/libwww-perl-${PV}" + +inherit cpan -- cgit v1.2.3 From 84de034a332e4c92c7533c65e09f6976e2f01866 Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 29 Feb 2008 12:02:54 +0000 Subject: task-openmoko-base: replace matchbox-keyboard-inputmethod with multitap-pad --- packages/tasks/task-openmoko-base.bb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/tasks/task-openmoko-base.bb b/packages/tasks/task-openmoko-base.bb index a5d13e7e08..310d3f07c3 100644 --- a/packages/tasks/task-openmoko-base.bb +++ b/packages/tasks/task-openmoko-base.bb @@ -1,7 +1,7 @@ DESCRIPTION = "OpenMoko: Base Task for the OpenMoko Linux Distribution" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r71" +PR = "r72" inherit task @@ -12,10 +12,11 @@ DESCRIPTION_task-openmoko-base = "OpenMoko: Top Panel, Application Launcher, App RDEPENDS_task-openmoko-base = "\ matchbox-panel-2 \ matchbox-panel-2-applets \ - matchbox-keyboard-inputmethod \ - matchbox-keyboard-im \ - matchbox-keyboard-applet \ +# matchbox-keyboard-inputmethod \ +# matchbox-keyboard-im \ +# matchbox-keyboard-applet \ matchbox-stroke \ + multitap-pad \ openmoko-terminal2 \ # openmoko-keyboard \ openmoko-panel-battery \ -- cgit v1.2.3 From ea9fb4e010fa6c07154e970a62de7b7239280ab7 Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 29 Feb 2008 12:06:42 +0000 Subject: u-boot-openmoko: remove do_configure_prepend because it's no longer necessary --- packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb | 6 ------ 1 file changed, 6 deletions(-) (limited to 'packages') diff --git a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb index 737cf8ef0c..020fd421c6 100644 --- a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb +++ b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb @@ -35,12 +35,6 @@ do_svnrev() { echo "echo ${LOCALVERSION}" >>tools/setlocalversion } -do_configure_prepend() { - find . -name "*.mk" -exec sed -i 's,-mabi=apcs-gnu,,' {} \; - find . -name "Makefile" -exec sed -i 's,-mabi=apcs-gnu,,' {} \; - cat ${WORKDIR}/uboot-eabi-fix-HACK.patch |patch -p1 -} - do_compile () { chmod +x board/neo1973/gta*/split_by_variant.sh for mach in ${UBOOT_MACHINES} -- cgit v1.2.3 From 5bd5a39dff021fd8efc2e95d301589b6e68bce75 Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 29 Feb 2008 12:27:25 +0000 Subject: openmoko: add DISTRO_EXTRA_RDEPENDS += "opkg-ipkg-compat" * increase task-base PR to reflect the change into task-distro-base --- packages/tasks/task-base.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 77aa07de00..15835508aa 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r62" +PR = "r63" inherit task -- cgit v1.2.3 From e0aab68643257609b8d7037764444674b382c742 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 29 Feb 2008 12:55:35 +0000 Subject: libmatchbox: Remove old versions, add patch from poky which fixes the .pc file --- packages/libmatchbox/files/configure_fixes.patch | 79 ++++++++++++++++++++++++ packages/libmatchbox/libmatchbox_1.2.bb | 6 -- packages/libmatchbox/libmatchbox_1.3.bb | 6 -- packages/libmatchbox/libmatchbox_1.4.bb | 6 -- packages/libmatchbox/libmatchbox_1.5.bb | 11 ---- packages/libmatchbox/libmatchbox_1.6.bb | 11 ---- packages/libmatchbox/libmatchbox_1.9.bb | 8 ++- 7 files changed, 84 insertions(+), 43 deletions(-) create mode 100644 packages/libmatchbox/files/configure_fixes.patch delete mode 100644 packages/libmatchbox/libmatchbox_1.2.bb delete mode 100644 packages/libmatchbox/libmatchbox_1.3.bb delete mode 100644 packages/libmatchbox/libmatchbox_1.4.bb delete mode 100644 packages/libmatchbox/libmatchbox_1.5.bb delete mode 100644 packages/libmatchbox/libmatchbox_1.6.bb (limited to 'packages') diff --git a/packages/libmatchbox/files/configure_fixes.patch b/packages/libmatchbox/files/configure_fixes.patch new file mode 100644 index 0000000000..083d32a04f --- /dev/null +++ b/packages/libmatchbox/files/configure_fixes.patch @@ -0,0 +1,79 @@ +--- + configure.ac | 15 +++++++-------- + libmb.pc.in | 2 +- + 2 files changed, 8 insertions(+), 9 deletions(-) + +Index: libmatchbox-1.9/configure.ac +=================================================================== +--- libmatchbox-1.9.orig/configure.ac 2007-11-11 22:26:43.000000000 +0000 ++++ libmatchbox-1.9/configure.ac 2007-11-11 22:52:09.000000000 +0000 +@@ -84,6 +84,7 @@ if test $have_libx11pc = yes; then + xft_pkg=xft + SUPPORTS_XFT=1 + AC_DEFINE(USE_XFT, [1], [Use Xft]) ++ XFT_REQUIRED="xft" + fi + # XXX : xau is missing from x11.pc - workaround is too add here + PKG_CHECK_MODULES(XLIBS, x11 xext $xft_pkg) +@@ -108,6 +109,7 @@ if test x$enable_xft != xno; then + AC_DEFINE(USE_XFT, [1], [Use Xft]) + SUPPORTS_XFT=1 + AC_MSG_RESULT(yes) ++ XFT_REQUIRED="xft" + else + + AC_PATH_PROG(XFT_CONFIG, xft-config, no) +@@ -122,21 +124,17 @@ if test x$enable_xft != xno; then + AC_DEFINE(USE_XFT, [1], [Use Xft]) + SUPPORTS_XFT=1 + AC_MSG_RESULT(yes) ++ MB_EXTRA_CFLAGS="$MB_EXTRA_CFLAGS $XFT_CFLAGS" ++ MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XFT_LIBS" + fi + fi + fi + + XLIBS_CFLAGS="$XLIBS_CLAGS $XFT_CFLAGS" +-XLIBS_LIBS="$X_LIBS $XFT_LIBS -lX11 -lXext" +- +-MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XLIBS_LIBS" ++XLIBS_LIBS="$XLIBS_LIBS $XFT_LIBS -lX11 -lXext" + + fi + +-# do this here for freetype include +-MB_EXTRA_CFLAGS="$MB_EXTRA_CFLAGS $XLIBS_CFLAGS" +- +- + dnl ------ Check for Pango --------------------------------------------------- + + if test x$enable_pango != xno; then +@@ -172,7 +170,7 @@ if test x$enable_png != xno; then + AC_DEFINE(USE_PNG, [1], [Use Png]) + SUPPORTS_PNG=1 + PNG_LIBS="-lpng -lz" +- MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XLIBS_LIBS $PNG_LIBS" ++ MB_EXTRA_LIBS="$MB_EXTRA_LIBS $PNG_LIBS" + else + AC_MSG_WARN([*** Cannot find PNG, disabling support]) + enable_png=no +@@ -340,6 +338,7 @@ AC_SUBST(MB_EXTRA_CFLAGS) + AC_SUBST(XLIBS_REQUIRED) + AC_SUBST(PANGO_REQUIRED) + AC_SUBST(PNG_REQUIRED) ++AC_SUBST(XFT_REQUIRED) + + dnl ------ Below used for mbconfig.h ---------------------------------------- + +Index: libmatchbox-1.9/libmb.pc.in +=================================================================== +--- libmatchbox-1.9.orig/libmb.pc.in 2007-11-11 22:30:47.000000000 +0000 ++++ libmatchbox-1.9/libmb.pc.in 2007-11-11 22:31:01.000000000 +0000 +@@ -7,6 +7,6 @@ Name: libmb + Description: Utility Library used by Matchbox utilities. + Version: @VERSION@ + +-Requires: @XLIBS_REQUIRED@ @PANGO_REQUIRED@ @PNG_REQUIRED@ ++Requires: @XLIBS_REQUIRED@ @PANGO_REQUIRED@ @PNG_REQUIRED@ @XFT_REQUIRED@ + Libs: -L${libdir} -lmb @MB_EXTRA_LIBS@ + Cflags: -I${includedir} @MB_EXTRA_CFLAGS@ diff --git a/packages/libmatchbox/libmatchbox_1.2.bb b/packages/libmatchbox/libmatchbox_1.2.bb deleted file mode 100644 index 467a3b1d74..0000000000 --- a/packages/libmatchbox/libmatchbox_1.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require libmatchbox.inc - -PR = "r2" - -SRC_URI = "http://projects.o-hand.com/matchbox/sources/libmatchbox/${PV}/libmatchbox-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" diff --git a/packages/libmatchbox/libmatchbox_1.3.bb b/packages/libmatchbox/libmatchbox_1.3.bb deleted file mode 100644 index 7213e71542..0000000000 --- a/packages/libmatchbox/libmatchbox_1.3.bb +++ /dev/null @@ -1,6 +0,0 @@ -require libmatchbox.inc - -PR = "r1" - -SRC_URI = "http://projects.o-hand.com/matchbox/sources/libmatchbox/${PV}/libmatchbox-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" diff --git a/packages/libmatchbox/libmatchbox_1.4.bb b/packages/libmatchbox/libmatchbox_1.4.bb deleted file mode 100644 index 7213e71542..0000000000 --- a/packages/libmatchbox/libmatchbox_1.4.bb +++ /dev/null @@ -1,6 +0,0 @@ -require libmatchbox.inc - -PR = "r1" - -SRC_URI = "http://projects.o-hand.com/matchbox/sources/libmatchbox/${PV}/libmatchbox-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" diff --git a/packages/libmatchbox/libmatchbox_1.5.bb b/packages/libmatchbox/libmatchbox_1.5.bb deleted file mode 100644 index 2f63f7ee64..0000000000 --- a/packages/libmatchbox/libmatchbox_1.5.bb +++ /dev/null @@ -1,11 +0,0 @@ -require libmatchbox.inc - -PR = "r1" - -SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \ - file://check.m4 \ - file://autofoo.patch;patch=1" - -do_configure_prepend () { - mv ${WORKDIR}/check.m4 ${S}/ -} diff --git a/packages/libmatchbox/libmatchbox_1.6.bb b/packages/libmatchbox/libmatchbox_1.6.bb deleted file mode 100644 index 29b04635ff..0000000000 --- a/packages/libmatchbox/libmatchbox_1.6.bb +++ /dev/null @@ -1,11 +0,0 @@ -require libmatchbox.inc - -PR = "r1" - -SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \ - file://check.m4 \ - file://fix-configure-for-1.9.patch;patch=1" - -do_configure_prepend () { - mv ${WORKDIR}/check.m4 ${S}/ -} diff --git a/packages/libmatchbox/libmatchbox_1.9.bb b/packages/libmatchbox/libmatchbox_1.9.bb index b9044a1d60..a0c5e272c0 100644 --- a/packages/libmatchbox/libmatchbox_1.9.bb +++ b/packages/libmatchbox/libmatchbox_1.9.bb @@ -1,10 +1,12 @@ require libmatchbox.inc -PR = "r1" + +PR = "r5" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \ - file://16bppfixes-2.patch;patch=1 \ + file://16bppfixes.patch;patch=1 \ + file://configure_fixes.patch;patch=1 \ file://check.m4" do_configure_prepend () { - mv ${WORKDIR}/check.m4 ${S}/ + cp ${WORKDIR}/check.m4 ${S}/ } -- cgit v1.2.3 From 335082f0f8fd26362fab59ae653458e26e39144e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 29 Feb 2008 12:57:16 +0000 Subject: matchbox-wm: Drop old versions, add patch from poky to fix expat configure option --- .../matchbox-wm/matchbox-wm/configure_fix.patch | 13 +++++++++ packages/matchbox-wm/matchbox-wm_0.8.3.bb | 26 ------------------ packages/matchbox-wm/matchbox-wm_0.8.4.bb | 26 ------------------ packages/matchbox-wm/matchbox-wm_0.9.2.bb | 30 -------------------- packages/matchbox-wm/matchbox-wm_0.9.3.bb | 32 ---------------------- packages/matchbox-wm/matchbox-wm_0.9.4.bb | 30 -------------------- packages/matchbox-wm/matchbox-wm_0.9.bb | 25 ----------------- packages/matchbox-wm/matchbox-wm_1.2.bb | 8 ++++-- 8 files changed, 18 insertions(+), 172 deletions(-) create mode 100644 packages/matchbox-wm/matchbox-wm/configure_fix.patch delete mode 100644 packages/matchbox-wm/matchbox-wm_0.8.3.bb delete mode 100644 packages/matchbox-wm/matchbox-wm_0.8.4.bb delete mode 100644 packages/matchbox-wm/matchbox-wm_0.9.2.bb delete mode 100644 packages/matchbox-wm/matchbox-wm_0.9.3.bb delete mode 100644 packages/matchbox-wm/matchbox-wm_0.9.4.bb delete mode 100644 packages/matchbox-wm/matchbox-wm_0.9.bb (limited to 'packages') diff --git a/packages/matchbox-wm/matchbox-wm/configure_fix.patch b/packages/matchbox-wm/matchbox-wm/configure_fix.patch new file mode 100644 index 0000000000..52cea0e8f7 --- /dev/null +++ b/packages/matchbox-wm/matchbox-wm/configure_fix.patch @@ -0,0 +1,13 @@ +Index: matchbox-window-manager/configure.ac +=================================================================== +--- matchbox-window-manager.orig/configure.ac 2007-11-14 12:02:28.000000000 +0000 ++++ matchbox-window-manager/configure.ac 2007-11-14 12:18:55.000000000 +0000 +@@ -283,7 +283,7 @@ + yes) + + case "$expat" in +- yes) ++ yes|"") + EXPAT_LIBS="-lexpat" + ;; + *) diff --git a/packages/matchbox-wm/matchbox-wm_0.8.3.bb b/packages/matchbox-wm/matchbox-wm_0.8.3.bb deleted file mode 100644 index 58da385674..0000000000 --- a/packages/matchbox-wm/matchbox-wm_0.8.3.bb +++ /dev/null @@ -1,26 +0,0 @@ -require matchbox-wm.inc - -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " -RDEPENDS = "" - -SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \ - file://kbdconfig_keylaunch_simpad.patch;patch=1;pnum=0" -S = "${WORKDIR}/matchbox-window-manager-${PV}" - -inherit autotools pkgconfig - -FILES_${PN} = "${bindir} \ - ${datadir}/matchbox \ - ${datadir}/themes/blondie/matchbox \ - ${datadir}/themes/bluebox/matchbox \ - ${datadir}/themes/borillo/matchbox" - -EXTRA_OECONF = "--enable-composite --enable-startup-notification --enable-expat" - -pkg_postinst() { -update-alternatives --install ${bindir}/x-window-manager x-window-manager ${bindir}/matchbox-session 10 -} - -pkg_postrm() { -update-alternatives --remove x-window-manager ${bindir}/matchbox-session -} diff --git a/packages/matchbox-wm/matchbox-wm_0.8.4.bb b/packages/matchbox-wm/matchbox-wm_0.8.4.bb deleted file mode 100644 index 58da385674..0000000000 --- a/packages/matchbox-wm/matchbox-wm_0.8.4.bb +++ /dev/null @@ -1,26 +0,0 @@ -require matchbox-wm.inc - -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " -RDEPENDS = "" - -SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \ - file://kbdconfig_keylaunch_simpad.patch;patch=1;pnum=0" -S = "${WORKDIR}/matchbox-window-manager-${PV}" - -inherit autotools pkgconfig - -FILES_${PN} = "${bindir} \ - ${datadir}/matchbox \ - ${datadir}/themes/blondie/matchbox \ - ${datadir}/themes/bluebox/matchbox \ - ${datadir}/themes/borillo/matchbox" - -EXTRA_OECONF = "--enable-composite --enable-startup-notification --enable-expat" - -pkg_postinst() { -update-alternatives --install ${bindir}/x-window-manager x-window-manager ${bindir}/matchbox-session 10 -} - -pkg_postrm() { -update-alternatives --remove x-window-manager ${bindir}/matchbox-session -} diff --git a/packages/matchbox-wm/matchbox-wm_0.9.2.bb b/packages/matchbox-wm/matchbox-wm_0.9.2.bb deleted file mode 100644 index a85e4b23c4..0000000000 --- a/packages/matchbox-wm/matchbox-wm_0.9.2.bb +++ /dev/null @@ -1,30 +0,0 @@ -require matchbox-wm.inc - -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " -RDEPENDS = "" -PR = "r2" - - -SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz" - -S = "${WORKDIR}/matchbox-window-manager-${PV}" - -inherit autotools pkgconfig - -FILES_${PN} = "${bindir} \ - ${datadir}/matchbox \ - ${sysconfdir}/matchbox \ - ${datadir}/themes/blondie/matchbox \ - ${datadir}/themes/Default/matchbox \ - ${datadir}/themes/MBOpus/matchbox" - -EXTRA_OECONF = "--enable-composite --enable-startup-notification --disable-xrm" - -pkg_postinst() { -update-alternatives --install ${bindir}/x-window-manager x-window-manager ${bindir}/matchbox-session 10 -} - -pkg_postrm() { -update-alternatives --remove x-window-manager ${bindir}/matchbox-session -} - diff --git a/packages/matchbox-wm/matchbox-wm_0.9.3.bb b/packages/matchbox-wm/matchbox-wm_0.9.3.bb deleted file mode 100644 index c2016cab66..0000000000 --- a/packages/matchbox-wm/matchbox-wm_0.9.3.bb +++ /dev/null @@ -1,32 +0,0 @@ -require matchbox-wm.inc - -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " -RDEPENDS = "" -PR = "r3" - - -SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz \ - file://kbdconfig" - -S = "${WORKDIR}/matchbox-window-manager-${PV}" - -inherit autotools pkgconfig update-alternatives - -FILES_${PN} = "${bindir} \ - ${datadir}/matchbox \ - ${sysconfdir}/matchbox \ - ${datadir}/themes/blondie/matchbox \ - ${datadir}/themes/Default/matchbox \ - ${datadir}/themes/MBOpus/matchbox" - -ALTERNATIVE_NAME = "x-window-manager" -ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PATH = "${bindir}/matchbox-session" -ALTERNATIVE_PRIORITY = "10" - -EXTRA_OECONF = "--enable-composite --enable-startup-notification --disable-xrm" - -do_install_prepend() { - install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig -} - diff --git a/packages/matchbox-wm/matchbox-wm_0.9.4.bb b/packages/matchbox-wm/matchbox-wm_0.9.4.bb deleted file mode 100644 index 80b6dc7e19..0000000000 --- a/packages/matchbox-wm/matchbox-wm_0.9.4.bb +++ /dev/null @@ -1,30 +0,0 @@ -require matchbox-wm.inc - -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " -RDEPENDS = "" - -SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz \ - file://kbdconfig" - -S = "${WORKDIR}/matchbox-window-manager-${PV}" - -inherit autotools pkgconfig update-alternatives - -FILES_${PN} = "${bindir} \ - ${datadir}/matchbox \ - ${sysconfdir}/matchbox \ - ${datadir}/themes/blondie/matchbox \ - ${datadir}/themes/Default/matchbox \ - ${datadir}/themes/MBOpus/matchbox" - -ALTERNATIVE_NAME = "x-window-manager" -ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PATH = "${bindir}/matchbox-session" -ALTERNATIVE_PRIORITY = "10" - -EXTRA_OECONF = "--enable-composite --enable-startup-notification --disable-xrm" - -do_install_prepend() { - install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig -} - diff --git a/packages/matchbox-wm/matchbox-wm_0.9.bb b/packages/matchbox-wm/matchbox-wm_0.9.bb deleted file mode 100644 index 700fb15eeb..0000000000 --- a/packages/matchbox-wm/matchbox-wm_0.9.bb +++ /dev/null @@ -1,25 +0,0 @@ -require matchbox-wm.inc - -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " -RDEPENDS = "" - -SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/${PV}/matchbox-window-manager-${PV}.tar.gz" -S = "${WORKDIR}/matchbox-window-manager-${PV}" - -inherit autotools pkgconfig - -FILES_${PN} = "${bindir} \ - ${datadir}/matchbox \ - ${datadir}/themes/blondie/matchbox \ - ${datadir}/themes/bluebox/matchbox \ - ${datadir}/themes/borillo/matchbox" - -EXTRA_OECONF = "--enable-composite --enable-startup-notification --enable-expat" - -pkg_postinst() { -update-alternatives --install ${bindir}/x-window-manager x-window-manager ${bindir}/matchbox-session 10 -} - -pkg_postrm() { -update-alternatives --remove x-window-manager ${bindir}/matchbox-session -} diff --git a/packages/matchbox-wm/matchbox-wm_1.2.bb b/packages/matchbox-wm/matchbox-wm_1.2.bb index bf57441815..78795f7a40 100644 --- a/packages/matchbox-wm/matchbox-wm_1.2.bb +++ b/packages/matchbox-wm/matchbox-wm_1.2.bb @@ -3,9 +3,10 @@ require matchbox-wm.inc DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf gconf-native " RDEPENDS = "" -PR="r3" +PR="r4" -SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \ +SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \ + file://configure_fix.patch;patch=1 \ file://gconf-2.m4 \ file://kbdconfig" @@ -29,7 +30,8 @@ ALTERNATIVE_PRIORITY = "10" EXTRA_OECONF = " \ --enable-startup-notification\ --enable-gconf \ - --enable-expat \ + --with-expat-lib=${STAGING_LIBDIR} \ + --with-expat-includes=${STAGING_INCDIR} \ --disable-xrm" do_configure_prepend () { -- cgit v1.2.3 From 6cf947b8aa906b3ac839b0f07fb6c9bcd5583844 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 29 Feb 2008 12:59:14 +0000 Subject: dtnrg: Add missing patch --- packages/dtnrg/files/.mtn2git_empty | 0 packages/dtnrg/files/configure_fix.patch | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 packages/dtnrg/files/.mtn2git_empty create mode 100644 packages/dtnrg/files/configure_fix.patch (limited to 'packages') diff --git a/packages/dtnrg/files/.mtn2git_empty b/packages/dtnrg/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/dtnrg/files/configure_fix.patch b/packages/dtnrg/files/configure_fix.patch new file mode 100644 index 0000000000..95587c242c --- /dev/null +++ b/packages/dtnrg/files/configure_fix.patch @@ -0,0 +1,22 @@ +head no longer supports "-1" syntax + +Index: dtn-2.5.0/oasys/aclocal/gcc.ac +=================================================================== +--- dtn-2.5.0.orig/oasys/aclocal/gcc.ac 2008-02-27 22:38:22.000000000 +0000 ++++ dtn-2.5.0/oasys/aclocal/gcc.ac 2008-02-27 22:39:05.000000000 +0000 +@@ -83,13 +83,13 @@ + dnl Figure out the version and set version-specific options + dnl + AC_CACHE_CHECK(for the version of the GNU C compiler, oasys_cv_prog_gccver, [ +- oasys_cv_prog_gccver=`$CC --version | head -1` ++ oasys_cv_prog_gccver=`$CC --version | head -n 1` + oasys_cv_prog_gccver=`echo $oasys_cv_prog_gccver | sed 's/.*gcc.*(GCC) //'` + oasys_cv_prog_gccver=`echo $oasys_cv_prog_gccver | sed 's/ .*//'` + ]) + + AC_CACHE_CHECK(for the version of the GNU C++ compiler, oasys_cv_prog_gxxver, [ +- oasys_cv_prog_gxxver=`$CXX --version | head -1` ++ oasys_cv_prog_gxxver=`$CXX --version | head -n 1` + oasys_cv_prog_gxxver=`echo $oasys_cv_prog_gxxver | sed 's/.*g++.*(GCC) //'` + oasys_cv_prog_gxxver=`echo $oasys_cv_prog_gxxver | sed 's/ .*//'` + ]) -- cgit v1.2.3 From ee412e54a5903b43af66aa90e44bfe2d8052e5d1 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 29 Feb 2008 14:46:38 +0000 Subject: add enter, an experimental inputmethod using efl --- packages/freesmartphone/enter_0.0.2.bb | 10 ++++++++++ packages/freesmartphone/pyneod_svn.bb | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 packages/freesmartphone/enter_0.0.2.bb (limited to 'packages') diff --git a/packages/freesmartphone/enter_0.0.2.bb b/packages/freesmartphone/enter_0.0.2.bb new file mode 100644 index 0000000000..7f1dd09a25 --- /dev/null +++ b/packages/freesmartphone/enter_0.0.2.bb @@ -0,0 +1,10 @@ +DESCRIPTION="A easy-to-use virtual keyboard for small touchscreen displays" +SECTION = "openmoko/inputmethods" +DEPENDS = "ecore evas edje" +PR = "r0" + +inherit autotools + +SRC_URI = "http://gstaedtner.net/projects/enter/enter.tar.gz" + +FILES_${PN} += "${datadir}" diff --git a/packages/freesmartphone/pyneod_svn.bb b/packages/freesmartphone/pyneod_svn.bb index 68938ed424..1ca728afe1 100644 --- a/packages/freesmartphone/pyneod_svn.bb +++ b/packages/freesmartphone/pyneod_svn.bb @@ -4,11 +4,11 @@ SECTION = "console/network" DEPENDS = "python" LICENSE = "GPL" PV = "0.0+svnr${SRCREV}" -PR = "r2" +PR = "r3" inherit update-rc.d -INITSCRIPT_NAME = "init.d.pyneod" +INITSCRIPT_NAME = "pyneod" INITSCRIPT_PARAMS = "defaults 40" SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=pyneod" -- cgit v1.2.3 From a1b6c4cc9887f89f23a1d440eb46878a00d2b620 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 29 Feb 2008 14:48:56 +0000 Subject: moko-underground-image: add some fonts to make matchbox happy, bump SRCREV for pyneod --- packages/images/moko-underground-image.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'packages') diff --git a/packages/images/moko-underground-image.bb b/packages/images/moko-underground-image.bb index f86fcfba58..a7dc463faf 100644 --- a/packages/images/moko-underground-image.bb +++ b/packages/images/moko-underground-image.bb @@ -4,6 +4,15 @@ IMAGE_LINGUAS = "" +ADD_INSTALL = "\ + fontconfig \ + \ + ttf-dejavu-common \ + ttf-dejavu-sans \ + ttf-dejavu-serif \ + \ +" + IMAGE_INSTALL = "\ ${MACHINE_TASK_PROVIDER} \ task-base \ @@ -28,6 +37,8 @@ IMAGE_INSTALL = "\ gsm0710muxd \ pyneod \ pyneog \ + \ + ${ADD_INSTALL} \ " DEPENDS = "\ -- cgit v1.2.3 From 5e33f4db5f153d6b3e3cc9c75523e9ce9288e396 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 29 Feb 2008 15:13:41 +0000 Subject: python 2.5.2 python-crypt needs to RRECOMMEND openssl, otherwise import md5 (_hashlib actually) fails --- packages/python/python_2.5.2.bb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'packages') diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb index 24b49f37ed..e6667cc04b 100644 --- a/packages/python/python_2.5.2.bb +++ b/packages/python/python_2.5.2.bb @@ -82,8 +82,11 @@ do_install() { require python-${PYTHON_MAJMIN}-manifest.inc +# manual additions RPROVIDES_python-core = "python" RRECOMMENDS_python-core = "python-readline" +RRECOMMENDS_python-crypt = "openssl" +PR_python-crypt = "ml1" # add sitecustomize FILES_python-core += "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py" -- cgit v1.2.3 From d9ce834542de0a4225a52b3c129082468d3cfa79 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 29 Feb 2008 15:37:28 +0000 Subject: busybox 1.9.1 enable cmp utility, remove openmoko-specific defconfig (not necessary) --- packages/busybox/busybox-1.9.1/defconfig | 2 +- .../busybox/busybox-1.9.1/openmoko/.mtn2git_empty | 0 packages/busybox/busybox-1.9.1/openmoko/defconfig | 777 --------------------- packages/busybox/busybox_1.9.1.bb | 2 +- 4 files changed, 2 insertions(+), 779 deletions(-) delete mode 100644 packages/busybox/busybox-1.9.1/openmoko/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.9.1/openmoko/defconfig (limited to 'packages') diff --git a/packages/busybox/busybox-1.9.1/defconfig b/packages/busybox/busybox-1.9.1/defconfig index 40ec933361..770ef6eb12 100644 --- a/packages/busybox/busybox-1.9.1/defconfig +++ b/packages/busybox/busybox-1.9.1/defconfig @@ -300,7 +300,7 @@ CONFIG_WHICH=y # CONFIG_AWK=y CONFIG_FEATURE_AWK_MATH=y -# CONFIG_CMP is not set +CONFIG_CMP=y CONFIG_DIFF=y CONFIG_FEATURE_DIFF_BINARY=y CONFIG_FEATURE_DIFF_DIR=y diff --git a/packages/busybox/busybox-1.9.1/openmoko/.mtn2git_empty b/packages/busybox/busybox-1.9.1/openmoko/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/busybox/busybox-1.9.1/openmoko/defconfig b/packages/busybox/busybox-1.9.1/openmoko/defconfig deleted file mode 100644 index d0505e4481..0000000000 --- a/packages/busybox/busybox-1.9.1/openmoko/defconfig +++ /dev/null @@ -1,777 +0,0 @@ -# -# Automatically generated make config: don't edit -# Busybox version: 1.9.1 -# Thu Feb 14 11:54:00 2008 -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Busybox Settings -# - -# -# General Configuration -# -# CONFIG_NITPICK is not set -# CONFIG_DESKTOP is not set -# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_SHOW_USAGE=y -# CONFIG_FEATURE_VERBOSE_USAGE is not set -CONFIG_FEATURE_COMPRESS_USAGE=y -# CONFIG_FEATURE_INSTALLER is not set -CONFIG_LOCALE_SUPPORT=y -CONFIG_GETOPT_LONG=y -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -CONFIG_FEATURE_PIDFILE=y -CONFIG_FEATURE_SUID=y -CONFIG_FEATURE_SUID_CONFIG=y -CONFIG_FEATURE_SUID_CONFIG_QUIET=y -# CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set -CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" -CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y - -# -# Build Options -# -# CONFIG_STATIC is not set -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_INDIVIDUAL is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_WERROR is not set -CONFIG_NO_DEBUG_LIB=y -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set -# CONFIG_INCLUDE_SUSv2 is not set - -# -# Installation Options -# -# CONFIG_INSTALL_NO_USR is not set -CONFIG_INSTALL_APPLET_SYMLINKS=y -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set -# CONFIG_INSTALL_APPLET_DONT is not set -# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set -# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set -# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set -CONFIG_PREFIX="./_install" - -# -# Busybox Library Tuning -# -CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=2 -CONFIG_FEATURE_FAST_TOP=y -# CONFIG_FEATURE_ETC_NETWORKS is not set -CONFIG_FEATURE_EDITING=y -CONFIG_FEATURE_EDITING_MAX_LEN=1024 -CONFIG_FEATURE_EDITING_FANCY_KEYS=y -# CONFIG_FEATURE_EDITING_VI is not set -CONFIG_FEATURE_EDITING_HISTORY=15 -CONFIG_FEATURE_EDITING_SAVEHISTORY=y -CONFIG_FEATURE_TAB_COMPLETION=y -CONFIG_FEATURE_USERNAME_COMPLETION=y -CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y - -# -# Applets -# - -# -# Archival Utilities -# -CONFIG_AR=y -# CONFIG_FEATURE_AR_LONG_FILENAMES is not set -CONFIG_BUNZIP2=y -# CONFIG_BZIP2 is not set -CONFIG_CPIO=y -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y -# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set -CONFIG_GZIP=y -# CONFIG_RPM2CPIO is not set -# CONFIG_RPM is not set -# CONFIG_FEATURE_RPM_BZ2 is not set -CONFIG_TAR=y -CONFIG_FEATURE_TAR_CREATE=y -CONFIG_FEATURE_TAR_BZIP2=y -# CONFIG_FEATURE_TAR_LZMA is not set -CONFIG_FEATURE_TAR_FROM=y -CONFIG_FEATURE_TAR_GZIP=y -# CONFIG_FEATURE_TAR_COMPRESS is not set -# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set -# CONFIG_UNCOMPRESS is not set -# CONFIG_UNLZMA is not set -# CONFIG_FEATURE_LZMA_FAST is not set -CONFIG_UNZIP=y - -# -# Common options for cpio and tar -# -# CONFIG_FEATURE_UNARCHIVE_TAPE is not set -# CONFIG_FEATURE_DEB_TAR_GZ is not set -# CONFIG_FEATURE_DEB_TAR_BZ2 is not set -# CONFIG_FEATURE_DEB_TAR_LZMA is not set - -# -# Coreutils -# -CONFIG_BASENAME=y -# CONFIG_CAL is not set -CONFIG_CAT=y -# CONFIG_CATV is not set -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -CONFIG_CHROOT=y -# CONFIG_CKSUM is not set -# CONFIG_COMM is not set -CONFIG_CP=y -CONFIG_CUT=y -CONFIG_DATE=y -# CONFIG_FEATURE_DATE_ISOFMT is not set -CONFIG_DD=y -CONFIG_FEATURE_DD_SIGNAL_HANDLING=y -# CONFIG_FEATURE_DD_IBS_OBS is not set -CONFIG_DF=y -# CONFIG_FEATURE_DF_INODE is not set -CONFIG_DIRNAME=y -# CONFIG_DOS2UNIX is not set -# CONFIG_UNIX2DOS is not set -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -CONFIG_FEATURE_ENV_LONG_OPTIONS=y -# CONFIG_EXPAND is not set -# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set -CONFIG_EXPR=y -# CONFIG_EXPR_MATH_SUPPORT_64 is not set -CONFIG_FALSE=y -# CONFIG_FOLD is not set -CONFIG_HEAD=y -# CONFIG_FEATURE_FANCY_HEAD is not set -# CONFIG_HOSTID is not set -CONFIG_ID=y -# CONFIG_INSTALL is not set -# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set -# CONFIG_LENGTH is not set -CONFIG_LN=y -CONFIG_LOGNAME=y -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -CONFIG_FEATURE_LS_COLOR=y -# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -CONFIG_MD5SUM=y -CONFIG_MKDIR=y -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -# CONFIG_FEATURE_MV_LONG_OPTIONS is not set -# CONFIG_NICE is not set -CONFIG_NOHUP=y -CONFIG_OD=y -# CONFIG_PRINTENV is not set -CONFIG_PRINTF=y -CONFIG_PWD=y -CONFIG_READLINK=y -CONFIG_FEATURE_READLINK_FOLLOW=y -CONFIG_REALPATH=y -CONFIG_RM=y -CONFIG_RMDIR=y -CONFIG_SEQ=y -# CONFIG_SHA1SUM is not set -CONFIG_SLEEP=y -CONFIG_FEATURE_FANCY_SLEEP=y -CONFIG_SORT=y -CONFIG_FEATURE_SORT_BIG=y -# CONFIG_SPLIT is not set -# CONFIG_FEATURE_SPLIT_FANCY is not set -# CONFIG_STAT is not set -# CONFIG_FEATURE_STAT_FORMAT is not set -CONFIG_STTY=y -# CONFIG_SUM is not set -CONFIG_SYNC=y -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -CONFIG_TEE=y -# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -CONFIG_TEST=y -# CONFIG_FEATURE_TEST_64 is not set -CONFIG_TOUCH=y -CONFIG_TR=y -CONFIG_FEATURE_TR_CLASSES=y -# CONFIG_FEATURE_TR_EQUIV is not set -CONFIG_TRUE=y -CONFIG_TTY=y -CONFIG_UNAME=y -# CONFIG_UNEXPAND is not set -# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set -CONFIG_UNIQ=y -CONFIG_USLEEP=y -# CONFIG_UUDECODE is not set -# CONFIG_UUENCODE is not set -CONFIG_WC=y -# CONFIG_FEATURE_WC_LARGE is not set -CONFIG_WHO=y -CONFIG_WHOAMI=y -CONFIG_YES=y - -# -# Common options for cp and mv -# -# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set - -# -# Common options for ls, more and telnet -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - -# -# Common options for md5sum, sha1sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - -# -# Console Utilities -# -CONFIG_CHVT=y -CONFIG_CLEAR=y -CONFIG_DEALLOCVT=y -CONFIG_DUMPKMAP=y -# CONFIG_KBD_MODE is not set -CONFIG_LOADFONT=y -CONFIG_LOADKMAP=y -CONFIG_OPENVT=y -CONFIG_RESET=y -# CONFIG_RESIZE is not set -# CONFIG_FEATURE_RESIZE_PRINT is not set -CONFIG_SETCONSOLE=y -# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set -# CONFIG_SETKEYCODES is not set -# CONFIG_SETLOGCONS is not set - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -# CONFIG_PIPE_PROGRESS is not set -CONFIG_RUN_PARTS=y -CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y -# CONFIG_FEATURE_RUN_PARTS_FANCY is not set -CONFIG_START_STOP_DAEMON=y -CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y -CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y -CONFIG_WHICH=y - -# -# Editors -# -CONFIG_AWK=y -CONFIG_FEATURE_AWK_MATH=y -CONFIG_CMP=y -CONFIG_DIFF=y -CONFIG_FEATURE_DIFF_BINARY=y -CONFIG_FEATURE_DIFF_DIR=y -# CONFIG_FEATURE_DIFF_MINIMAL is not set -# CONFIG_ED is not set -CONFIG_PATCH=y -CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_MAX_LEN=1024 -CONFIG_FEATURE_VI_8BIT=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -CONFIG_FEATURE_VI_USE_SIGNALS=y -# CONFIG_FEATURE_VI_DOT_CMD is not set -# CONFIG_FEATURE_VI_READONLY is not set -# CONFIG_FEATURE_VI_SETOPTS is not set -# CONFIG_FEATURE_VI_SET is not set -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y -CONFIG_FEATURE_ALLOW_EXEC=y - -# -# Finding Utilities -# -CONFIG_FIND=y -CONFIG_FEATURE_FIND_PRINT0=y -CONFIG_FEATURE_FIND_MTIME=y -CONFIG_FEATURE_FIND_MMIN=y -CONFIG_FEATURE_FIND_PERM=y -CONFIG_FEATURE_FIND_TYPE=y -CONFIG_FEATURE_FIND_XDEV=y -CONFIG_FEATURE_FIND_MAXDEPTH=y -CONFIG_FEATURE_FIND_NEWER=y -# CONFIG_FEATURE_FIND_INUM is not set -CONFIG_FEATURE_FIND_EXEC=y -CONFIG_FEATURE_FIND_USER=y -CONFIG_FEATURE_FIND_GROUP=y -CONFIG_FEATURE_FIND_NOT=y -CONFIG_FEATURE_FIND_DEPTH=y -CONFIG_FEATURE_FIND_PAREN=y -CONFIG_FEATURE_FIND_SIZE=y -CONFIG_FEATURE_FIND_PRUNE=y -# CONFIG_FEATURE_FIND_DELETE is not set -CONFIG_FEATURE_FIND_PATH=y -CONFIG_FEATURE_FIND_REGEX=y -# CONFIG_FEATURE_FIND_CONTEXT is not set -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -CONFIG_FEATURE_GREP_FGREP_ALIAS=y -CONFIG_FEATURE_GREP_CONTEXT=y -CONFIG_XARGS=y -# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set -# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set -# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set - -# -# Init Utilities -# -# CONFIG_INIT is not set -# CONFIG_DEBUG_INIT is not set -# CONFIG_FEATURE_USE_INITTAB is not set -# CONFIG_FEATURE_INIT_SCTTY is not set -# CONFIG_FEATURE_INIT_SYSLOG is not set -# CONFIG_FEATURE_EXTRA_QUIET is not set -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set -# CONFIG_HALT is not set -# CONFIG_MESG is not set - -# -# Login/Password Management Utilities -# -# CONFIG_FEATURE_SHADOWPASSWDS is not set -# CONFIG_USE_BB_SHADOW is not set -# CONFIG_USE_BB_PWD_GRP is not set -CONFIG_ADDGROUP=y -CONFIG_FEATURE_ADDUSER_TO_GROUP=y -CONFIG_DELGROUP=y -CONFIG_FEATURE_DEL_USER_FROM_GROUP=y -CONFIG_ADDUSER=y -CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y -CONFIG_DELUSER=y -CONFIG_GETTY=y -CONFIG_FEATURE_UTMP=y -CONFIG_FEATURE_WTMP=y -CONFIG_LOGIN=y -# CONFIG_PAM is not set -# CONFIG_LOGIN_SCRIPTS is not set -CONFIG_FEATURE_NOLOGIN=y -CONFIG_FEATURE_SECURETTY=y -CONFIG_PASSWD=y -CONFIG_FEATURE_PASSWD_WEAK_CHECK=y -# CONFIG_CRYPTPW is not set -# CONFIG_CHPASSWD is not set -CONFIG_SU=y -CONFIG_FEATURE_SU_SYSLOG=y -CONFIG_FEATURE_SU_CHECKS_SHELLS=y -# CONFIG_SULOGIN is not set -CONFIG_VLOCK=y - -# -# Linux Ext2 FS Progs -# -CONFIG_CHATTR=y -CONFIG_FSCK=y -# CONFIG_LSATTR is not set - -# -# Linux Module Utilities -# -CONFIG_INSMOD=y -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -CONFIG_RMMOD=y -CONFIG_LSMOD=y -# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set -CONFIG_MODPROBE=y -CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y -CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y - -# -# Options common to multiple modutils -# -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y -# CONFIG_FEATURE_2_4_MODULES is not set -CONFIG_FEATURE_2_6_MODULES=y -# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set - -# -# Linux System Utilities -# -CONFIG_DMESG=y -CONFIG_FEATURE_DMESG_PRETTY=y -CONFIG_FBSET=y -CONFIG_FEATURE_FBSET_FANCY=y -CONFIG_FEATURE_FBSET_READMODE=y -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -CONFIG_FDISK=y -CONFIG_FDISK_SUPPORT_LARGE_DISKS=y -CONFIG_FEATURE_FDISK_WRITABLE=y -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -# CONFIG_FREERAMDISK is not set -CONFIG_FSCK_MINIX=y -CONFIG_MKFS_MINIX=y - -# -# Minix filesystem support -# -CONFIG_FEATURE_MINIX2=y -# CONFIG_GETOPT is not set -CONFIG_HEXDUMP=y -# CONFIG_HD is not set -# CONFIG_FEATURE_HEXDUMP_REVERSE is not set -CONFIG_HWCLOCK=y -CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y -CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y -# CONFIG_IPCRM is not set -# CONFIG_IPCS is not set -CONFIG_LOSETUP=y -# CONFIG_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -# CONFIG_FEATURE_MDEV_EXEC is not set -# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set -CONFIG_MKSWAP=y -# CONFIG_FEATURE_MKSWAP_V0 is not set -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_MOUNT=y -# CONFIG_FEATURE_MOUNT_HELPERS is not set -CONFIG_FEATURE_MOUNT_NFS=y -# CONFIG_FEATURE_MOUNT_CIFS is not set -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y -CONFIG_PIVOT_ROOT=y -CONFIG_RDATE=y -# CONFIG_READPROFILE is not set -# CONFIG_SETARCH is not set -CONFIG_SWAPONOFF=y -CONFIG_SWITCH_ROOT=y -CONFIG_UMOUNT=y -# CONFIG_FEATURE_UMOUNT_ALL is not set - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set - -# -# Miscellaneous Utilities -# -# CONFIG_ADJTIMEX is not set -# CONFIG_BBCONFIG is not set -# CONFIG_CHRT is not set -# CONFIG_CROND is not set -# CONFIG_DEBUG_CROND_OPTION is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -# CONFIG_CRONTAB is not set -CONFIG_DC=y -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_FEATURE_DEVFS is not set -# CONFIG_EJECT is not set -# CONFIG_LAST is not set -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -# CONFIG_FEATURE_LESS_FLAGCS is not set -# CONFIG_FEATURE_LESS_MARKS is not set -# CONFIG_FEATURE_LESS_REGEXP is not set -# CONFIG_HDPARM is not set -# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set -# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set -# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -# CONFIG_FEATURE_MAKEDEVS_TABLE is not set -# CONFIG_MICROCOM is not set -# CONFIG_MOUNTPOINT is not set -# CONFIG_MT is not set -# CONFIG_RAIDAUTORUN is not set -# CONFIG_READAHEAD is not set -# CONFIG_RUNLEVEL is not set -# CONFIG_RX is not set -CONFIG_STRINGS=y -# CONFIG_SETSID is not set -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set -CONFIG_TIME=y -# CONFIG_TTYSIZE is not set -# CONFIG_WATCHDOG is not set - -# -# Networking Utilities -# -CONFIG_FEATURE_IPV6=y -CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y -# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set -# CONFIG_ARP is not set -# CONFIG_ARPING is not set -# CONFIG_DNSD is not set -# CONFIG_ETHER_WAKE is not set -# CONFIG_FAKEIDENTD is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set -CONFIG_HOSTNAME=y -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_RANGES is not set -# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set -# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set -# CONFIG_FEATURE_HTTPD_PROXY is not set -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -# CONFIG_FEATURE_IFCONFIG_SLIP is not set -# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set -CONFIG_FEATURE_IFCONFIG_HW=y -# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set -CONFIG_IFUPDOWN=y -CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" -# CONFIG_FEATURE_IFUPDOWN_IP is not set -# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set -CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN=y -CONFIG_FEATURE_IFUPDOWN_IPV4=y -CONFIG_FEATURE_IFUPDOWN_IPV6=y -CONFIG_FEATURE_IFUPDOWN_MAPPING=y -# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set -# CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set -CONFIG_IP=y -CONFIG_FEATURE_IP_ADDRESS=y -CONFIG_FEATURE_IP_LINK=y -CONFIG_FEATURE_IP_ROUTE=y -CONFIG_FEATURE_IP_TUNNEL=y -# CONFIG_FEATURE_IP_RULE is not set -# CONFIG_FEATURE_IP_SHORT_FORMS is not set -# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set -# CONFIG_IPADDR is not set -# CONFIG_IPLINK is not set -# CONFIG_IPROUTE is not set -# CONFIG_IPTUNNEL is not set -# CONFIG_IPRULE is not set -# CONFIG_IPCALC is not set -# CONFIG_FEATURE_IPCALC_FANCY is not set -# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set -# CONFIG_NAMEIF is not set -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set -CONFIG_NC=y -# CONFIG_NC_SERVER is not set -# CONFIG_NC_EXTRA is not set -CONFIG_NETSTAT=y -# CONFIG_FEATURE_NETSTAT_WIDE is not set -CONFIG_NSLOOKUP=y -CONFIG_PING=y -CONFIG_PING6=y -# CONFIG_PSCAN is not set -CONFIG_FEATURE_FANCY_PING=y -CONFIG_ROUTE=y -# CONFIG_SLATTACH is not set -CONFIG_TELNET=y -# CONFIG_FEATURE_TELNET_TTYPE is not set -CONFIG_FEATURE_TELNET_AUTOLOGIN=y -# CONFIG_TELNETD is not set -# CONFIG_FEATURE_TELNETD_STANDALONE is not set -CONFIG_TFTP=y -CONFIG_FEATURE_TFTP_GET=y -CONFIG_FEATURE_TFTP_PUT=y -# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_DEBUG_TFTP is not set -CONFIG_TRACEROUTE=y -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -CONFIG_APP_UDHCPD=y -# CONFIG_APP_DHCPRELAY is not set -CONFIG_APP_DUMPLEASES=y -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set -CONFIG_APP_UDHCPC=y -CONFIG_FEATURE_UDHCPC_ARPING=y -# CONFIG_FEATURE_UDHCP_DEBUG is not set -# CONFIG_FEATURE_RFC3397 is not set -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 -# CONFIG_VCONFIG is not set -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_LONG_OPTIONS=y -# CONFIG_ZCIP is not set - -# -# Process Utilities -# -CONFIG_FREE=y -CONFIG_FUSER=y -CONFIG_KILL=y -CONFIG_KILLALL=y -# CONFIG_KILLALL5 is not set -# CONFIG_NMETER is not set -# CONFIG_PGREP is not set -CONFIG_PIDOF=y -# CONFIG_FEATURE_PIDOF_SINGLE is not set -# CONFIG_FEATURE_PIDOF_OMIT is not set -# CONFIG_PKILL is not set -CONFIG_PS=y -CONFIG_FEATURE_PS_WIDE=y -CONFIG_RENICE=y -CONFIG_BB_SYSCTL=y -CONFIG_TOP=y -CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y -CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y -# CONFIG_FEATURE_TOP_DECIMALS is not set -# CONFIG_FEATURE_TOPMEM is not set -CONFIG_UPTIME=y -CONFIG_WATCH=y - -# -# Shells -# -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_MSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set -CONFIG_ASH=y - -# -# Ash Shell Options -# -CONFIG_ASH_JOB_CONTROL=y -CONFIG_ASH_READ_NCHARS=y -CONFIG_ASH_READ_TIMEOUT=y -CONFIG_ASH_ALIAS=y -CONFIG_ASH_MATH_SUPPORT=y -# CONFIG_ASH_MATH_SUPPORT_64 is not set -CONFIG_ASH_GETOPTS=y -# CONFIG_ASH_BUILTIN_ECHO is not set -CONFIG_ASH_BUILTIN_TEST=y -# CONFIG_ASH_CMDCMD is not set -# CONFIG_ASH_MAIL is not set -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -# CONFIG_ASH_RANDOM_SUPPORT is not set -CONFIG_ASH_EXPAND_PRMT=y -# CONFIG_HUSH is not set -# CONFIG_HUSH_HELP is not set -# CONFIG_HUSH_INTERACTIVE is not set -# CONFIG_HUSH_JOB is not set -# CONFIG_HUSH_TICK is not set -# CONFIG_HUSH_IF is not set -# CONFIG_HUSH_LOOPS is not set -# CONFIG_LASH is not set -# CONFIG_MSH is not set - -# -# Bourne Shell Options -# -CONFIG_FEATURE_SH_EXTRA_QUIET=y -# CONFIG_FEATURE_SH_STANDALONE is not set -# CONFIG_CTTYHACK is not set - -# -# System Logging Utilities -# -CONFIG_SYSLOGD=y -CONFIG_FEATURE_ROTATE_LOGFILE=y -CONFIG_FEATURE_REMOTE_LOG=y -CONFIG_FEATURE_IPC_SYSLOG=y -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 -CONFIG_LOGREAD=y -CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y -CONFIG_KLOGD=y -CONFIG_LOGGER=y - -# -# Runit Utilities -# -# CONFIG_RUNSV is not set -# CONFIG_RUNSVDIR is not set -# CONFIG_SV is not set -# CONFIG_SVLOGD is not set -# CONFIG_CHPST is not set -# CONFIG_SETUIDGID is not set -# CONFIG_ENVUIDGID is not set -# CONFIG_ENVDIR is not set -# CONFIG_SOFTLIMIT is not set -# CONFIG_CHCON is not set -# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set -# CONFIG_GETENFORCE is not set -# CONFIG_GETSEBOOL is not set -# CONFIG_LOAD_POLICY is not set -# CONFIG_MATCHPATHCON is not set -# CONFIG_RESTORECON is not set -# CONFIG_RUNCON is not set -# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set -# CONFIG_SELINUXENABLED is not set -# CONFIG_SETENFORCE is not set -# CONFIG_SETFILES is not set -# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set -# CONFIG_SETSEBOOL is not set -# CONFIG_SESTATUS is not set - -# -# ipsvd utilities -# -# CONFIG_TCPSVD is not set -# CONFIG_UDPSVD is not set diff --git a/packages/busybox/busybox_1.9.1.bb b/packages/busybox/busybox_1.9.1.bb index c25f453405..cec4af8d59 100644 --- a/packages/busybox/busybox_1.9.1.bb +++ b/packages/busybox/busybox_1.9.1.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = "r3" +PR = "r4" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ http://busybox.net/downloads/fixes-1.9.1/busybox-1.9.1-lineedit.patch;patch=1 \ -- cgit v1.2.3 From 841137578b67664560a7cfb14443cac1c2031420 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Fri, 29 Feb 2008 15:43:01 +0000 Subject: linux-rt-2.6.24: Added leds-cpu-activity. --- .../leds-cpu-activity-powerpc.patch | 44 ++ .../linux/linux-rt-2.6.24/leds-cpu-activity.patch | 554 +++++++++++++++++++++ .../linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig | 3 +- packages/linux/linux-rt_2.6.24.bb | 2 + 4 files changed, 602 insertions(+), 1 deletion(-) create mode 100644 packages/linux/linux-rt-2.6.24/leds-cpu-activity-powerpc.patch create mode 100644 packages/linux/linux-rt-2.6.24/leds-cpu-activity.patch (limited to 'packages') diff --git a/packages/linux/linux-rt-2.6.24/leds-cpu-activity-powerpc.patch b/packages/linux/linux-rt-2.6.24/leds-cpu-activity-powerpc.patch new file mode 100644 index 0000000000..d8b4d2d017 --- /dev/null +++ b/packages/linux/linux-rt-2.6.24/leds-cpu-activity-powerpc.patch @@ -0,0 +1,44 @@ +Index: linux-2.6.24.3/arch/powerpc/kernel/idle.c +=================================================================== +--- linux-2.6.24.3.orig/arch/powerpc/kernel/idle.c 2008-02-29 14:49:40.000000000 +0100 ++++ linux-2.6.24.3/arch/powerpc/kernel/idle.c 2008-02-29 16:29:23.000000000 +0100 +@@ -19,6 +19,7 @@ + * 2 of the License, or (at your option) any later version. + */ + ++#include + #include + #include + #include +@@ -51,6 +52,12 @@ + __setup("powersave=off", powersave_off); + + /* ++ * CPU activity indicator. ++ */ ++void (*leds_idle)(int is_idle); ++EXPORT_SYMBOL(leds_idle); ++ ++/* + * The body of the idle task. + */ + void cpu_idle(void) +@@ -64,7 +71,8 @@ + while (!need_resched() && !need_resched_delayed() && + !cpu_should_die()) { + ppc64_runlatch_off(); +- ++ if (leds_idle) ++ leds_idle(1); + if (ppc_md.power_save) { + clear_thread_flag(TIF_POLLING_NRFLAG); + /* +@@ -99,6 +107,8 @@ + if (cpu_should_die()) + cpu_die(); + __preempt_enable_no_resched(); ++ if (leds_idle) ++ leds_idle(0); + schedule(); + preempt_disable(); + } diff --git a/packages/linux/linux-rt-2.6.24/leds-cpu-activity.patch b/packages/linux/linux-rt-2.6.24/leds-cpu-activity.patch new file mode 100644 index 0000000000..2495b9b3f7 --- /dev/null +++ b/packages/linux/linux-rt-2.6.24/leds-cpu-activity.patch @@ -0,0 +1,554 @@ +Index: linux-2.6.24.3/drivers/leds/Kconfig +=================================================================== +--- linux-2.6.24.3.orig/drivers/leds/Kconfig 2008-02-29 13:56:08.000000000 +0100 ++++ linux-2.6.24.3/drivers/leds/Kconfig 2008-02-29 13:56:11.000000000 +0100 +@@ -130,6 +130,15 @@ + This allows LEDs to be controlled by a programmable timer + via sysfs. If unsure, say Y. + ++config LEDS_TRIGGER_CPU_ACTIVITY ++ tristate "LED CPU Activity Trigger" ++ depends on LEDS_TRIGGERS ++ help ++ This allows LEDs to be set to show cpu activity via sysfs. ++ The LED will blink when the cpu is active and stay steady ++ (on or off according to the trigger selected) when idle. ++ Platform support is needed for this to work. If unsure, say Y. ++ + config LEDS_TRIGGER_IDE_DISK + bool "LED IDE Disk Trigger" + depends on LEDS_TRIGGERS && BLK_DEV_IDEDISK +Index: linux-2.6.24.3/drivers/leds/ledtrig-cpu.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.24.3/drivers/leds/ledtrig-cpu.c 2008-02-29 13:56:11.000000000 +0100 +@@ -0,0 +1,502 @@ ++/* ++ * LEDs CPU activity trigger ++ * ++ * Author: John Bowler ++ * ++ * Copyright (c) 2006 John Bowler ++ * ++ * Permission is hereby granted, free of charge, to any ++ * person obtaining a copy of this software and associated ++ * documentation files (the "Software"), to deal in the ++ * Software without restriction, including without ++ * limitation the rights to use, copy, modify, merge, ++ * publish, distribute, sublicense, and/or sell copies of ++ * the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the ++ * following conditions: ++ * ++ * The above copyright notice and this permission notice ++ * shall be included in all copies or substantial portions ++ * of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ++ * ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED ++ * TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A ++ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT ++ * SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ++ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ++ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ * OTHER DEALINGS IN THE SOFTWARE. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include "leds.h" ++ ++//#include ++//#include ++ ++ ++/* ++ * To simplify this the LED state is given for each case of ++ * CPU state - idle or active. The LED can be: ++ * ++ * off ++ * flash - slow for idle, fast (flicker) for active ++ * on ++ * ++ * This gives two useless states - off/off and on/on ++ */ ++typedef enum cpu_trigger_led_state { ++ cpu_led_off, ++ cpu_led_flash, ++ cpu_led_on, ++ cpu_led_invalid ++} cpu_trigger_led_state; ++ ++static const char *const cpu_trigger_names[] = { ++ "off", ++ "flash", ++ "on", ++ "invalid" ++}; ++ ++/* Forward declaration - this is called back when an LED property ++ * is changed. ++ */ ++static void leds_cpu_trigger_state_change(void); ++ ++/* ++ * These constants define the actual mark/space of the flashing ++ * in jiffies. msecs_to_jiffies rounds up and is compile time ++ * evaluable for constant arguments. Writing the ?: stuff below ++ * this way ensures the compiler doesn't think it needs to ++ * compile in the math of msecs_to_jiffies. ++ * ++ * These values have been determined by experiment to work well ++ * for the ready/status LED on a LinkSys NSLU2 (light piped) and ++ * for the user LED on a Loft (Gateway Avila variant) board where ++ * the LED was directly visible. Light Output Varies Everywhere. ++ */ ++#define LEDS_CPU_ACTIVE_MARK msecs_to_jiffies(40) ++#define LEDS_CPU_IDLE_MARK msecs_to_jiffies(800) ++#define LEDS_CPU_ACTIVE_SPACE msecs_to_jiffies(60) ++#define LEDS_CPU_IDLE_SPACE msecs_to_jiffies(800) ++ ++ ++/* ++ * Individual LEDs ------------------------------------------------------------ ++ */ ++struct cpu_trigger_data { ++ cpu_trigger_led_state active; /* Behaviour when the CPU is active. */ ++ cpu_trigger_led_state idle; /* Behaviour when the CPU is idle. */ ++}; ++ ++/* ++ * LED state change - called when the state of a single LED might ++ * have changed. Returns true if the LED is blinking. The argument ++ * is the blink state - the brightness of the blinking LED. ++ */ ++static int leds_cpu_trigger_led_state_change(struct led_classdev *led, ++ int is_active, enum led_brightness brightness) ++{ ++ int is_blinking = 0; ++ ++ struct cpu_trigger_data *data = led->trigger_data; ++ ++ /* Find the new brightness for the LED, if the LED is ++ * set to flash then the brightness passed in is the ++ * required value. ++ */ ++ if (likely(data != 0)) ++ switch (is_active ? data->active : data->idle) { ++ case cpu_led_off: brightness = LED_OFF; break; ++ case cpu_led_flash: is_blinking = 1; break; ++ case cpu_led_on: brightness = LED_FULL; break; ++ } ++ else ++ brightness = is_active ? LED_FULL : LED_OFF; ++ ++ led_set_brightness(led, brightness); ++ ++ return is_blinking; ++} ++ ++/* ++ * sysfs properties, the property is output at an list of the ++ * values with the current setting enclosed in [] ++ */ ++static ssize_t leds_cpu_trigger_show_prop(struct device *dev, ++ struct device_attribute *attr, char *buf, size_t where) ++{ ++ struct led_classdev *led = dev_get_drvdata(dev); ++ cpu_trigger_led_state item = cpu_led_invalid, i; ++ char *next; ++ ++ if (likely(led->trigger_data != 0)) ++ item = *(const cpu_trigger_led_state*)( ++ led->trigger_data + where); ++ ++ for (i=0, next=buf; i= size) ++ return rc; ++ ++ /* look for a simple match against the trigger name, case ++ * sensitive. ++ */ ++ do { ++ const char *name = cpu_trigger_names[value]; ++ size_t len = strlen(name); ++ if (len <= size && memcmp(buf+rc, name, len) == 0) { ++ rc = len; ++ break; ++ } ++ if (++value >= cpu_led_invalid) ++ return -EINVAL; ++ } while (1); ++ ++ led = dev_get_drvdata(dev); ++ if (likely(led->trigger_data != 0)) ++ *(cpu_trigger_led_state*)( ++ led->trigger_data + where) = value; ++ ++ return rc; ++} ++ ++static ssize_t leds_cpu_trigger_store_active(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t size) ++{ ++ ssize_t rc = leds_cpu_trigger_store_prop(dev, attr, buf, size, ++ offsetof(struct cpu_trigger_data, active)); ++ /* ++ * At least one CPU must be active (otherwise who is doing this?) ++ * Call down into the global state below to cause an update ++ * to happen now. ++ */ ++ leds_cpu_trigger_state_change(); ++ return rc; ++} ++ ++static ssize_t leds_cpu_trigger_store_idle(struct device *dev, ++ struct device_attribute *attr, const char *buf, size_t size) ++{ ++ return leds_cpu_trigger_store_prop(dev, attr, buf, size, ++ offsetof(struct cpu_trigger_data, idle)); ++} ++ ++static DEVICE_ATTR(active, 0644, leds_cpu_trigger_show_active, ++ leds_cpu_trigger_store_active); ++ ++static DEVICE_ATTR(idle, 0644, leds_cpu_trigger_show_idle, ++ leds_cpu_trigger_store_idle); ++ ++/* ++ * Activate and deactivate are called on individual LEDs when the ++ * LED trigger property is changed. ++ */ ++static void leds_cpu_trigger_activate(struct led_classdev *led) ++{ ++ /* ++ * The initial setting of the trigger is simple CPU activity ++ * with the LED off for idle and on for active. Consequently ++ * there is no need to mess with the global state initially, ++ * we know the CPU is active at this moment! ++ */ ++ int rc; ++ struct cpu_trigger_data *data = kmalloc(sizeof *data, GFP_KERNEL); ++ if (unlikely(data == 0)) ++ return; ++ ++ data->active = cpu_led_on; ++ data->idle = cpu_led_off; ++ led->trigger_data = data; ++ ++ rc = device_create_file(led->dev, &dev_attr_active); ++ if (rc) ++ goto err_out; ++ rc = device_create_file(led->dev, &dev_attr_idle); ++ if (rc) ++ goto err_out_active; ++ ++ led_set_brightness(led, LED_FULL); ++ return; ++ ++err_out_active: ++ device_remove_file(led->dev, &dev_attr_active); ++err_out: ++ led->trigger_data = NULL; ++ kfree(data); ++} ++ ++static void leds_cpu_trigger_deactivate(struct led_classdev *led) ++{ ++ struct cpu_trigger_data *data = led->trigger_data; ++ if (likely(data != 0)) { ++ led_set_brightness(led, LED_OFF); ++ ++ device_remove_file(led->dev, &dev_attr_idle); ++ device_remove_file(led->dev, &dev_attr_active); ++ ++ led->trigger_data = 0; ++ kfree(data); ++ } ++} ++ ++ ++/* ++ * Global state -------------------------------------------------------------- ++ * ++ * This is global because the CPU state is global and we only need one timer to ++ * do this stuff. ++ */ ++typedef struct leds_cpu_trigger_data { ++ struct led_trigger trigger; /* the lock in here protects everything */ ++ struct timer_list timer; ++ unsigned long last_active_time; /* record of last jiffies */ ++ unsigned long last_idle_time; /* record of last jiffies */ ++ int count_active; /* number of active CPUs */ ++} leds_cpu_trigger_data; ++ ++/* ++ * Mark state - uses the current time (jiffies) to work out ++ * whether this is a mark or space. ++ */ ++static int leds_cpu_trigger_mark(struct leds_cpu_trigger_data *data, ++ unsigned long now) { ++ if (data->count_active > 0) { ++ unsigned long elapsed = now - data->last_active_time; ++ elapsed %= LEDS_CPU_ACTIVE_SPACE + LEDS_CPU_ACTIVE_MARK; ++ data->last_active_time = now - elapsed; ++ return elapsed > LEDS_CPU_ACTIVE_SPACE; ++ } else { ++ unsigned long elapsed = now - data->last_idle_time; ++ elapsed %= LEDS_CPU_IDLE_SPACE + LEDS_CPU_IDLE_MARK; ++ data->last_idle_time = now - elapsed; ++ return elapsed > LEDS_CPU_IDLE_SPACE; ++ } ++} ++ ++ ++/* ++ * State change - given information about the nature of the ++ * (possible) state change call up to each LED to adjust its ++ * state. Returns true if any LED is blinking. The lock ++ * must be held (a read lock is adequate). ++ */ ++static int leds_cpu_trigger_scan_leds(struct leds_cpu_trigger_data *data, ++ unsigned long now) ++{ ++ int blinking = 0; ++ const int active = data->count_active > 0; ++ const enum led_brightness brightness = ++ leds_cpu_trigger_mark(data, now) ? LED_FULL : LED_OFF; ++ struct list_head *entry; ++ ++ list_for_each(entry, &data->trigger.led_cdevs) { ++ struct led_classdev *led = ++ list_entry(entry, struct led_classdev, trig_list); ++ ++ blinking |= leds_cpu_trigger_led_state_change(led, ++ active, brightness); ++ } ++ ++ return blinking; ++} ++ ++/* ++ * Set the timer correctly according to the current state, the lock ++ * must be held for write. ++ */ ++static void leds_cpu_trigger_set_timer(struct leds_cpu_trigger_data *state, ++ unsigned long now) ++{ ++ unsigned long next; ++ if (state->count_active > 0) { ++ next = state->last_active_time; ++ if (now - next > LEDS_CPU_ACTIVE_SPACE) ++ next += LEDS_CPU_ACTIVE_MARK; ++ next += LEDS_CPU_ACTIVE_SPACE; ++ } else { ++ next = state->last_idle_time; ++ if (now - next > LEDS_CPU_IDLE_SPACE) ++ next += LEDS_CPU_IDLE_MARK; ++ next += LEDS_CPU_IDLE_SPACE; ++ } ++ mod_timer(&state->timer, next); ++} ++ ++/* ++ * The timer callback if the LED is currently flashing, the callback ++ * calls the state change function and, if that returns true, meaning ++ * that at least one LED is still blinking, the timer is restarted ++ * with the correct timeout. ++ */ ++static void leds_cpu_trigger_timer_callback(unsigned long data) ++{ ++ struct leds_cpu_trigger_data *state = ++ (struct leds_cpu_trigger_data *)data; ++ ++ write_lock(&state->trigger.leddev_list_lock); ++ { ++ unsigned long now = jiffies; ++ ++ /* If at least one LED is set to flash; set the timer ++ * again (this won't reset the timer set within the ++ * idle loop). ++ */ ++ if (leds_cpu_trigger_scan_leds(state, now)) ++ leds_cpu_trigger_set_timer(state, now); ++ } ++ write_unlock(&state->trigger.leddev_list_lock); ++} ++ ++ ++/* ++ * There is one global control structure, one timer and one set ++ * of state for active CPUs shared across all the LEDs. Individual ++ * LEDs say how this state to be handled. It is currently *not* ++ * possible to show per-cpu activity on individual LEDs, the code ++ * maintains a count of active CPUs and the state is only 'idle' ++ * if all CPUs are idle. ++ */ ++static struct leds_cpu_trigger_data leds_cpu_trigger = { ++ .trigger = { ++ .name = "cpu", ++ .activate = leds_cpu_trigger_activate, ++ .deactivate = leds_cpu_trigger_deactivate, ++ } , ++ .timer = TIMER_INITIALIZER(leds_cpu_trigger_timer_callback, 0, ++ (unsigned long)&leds_cpu_trigger), ++ .last_active_time = 0, ++ .last_idle_time = 0, ++ .count_active = 0, ++}; ++ ++/* ++ * State change - callback from an individual LED on a property change which ++ * might require a redisplay. ++ */ ++static void leds_cpu_trigger_state_change() { ++ write_lock(&leds_cpu_trigger.trigger.leddev_list_lock); ++ { ++ unsigned long now = jiffies; ++ ++ if (leds_cpu_trigger_scan_leds(&leds_cpu_trigger, now) && ++ !timer_pending(&leds_cpu_trigger.timer)) ++ leds_cpu_trigger_set_timer(&leds_cpu_trigger, now); ++ } ++ write_unlock(&leds_cpu_trigger.trigger.leddev_list_lock); ++} ++ ++/* ++ * Called from every CPU at the start and end of the idle loop. ++ * The active count is initially 0, even though CPUs are running, ++ * so the code below must check for the resultant underflow. ++ * ++ * If the idle behaviour is 'flash' then when the timer times out ++ * it will take the CPU out of idle, set the active state (which ++ * may also be flash), drop back into idle and reset the timer to ++ * the idle timeout... ++ */ ++static void leds_cpu_trigger_idle(int is_idle) ++{ ++ write_lock(&leds_cpu_trigger.trigger.leddev_list_lock); ++ if ((is_idle && leds_cpu_trigger.count_active > 0 && ++ --leds_cpu_trigger.count_active == 0) || ++ (!is_idle && leds_cpu_trigger.count_active < num_online_cpus() && ++ ++leds_cpu_trigger.count_active == 1)) { ++ unsigned long now = jiffies; ++ ++ /* State change - the system just became idle or active, ++ * call the del_timer first in an attempt to minimise ++ * getting a timer interrupt which will take us unnecessarily ++ * out of idle (this doesn't matter). ++ */ ++ del_timer(&leds_cpu_trigger.timer); ++ if (leds_cpu_trigger_scan_leds(&leds_cpu_trigger, now)) ++ leds_cpu_trigger_set_timer(&leds_cpu_trigger, now); ++ } ++ write_unlock(&leds_cpu_trigger.trigger.leddev_list_lock); ++} ++ ++/* ++ * Module init and exit - register the trigger, then store ++ * the idle callback in the arch-specific global. For this ++ * module to link (into the kernel) or load (into a running ++ * kernel) the architecture must define the leds_idle global. ++ */ ++static int __init leds_cpu_trigger_init(void) ++{ ++ int rc = led_trigger_register(&leds_cpu_trigger.trigger); ++ leds_idle = leds_cpu_trigger_idle; ++ return rc; ++} ++module_init(leds_cpu_trigger_init); ++ ++static void __exit leds_cpu_trigger_exit(void) ++{ ++ leds_idle = 0; ++ del_timer_sync(&leds_cpu_trigger.timer); ++ led_trigger_unregister(&leds_cpu_trigger.trigger); ++} ++module_exit(leds_cpu_trigger_exit); ++ ++MODULE_AUTHOR("John Bowler "); ++MODULE_DESCRIPTION("CPU activity LED trigger"); ++MODULE_LICENSE("Dual MIT/GPL"); +Index: linux-2.6.24.3/drivers/leds/Makefile +=================================================================== +--- linux-2.6.24.3.orig/drivers/leds/Makefile 2008-02-29 13:56:08.000000000 +0100 ++++ linux-2.6.24.3/drivers/leds/Makefile 2008-02-29 13:56:11.000000000 +0100 +@@ -24,3 +24,4 @@ + obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o + obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += ledtrig-ide-disk.o + obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += ledtrig-heartbeat.o ++obj-$(CONFIG_LEDS_TRIGGER_CPU_ACTIVITY) += ledtrig-cpu.o +Index: linux-2.6.24.3/include/linux/leds.h +=================================================================== +--- linux-2.6.24.3.orig/include/linux/leds.h 2008-02-29 13:56:08.000000000 +0100 ++++ linux-2.6.24.3/include/linux/leds.h 2008-02-29 13:56:11.000000000 +0100 +@@ -124,4 +124,13 @@ + }; + + ++/* ++ * CPU activity indication. ++ */ ++/* Idle callback - call with is_idle==1 at the start of the idle loop ++ * and with is_idle==0 at the end. This symbol must be defined by ++ * the arch core to be able to use LEDS_TRIGGER_CPU_ACTIVITY ++ */ ++extern void (*leds_idle)(int is_idle); ++ + #endif /* __LINUX_LEDS_H_INCLUDED */ diff --git a/packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig b/packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig index 11b37d3ec1..a49497ccb2 100644 --- a/packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig +++ b/packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.24.3-rt3 -# Fri Feb 29 00:48:47 2008 +# Fri Feb 29 13:59:05 2008 # # CONFIG_PPC64 is not set @@ -1356,6 +1356,7 @@ CONFIG_LEDS_MPC8313E_RDB=m # CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_CPU_ACTIVITY=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m # CONFIG_INFINIBAND is not set # CONFIG_EDAC is not set diff --git a/packages/linux/linux-rt_2.6.24.bb b/packages/linux/linux-rt_2.6.24.bb index 61fd734632..8081f44e93 100644 --- a/packages/linux/linux-rt_2.6.24.bb +++ b/packages/linux/linux-rt_2.6.24.bb @@ -13,6 +13,8 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.3.tar.bz2 \ http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \ file://sysctl_missing_include.patch;patch=1 \ file://powerpc-clockres.patch;patch=1 \ + file://leds-cpu-activity.patch;patch=1 \ + file://leds-cpu-activity-powerpc.patch;patch=1 \ file://defconfig" S = "${WORKDIR}/linux-2.6.24.3" -- cgit v1.2.3 From f0db03f5fa5e65e1d7f097c98063f644503b4940 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 29 Feb 2008 15:56:13 +0000 Subject: pango: Add patch to fix pkgconfig breakage (from poky) --- packages/pango/pango-1.18.3/pkgconfig_fixes.patch | 79 +++++++++++++++++++++++ packages/pango/pango_1.18.3.bb | 2 +- 2 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 packages/pango/pango-1.18.3/pkgconfig_fixes.patch (limited to 'packages') diff --git a/packages/pango/pango-1.18.3/pkgconfig_fixes.patch b/packages/pango/pango-1.18.3/pkgconfig_fixes.patch new file mode 100644 index 0000000000..f021591a91 --- /dev/null +++ b/packages/pango/pango-1.18.3/pkgconfig_fixes.patch @@ -0,0 +1,79 @@ +Index: pango-1.18.1/configure.in +=================================================================== +--- pango-1.18.1.orig/configure.in 2007-08-28 00:29:54.000000000 +0000 ++++ pango-1.18.1/configure.in 2007-11-12 19:21:22.000000000 +0000 +@@ -226,13 +226,9 @@ + # + # Checks for FreeType + # +- FREETYPE_LIBS= +- FREETYPE_CFLAGS= +- AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) +- if test "x$FREETYPE_CONFIG" != "xno" ; then +- FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags` +- FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` ++ PKG_CHECK_MODULES(FREETYPE, freetype2 >= 1.0.1, have_freetype=true, AC_MSG_RESULT([no])) + ++ if $have_freetype ; then + pango_save_ldflags=$LDFLAGS + LDFLAGS="$LDFLAGS $FREETYPE_LIBS" + AC_CHECK_LIB(freetype, FT_Get_Next_Char, have_freetype=true, :) +Index: pango-1.18.1/pangoft2-uninstalled.pc.in +=================================================================== +--- pango-1.18.1.orig/pangoft2-uninstalled.pc.in 2007-07-05 21:30:28.000000000 +0000 ++++ pango-1.18.1/pangoft2-uninstalled.pc.in 2007-11-12 19:23:44.000000000 +0000 +@@ -1,7 +1,7 @@ + Name: Pango FT2 Uninstalled + Description: Freetype 2.0 font support for Pango, Not Installed + Version: @VERSION@ +-Requires: pango +-Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoft2-@PANGO_API_VERSION@.la @FREETYPE_LIBS@ +-Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @FREETYPE_CFLAGS@ ++Requires: pango freetype2 ++Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoft2-@PANGO_API_VERSION@.la ++Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ + +Index: pango-1.18.1/pangoft2.pc.in +=================================================================== +--- pango-1.18.1.orig/pangoft2.pc.in 2007-07-05 21:30:28.000000000 +0000 ++++ pango-1.18.1/pangoft2.pc.in 2007-11-12 19:27:05.000000000 +0000 +@@ -6,7 +6,7 @@ + Name: Pango FT2 + Description: Freetype 2.0 font support for Pango + Version: @VERSION@ +-Requires: pango +-Libs: -L${libdir} -lpangoft2-@PANGO_API_VERSION@ @PKGCONFIG_FREETYPE_LIBS@ +-Cflags: -I${includedir}/pango-1.0 @FONTCONFIG_CFLAGS@ @FREETYPE_CFLAGS@ ++Requires: pango freetype2 fontconfig ++Libs: -L${libdir} -lpangoft2-@PANGO_API_VERSION@ ++Cflags: -I${includedir}/pango-1.0 + +Index: pango-1.18.1/pangoxft-uninstalled.pc.in +=================================================================== +--- pango-1.18.1.orig/pangoxft-uninstalled.pc.in 2007-07-05 21:30:28.000000000 +0000 ++++ pango-1.18.1/pangoxft-uninstalled.pc.in 2007-11-12 19:22:24.000000000 +0000 +@@ -1,7 +1,7 @@ + Name: Pango Xft Uninstalled + Description: Xft font support for Pango, Not Installed + Version: @VERSION@ +-Requires: pango +-Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoxft-@PANGO_API_VERSION@.la @XFT_LIBS@ +-Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @X_CFLAGS@ @FREETYPE_CFLAGS@ ++Requires: pango xft ++Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoxft-@PANGO_API_VERSION@.la ++Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @X_CFLAGS@ + +Index: pango-1.18.1/pangoxft.pc.in +=================================================================== +--- pango-1.18.1.orig/pangoxft.pc.in 2007-07-05 21:30:28.000000000 +0000 ++++ pango-1.18.1/pangoxft.pc.in 2007-11-12 19:21:57.000000000 +0000 +@@ -6,6 +6,6 @@ + Name: Pango Xft + Description: Xft font support for Pango + Version: @VERSION@ +-Requires: pango pangoft2 +-Libs: -L${libdir} -lpangoxft-@PANGO_API_VERSION@ @PKGCONFIG_XFT_LIBS@ +-Cflags: -I${includedir}/pango-1.0 @XFT_CFLAGS@ ++Requires: pango pangoft2 xft ++Libs: -L${libdir} -lpangoxft-@PANGO_API_VERSION@ ++Cflags: -I${includedir}/pango-1.0 diff --git a/packages/pango/pango_1.18.3.bb b/packages/pango/pango_1.18.3.bb index 9656f30376..4069cecebd 100644 --- a/packages/pango/pango_1.18.3.bb +++ b/packages/pango/pango_1.18.3.bb @@ -1,4 +1,4 @@ require pango.inc -DEFAULT_PREFERENCE = "-1" +SRC_URI += "file://pkgconfig_fixes.patch;patch=1" -- cgit v1.2.3 From e69abd79c3b8104a1b44cf40be7a60a9d1ed9c12 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 29 Feb 2008 15:57:59 +0000 Subject: xorg-xserver-1.4: Fix pkgconfig file --- .../xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch | 13 +++++++++++++ packages/xorg-xserver/xserver-kdrive_1.4.bb | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch b/packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch new file mode 100644 index 0000000000..0790d4c32b --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch @@ -0,0 +1,13 @@ +Index: xorg-server-1.4/xorg-server.pc.in +=================================================================== +--- xorg-server-1.4.orig/xorg-server.pc.in 2008-02-29 12:29:02.000000000 +0000 ++++ xorg-server-1.4/xorg-server.pc.in 2008-02-29 12:27:36.000000000 +0000 +@@ -7,6 +7,7 @@ + + Name: xorg-server + Description: Modular X.Org X Server ++Requires: pixman + Version: @PACKAGE_VERSION@ +-Cflags: -I${sdkdir} @PIXMAN_CFLAGS@ ++Cflags: -I${sdkdir} + Libs: -L${libdir} diff --git a/packages/xorg-xserver/xserver-kdrive_1.4.bb b/packages/xorg-xserver/xserver-kdrive_1.4.bb index c87090197c..30ae4a2e3d 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.4.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.4.bb @@ -3,7 +3,7 @@ require xserver-kdrive-common.inc DEPENDS += "hal libxkbfile libxcalibrate pixman" PE = "1" -PR = "r3" +PR = "r4" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ @@ -22,6 +22,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ file://fbdev-evdev.patch;patch=1 \ file://keyboard-resume-workaround.patch;patch=1 \ file://xorg-avr32-support.diff;patch=1 \ + file://pkgconfig_fix.patch;patch=1 \ " S = "${WORKDIR}/xorg-server-${PV}" -- cgit v1.2.3 From d702784a2059e2786b929d8998f321cc0edee502 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 29 Feb 2008 16:01:29 +0000 Subject: matchbox-desktop-0.9.1: Add fix for pkgconfig file --- .../matchbox-desktop-0.9.1/pkgconfig_fix.patch | 15 +++++++++++++++ packages/matchbox-desktop/matchbox-desktop_0.9.1.bb | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 packages/matchbox-desktop/matchbox-desktop-0.9.1/pkgconfig_fix.patch (limited to 'packages') diff --git a/packages/matchbox-desktop/matchbox-desktop-0.9.1/pkgconfig_fix.patch b/packages/matchbox-desktop/matchbox-desktop-0.9.1/pkgconfig_fix.patch new file mode 100644 index 0000000000..5ca98a9164 --- /dev/null +++ b/packages/matchbox-desktop/matchbox-desktop-0.9.1/pkgconfig_fix.patch @@ -0,0 +1,15 @@ +Index: matchbox-desktop-0.9.1/matchbox-desktop.pc.in +=================================================================== +--- matchbox-desktop-0.9.1.orig/matchbox-desktop.pc.in 2008-02-29 13:48:39.000000000 +0000 ++++ matchbox-desktop-0.9.1/matchbox-desktop.pc.in 2008-02-29 13:49:07.000000000 +0000 +@@ -6,5 +6,6 @@ + Name: matchbox-desktop + Description: Matchbox Desktop module dependencies. + Version: @VERSION@ +-Libs: -L${libdir} @LIBMB_LIBS@ +-Cflags: -I${includedir}/matchbox-desktop @LIBMB_CFLAGS@ +\ No newline at end of file ++Requires: libmb ++Libs: -L${libdir} ++Cflags: -I${includedir}/matchbox-desktop +\ No newline at end of file diff --git a/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb b/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb index 4aba935386..d3be3b166e 100644 --- a/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb +++ b/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb @@ -2,9 +2,10 @@ DESCRIPTION = "Matchbox Window Manager Desktop" LICENSE = "GPL" DEPENDS = "libmatchbox startup-notification" SECTION = "x11/wm" -PR = "r2" +PR = "r3" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2 \ + file://pkgconfig_fix.patch;patch=1 \ file://mb-desktop-multi-category-matching.patch;patch=1" EXTRA_OECONF = "--enable-startup-notification --enable-dnotify" -- cgit v1.2.3 From 1c550c086ea627e6871f5c8aea49590972af49a7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 29 Feb 2008 16:03:00 +0000 Subject: gnutls-1.6.3: Update configure patch to address pkgconfig issues --- .../gnutls/gnutls-1.6.3/configure_madness.patch | 31 ++++++++++++++++++++-- packages/gnutls/gnutls_1.6.3.bb | 2 +- 2 files changed, 30 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/gnutls/gnutls-1.6.3/configure_madness.patch b/packages/gnutls/gnutls-1.6.3/configure_madness.patch index 26111dfe96..bdee81cc54 100644 --- a/packages/gnutls/gnutls-1.6.3/configure_madness.patch +++ b/packages/gnutls/gnutls-1.6.3/configure_madness.patch @@ -1,7 +1,7 @@ Index: gnutls-1.6.3/configure.in =================================================================== ---- gnutls-1.6.3.orig/configure.in 2007-05-25 12:28:59.000000000 +0000 -+++ gnutls-1.6.3/configure.in 2007-11-13 17:53:23.000000000 +0000 +--- gnutls-1.6.3.orig/configure.in 2008-02-29 09:58:12.000000000 +0000 ++++ gnutls-1.6.3/configure.in 2008-02-29 09:58:15.000000000 +0000 @@ -574,13 +574,13 @@ AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL @@ -20,3 +20,30 @@ Index: gnutls-1.6.3/configure.in AC_SUBST(LIBGNUTLS_EXTRA_LIBS) AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS) export ac_full +Index: gnutls-1.6.3/lib/gnutls.pc.in +=================================================================== +--- gnutls-1.6.3.orig/lib/gnutls.pc.in 2008-02-29 09:58:23.000000000 +0000 ++++ gnutls-1.6.3/lib/gnutls.pc.in 2008-02-29 09:58:49.000000000 +0000 +@@ -18,6 +18,7 @@ + Name: GnuTLS + Description: Transport Security Layer implementation for the GNU system + Version: @VERSION@ ++Requires.private: gcrypt + Libs: -L${libdir} -lgnutls +-Libs.private: @LIBGNUTLS_LIBS@ ++Libs.private: -L${libdir} -lgnutls + Cflags: -I${includedir} +Index: gnutls-1.6.3/libextra/gnutls-extra.pc.in +=================================================================== +--- gnutls-1.6.3.orig/libextra/gnutls-extra.pc.in 2008-02-29 09:59:02.000000000 +0000 ++++ gnutls-1.6.3/libextra/gnutls-extra.pc.in 2008-02-29 09:59:31.000000000 +0000 +@@ -18,7 +18,8 @@ + Name: GnuTLS-extra + Description: Additional add-ons for GnuTLS licensed under GPL + Requires: gnutls ++Requires.private: gnutls + Version: @VERSION@ + Libs: -L${libdir} -lgnutls-extra +-Libs.private: @LIBGNUTLS_EXTRA_LIBS@ ++Libs.private: -L${libdir} -lgnutls-extra + Cflags: -I${includedir} diff --git a/packages/gnutls/gnutls_1.6.3.bb b/packages/gnutls/gnutls_1.6.3.bb index ddaef1dea3..be68b55d04 100644 --- a/packages/gnutls/gnutls_1.6.3.bb +++ b/packages/gnutls/gnutls_1.6.3.bb @@ -6,4 +6,4 @@ SRC_URI += "\ file://configure_madness.patch;patch=1 \ " -PR = "r3" +PR = "r4" -- cgit v1.2.3 From c980991c2e80eb580ed55885a3909fb67c49bcdc Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 29 Feb 2008 16:03:42 +0000 Subject: curl: Fix pkgconfig file --- packages/curl/curl_7.16.4.bb | 5 +++-- packages/curl/files/.mtn2git_empty | 0 packages/curl/files/pkgconfig_fix.patch | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 packages/curl/files/.mtn2git_empty create mode 100644 packages/curl/files/pkgconfig_fix.patch (limited to 'packages') diff --git a/packages/curl/curl_7.16.4.bb b/packages/curl/curl_7.16.4.bb index 0053a12fdb..555e5bc643 100644 --- a/packages/curl/curl_7.16.4.bb +++ b/packages/curl/curl_7.16.4.bb @@ -2,9 +2,10 @@ DESCRIPTION = "Command line tool and library for client-side URL transfers." LICENSE = "MIT" DEPENDS = "zlib gnutls" SECTION = "console/network" -PR = "r1" +PR = "r2" -SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2" +SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ + file://pkgconfig_fix.patch;patch=1" S = "${WORKDIR}/curl-${PV}" inherit autotools pkgconfig binconfig diff --git a/packages/curl/files/.mtn2git_empty b/packages/curl/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/curl/files/pkgconfig_fix.patch b/packages/curl/files/pkgconfig_fix.patch new file mode 100644 index 0000000000..a5730095d2 --- /dev/null +++ b/packages/curl/files/pkgconfig_fix.patch @@ -0,0 +1,14 @@ +Index: curl-7.16.4/libcurl.pc.in +=================================================================== +--- curl-7.16.4.orig/libcurl.pc.in 2007-02-18 09:41:27.000000000 +0000 ++++ curl-7.16.4/libcurl.pc.in 2008-02-29 12:19:32.000000000 +0000 +@@ -33,6 +33,7 @@ + URL: http://curl.haxx.se/ + Description: Library to transfer files with ftp, http, etc. + Version: @VERSION@ +-Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@ +-Libs.private: @LIBCURL_LIBS@ @LIBS@ ++Requires.private: gnutls ++Libs: -L${libdir} -lcurl ++Libs.private: -ldl -lz + Cflags: -I${includedir} -- cgit v1.2.3 From 69c3a4e292aabe37e7ae28bb521462a1619a3fa2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 29 Feb 2008 16:10:25 +0000 Subject: gtk-webcore: Tweak pkgconfig usage so it works within a sysroot --- packages/gtk-webcore/files/path_fixes.patch | 15 +++++++++++++++ packages/gtk-webcore/osb-nrcit/.mtn2git_empty | 0 packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch | 13 +++++++++++++ packages/gtk-webcore/osb-nrcit_svn.bb | 3 ++- packages/gtk-webcore/osb-nrcore.inc | 2 ++ packages/gtk-webcore/osb-nrcore_svn.bb | 5 +++-- 6 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 packages/gtk-webcore/files/path_fixes.patch create mode 100644 packages/gtk-webcore/osb-nrcit/.mtn2git_empty create mode 100644 packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch (limited to 'packages') diff --git a/packages/gtk-webcore/files/path_fixes.patch b/packages/gtk-webcore/files/path_fixes.patch new file mode 100644 index 0000000000..adb27bdd85 --- /dev/null +++ b/packages/gtk-webcore/files/path_fixes.patch @@ -0,0 +1,15 @@ +Index: NRCore/configure.in +=================================================================== +--- NRCore.orig/configure.in 2008-02-29 11:01:14.000000000 +0000 ++++ NRCore/configure.in 2008-02-29 12:45:18.000000000 +0000 +@@ -67,8 +67,8 @@ + AC_MSG_RESULT([found. Using prefix $jscore_prefix]) + JSCORE_ENABLE=yes + AC_SUBST(JSCORE_ENABLE) +- JSCORE_LIBS="-L$jscore_prefix/lib -ljscore" +- JSCORE_CFLAGS="-I$jscore_prefix/include/gtk-webcore-jscore/" ++ JSCORE_LIBS="-L$jscore_prefix/lib -lgtk_webcore_jscore" ++ JSCORE_CFLAGS="-I$jscore_prefix/include/gtk-webcore/" + jscore_pkgdatadir="$jscore_prefix/share/gtk-webcore-jscore" + else + AC_MSG_ERROR([JavaScriptCore not found. Use --with-javascriptcore-prefix=PREFIX]) diff --git a/packages/gtk-webcore/osb-nrcit/.mtn2git_empty b/packages/gtk-webcore/osb-nrcit/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch b/packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch new file mode 100644 index 0000000000..d26009bbb7 --- /dev/null +++ b/packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch @@ -0,0 +1,13 @@ +Index: NRCit/gtk-webcore-nrcit.pc.in +=================================================================== +--- NRCit.orig/gtk-webcore-nrcit.pc.in 2008-02-29 13:46:41.000000000 +0000 ++++ NRCit/gtk-webcore-nrcit.pc.in 2008-02-29 13:46:51.000000000 +0000 +@@ -6,6 +6,6 @@ + Name: gtk-webcore-nrcit + Description: Gtk+-WebCore HTML rendering engine, browser interface + Version: @VERSION@ +-Requires: gtk-webcore-jscore gtk-webcore-nrcore xft fontconfig gdk-2.0 gtk+-2.0 glib-2.0 +-Libs: -L${libdir} -lgtk_webcore_nrcore -lgtk_webcore_nrcit -lgthread-2.0 -lgobject-2.0 @LIBCURL_LIBS@ ++Requires: gtk-webcore-jscore gtk-webcore-nrcore xft fontconfig gdk-2.0 gtk+-2.0 glib-2.0 libcurl ++Libs: -L${libdir} -lgtk_webcore_nrcore -lgtk_webcore_nrcit -lgthread-2.0 -lgobject-2.0 + Cflags: -I${includedir}/gtk-webcore/webi -I${includedir}/gtk-webcore diff --git a/packages/gtk-webcore/osb-nrcit_svn.bb b/packages/gtk-webcore/osb-nrcit_svn.bb index 7ea8b3b6fa..57bb096183 100644 --- a/packages/gtk-webcore/osb-nrcit_svn.bb +++ b/packages/gtk-webcore/osb-nrcit_svn.bb @@ -5,11 +5,12 @@ PRIORITY = "optional" SECTION = "gpe" PV = "0.5.2+svnr${SRCREV}" -PR = "r0" +PR = "r1" DEPENDS = "curl librsvg osb-nrcore pango" SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCit;proto=https \ + file://pkgconfig_fix.patch;patch=1 \ file://gcc4-fno-threadsafe-statics-NRCit.patch;patch=1" inherit autotools pkgconfig diff --git a/packages/gtk-webcore/osb-nrcore.inc b/packages/gtk-webcore/osb-nrcore.inc index 6fd1d22580..eca304959f 100644 --- a/packages/gtk-webcore/osb-nrcore.inc +++ b/packages/gtk-webcore/osb-nrcore.inc @@ -12,6 +12,8 @@ inherit autotools pkgconfig #/khtml/css/cssproperties.h failes to generate properly with high parallel makes PARALLEL_MAKE = "" +EXTRA_OECONF += "--with-javascriptcore-prefix=${STAGING_EXECPREFIXDIR}" + do_configure () { autotools_do_configure cd ${S} diff --git a/packages/gtk-webcore/osb-nrcore_svn.bb b/packages/gtk-webcore/osb-nrcore_svn.bb index 8e0b4b04b6..b85c06e422 100644 --- a/packages/gtk-webcore/osb-nrcore_svn.bb +++ b/packages/gtk-webcore/osb-nrcore_svn.bb @@ -1,11 +1,12 @@ require osb-nrcore.inc PV = "0.5.2+svnr${SRCREV}" -PR = "r1" +PR = "r3" SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCore;proto=https \ file://gcc4-fno-threadsafe-statics-NRCore.patch;patch=1 \ - file://build_silence.patch;patch=0;maxdate=20070401" + file://build_silence.patch;patch=0;maxdate=20070401 \ + file://path_fixes.patch;patch=1" S = "${WORKDIR}/NRCore" -- cgit v1.2.3 From 81179c3916d30a2f7489a00c6bdc6740201b5580 Mon Sep 17 00:00:00 2001 From: Jeremy Laine Date: Fri, 29 Feb 2008 17:03:14 +0000 Subject: madwifi-ng_r.inc: fix the list of packages built from madwifi-ng --- packages/madwifi/madwifi-ng_r.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/madwifi/madwifi-ng_r.inc b/packages/madwifi/madwifi-ng_r.inc index 22cf332420..c6bee78e22 100644 --- a/packages/madwifi/madwifi-ng_r.inc +++ b/packages/madwifi/madwifi-ng_r.inc @@ -55,6 +55,6 @@ else fi } -PACKAGES = "${PN}-dbg ${PN}-modules ${PN}-tools" +PACKAGES += "${PN}-modules ${PN}-tools" FILES_${PN}-modules = "/lib/modules/" FILES_${PN}-tools = "/usr/" -- cgit v1.2.3 From 22ffa155888b2af551d468577b0ce6ab8b4cdc1b Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Fri, 29 Feb 2008 17:25:43 +0000 Subject: linux 2.6.24: update cm-x270 to use 2.6.24 kernel --- packages/linux/linux-2.6.24/cm-x270/.mtn2git_empty | 0 .../cm-x270/0001-cm-x270-match-type.patch | 25 + .../linux-2.6.24/cm-x270/0002-ramdisk_load.patch | 81 ++ .../cm-x270/0003-mmcsd_large_cards-r0.patch | 36 + .../cm-x270/0004-cm-x270-nand-simplify-name.patch | 25 + .../0005-add-display-set-default-16bpp.patch | 82 ++ .../cm-x270/0006-updated-defconfig.patch | 1325 ++++++++++++++++++++ packages/linux/linux-2.6.24/cm-x270/defconfig | 1202 ++++++++++++++++++ packages/linux/linux_2.6.23.bb | 1 - packages/linux/linux_2.6.24.bb | 55 +- 10 files changed, 2827 insertions(+), 5 deletions(-) create mode 100644 packages/linux/linux-2.6.24/cm-x270/.mtn2git_empty create mode 100644 packages/linux/linux-2.6.24/cm-x270/0001-cm-x270-match-type.patch create mode 100644 packages/linux/linux-2.6.24/cm-x270/0002-ramdisk_load.patch create mode 100644 packages/linux/linux-2.6.24/cm-x270/0003-mmcsd_large_cards-r0.patch create mode 100644 packages/linux/linux-2.6.24/cm-x270/0004-cm-x270-nand-simplify-name.patch create mode 100644 packages/linux/linux-2.6.24/cm-x270/0005-add-display-set-default-16bpp.patch create mode 100644 packages/linux/linux-2.6.24/cm-x270/0006-updated-defconfig.patch create mode 100644 packages/linux/linux-2.6.24/cm-x270/defconfig (limited to 'packages') diff --git a/packages/linux/linux-2.6.24/cm-x270/.mtn2git_empty b/packages/linux/linux-2.6.24/cm-x270/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/linux-2.6.24/cm-x270/0001-cm-x270-match-type.patch b/packages/linux/linux-2.6.24/cm-x270/0001-cm-x270-match-type.patch new file mode 100644 index 0000000000..a731b4d370 --- /dev/null +++ b/packages/linux/linux-2.6.24/cm-x270/0001-cm-x270-match-type.patch @@ -0,0 +1,25 @@ +From 1ae549fbb28ce1d57dc5201375b9f5bfa4a8c11d Mon Sep 17 00:00:00 2001 +From: Cliff Brake +Date: Fri, 20 Jul 2007 18:58:27 -0400 +Subject: [PATCH] cm-x270-match-type + +--- + arch/arm/boot/compressed/head-xscale.S | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/boot/compressed/head-xscale.S b/arch/arm/boot/compressed/head-xscale.S +index 67ea99e..2e63ba2 100644 +--- a/arch/arm/boot/compressed/head-xscale.S ++++ b/arch/arm/boot/compressed/head-xscale.S +@@ -44,3 +44,8 @@ __XScale_start: + str r1, [r0, #0x18] + #endif + ++#if defined(CONFIG_MACH_ARMCORE) ++ mov r7, #(MACH_TYPE_ARMCORE & 0xFF00) ++ add r7, r7, #(MACH_TYPE_ARMCORE & 0xFF) ++#endif ++ +-- +1.5.4.rc4 + diff --git a/packages/linux/linux-2.6.24/cm-x270/0002-ramdisk_load.patch b/packages/linux/linux-2.6.24/cm-x270/0002-ramdisk_load.patch new file mode 100644 index 0000000000..4cc0c56a73 --- /dev/null +++ b/packages/linux/linux-2.6.24/cm-x270/0002-ramdisk_load.patch @@ -0,0 +1,81 @@ +From e2e1f41847cdd2ec6cbcfa97ca47972301fec10e Mon Sep 17 00:00:00 2001 +From: Cliff Brake +Date: Fri, 20 Jul 2007 19:01:50 -0400 +Subject: [PATCH] ramdisk_load + +--- + arch/arm/mach-pxa/cm-x270.c | 6 ++++++ + include/asm-arm/arch-pxa/cm-x270.h | 4 ++++ + init/initramfs.c | 16 ++++++++++++++++ + 3 files changed, 26 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c +index 177664c..fb607e9 100644 +--- a/arch/arm/mach-pxa/cm-x270.c ++++ b/arch/arm/mach-pxa/cm-x270.c +@@ -239,6 +239,12 @@ static struct map_desc cmx270_io_desc[] __initdata = { + .length = SZ_64M, + .type = MT_DEVICE + }, ++ [2] = { /* NOR flash */ ++ .virtual = CMX270_FLASH_VIRT, ++ .pfn = __phys_to_pfn(PXA_CS0_PHYS), ++ .length = (8<<20), /* up to 8 MByte flash */ ++ .type = MT_DEVICE ++ }, + }; + + /* +diff --git a/include/asm-arm/arch-pxa/cm-x270.h b/include/asm-arm/arch-pxa/cm-x270.h +index f8fac9e..70e0dce 100644 +--- a/include/asm-arm/arch-pxa/cm-x270.h ++++ b/include/asm-arm/arch-pxa/cm-x270.h +@@ -20,6 +20,10 @@ + #define CMX270_VIRT_BASE (0xe8000000) + #define CMX270_IT8152_VIRT (CMX270_VIRT_BASE) + #define CMX270_IDE104_VIRT (CMX270_IT8152_VIRT + SZ_64M) ++#define CMX270_FLASH_VIRT (CMX270_IDE104_VIRT + SZ_64M) ++ ++#define CMX270_FLASH_RAMDISK_VIRT (CMX270_FLASH_VIRT + 0x1c0000) ++ + + /* GPIO related definitions */ + #define GPIO_IT8152_IRQ (22) +diff --git a/init/initramfs.c b/init/initramfs.c +index 1db02a0..d875fbc 100644 +--- a/init/initramfs.c ++++ b/init/initramfs.c +@@ -7,6 +7,9 @@ + #include + #include + ++// HACK for compulab cm-x270 ++#include ++ + static __initdata char *message; + static void __init error(char *x) + { +@@ -550,7 +553,20 @@ static int __init populate_rootfs(void) + #ifdef CONFIG_BLK_DEV_INITRD + if (initrd_start) { + #ifdef CONFIG_BLK_DEV_RAM ++ ++ /* hack to make initramfs work because the ++ * compulab BL does not zero out the ++ * initrd memory. This only seems to affect loading ++ * initramfs (cpio.gz) archives. Does not seem to ++ * affect ramdisks. ++ */ ++ int initrd_size = *(int *)(CMX270_FLASH_RAMDISK_VIRT); + int fd; ++ ++ initrd_end = initrd_start + initrd_size; ++ //printk("CLIFF: initrd_start = 0x%x\n", initrd_start); ++ //printk("CLIFF: initrd_end = 0x%x\n", initrd_end); ++ + printk(KERN_INFO "checking if image is initramfs..."); + err = unpack_to_rootfs((char *)initrd_start, + initrd_end - initrd_start, 1); +-- +1.5.4.rc4 + diff --git a/packages/linux/linux-2.6.24/cm-x270/0003-mmcsd_large_cards-r0.patch b/packages/linux/linux-2.6.24/cm-x270/0003-mmcsd_large_cards-r0.patch new file mode 100644 index 0000000000..ed80fc1db1 --- /dev/null +++ b/packages/linux/linux-2.6.24/cm-x270/0003-mmcsd_large_cards-r0.patch @@ -0,0 +1,36 @@ +From 549141e199a0ff0d2d6b12668da23581b4467aae Mon Sep 17 00:00:00 2001 +From: Cliff Brake +Date: Fri, 20 Jul 2007 19:02:55 -0400 +Subject: [PATCH] mmcsd_large_cards-r0 + +--- + drivers/mmc/card/block.c | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c +index aeb32a9..d854b0c 100644 +--- a/drivers/mmc/card/block.c ++++ b/drivers/mmc/card/block.c +@@ -423,6 +423,7 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card) + { + struct mmc_blk_data *md; + int devidx, ret; ++ unsigned long cap; + + devidx = find_first_zero_bit(dev_use, MMC_NUM_MINORS); + if (devidx >= MMC_NUM_MINORS) +@@ -486,6 +487,11 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card) + + sprintf(md->disk->disk_name, "mmcblk%d", devidx); + ++ if (card->csd.read_blkbits > 9) ++ md->block_bits = 9; ++ else ++ md->block_bits = card->csd.read_blkbits; ++ + blk_queue_hardsect_size(md->queue.queue, 1 << md->block_bits); + + if (!mmc_card_sd(card) && mmc_card_blockaddr(card)) { +-- +1.5.4.rc4 + diff --git a/packages/linux/linux-2.6.24/cm-x270/0004-cm-x270-nand-simplify-name.patch b/packages/linux/linux-2.6.24/cm-x270/0004-cm-x270-nand-simplify-name.patch new file mode 100644 index 0000000000..17a2579932 --- /dev/null +++ b/packages/linux/linux-2.6.24/cm-x270/0004-cm-x270-nand-simplify-name.patch @@ -0,0 +1,25 @@ +From 3e1d0d66b6cb94fc06621fbd1af64d8bebb6046b Mon Sep 17 00:00:00 2001 +From: Cliff Brake +Date: Fri, 20 Jul 2007 19:04:12 -0400 +Subject: [PATCH] cm-x270-nand-simplify-name + +--- + drivers/mtd/nand/cmx270_nand.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/drivers/mtd/nand/cmx270_nand.c b/drivers/mtd/nand/cmx270_nand.c +index cb663ef..3654ce4 100644 +--- a/drivers/mtd/nand/cmx270_nand.c ++++ b/drivers/mtd/nand/cmx270_nand.c +@@ -191,6 +191,8 @@ static int cmx270_init(void) + cmx270_nand_mtd->owner = THIS_MODULE; + cmx270_nand_mtd->priv = this; + ++ cmx270_nand_mtd->name = "cm-x270-nand"; ++ + /* insert callbacks */ + this->IO_ADDR_R = cmx270_nand_io; + this->IO_ADDR_W = cmx270_nand_io; +-- +1.5.4.rc4 + diff --git a/packages/linux/linux-2.6.24/cm-x270/0005-add-display-set-default-16bpp.patch b/packages/linux/linux-2.6.24/cm-x270/0005-add-display-set-default-16bpp.patch new file mode 100644 index 0000000000..61bd70a530 --- /dev/null +++ b/packages/linux/linux-2.6.24/cm-x270/0005-add-display-set-default-16bpp.patch @@ -0,0 +1,82 @@ +From fb2f97500aa492ed9b2d6a3a665bac13d14e44b4 Mon Sep 17 00:00:00 2001 +From: Cliff Brake +Date: Wed, 27 Feb 2008 16:44:42 -0500 +Subject: [PATCH] add-display-set-default-16bpp + +--- + arch/arm/mach-pxa/cm-x270.c | 31 +++++++++++++++++++++++++++++-- + 1 files changed, 29 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c +index fb607e9..915412a 100644 +--- a/arch/arm/mach-pxa/cm-x270.c ++++ b/arch/arm/mach-pxa/cm-x270.c +@@ -258,6 +258,7 @@ static struct map_desc cmx270_io_desc[] __initdata = { + #define MTYPE_CRT800x600 3 + #define MTYPE_TFT320x240 6 + #define MTYPE_STN640x480 7 ++#define MTYPE_TFT640x480_SHARP 8 + + static struct pxafb_mode_info generic_stn_320x240_mode = { + .pixclock = 76923, +@@ -288,7 +289,7 @@ static struct pxafb_mach_info generic_stn_320x240 = { + + static struct pxafb_mode_info generic_tft_640x480_mode = { + .pixclock = 38461, +- .bpp = 8, ++ .bpp = 16, + .xres = 640, + .yres = 480, + .hsync_len = 60, +@@ -314,7 +315,7 @@ static struct pxafb_mach_info generic_tft_640x480 = { + + static struct pxafb_mode_info generic_crt_640x480_mode = { + .pixclock = 38461, +- .bpp = 8, ++ .bpp = 16, + .xres = 640, + .yres = 480, + .hsync_len = 63, +@@ -416,6 +417,29 @@ static struct pxafb_mach_info generic_stn_640x480 = { + .cmap_static = 0, + }; + ++ ++static struct pxafb_mode_info sharp_vga_tft_mode = { ++ .pixclock = 38461, ++ .bpp = 16, ++ .xres = 640, ++ .yres = 480, ++ .hsync_len = 60, ++ .vsync_len = 2, ++ .left_margin = 72, ++ .upper_margin = 32, ++ .right_margin = 72, ++ .lower_margin = 10, ++ .sync = 0, ++}; ++ ++static struct pxafb_mach_info sharp_vga_tft = { ++ .modes = &sharp_vga_tft_mode, ++ .num_modes = 1, ++ .lccr0 = (LCCR0_PAS), ++ .lccr3 = (LCCR3_PixClkDiv(0x01) | ++ LCCR3_Acb(0xff)), ++}; ++ + static struct pxafb_mach_info *cmx270_display = &generic_crt_640x480; + + static int __init cmx270_set_display(char *str) +@@ -437,6 +461,9 @@ static int __init cmx270_set_display(char *str) + case MTYPE_TFT320x240: + cmx270_display = &generic_tft_320x240; + break; ++ case MTYPE_TFT640x480_SHARP: ++ cmx270_display = &sharp_vga_tft; ++ break; + case MTYPE_STN640x480: + cmx270_display = &generic_stn_640x480; + break; +-- +1.5.4.rc4 + diff --git a/packages/linux/linux-2.6.24/cm-x270/0006-updated-defconfig.patch b/packages/linux/linux-2.6.24/cm-x270/0006-updated-defconfig.patch new file mode 100644 index 0000000000..69c80b2f15 --- /dev/null +++ b/packages/linux/linux-2.6.24/cm-x270/0006-updated-defconfig.patch @@ -0,0 +1,1325 @@ +From 0dc522d8bbae9defb121c462ee6f7268418e4afa Mon Sep 17 00:00:00 2001 +From: Cliff Brake +Date: Wed, 27 Feb 2008 15:57:02 -0500 +Subject: [PATCH] updated defconfig + +--- + arch/arm/configs/cm_x270_defconfig | 780 +++++++++++++----------------------- + 1 files changed, 286 insertions(+), 494 deletions(-) + +diff --git a/arch/arm/configs/cm_x270_defconfig b/arch/arm/configs/cm_x270_defconfig +index 5cab083..412c772 100644 +--- a/arch/arm/configs/cm_x270_defconfig ++++ b/arch/arm/configs/cm_x270_defconfig +@@ -1,13 +1,13 @@ + # + # Automatically generated make config: don't edit +-# Linux kernel version: 2.6.22 +-# Wed Jul 18 14:11:48 2007 ++# Linux kernel version: 2.6.24 ++# Wed Feb 27 16:38:09 2008 + # + CONFIG_ARM=y + CONFIG_SYS_SUPPORTS_APM_EMULATION=y + CONFIG_GENERIC_GPIO=y + CONFIG_GENERIC_TIME=y +-# CONFIG_GENERIC_CLOCKEVENTS is not set ++CONFIG_GENERIC_CLOCKEVENTS=y + CONFIG_MMU=y + # CONFIG_NO_IOPORT is not set + CONFIG_GENERIC_HARDIRQS=y +@@ -27,16 +27,13 @@ CONFIG_VECTORS_BASE=0xffff0000 + CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + + # +-# Code maturity level options ++# General setup + # + CONFIG_EXPERIMENTAL=y + CONFIG_BROKEN_ON_SMP=y ++CONFIG_LOCK_KERNEL=y + CONFIG_INIT_ENV_ARG_LIMIT=32 +- +-# +-# General setup +-# +-CONFIG_LOCALVERSION="" ++CONFIG_LOCALVERSION="-cm-x270" + # CONFIG_LOCALVERSION_AUTO is not set + CONFIG_SWAP=y + CONFIG_SYSVIPC=y +@@ -45,10 +42,15 @@ CONFIG_SYSVIPC_SYSCTL=y + # CONFIG_BSD_PROCESS_ACCT is not set + # CONFIG_TASKSTATS is not set + # CONFIG_USER_NS is not set ++# CONFIG_PID_NS is not set + # CONFIG_AUDIT is not set + CONFIG_IKCONFIG=y + CONFIG_IKCONFIG_PROC=y +-CONFIG_LOG_BUF_SHIFT=17 ++CONFIG_LOG_BUF_SHIFT=14 ++# CONFIG_CGROUPS is not set ++CONFIG_FAIR_GROUP_SCHED=y ++CONFIG_FAIR_USER_SCHED=y ++# CONFIG_FAIR_CGROUP_SCHED is not set + CONFIG_SYSFS_DEPRECATED=y + # CONFIG_RELAY is not set + CONFIG_BLK_DEV_INITRD=y +@@ -59,7 +61,6 @@ CONFIG_EMBEDDED=y + CONFIG_UID16=y + CONFIG_SYSCTL_SYSCALL=y + CONFIG_KALLSYMS=y +-# CONFIG_KALLSYMS_ALL is not set + # CONFIG_KALLSYMS_EXTRA_PASS is not set + CONFIG_HOTPLUG=y + CONFIG_PRINTK=y +@@ -68,21 +69,21 @@ CONFIG_ELF_CORE=y + CONFIG_BASE_FULL=y + CONFIG_FUTEX=y + CONFIG_ANON_INODES=y +-# CONFIG_EPOLL is not set +-# CONFIG_SIGNALFD is not set +-# CONFIG_TIMERFD is not set +-# CONFIG_EVENTFD is not set ++CONFIG_EPOLL=y ++CONFIG_SIGNALFD=y ++CONFIG_EVENTFD=y + CONFIG_SHMEM=y + CONFIG_VM_EVENT_COUNTERS=y + CONFIG_SLAB=y + # CONFIG_SLUB is not set + # CONFIG_SLOB is not set ++CONFIG_SLABINFO=y + CONFIG_RT_MUTEXES=y + # CONFIG_TINY_SHMEM is not set + CONFIG_BASE_SMALL=0 + CONFIG_MODULES=y + CONFIG_MODULE_UNLOAD=y +-CONFIG_MODULE_FORCE_UNLOAD=y ++# CONFIG_MODULE_FORCE_UNLOAD is not set + # CONFIG_MODVERSIONS is not set + # CONFIG_MODULE_SRCVERSION_ALL is not set + CONFIG_KMOD=y +@@ -99,11 +100,11 @@ CONFIG_IOSCHED_NOOP=y + CONFIG_IOSCHED_AS=y + CONFIG_IOSCHED_DEADLINE=y + CONFIG_IOSCHED_CFQ=y +-CONFIG_DEFAULT_AS=y ++# CONFIG_DEFAULT_AS is not set + # CONFIG_DEFAULT_DEADLINE is not set +-# CONFIG_DEFAULT_CFQ is not set ++CONFIG_DEFAULT_CFQ=y + # CONFIG_DEFAULT_NOOP is not set +-CONFIG_DEFAULT_IOSCHED="anticipatory" ++CONFIG_DEFAULT_IOSCHED="cfq" + + # + # System Type +@@ -131,6 +132,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" + # CONFIG_ARCH_L7200 is not set + # CONFIG_ARCH_KS8695 is not set + # CONFIG_ARCH_NS9XXX is not set ++# CONFIG_ARCH_MXC is not set + # CONFIG_ARCH_PNX4008 is not set + CONFIG_ARCH_PXA=y + # CONFIG_ARCH_RPC is not set +@@ -140,10 +142,9 @@ CONFIG_ARCH_PXA=y + # CONFIG_ARCH_LH7A40X is not set + # CONFIG_ARCH_DAVINCI is not set + # CONFIG_ARCH_OMAP is not set +-CONFIG_DMABOUNCE=y + + # +-# Intel PXA2xx Implementations ++# Intel PXA2xx/PXA3xx Implementations + # + # CONFIG_ARCH_LUBBOCK is not set + # CONFIG_MACH_LOGICPD_PXA270 is not set +@@ -151,10 +152,20 @@ CONFIG_DMABOUNCE=y + # CONFIG_ARCH_PXA_IDP is not set + # CONFIG_PXA_SHARPSL is not set + # CONFIG_MACH_TRIZEPS4 is not set ++# CONFIG_MACH_EM_X270 is not set ++# CONFIG_MACH_ZYLONITE is not set + CONFIG_MACH_ARMCORE=y + CONFIG_PXA27x=y + + # ++# Boot options ++# ++ ++# ++# Power management ++# ++ ++# + # Processor Type + # + CONFIG_CPU_32=y +@@ -178,25 +189,22 @@ CONFIG_XSCALE_PMU=y + # + # Bus support + # +-CONFIG_PCI=y +-CONFIG_PCI_SYSCALL=y +-CONFIG_PCI_HOST_ITE8152=y ++# CONFIG_PCI is not set ++# CONFIG_PCI_SYSCALL is not set + # CONFIG_ARCH_SUPPORTS_MSI is not set +-# CONFIG_PCI_DEBUG is not set +- +-# +-# PCCARD (PCMCIA/CardBus) support +-# + # CONFIG_PCCARD is not set + + # + # Kernel Features + # +-# CONFIG_TICK_ONESHOT is not set +-# CONFIG_PREEMPT is not set +-# CONFIG_NO_IDLE_HZ is not set ++CONFIG_TICK_ONESHOT=y ++# CONFIG_NO_HZ is not set ++CONFIG_HIGH_RES_TIMERS=y ++CONFIG_GENERIC_CLOCKEVENTS_BUILD=y ++CONFIG_PREEMPT=y + CONFIG_HZ=100 +-# CONFIG_AEABI is not set ++CONFIG_AEABI=y ++CONFIG_OABI_COMPAT=y + # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set + CONFIG_SELECT_MEMORY_MODEL=y + CONFIG_FLATMEM_MANUAL=y +@@ -205,6 +213,7 @@ CONFIG_FLATMEM_MANUAL=y + CONFIG_FLATMEM=y + CONFIG_FLAT_NODE_MEM_MAP=y + # CONFIG_SPARSEMEM_STATIC is not set ++# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set + CONFIG_SPLIT_PTLOCK_CPUS=4096 + # CONFIG_RESOURCES_64BIT is not set + CONFIG_ZONE_DMA_FLAG=1 +@@ -217,7 +226,7 @@ CONFIG_ALIGNMENT_TRAP=y + # + CONFIG_ZBOOT_ROM_TEXT=0x0 + CONFIG_ZBOOT_ROM_BSS=0x0 +-CONFIG_CMDLINE="" ++CONFIG_CMDLINE="console=ttyS1,38400 monitor=1 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2" + # CONFIG_XIP_KERNEL is not set + # CONFIG_KEXEC is not set + +@@ -228,8 +237,7 @@ CONFIG_CMDLINE="" + # + # At least one emulation must be selected + # +-CONFIG_FPE_NWFPE=y +-# CONFIG_FPE_NWFPE_XP is not set ++# CONFIG_FPE_NWFPE is not set + # CONFIG_FPE_FASTFPE is not set + + # +@@ -238,16 +246,12 @@ CONFIG_FPE_NWFPE=y + CONFIG_BINFMT_ELF=y + # CONFIG_BINFMT_AOUT is not set + # CONFIG_BINFMT_MISC is not set +-# CONFIG_ARTHUR is not set + + # + # Power management options + # +-CONFIG_PM=y +-# CONFIG_PM_LEGACY is not set +-# CONFIG_PM_DEBUG is not set +-# CONFIG_PM_SYSFS_DEPRECATED is not set +-# CONFIG_APM_EMULATION is not set ++# CONFIG_PM is not set ++CONFIG_SUSPEND_UP_POSSIBLE=y + + # + # Networking +@@ -285,6 +289,7 @@ CONFIG_IP_PNP_BOOTP=y + CONFIG_INET_XFRM_MODE_TRANSPORT=y + CONFIG_INET_XFRM_MODE_TUNNEL=y + CONFIG_INET_XFRM_MODE_BEET=y ++# CONFIG_INET_LRO is not set + CONFIG_INET_DIAG=y + CONFIG_INET_TCP_DIAG=y + # CONFIG_TCP_CONG_ADVANCED is not set +@@ -310,10 +315,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" + # CONFIG_LAPB is not set + # CONFIG_ECONET is not set + # CONFIG_WAN_ROUTER is not set +- +-# +-# QoS and/or fair queueing +-# + # CONFIG_NET_SCHED is not set + + # +@@ -329,14 +330,9 @@ CONFIG_DEFAULT_TCP_CONG="cubic" + # Wireless + # + # CONFIG_CFG80211 is not set +-CONFIG_WIRELESS_EXT=y ++# CONFIG_WIRELESS_EXT is not set + # CONFIG_MAC80211 is not set +-CONFIG_IEEE80211=m +-# CONFIG_IEEE80211_DEBUG is not set +-CONFIG_IEEE80211_CRYPT_WEP=m +-CONFIG_IEEE80211_CRYPT_CCMP=m +-# CONFIG_IEEE80211_CRYPT_TKIP is not set +-# CONFIG_IEEE80211_SOFTMAC is not set ++# CONFIG_IEEE80211 is not set + # CONFIG_RFKILL is not set + # CONFIG_NET_9P is not set + +@@ -347,38 +343,40 @@ CONFIG_IEEE80211_CRYPT_CCMP=m + # + # Generic Driver Options + # ++CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" + CONFIG_STANDALONE=y + CONFIG_PREVENT_FIRMWARE_BUILD=y + CONFIG_FW_LOADER=y +-# CONFIG_DEBUG_DRIVER is not set +-# CONFIG_DEBUG_DEVRES is not set + # CONFIG_SYS_HYPERVISOR is not set + # CONFIG_CONNECTOR is not set +-CONFIG_MTD=m ++CONFIG_MTD=y + # CONFIG_MTD_DEBUG is not set + # CONFIG_MTD_CONCAT is not set + CONFIG_MTD_PARTITIONS=y + # CONFIG_MTD_REDBOOT_PARTS is not set ++CONFIG_MTD_CMDLINE_PARTS=y + # CONFIG_MTD_AFS_PARTS is not set + + # + # User Modules And Translation Layers + # +-CONFIG_MTD_CHAR=m +-CONFIG_MTD_BLKDEVS=m +-CONFIG_MTD_BLOCK=m +-# CONFIG_MTD_BLOCK_RO is not set ++CONFIG_MTD_CHAR=y ++CONFIG_MTD_BLKDEVS=y ++CONFIG_MTD_BLOCK=y + # CONFIG_FTL is not set + # CONFIG_NFTL is not set + # CONFIG_INFTL is not set + # CONFIG_RFD_FTL is not set + # CONFIG_SSFDC is not set ++# CONFIG_MTD_OOPS is not set + + # + # RAM/ROM/Flash chip drivers + # +-# CONFIG_MTD_CFI is not set ++CONFIG_MTD_CFI=y + # CONFIG_MTD_JEDECPROBE is not set ++CONFIG_MTD_GEN_PROBE=y ++# CONFIG_MTD_CFI_ADV_OPTIONS is not set + CONFIG_MTD_MAP_BANK_WIDTH_1=y + CONFIG_MTD_MAP_BANK_WIDTH_2=y + CONFIG_MTD_MAP_BANK_WIDTH_4=y +@@ -389,21 +387,30 @@ CONFIG_MTD_CFI_I1=y + CONFIG_MTD_CFI_I2=y + # CONFIG_MTD_CFI_I4 is not set + # CONFIG_MTD_CFI_I8 is not set ++# CONFIG_MTD_CFI_INTELEXT is not set ++CONFIG_MTD_CFI_AMDSTD=y ++# CONFIG_MTD_CFI_STAA is not set ++CONFIG_MTD_CFI_UTIL=y + # CONFIG_MTD_RAM is not set + # CONFIG_MTD_ROM is not set + # CONFIG_MTD_ABSENT is not set ++# CONFIG_MTD_XIP is not set + + # + # Mapping drivers for chip access + # + # CONFIG_MTD_COMPLEX_MAPPINGS is not set ++CONFIG_MTD_PHYSMAP=y ++CONFIG_MTD_PHYSMAP_START=0x0 ++CONFIG_MTD_PHYSMAP_LEN=0x400000 ++CONFIG_MTD_PHYSMAP_BANKWIDTH=2 ++# CONFIG_MTD_ARM_INTEGRATOR is not set + # CONFIG_MTD_SHARP_SL is not set + # CONFIG_MTD_PLATRAM is not set + + # + # Self-contained MTD device drivers + # +-# CONFIG_MTD_PMC551 is not set + # CONFIG_MTD_SLRAM is not set + # CONFIG_MTD_PHRAM is not set + # CONFIG_MTD_MTDRAM is not set +@@ -415,18 +422,18 @@ CONFIG_MTD_CFI_I2=y + # CONFIG_MTD_DOC2000 is not set + # CONFIG_MTD_DOC2001 is not set + # CONFIG_MTD_DOC2001PLUS is not set +-CONFIG_MTD_NAND=m ++CONFIG_MTD_NAND=y + # CONFIG_MTD_NAND_VERIFY_WRITE is not set + # CONFIG_MTD_NAND_ECC_SMC is not set + # CONFIG_MTD_NAND_MUSEUM_IDS is not set + # CONFIG_MTD_NAND_H1900 is not set +-CONFIG_MTD_NAND_IDS=m ++CONFIG_MTD_NAND_IDS=y + # CONFIG_MTD_NAND_DISKONCHIP is not set + # CONFIG_MTD_NAND_SHARPSL is not set +-# CONFIG_MTD_NAND_CAFE is not set +-CONFIG_MTD_NAND_CM_X270=m ++CONFIG_MTD_NAND_CM_X270=y + # CONFIG_MTD_NAND_NANDSIM is not set + # CONFIG_MTD_NAND_PLATFORM is not set ++# CONFIG_MTD_ALAUDA is not set + # CONFIG_MTD_ONENAND is not set + + # +@@ -435,48 +442,20 @@ CONFIG_MTD_NAND_CM_X270=m + # CONFIG_MTD_UBI is not set + # CONFIG_PARPORT is not set + CONFIG_BLK_DEV=y +-# CONFIG_BLK_CPQ_DA is not set +-# CONFIG_BLK_CPQ_CISS_DA is not set +-# CONFIG_BLK_DEV_DAC960 is not set +-# CONFIG_BLK_DEV_UMEM is not set + # CONFIG_BLK_DEV_COW_COMMON is not set + CONFIG_BLK_DEV_LOOP=y + # CONFIG_BLK_DEV_CRYPTOLOOP is not set + # CONFIG_BLK_DEV_NBD is not set +-# CONFIG_BLK_DEV_SX8 is not set + # CONFIG_BLK_DEV_UB is not set + CONFIG_BLK_DEV_RAM=y + CONFIG_BLK_DEV_RAM_COUNT=16 +-CONFIG_BLK_DEV_RAM_SIZE=12000 ++CONFIG_BLK_DEV_RAM_SIZE=4096 + CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 + # CONFIG_CDROM_PKTCDVD is not set + # CONFIG_ATA_OVER_ETH is not set +-CONFIG_IDE=m +-CONFIG_IDE_MAX_HWIFS=4 +-CONFIG_BLK_DEV_IDE=m +- +-# +-# Please see Documentation/ide.txt for help/info on IDE drives +-# +-# CONFIG_BLK_DEV_IDE_SATA is not set +-CONFIG_BLK_DEV_IDEDISK=m +-# CONFIG_IDEDISK_MULTI_MODE is not set +-CONFIG_BLK_DEV_IDECD=m +-# CONFIG_BLK_DEV_IDETAPE is not set +-# CONFIG_BLK_DEV_IDEFLOPPY is not set +-# CONFIG_BLK_DEV_IDESCSI is not set +-# CONFIG_IDE_TASK_IOCTL is not set +-CONFIG_IDE_PROC_FS=y +- +-# +-# IDE chipset support/bugfixes +-# +-# CONFIG_IDE_GENERIC is not set +-# CONFIG_BLK_DEV_IDEPCI is not set +-# CONFIG_IDEPCI_PCIBUS_ORDER is not set +-# CONFIG_IDE_ARM is not set +-# CONFIG_BLK_DEV_IDEDMA is not set +-# CONFIG_BLK_DEV_HD is not set ++CONFIG_MISC_DEVICES=y ++# CONFIG_EEPROM_93CX6 is not set ++# CONFIG_IDE is not set + + # + # SCSI device support +@@ -486,7 +465,7 @@ CONFIG_SCSI=y + CONFIG_SCSI_DMA=y + # CONFIG_SCSI_TGT is not set + # CONFIG_SCSI_NETLINK is not set +-# CONFIG_SCSI_PROC_FS is not set ++CONFIG_SCSI_PROC_FS=y + + # + # SCSI support type (disk, tape, CD-ROM) +@@ -513,60 +492,13 @@ CONFIG_SCSI_WAIT_SCAN=m + # CONFIG_SCSI_SPI_ATTRS is not set + # CONFIG_SCSI_FC_ATTRS is not set + # CONFIG_SCSI_ISCSI_ATTRS is not set +-# CONFIG_SCSI_SAS_ATTRS is not set + # CONFIG_SCSI_SAS_LIBSAS is not set +- +-# +-# SCSI low-level drivers +-# ++# CONFIG_SCSI_SRP_ATTRS is not set ++CONFIG_SCSI_LOWLEVEL=y + # CONFIG_ISCSI_TCP is not set +-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +-# CONFIG_SCSI_3W_9XXX is not set +-# CONFIG_SCSI_ACARD is not set +-# CONFIG_SCSI_AACRAID is not set +-# CONFIG_SCSI_AIC7XXX is not set +-# CONFIG_SCSI_AIC7XXX_OLD is not set +-# CONFIG_SCSI_AIC79XX is not set +-# CONFIG_SCSI_AIC94XX is not set +-# CONFIG_SCSI_DPT_I2O is not set +-# CONFIG_SCSI_ARCMSR is not set +-# CONFIG_MEGARAID_NEWGEN is not set +-# CONFIG_MEGARAID_LEGACY is not set +-# CONFIG_MEGARAID_SAS is not set +-# CONFIG_SCSI_HPTIOP is not set +-# CONFIG_SCSI_DMX3191D is not set +-# CONFIG_SCSI_FUTURE_DOMAIN is not set +-# CONFIG_SCSI_IPS is not set +-# CONFIG_SCSI_INITIO is not set +-# CONFIG_SCSI_INIA100 is not set +-# CONFIG_SCSI_STEX is not set +-# CONFIG_SCSI_SYM53C8XX_2 is not set +-# CONFIG_SCSI_QLOGIC_1280 is not set +-# CONFIG_SCSI_QLA_FC is not set +-# CONFIG_SCSI_QLA_ISCSI is not set +-# CONFIG_SCSI_LPFC is not set +-# CONFIG_SCSI_DC395x is not set +-# CONFIG_SCSI_DC390T is not set +-# CONFIG_SCSI_NSP32 is not set + # CONFIG_SCSI_DEBUG is not set +-# CONFIG_SCSI_SRP is not set + # CONFIG_ATA is not set + # CONFIG_MD is not set +- +-# +-# Fusion MPT device support +-# +-# CONFIG_FUSION is not set +-# CONFIG_FUSION_SPI is not set +-# CONFIG_FUSION_FC is not set +-# CONFIG_FUSION_SAS is not set +- +-# +-# IEEE 1394 (FireWire) support +-# +-# CONFIG_FIREWIRE is not set +-# CONFIG_IEEE1394 is not set +-# CONFIG_I2O is not set + CONFIG_NETDEVICES=y + # CONFIG_NETDEVICES_MULTIQUEUE is not set + # CONFIG_DUMMY is not set +@@ -574,69 +506,21 @@ CONFIG_NETDEVICES=y + # CONFIG_MACVLAN is not set + # CONFIG_EQUALIZER is not set + # CONFIG_TUN is not set +-# CONFIG_ARCNET is not set ++# CONFIG_VETH is not set + # CONFIG_PHYLIB is not set + CONFIG_NET_ETHERNET=y + CONFIG_MII=y + # CONFIG_AX88796 is not set +-# CONFIG_HAPPYMEAL is not set +-# CONFIG_SUNGEM is not set +-# CONFIG_CASSINI is not set +-# CONFIG_NET_VENDOR_3COM is not set + # CONFIG_SMC91X is not set + CONFIG_DM9000=y + # CONFIG_SMC911X is not set +-# CONFIG_NET_TULIP is not set +-# CONFIG_HP100 is not set +-CONFIG_NET_PCI=y +-# CONFIG_PCNET32 is not set +-# CONFIG_AMD8111_ETH is not set +-# CONFIG_ADAPTEC_STARFIRE is not set ++# CONFIG_IBM_NEW_EMAC_ZMII is not set ++# CONFIG_IBM_NEW_EMAC_RGMII is not set ++# CONFIG_IBM_NEW_EMAC_TAH is not set ++# CONFIG_IBM_NEW_EMAC_EMAC4 is not set + # CONFIG_B44 is not set +-# CONFIG_FORCEDETH is not set +-# CONFIG_DGRS is not set +-# CONFIG_EEPRO100 is not set +-# CONFIG_E100 is not set +-# CONFIG_FEALNX is not set +-# CONFIG_NATSEMI is not set +-# CONFIG_NE2K_PCI is not set +-# CONFIG_8139CP is not set +-CONFIG_8139TOO=m +-# CONFIG_8139TOO_PIO is not set +-# CONFIG_8139TOO_TUNE_TWISTER is not set +-# CONFIG_8139TOO_8129 is not set +-# CONFIG_8139_OLD_RX_RESET is not set +-# CONFIG_SIS900 is not set +-# CONFIG_EPIC100 is not set +-# CONFIG_SUNDANCE is not set +-# CONFIG_TLAN is not set +-# CONFIG_VIA_RHINE is not set +-# CONFIG_SC92031 is not set +-CONFIG_NETDEV_1000=y +-# CONFIG_ACENIC is not set +-# CONFIG_DL2K is not set +-# CONFIG_E1000 is not set +-# CONFIG_NS83820 is not set +-# CONFIG_HAMACHI is not set +-# CONFIG_YELLOWFIN is not set +-# CONFIG_R8169 is not set +-# CONFIG_SIS190 is not set +-# CONFIG_SKGE is not set +-# CONFIG_SKY2 is not set +-# CONFIG_VIA_VELOCITY is not set +-# CONFIG_TIGON3 is not set +-# CONFIG_BNX2 is not set +-# CONFIG_QLA3XXX is not set +-# CONFIG_ATL1 is not set +-CONFIG_NETDEV_10000=y +-# CONFIG_CHELSIO_T1 is not set +-# CONFIG_CHELSIO_T3 is not set +-# CONFIG_IXGB is not set +-# CONFIG_S2IO is not set +-# CONFIG_MYRI10GE is not set +-# CONFIG_NETXEN_NIC is not set +-# CONFIG_MLX4_CORE is not set +-# CONFIG_TR is not set ++# CONFIG_NETDEV_1000 is not set ++# CONFIG_NETDEV_10000 is not set + + # + # Wireless LAN +@@ -647,18 +531,24 @@ CONFIG_NETDEV_10000=y + # + # USB Network Adapters + # +-# CONFIG_USB_CATC is not set +-# CONFIG_USB_KAWETH is not set +-# CONFIG_USB_PEGASUS is not set +-# CONFIG_USB_RTL8150 is not set +-# CONFIG_USB_USBNET_MII is not set +-# CONFIG_USB_USBNET is not set ++CONFIG_USB_CATC=m ++CONFIG_USB_KAWETH=m ++CONFIG_USB_PEGASUS=m ++CONFIG_USB_RTL8150=m ++CONFIG_USB_USBNET=m ++CONFIG_USB_NET_AX8817X=m ++CONFIG_USB_NET_CDCETHER=m ++# CONFIG_USB_NET_DM9601 is not set ++CONFIG_USB_NET_GL620A=m ++CONFIG_USB_NET_NET1080=m ++CONFIG_USB_NET_PLUSB=m ++CONFIG_USB_NET_MCS7830=m ++# CONFIG_USB_NET_RNDIS_HOST is not set ++# CONFIG_USB_NET_CDC_SUBSET is not set ++# CONFIG_USB_NET_ZAURUS is not set + # CONFIG_WAN is not set +-# CONFIG_FDDI is not set +-# CONFIG_HIPPI is not set + # CONFIG_PPP is not set + # CONFIG_SLIP is not set +-# CONFIG_NET_FC is not set + # CONFIG_SHAPER is not set + # CONFIG_NETCONSOLE is not set + # CONFIG_NETPOLL is not set +@@ -675,20 +565,42 @@ CONFIG_INPUT=y + # + # Userland interfaces + # +-# CONFIG_INPUT_MOUSEDEV is not set ++CONFIG_INPUT_MOUSEDEV=y ++CONFIG_INPUT_MOUSEDEV_PSAUX=y ++CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 ++CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 + # CONFIG_INPUT_JOYDEV is not set +-# CONFIG_INPUT_TSDEV is not set +-CONFIG_INPUT_EVDEV=y ++CONFIG_INPUT_EVDEV=m + # CONFIG_INPUT_EVBUG is not set + + # + # Input Device Drivers + # +-# CONFIG_INPUT_KEYBOARD is not set +-# CONFIG_INPUT_MOUSE is not set ++CONFIG_INPUT_KEYBOARD=y ++CONFIG_KEYBOARD_ATKBD=y ++# CONFIG_KEYBOARD_SUNKBD is not set ++# CONFIG_KEYBOARD_LKKBD is not set ++# CONFIG_KEYBOARD_XTKBD is not set ++# CONFIG_KEYBOARD_NEWTON is not set ++# CONFIG_KEYBOARD_STOWAWAY is not set ++# CONFIG_KEYBOARD_PXA27x is not set ++# CONFIG_KEYBOARD_GPIO is not set ++CONFIG_INPUT_MOUSE=y ++CONFIG_MOUSE_PS2=y ++# CONFIG_MOUSE_PS2_ALPS is not set ++# CONFIG_MOUSE_PS2_LOGIPS2PP is not set ++# CONFIG_MOUSE_PS2_SYNAPTICS is not set ++# CONFIG_MOUSE_PS2_LIFEBOOK is not set ++# CONFIG_MOUSE_PS2_TRACKPOINT is not set ++# CONFIG_MOUSE_PS2_TOUCHKIT is not set ++# CONFIG_MOUSE_SERIAL is not set ++# CONFIG_MOUSE_APPLETOUCH is not set ++# CONFIG_MOUSE_VSXXXAA is not set ++# CONFIG_MOUSE_GPIO is not set + # CONFIG_INPUT_JOYSTICK is not set + # CONFIG_INPUT_TABLET is not set + CONFIG_INPUT_TOUCHSCREEN=y ++# CONFIG_TOUCHSCREEN_FUJITSU is not set + # CONFIG_TOUCHSCREEN_GUNZE is not set + # CONFIG_TOUCHSCREEN_ELO is not set + # CONFIG_TOUCHSCREEN_MTOUCH is not set +@@ -703,7 +615,10 @@ CONFIG_TOUCHSCREEN_UCB1400=m + # + # Hardware I/O ports + # +-# CONFIG_SERIO is not set ++CONFIG_SERIO=y ++CONFIG_SERIO_SERPORT=y ++CONFIG_SERIO_LIBPS2=y ++# CONFIG_SERIO_RAW is not set + # CONFIG_GAMEPORT is not set + + # +@@ -727,83 +642,141 @@ CONFIG_SERIAL_PXA=y + CONFIG_SERIAL_PXA_CONSOLE=y + CONFIG_SERIAL_CORE=y + CONFIG_SERIAL_CORE_CONSOLE=y +-# CONFIG_SERIAL_JSM is not set + CONFIG_UNIX98_PTYS=y +-CONFIG_LEGACY_PTYS=y +-CONFIG_LEGACY_PTY_COUNT=256 ++# CONFIG_LEGACY_PTYS is not set + # CONFIG_IPMI_HANDLER is not set +-# CONFIG_WATCHDOG is not set +-CONFIG_HW_RANDOM=m ++CONFIG_HW_RANDOM=y + # CONFIG_NVRAM is not set + # CONFIG_R3964 is not set +-# CONFIG_APPLICOM is not set +-# CONFIG_DRM is not set + # CONFIG_RAW_DRIVER is not set + # CONFIG_TCG_TPM is not set +-CONFIG_DEVPORT=y +-# CONFIG_I2C is not set ++CONFIG_I2C=m ++CONFIG_I2C_BOARDINFO=y ++CONFIG_I2C_CHARDEV=m + + # +-# SPI support ++# I2C Algorithms + # +-# CONFIG_SPI is not set +-# CONFIG_SPI_MASTER is not set +-# CONFIG_W1 is not set +-# CONFIG_HWMON is not set +-CONFIG_MISC_DEVICES=y +-# CONFIG_PHANTOM is not set +-# CONFIG_EEPROM_93CX6 is not set +-# CONFIG_SGI_IOC4 is not set +-# CONFIG_TIFM_CORE is not set ++# CONFIG_I2C_ALGOBIT is not set ++# CONFIG_I2C_ALGOPCF is not set ++# CONFIG_I2C_ALGOPCA is not set + + # +-# Multifunction device drivers ++# I2C Hardware Bus support + # +-# CONFIG_MFD_SM501 is not set ++# CONFIG_I2C_GPIO is not set ++CONFIG_I2C_PXA=m ++# CONFIG_I2C_PXA_SLAVE is not set ++# CONFIG_I2C_OCORES is not set ++# CONFIG_I2C_PARPORT_LIGHT is not set ++# CONFIG_I2C_SIMTEC is not set ++# CONFIG_I2C_TAOS_EVM is not set ++# CONFIG_I2C_STUB is not set ++# CONFIG_I2C_TINY_USB is not set + + # +-# LED devices ++# Miscellaneous I2C Chip support + # +-CONFIG_NEW_LEDS=y +-CONFIG_LEDS_CLASS=y ++# CONFIG_SENSORS_DS1337 is not set ++# CONFIG_SENSORS_DS1374 is not set ++# CONFIG_DS1682 is not set ++# CONFIG_SENSORS_EEPROM is not set ++# CONFIG_SENSORS_PCF8574 is not set ++# CONFIG_SENSORS_PCA9539 is not set ++# CONFIG_SENSORS_PCF8591 is not set ++# CONFIG_SENSORS_MAX6875 is not set ++# CONFIG_SENSORS_TSL2550 is not set ++# CONFIG_I2C_DEBUG_CORE is not set ++# CONFIG_I2C_DEBUG_ALGO is not set ++# CONFIG_I2C_DEBUG_BUS is not set ++# CONFIG_I2C_DEBUG_CHIP is not set + + # +-# LED drivers ++# SPI support + # +-CONFIG_LEDS_CM_X270=y ++# CONFIG_SPI is not set ++# CONFIG_SPI_MASTER is not set ++# CONFIG_W1 is not set ++# CONFIG_POWER_SUPPLY is not set ++CONFIG_HWMON=y ++# CONFIG_HWMON_VID is not set ++# CONFIG_SENSORS_AD7418 is not set ++# CONFIG_SENSORS_ADM1021 is not set ++# CONFIG_SENSORS_ADM1025 is not set ++# CONFIG_SENSORS_ADM1026 is not set ++# CONFIG_SENSORS_ADM1029 is not set ++# CONFIG_SENSORS_ADM1031 is not set ++# CONFIG_SENSORS_ADM9240 is not set ++# CONFIG_SENSORS_ADT7470 is not set ++# CONFIG_SENSORS_ATXP1 is not set ++# CONFIG_SENSORS_DS1621 is not set ++# CONFIG_SENSORS_F71805F is not set ++# CONFIG_SENSORS_F71882FG is not set ++# CONFIG_SENSORS_F75375S is not set ++# CONFIG_SENSORS_GL518SM is not set ++# CONFIG_SENSORS_GL520SM is not set ++# CONFIG_SENSORS_IT87 is not set ++# CONFIG_SENSORS_LM63 is not set ++# CONFIG_SENSORS_LM75 is not set ++# CONFIG_SENSORS_LM77 is not set ++# CONFIG_SENSORS_LM78 is not set ++# CONFIG_SENSORS_LM80 is not set ++# CONFIG_SENSORS_LM83 is not set ++# CONFIG_SENSORS_LM85 is not set ++# CONFIG_SENSORS_LM87 is not set ++# CONFIG_SENSORS_LM90 is not set ++# CONFIG_SENSORS_LM92 is not set ++# CONFIG_SENSORS_LM93 is not set ++# CONFIG_SENSORS_MAX1619 is not set ++# CONFIG_SENSORS_MAX6650 is not set ++# CONFIG_SENSORS_PC87360 is not set ++# CONFIG_SENSORS_PC87427 is not set ++# CONFIG_SENSORS_DME1737 is not set ++# CONFIG_SENSORS_SMSC47M1 is not set ++# CONFIG_SENSORS_SMSC47M192 is not set ++# CONFIG_SENSORS_SMSC47B397 is not set ++# CONFIG_SENSORS_THMC50 is not set ++# CONFIG_SENSORS_VT1211 is not set ++# CONFIG_SENSORS_W83781D is not set ++# CONFIG_SENSORS_W83791D is not set ++# CONFIG_SENSORS_W83792D is not set ++# CONFIG_SENSORS_W83793 is not set ++# CONFIG_SENSORS_W83L785TS is not set ++# CONFIG_SENSORS_W83627HF is not set ++# CONFIG_SENSORS_W83627EHF is not set ++# CONFIG_HWMON_DEBUG_CHIP is not set ++# CONFIG_WATCHDOG is not set + + # +-# LED Triggers ++# Sonics Silicon Backplane ++# ++CONFIG_SSB_POSSIBLE=y ++# CONFIG_SSB is not set ++ ++# ++# Multifunction device drivers + # +-CONFIG_LEDS_TRIGGERS=y +-# CONFIG_LEDS_TRIGGER_TIMER is not set +-# CONFIG_LEDS_TRIGGER_IDE_DISK is not set +-CONFIG_LEDS_TRIGGER_HEARTBEAT=y ++# CONFIG_MFD_SM501 is not set + + # + # Multimedia devices + # + # CONFIG_VIDEO_DEV is not set + # CONFIG_DVB_CORE is not set +-CONFIG_DAB=y +-# CONFIG_USB_DABUSB is not set ++# CONFIG_DAB is not set + + # + # Graphics support + # +-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set +- +-# +-# Display device support +-# +-# CONFIG_DISPLAY_SUPPORT is not set + # CONFIG_VGASTATE is not set ++# CONFIG_VIDEO_OUTPUT_CONTROL is not set + CONFIG_FB=y + # CONFIG_FIRMWARE_EDID is not set + # CONFIG_FB_DDC is not set + CONFIG_FB_CFB_FILLRECT=y + CONFIG_FB_CFB_COPYAREA=y + CONFIG_FB_CFB_IMAGEBLIT=y ++# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set + # CONFIG_FB_SYS_FILLRECT is not set + # CONFIG_FB_SYS_COPYAREA is not set + # CONFIG_FB_SYS_IMAGEBLIT is not set +@@ -818,33 +791,17 @@ CONFIG_FB_DEFERRED_IO=y + # + # Frame buffer hardware drivers + # +-# CONFIG_FB_CIRRUS is not set +-# CONFIG_FB_PM2 is not set +-# CONFIG_FB_CYBER2000 is not set +-# CONFIG_FB_ASILIANT is not set +-# CONFIG_FB_IMSTT is not set + # CONFIG_FB_S1D13XXX is not set +-# CONFIG_FB_NVIDIA is not set +-# CONFIG_FB_RIVA is not set +-# CONFIG_FB_MATROX is not set +-# CONFIG_FB_RADEON is not set +-# CONFIG_FB_ATY128 is not set +-# CONFIG_FB_ATY is not set +-# CONFIG_FB_S3 is not set +-# CONFIG_FB_SAVAGE is not set +-# CONFIG_FB_SIS is not set +-# CONFIG_FB_NEOMAGIC is not set +-# CONFIG_FB_KYRO is not set +-# CONFIG_FB_3DFX is not set +-# CONFIG_FB_VOODOO1 is not set +-# CONFIG_FB_VT8623 is not set +-# CONFIG_FB_TRIDENT is not set +-# CONFIG_FB_ARK is not set +-# CONFIG_FB_PM3 is not set + CONFIG_FB_PXA=y +-# CONFIG_FB_PXA_PARAMETERS is not set +-CONFIG_FB_MBX=m ++CONFIG_FB_PXA_PARAMETERS=y ++# CONFIG_FB_MBX is not set + # CONFIG_FB_VIRTUAL is not set ++# CONFIG_BACKLIGHT_LCD_SUPPORT is not set ++ ++# ++# Display device support ++# ++# CONFIG_DISPLAY_SUPPORT is not set + + # + # Console display driver support +@@ -852,14 +809,14 @@ CONFIG_FB_MBX=m + # CONFIG_VGA_CONSOLE is not set + CONFIG_DUMMY_CONSOLE=y + CONFIG_FRAMEBUFFER_CONSOLE=y +-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set ++CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y + # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set + # CONFIG_FONTS is not set + CONFIG_FONT_8x8=y + CONFIG_FONT_8x16=y + CONFIG_LOGO=y +-CONFIG_LOGO_LINUX_MONO=y +-CONFIG_LOGO_LINUX_VGA16=y ++# CONFIG_LOGO_LINUX_MONO is not set ++# CONFIG_LOGO_LINUX_VGA16 is not set + CONFIG_LOGO_LINUX_CLUT224=y + + # +@@ -874,10 +831,8 @@ CONFIG_SND=m + CONFIG_SND_TIMER=m + CONFIG_SND_PCM=m + # CONFIG_SND_SEQUENCER is not set +-CONFIG_SND_OSSEMUL=y +-CONFIG_SND_MIXER_OSS=m +-CONFIG_SND_PCM_OSS=m +-CONFIG_SND_PCM_OSS_PLUGINS=y ++# CONFIG_SND_MIXER_OSS is not set ++# CONFIG_SND_PCM_OSS is not set + # CONFIG_SND_DYNAMIC_MINORS is not set + CONFIG_SND_SUPPORT_OLD_API=y + CONFIG_SND_VERBOSE_PROCFS=y +@@ -894,66 +849,6 @@ CONFIG_SND_AC97_CODEC=m + # CONFIG_SND_MPU401 is not set + + # +-# PCI devices +-# +-# CONFIG_SND_AD1889 is not set +-# CONFIG_SND_ALS300 is not set +-# CONFIG_SND_ALI5451 is not set +-# CONFIG_SND_ATIIXP is not set +-# CONFIG_SND_ATIIXP_MODEM is not set +-# CONFIG_SND_AU8810 is not set +-# CONFIG_SND_AU8820 is not set +-# CONFIG_SND_AU8830 is not set +-# CONFIG_SND_AZT3328 is not set +-# CONFIG_SND_BT87X is not set +-# CONFIG_SND_CA0106 is not set +-# CONFIG_SND_CMIPCI is not set +-# CONFIG_SND_CS4281 is not set +-# CONFIG_SND_CS46XX is not set +-# CONFIG_SND_DARLA20 is not set +-# CONFIG_SND_GINA20 is not set +-# CONFIG_SND_LAYLA20 is not set +-# CONFIG_SND_DARLA24 is not set +-# CONFIG_SND_GINA24 is not set +-# CONFIG_SND_LAYLA24 is not set +-# CONFIG_SND_MONA is not set +-# CONFIG_SND_MIA is not set +-# CONFIG_SND_ECHO3G is not set +-# CONFIG_SND_INDIGO is not set +-# CONFIG_SND_INDIGOIO is not set +-# CONFIG_SND_INDIGODJ is not set +-# CONFIG_SND_EMU10K1 is not set +-# CONFIG_SND_EMU10K1X is not set +-# CONFIG_SND_ENS1370 is not set +-# CONFIG_SND_ENS1371 is not set +-# CONFIG_SND_ES1938 is not set +-# CONFIG_SND_ES1968 is not set +-# CONFIG_SND_FM801 is not set +-# CONFIG_SND_HDA_INTEL is not set +-# CONFIG_SND_HDSP is not set +-# CONFIG_SND_HDSPM is not set +-# CONFIG_SND_ICE1712 is not set +-# CONFIG_SND_ICE1724 is not set +-# CONFIG_SND_INTEL8X0 is not set +-# CONFIG_SND_INTEL8X0M is not set +-# CONFIG_SND_KORG1212 is not set +-# CONFIG_SND_MAESTRO3 is not set +-# CONFIG_SND_MIXART is not set +-# CONFIG_SND_NM256 is not set +-# CONFIG_SND_PCXHR is not set +-# CONFIG_SND_RIPTIDE is not set +-# CONFIG_SND_RME32 is not set +-# CONFIG_SND_RME96 is not set +-# CONFIG_SND_RME9652 is not set +-# CONFIG_SND_SONICVIBES is not set +-# CONFIG_SND_TRIDENT is not set +-# CONFIG_SND_VIA82XX is not set +-# CONFIG_SND_VIA82XX_MODEM is not set +-# CONFIG_SND_VX222 is not set +-# CONFIG_SND_YMFPCI is not set +-# CONFIG_SND_AC97_POWER_SAVE is not set +- +-# + # ALSA ARM devices + # + CONFIG_SND_PXA2XX_PCM=m +@@ -971,6 +866,10 @@ CONFIG_SND_PXA2XX_AC97=m + # CONFIG_SND_SOC is not set + + # ++# SoC Audio support for SuperH ++# ++ ++# + # Open Sound System + # + # CONFIG_SOUND_PRIME is not set +@@ -978,6 +877,7 @@ CONFIG_AC97_BUS=m + CONFIG_HID_SUPPORT=y + CONFIG_HID=y + # CONFIG_HID_DEBUG is not set ++# CONFIG_HIDRAW is not set + + # + # USB Input Devices +@@ -989,7 +889,7 @@ CONFIG_USB_HID=y + CONFIG_USB_SUPPORT=y + CONFIG_USB_ARCH_HAS_HCD=y + CONFIG_USB_ARCH_HAS_OHCI=y +-CONFIG_USB_ARCH_HAS_EHCI=y ++# CONFIG_USB_ARCH_HAS_EHCI is not set + CONFIG_USB=y + # CONFIG_USB_DEBUG is not set + +@@ -999,20 +899,16 @@ CONFIG_USB=y + CONFIG_USB_DEVICEFS=y + # CONFIG_USB_DEVICE_CLASS is not set + # CONFIG_USB_DYNAMIC_MINORS is not set +-# CONFIG_USB_SUSPEND is not set +-# CONFIG_USB_PERSIST is not set + # CONFIG_USB_OTG is not set + + # + # USB Host Controller Drivers + # +-# CONFIG_USB_EHCI_HCD is not set + # CONFIG_USB_ISP116X_HCD is not set + CONFIG_USB_OHCI_HCD=y + # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set + # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set + CONFIG_USB_OHCI_LITTLE_ENDIAN=y +-# CONFIG_USB_UHCI_HCD is not set + # CONFIG_USB_SL811_HCD is not set + # CONFIG_USB_R8A66597_HCD is not set + +@@ -1033,12 +929,14 @@ CONFIG_USB_STORAGE=y + # CONFIG_USB_STORAGE_DEBUG is not set + # CONFIG_USB_STORAGE_DATAFAB is not set + # CONFIG_USB_STORAGE_FREECOM is not set ++# CONFIG_USB_STORAGE_ISD200 is not set + # CONFIG_USB_STORAGE_DPCM is not set + # CONFIG_USB_STORAGE_USBAT is not set + # CONFIG_USB_STORAGE_SDDR09 is not set + # CONFIG_USB_STORAGE_SDDR55 is not set + # CONFIG_USB_STORAGE_JUMPSHOT is not set + # CONFIG_USB_STORAGE_ALAUDA is not set ++# CONFIG_USB_STORAGE_ONETOUCH is not set + # CONFIG_USB_STORAGE_KARMA is not set + # CONFIG_USB_LIBUSUAL is not set + +@@ -1098,59 +996,27 @@ CONFIG_MMC=m + # + CONFIG_MMC_BLOCK=m + CONFIG_MMC_BLOCK_BOUNCE=y ++# CONFIG_SDIO_UART is not set + + # + # MMC/SD Host Controller Drivers + # + CONFIG_MMC_PXA=m +-# CONFIG_MMC_SDHCI is not set +-# CONFIG_MMC_TIFM_SD is not set +- +-# +-# Real Time Clock +-# +-CONFIG_RTC_LIB=y +-CONFIG_RTC_CLASS=y +-CONFIG_RTC_HCTOSYS=y +-CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +-# CONFIG_RTC_DEBUG is not set +- +-# +-# RTC interfaces +-# +-CONFIG_RTC_INTF_SYSFS=y +-CONFIG_RTC_INTF_PROC=y +-CONFIG_RTC_INTF_DEV=y +-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +-# CONFIG_RTC_DRV_TEST is not set +- +-# +-# Platform RTC drivers +-# +-# CONFIG_RTC_DRV_CMOS is not set +-# CONFIG_RTC_DRV_DS1553 is not set +-# CONFIG_RTC_DRV_DS1742 is not set +-# CONFIG_RTC_DRV_M48T86 is not set +-# CONFIG_RTC_DRV_M48T59 is not set +-CONFIG_RTC_DRV_V3020=y +- +-# +-# on-CPU RTC drivers +-# +-CONFIG_RTC_DRV_SA1100=y +- +-# +-# DMA Engine support +-# +-# CONFIG_DMA_ENGINE is not set ++CONFIG_NEW_LEDS=y ++CONFIG_LEDS_CLASS=y + + # +-# DMA Clients ++# LED drivers + # ++# CONFIG_LEDS_GPIO is not set ++CONFIG_LEDS_CM_X270=y + + # +-# DMA Devices ++# LED Triggers + # ++# CONFIG_LEDS_TRIGGERS is not set ++CONFIG_RTC_LIB=y ++# CONFIG_RTC_CLASS is not set + + # + # File systems +@@ -1164,7 +1030,6 @@ CONFIG_EXT3_FS_XATTR=y + # CONFIG_EXT3_FS_SECURITY is not set + # CONFIG_EXT4DEV_FS is not set + CONFIG_JBD=y +-# CONFIG_JBD_DEBUG is not set + CONFIG_FS_MBCACHE=y + # CONFIG_REISERFS_FS is not set + # CONFIG_JFS_FS is not set +@@ -1207,7 +1072,6 @@ CONFIG_SYSFS=y + CONFIG_TMPFS=y + # CONFIG_TMPFS_POSIX_ACL is not set + # CONFIG_HUGETLB_PAGE is not set +-CONFIG_RAMFS=y + # CONFIG_CONFIGFS_FS is not set + + # +@@ -1220,33 +1084,27 @@ CONFIG_RAMFS=y + # CONFIG_BEFS_FS is not set + # CONFIG_BFS_FS is not set + # CONFIG_EFS_FS is not set +-# CONFIG_JFFS2_FS is not set ++CONFIG_JFFS2_FS=y ++CONFIG_JFFS2_FS_DEBUG=0 ++CONFIG_JFFS2_FS_WRITEBUFFER=y ++# CONFIG_JFFS2_FS_WBUF_VERIFY is not set ++CONFIG_JFFS2_SUMMARY=y ++# CONFIG_JFFS2_FS_XATTR is not set ++# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set ++CONFIG_JFFS2_ZLIB=y ++# CONFIG_JFFS2_LZO is not set ++CONFIG_JFFS2_RTIME=y ++# CONFIG_JFFS2_RUBIN is not set + # CONFIG_CRAMFS is not set + # CONFIG_VXFS_FS is not set + # CONFIG_HPFS_FS is not set + # CONFIG_QNX4FS_FS is not set + # CONFIG_SYSV_FS is not set + # CONFIG_UFS_FS is not set +- +-# +-# Network File Systems +-# +-CONFIG_NFS_FS=y +-CONFIG_NFS_V3=y +-# CONFIG_NFS_V3_ACL is not set +-# CONFIG_NFS_V4 is not set +-# CONFIG_NFS_DIRECTIO is not set ++CONFIG_NETWORK_FILESYSTEMS=y ++# CONFIG_NFS_FS is not set + # CONFIG_NFSD is not set +-CONFIG_ROOT_NFS=y +-CONFIG_LOCKD=y +-CONFIG_LOCKD_V4=y +-CONFIG_NFS_COMMON=y +-CONFIG_SUNRPC=y +-# CONFIG_SUNRPC_BIND34 is not set +-# CONFIG_RPCSEC_GSS_KRB5 is not set +-# CONFIG_RPCSEC_GSS_SPKM3 is not set +-CONFIG_SMB_FS=y +-# CONFIG_SMB_NLS_DEFAULT is not set ++# CONFIG_SMB_FS is not set + # CONFIG_CIFS is not set + # CONFIG_NCP_FS is not set + # CONFIG_CODA_FS is not set +@@ -1257,10 +1115,6 @@ CONFIG_SMB_FS=y + # + # CONFIG_PARTITION_ADVANCED is not set + CONFIG_MSDOS_PARTITION=y +- +-# +-# Native Language Support +-# + CONFIG_NLS=y + CONFIG_NLS_DEFAULT="iso8859-1" + CONFIG_NLS_CODEPAGE_437=y +@@ -1301,98 +1155,34 @@ CONFIG_NLS_ISO8859_1=y + # CONFIG_NLS_KOI8_R is not set + # CONFIG_NLS_KOI8_U is not set + # CONFIG_NLS_UTF8 is not set +- +-# +-# Distributed Lock Manager +-# + # CONFIG_DLM is not set +- +-# +-# Profiling support +-# ++CONFIG_INSTRUMENTATION=y + # CONFIG_PROFILING is not set ++# CONFIG_MARKERS is not set + + # + # Kernel hacking + # + # CONFIG_PRINTK_TIME is not set ++CONFIG_ENABLE_WARN_DEPRECATED=y + CONFIG_ENABLE_MUST_CHECK=y +-CONFIG_MAGIC_SYSRQ=y ++# CONFIG_MAGIC_SYSRQ is not set + # CONFIG_UNUSED_SYMBOLS is not set + # CONFIG_DEBUG_FS is not set + # CONFIG_HEADERS_CHECK is not set +-CONFIG_DEBUG_KERNEL=y +-# CONFIG_DEBUG_SHIRQ is not set +-# CONFIG_DETECT_SOFTLOCKUP is not set +-CONFIG_SCHED_DEBUG=y +-# CONFIG_SCHEDSTATS is not set +-# CONFIG_TIMER_STATS is not set +-# CONFIG_DEBUG_SLAB is not set +-# CONFIG_DEBUG_RT_MUTEXES is not set +-# CONFIG_RT_MUTEX_TESTER is not set +-# CONFIG_DEBUG_SPINLOCK is not set +-# CONFIG_DEBUG_MUTEXES is not set +-# CONFIG_DEBUG_LOCK_ALLOC is not set +-# CONFIG_PROVE_LOCKING is not set +-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +-# CONFIG_DEBUG_KOBJECT is not set ++# CONFIG_DEBUG_KERNEL is not set + # CONFIG_DEBUG_BUGVERBOSE is not set +-CONFIG_DEBUG_INFO=y +-# CONFIG_DEBUG_VM is not set +-# CONFIG_DEBUG_LIST is not set + CONFIG_FRAME_POINTER=y +-CONFIG_FORCED_INLINING=y +-# CONFIG_RCU_TORTURE_TEST is not set +-# CONFIG_FAULT_INJECTION is not set +-CONFIG_DEBUG_USER=y +-CONFIG_DEBUG_ERRORS=y +-CONFIG_DEBUG_LL=y +-# CONFIG_DEBUG_ICEDCC is not set ++# CONFIG_SAMPLES is not set ++# CONFIG_DEBUG_USER is not set + + # + # Security options + # + # CONFIG_KEYS is not set + # CONFIG_SECURITY is not set +-CONFIG_CRYPTO=y +-CONFIG_CRYPTO_ALGAPI=m +-CONFIG_CRYPTO_BLKCIPHER=m +-CONFIG_CRYPTO_MANAGER=m +-# CONFIG_CRYPTO_HMAC is not set +-# CONFIG_CRYPTO_XCBC is not set +-# CONFIG_CRYPTO_NULL is not set +-# CONFIG_CRYPTO_MD4 is not set +-# CONFIG_CRYPTO_MD5 is not set +-# CONFIG_CRYPTO_SHA1 is not set +-# CONFIG_CRYPTO_SHA256 is not set +-# CONFIG_CRYPTO_SHA512 is not set +-# CONFIG_CRYPTO_WP512 is not set +-# CONFIG_CRYPTO_TGR192 is not set +-# CONFIG_CRYPTO_GF128MUL is not set +-CONFIG_CRYPTO_ECB=m +-CONFIG_CRYPTO_CBC=m +-CONFIG_CRYPTO_PCBC=m +-# CONFIG_CRYPTO_LRW is not set +-# CONFIG_CRYPTO_CRYPTD is not set +-# CONFIG_CRYPTO_DES is not set +-# CONFIG_CRYPTO_FCRYPT is not set +-# CONFIG_CRYPTO_BLOWFISH is not set +-# CONFIG_CRYPTO_TWOFISH is not set +-# CONFIG_CRYPTO_SERPENT is not set +-CONFIG_CRYPTO_AES=m +-# CONFIG_CRYPTO_CAST5 is not set +-# CONFIG_CRYPTO_CAST6 is not set +-# CONFIG_CRYPTO_TEA is not set +-CONFIG_CRYPTO_ARC4=m +-# CONFIG_CRYPTO_KHAZAD is not set +-# CONFIG_CRYPTO_ANUBIS is not set +-# CONFIG_CRYPTO_DEFLATE is not set +-# CONFIG_CRYPTO_MICHAEL_MIC is not set +-# CONFIG_CRYPTO_CRC32C is not set +-# CONFIG_CRYPTO_CAMELLIA is not set +-# CONFIG_CRYPTO_TEST is not set +-CONFIG_CRYPTO_HW=y ++# CONFIG_SECURITY_FILE_CAPABILITIES is not set ++# CONFIG_CRYPTO is not set + + # + # Library routines +@@ -1404,6 +1194,8 @@ CONFIG_BITREVERSE=y + CONFIG_CRC32=y + # CONFIG_CRC7 is not set + # CONFIG_LIBCRC32C is not set ++CONFIG_ZLIB_INFLATE=y ++CONFIG_ZLIB_DEFLATE=y + CONFIG_PLIST=y + CONFIG_HAS_IOMEM=y + CONFIG_HAS_IOPORT=y +-- +1.5.4.rc4 + diff --git a/packages/linux/linux-2.6.24/cm-x270/defconfig b/packages/linux/linux-2.6.24/cm-x270/defconfig new file mode 100644 index 0000000000..412c772211 --- /dev/null +++ b/packages/linux/linux-2.6.24/cm-x270/defconfig @@ -0,0 +1,1202 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.24 +# Wed Feb 27 16:38:09 2008 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y +CONFIG_ARCH_MTD_XIP=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="-cm-x270" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_USER_NS is not set +# CONFIG_PID_NS is not set +# CONFIG_AUDIT is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_CGROUPS is not set +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_FAIR_USER_SCHED=y +# CONFIG_FAIR_CGROUP_SCHED is not set +CONFIG_SYSFS_DEPRECATED=y +# CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_EMBEDDED=y +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_ANON_INODES=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set +# CONFIG_BLK_DEV_BSG is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_PNX4008 is not set +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_DAVINCI is not set +# CONFIG_ARCH_OMAP is not set + +# +# Intel PXA2xx/PXA3xx Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_LOGICPD_PXA270 is not set +# CONFIG_MACH_MAINSTONE is not set +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_PXA_SHARPSL is not set +# CONFIG_MACH_TRIZEPS4 is not set +# CONFIG_MACH_EM_X270 is not set +# CONFIG_MACH_ZYLONITE is not set +CONFIG_MACH_ARMCORE=y +CONFIG_PXA27x=y + +# +# Boot options +# + +# +# Power management +# + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_XSCALE=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_OUTER_CACHE is not set +CONFIG_IWMMXT=y +CONFIG_XSCALE_PMU=y + +# +# Bus support +# +# CONFIG_PCI is not set +# CONFIG_PCI_SYSCALL is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_TICK_ONESHOT=y +# CONFIG_NO_HZ is not set +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_PREEMPT=y +CONFIG_HZ=100 +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="console=ttyS1,38400 monitor=1 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2" +# CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +# CONFIG_FPE_NWFPE is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set + +# +# Power management options +# +# CONFIG_PM is not set +CONFIG_SUSPEND_UP_POSSIBLE=y + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_LRO is not set +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set + +# +# Wireless +# +# CONFIG_CFG80211 is not set +# CONFIG_WIRELESS_EXT is not set +# CONFIG_MAC80211 is not set +# CONFIG_IEEE80211 is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_MTD_OOPS is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_GEN_PROBE=y +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_CFI_INTELEXT is not set +CONFIG_MTD_CFI_AMDSTD=y +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_XIP is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_PHYSMAP_START=0x0 +CONFIG_MTD_PHYSMAP_LEN=0x400000 +CONFIG_MTD_PHYSMAP_BANKWIDTH=2 +# CONFIG_MTD_ARM_INTEGRATOR is not set +# CONFIG_MTD_SHARP_SL is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_H1900 is not set +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_SHARPSL is not set +CONFIG_MTD_NAND_CM_X270=y +# CONFIG_MTD_NAND_NANDSIM is not set +# CONFIG_MTD_NAND_PLATFORM is not set +# CONFIG_MTD_ALAUDA is not set +# CONFIG_MTD_ONENAND is not set + +# +# UBI - Unsorted block images +# +# CONFIG_MTD_UBI is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +CONFIG_MISC_DEVICES=y +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +# CONFIG_BLK_DEV_SR is not set +# CONFIG_CHR_DEV_SG is not set +# CONFIG_CHR_DEV_SCH is not set + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +CONFIG_SCSI_LOWLEVEL=y +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_ATA is not set +# CONFIG_MD is not set +CONFIG_NETDEVICES=y +# CONFIG_NETDEVICES_MULTIQUEUE is not set +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_VETH is not set +# CONFIG_PHYLIB is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_AX88796 is not set +# CONFIG_SMC91X is not set +CONFIG_DM9000=y +# CONFIG_SMC911X is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_B44 is not set +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set + +# +# Wireless LAN +# +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +# CONFIG_USB_NET_DM9601 is not set +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set +# CONFIG_WAN is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=m +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_PXA27x is not set +# CONFIG_KEYBOARD_GPIO is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +# CONFIG_MOUSE_PS2_ALPS is not set +# CONFIG_MOUSE_PS2_LOGIPS2PP is not set +# CONFIG_MOUSE_PS2_SYNAPTICS is not set +# CONFIG_MOUSE_PS2_LIFEBOOK is not set +# CONFIG_MOUSE_PS2_TRACKPOINT is not set +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_APPLETOUCH is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_MOUSE_GPIO is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_FUJITSU is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +CONFIG_TOUCHSCREEN_UCB1400=m +# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_PXA=y +CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +# CONFIG_LEGACY_PTYS is not set +# CONFIG_IPMI_HANDLER is not set +CONFIG_HW_RANDOM=y +# CONFIG_NVRAM is not set +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=m + +# +# I2C Algorithms +# +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +# CONFIG_I2C_GPIO is not set +CONFIG_I2C_PXA=m +# CONFIG_I2C_PXA_SLAVE is not set +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_SIMTEC is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_TINY_USB is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_DS1682 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_SENSORS_TSL2550 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set +# CONFIG_W1 is not set +# CONFIG_POWER_SUPPLY is not set +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_AD7418 is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ADT7470 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_F71882FG is not set +# CONFIG_SENSORS_F75375S is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_LM93 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_MAX6650 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_DME1737 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_THMC50 is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_HWMON_DEBUG_CHIP is not set +# CONFIG_WATCHDOG is not set + +# +# Sonics Silicon Backplane +# +CONFIG_SSB_POSSIBLE=y +# CONFIG_SSB is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_SM501 is not set + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set +# CONFIG_DVB_CORE is not set +# CONFIG_DAB is not set + +# +# Graphics support +# +# CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_SYS_FOPS is not set +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_PXA=y +CONFIG_FB_PXA_PARAMETERS=y +# CONFIG_FB_MBX is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y + +# +# Sound +# +CONFIG_SOUND=m + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +# CONFIG_SND_SEQUENCER is not set +# CONFIG_SND_MIXER_OSS is not set +# CONFIG_SND_PCM_OSS is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +CONFIG_SND_AC97_CODEC=m +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# ALSA ARM devices +# +CONFIG_SND_PXA2XX_PCM=m +CONFIG_SND_PXA2XX_AC97=m + +# +# USB devices +# +# CONFIG_SND_USB_AUDIO is not set +# CONFIG_SND_USB_CAIAQ is not set + +# +# System on Chip audio support +# +# CONFIG_SND_SOC is not set + +# +# SoC Audio support for SuperH +# + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set +# CONFIG_HIDRAW is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +# CONFIG_HID_FF is not set +# CONFIG_USB_HIDDEV is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_DEVICE_CLASS is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=y +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_DPCM is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_ONETOUCH is not set +# CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set +CONFIG_USB_MON=y + +# +# USB port drivers +# + +# +# USB Serial Converter support +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_BERRY_CHARGE is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGET is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set +# CONFIG_USB_TEST is not set + +# +# USB DSL modem support +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set + +# +# MMC/SD Card Drivers +# +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_BOUNCE=y +# CONFIG_SDIO_UART is not set + +# +# MMC/SD Host Controller Drivers +# +CONFIG_MMC_PXA=m +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +# CONFIG_LEDS_GPIO is not set +CONFIG_LEDS_CM_X270=y + +# +# LED Triggers +# +# CONFIG_LEDS_TRIGGERS is not set +CONFIG_RTC_LIB=y +# CONFIG_RTC_CLASS is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=y +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_SUMMARY=y +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set +CONFIG_NETWORK_FILESYSTEMS=y +# CONFIG_NFS_FS is not set +# CONFIG_NFSD is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_UTF8 is not set +# CONFIG_DLM is not set +CONFIG_INSTRUMENTATION=y +# CONFIG_PROFILING is not set +# CONFIG_MARKERS is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_KERNEL is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_FRAME_POINTER=y +# CONFIG_SAMPLES is not set +# CONFIG_DEBUG_USER is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITY_FILE_CAPABILITIES is not set +# CONFIG_CRYPTO is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +# CONFIG_CRC7 is not set +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y diff --git a/packages/linux/linux_2.6.23.bb b/packages/linux/linux_2.6.23.bb index ffc1820229..d3989a42ef 100644 --- a/packages/linux/linux_2.6.23.bb +++ b/packages/linux/linux_2.6.23.bb @@ -2,7 +2,6 @@ require linux.inc # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_cm-x270 = "1" DEFAULT_PREFERENCE_mpc8313e-rdb = "1" DEFAULT_PREFERENCE_mpc8323e-rdb = "1" DEFAULT_PREFERENCE_avr32 = "1" diff --git a/packages/linux/linux_2.6.24.bb b/packages/linux/linux_2.6.24.bb index 04470bdf03..d9f8063a8e 100644 --- a/packages/linux/linux_2.6.24.bb +++ b/packages/linux/linux_2.6.24.bb @@ -3,15 +3,14 @@ require linux.inc # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_gesbc-9302 = "1" +DEFAULT_PREFERENCE_cm-x270 = "1" DEFAULT_PREFERENCE_mpc8313e-rdb = "1" DEPENDS_append_mpc8313e-rdb = " dtc-native" -PR = "r6" +PR = "r7" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ - http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \ - file://powerpc-clockres.patch;patch=1 \ file://defconfig" # Real-time preemption. This is experimental and requires a different defconfig. @@ -23,17 +22,64 @@ SRC_URI_append_gesbc-9302 = " \ file://0005-ep93xx-reboot.patch;patch=1 \ " -SRC_URI_append_mpc8313e-rdb = "\ +SRC_URI_append_mpc8313e-rdb = " \ + http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \ + file://powerpc-clockres.patch;patch=1 \ file://mpc831x-nand.patch;patch=1 \ file://mpc8313e-rdb-leds.patch;patch=1 \ file://mpc8313e-rdb-rtc.patch;patch=1" CMDLINE_gesbc-9302 = "console=ttyAM0 root=mtd5 rootfstype=jffs2 mtdparts=GESBC-NAND:64m(app),-(data)" +SRC_URI_append_cm-x270 = " \ + file://0001-cm-x270-match-type.patch;patch=1 \ + file://0002-ramdisk_load.patch;patch=1 \ + file://0003-mmcsd_large_cards-r0.patch;patch=1 \ + file://0004-cm-x270-nand-simplify-name.patch;patch=1 \ + file://0005-add-display-set-default-16bpp.patch;patch=1 \ + " + +CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=1 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2" + FILES_kernel-image_gesbc-9302 = "" DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts" DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000" +python do_compulab_image() { + import os + import os.path + import struct + + machine = bb.data.getVar('MACHINE', d, 1) + if machine == "cm-x270": + deploy_dir = bb.data.getVar('DEPLOY_DIR_IMAGE', d, 1) + kernel_file = os.path.join(deploy_dir, bb.data.expand('${KERNEL_IMAGE_BASE_NAME}', d) + '.bin') + img_file = os.path.join(deploy_dir, bb.data.expand('${KERNEL_IMAGE_BASE_NAME}', d) + '.cmx270') + + fo = open(img_file, 'wb') + + image_data = open(kernel_file, 'rb').read() + + # first write size into first 4 bytes + size_s = struct.pack('i', len(image_data)) + + # truncate size if we are running on a 64-bit host + size_s = size_s[:4] + + fo.write(size_s) + fo.write(image_data) + fo.close() + + os.chdir(deploy_dir) + link_file = bb.data.expand('${KERNEL_IMAGE_SYMLINK_NAME}', d) + '.cmx270' + img_file = bb.data.expand('${KERNEL_IMAGE_BASE_NAME}', d) + '.cmx270' + try: + os.unlink(link_file) + except: + pass + os.symlink(img_file, link_file) +} + do_devicetree_image() { if test -n "${DEVICETREE}" ; then @@ -45,5 +91,6 @@ do_devicetree_image() { fi } +addtask compulab_image after do_deploy before do_package addtask devicetree_image after do_deploy before do_package -- cgit v1.2.3 From c6ccbda2d4a75e4e171e01b1930f24248f6b8bb6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 29 Feb 2008 17:39:54 +0000 Subject: pango: Remove unstable testing versions and stable versions with later bugfix point releases --- packages/pango/pango-1.13.3/.mtn2git_empty | 0 .../pango/pango-1.13.3/opentype-makefile.patch | 20 -------- packages/pango/pango-1.16.0/.mtn2git_empty | 0 packages/pango/pango-1.16.0/no-tests.patch | 10 ---- packages/pango/pango-1.16.2/.mtn2git_empty | 0 packages/pango/pango-1.16.2/no-tests.patch | 10 ---- packages/pango/pango-1.18.1/.mtn2git_empty | 0 packages/pango/pango-1.18.1/no-tests.patch | 10 ---- packages/pango/pango_1.13.3.bb | 54 ---------------------- packages/pango/pango_1.14.0.bb | 49 -------------------- packages/pango/pango_1.15.1.bb | 51 -------------------- packages/pango/pango_1.15.2.bb | 1 - packages/pango/pango_1.16.0.bb | 1 - packages/pango/pango_1.16.2.bb | 1 - packages/pango/pango_1.16.4.bb | 2 - packages/pango/pango_1.18.1.bb | 1 - packages/pango/pango_1.9.1.bb | 52 --------------------- 17 files changed, 262 deletions(-) delete mode 100644 packages/pango/pango-1.13.3/.mtn2git_empty delete mode 100644 packages/pango/pango-1.13.3/opentype-makefile.patch delete mode 100644 packages/pango/pango-1.16.0/.mtn2git_empty delete mode 100644 packages/pango/pango-1.16.0/no-tests.patch delete mode 100644 packages/pango/pango-1.16.2/.mtn2git_empty delete mode 100644 packages/pango/pango-1.16.2/no-tests.patch delete mode 100644 packages/pango/pango-1.18.1/.mtn2git_empty delete mode 100644 packages/pango/pango-1.18.1/no-tests.patch delete mode 100644 packages/pango/pango_1.13.3.bb delete mode 100644 packages/pango/pango_1.14.0.bb delete mode 100644 packages/pango/pango_1.15.1.bb delete mode 100644 packages/pango/pango_1.15.2.bb delete mode 100644 packages/pango/pango_1.16.0.bb delete mode 100644 packages/pango/pango_1.16.2.bb delete mode 100644 packages/pango/pango_1.18.1.bb delete mode 100644 packages/pango/pango_1.9.1.bb (limited to 'packages') diff --git a/packages/pango/pango-1.13.3/.mtn2git_empty b/packages/pango/pango-1.13.3/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/pango/pango-1.13.3/opentype-makefile.patch b/packages/pango/pango-1.13.3/opentype-makefile.patch deleted file mode 100644 index 9f68420bc5..0000000000 --- a/packages/pango/pango-1.13.3/opentype-makefile.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- pango/opentype/Makefile.am~ 2006-07-05 14:49:28.000000000 +0200 -+++ pango/opentype/Makefile.am 2006-07-05 14:49:28.000000000 +0200 -@@ -5,7 +5,7 @@ - - noinst_LTLIBRARIES = libharfbuzz-1.la - --SOURCES = \ -+MAIN_SOURCES = \ - ftglue.c \ - harfbuzz-buffer.c \ - harfbuzz-dump.c \ -@@ -34,7 +34,7 @@ - harfbuzz-open-private.h - - libharfbuzz_1_la_SOURCES = \ -- $(SOURCES) \ -+ $(MAIN_SOURCES) \ - $(PUBLICHEADERS) \ - $(PRIVATEHEADERS) - diff --git a/packages/pango/pango-1.16.0/.mtn2git_empty b/packages/pango/pango-1.16.0/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/pango/pango-1.16.0/no-tests.patch b/packages/pango/pango-1.16.0/no-tests.patch deleted file mode 100644 index dafcb20c3b..0000000000 --- a/packages/pango/pango-1.16.0/no-tests.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- /tmp/Makefile.am 2007-03-01 13:29:37.000000000 +0100 -+++ pango-1.16.0/Makefile.am 2007-03-01 13:29:52.545251000 +0100 -@@ -1,6 +1,6 @@ - ## Process this file with automake to create Makefile.in. - --SUBDIRS= pango modules pango-view examples docs tools tests -+SUBDIRS= pango modules pango-view examples docs tools - - EXTRA_DIST = \ - autogen.sh \ diff --git a/packages/pango/pango-1.16.2/.mtn2git_empty b/packages/pango/pango-1.16.2/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/pango/pango-1.16.2/no-tests.patch b/packages/pango/pango-1.16.2/no-tests.patch deleted file mode 100644 index dafcb20c3b..0000000000 --- a/packages/pango/pango-1.16.2/no-tests.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- /tmp/Makefile.am 2007-03-01 13:29:37.000000000 +0100 -+++ pango-1.16.0/Makefile.am 2007-03-01 13:29:52.545251000 +0100 -@@ -1,6 +1,6 @@ - ## Process this file with automake to create Makefile.in. - --SUBDIRS= pango modules pango-view examples docs tools tests -+SUBDIRS= pango modules pango-view examples docs tools - - EXTRA_DIST = \ - autogen.sh \ diff --git a/packages/pango/pango-1.18.1/.mtn2git_empty b/packages/pango/pango-1.18.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/pango/pango-1.18.1/no-tests.patch b/packages/pango/pango-1.18.1/no-tests.patch deleted file mode 100644 index dafcb20c3b..0000000000 --- a/packages/pango/pango-1.18.1/no-tests.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- /tmp/Makefile.am 2007-03-01 13:29:37.000000000 +0100 -+++ pango-1.16.0/Makefile.am 2007-03-01 13:29:52.545251000 +0100 -@@ -1,6 +1,6 @@ - ## Process this file with automake to create Makefile.in. - --SUBDIRS= pango modules pango-view examples docs tools tests -+SUBDIRS= pango modules pango-view examples docs tools - - EXTRA_DIST = \ - autogen.sh \ diff --git a/packages/pango/pango_1.13.3.bb b/packages/pango/pango_1.13.3.bb deleted file mode 100644 index 90e4acbf50..0000000000 --- a/packages/pango/pango_1.13.3.bb +++ /dev/null @@ -1,54 +0,0 @@ -LICENSE = "LGPL" -SECTION = "x11/libs" -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc cairo" -DESCRIPTION = "The goal of the Pango project is to provide an \ -Open Source framework for the layout and rendering of \ -internationalized text." -PR = "r2" - -RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" - -# seems to go wrong with default cflags -FULL_OPTIMIZATION_arm = "-O2" - -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/pango/1.13/pango-${PV}.tar.bz2 \ - file://no-tests.patch;patch=1 \ - file://opentype-makefile.patch;patch=1;pnum=0" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-glibtest \ - --enable-explicit-deps=no \ - --disable-debug" - -LEAD_SONAME = "libpango-1.0*" -LIBV = "1.5.0" - -FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*" -FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" -FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" - -do_stage () { - for lib in pango pangox pangoft2 pangoxft pangocairo; do - oe_libinstall -so -C pango lib$lib-1.0 ${STAGING_LIBDIR}/ - done - install -d ${STAGING_INCDIR}/pango - install -m 0644 ${S}/pango/pango*.h ${STAGING_INCDIR}/pango/ -} - -postinst_prologue() { -if [ "x$D" != "x" ]; then - exit 1 -fi - -} - -PACKAGES_DYNAMIC = "pango-module-*" - -python populate_packages_prepend () { - prologue = bb.data.getVar("postinst_prologue", d, 1) - - modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d) - - do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules') -} diff --git a/packages/pango/pango_1.14.0.bb b/packages/pango/pango_1.14.0.bb deleted file mode 100644 index caa09c610a..0000000000 --- a/packages/pango/pango_1.14.0.bb +++ /dev/null @@ -1,49 +0,0 @@ -LICENSE = "LGPL" -SECTION = "x11/libs" -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc cairo" -DESCRIPTION = "The goal of the Pango project is to provide an \ -Open Source framework for the layout and rendering of \ -internationalized text." -PR = "r2" - -PACKAGES_DYNAMIC = "pango-module-*" - -RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" - -# seems to go wrong with default cflags -FULL_OPTIMIZATION_arm = "-O2" - -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/pango/1.14/pango-${PV}.tar.bz2 \ - file://no-tests.patch;patch=1 \ - " -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-glibtest \ - --enable-explicit-deps=no \ - --disable-debug" - -LEAD_SONAME = "libpango-1.0*" -LIBV = "1.5.0" - -FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*" -FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" -FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" - -do_stage () { - autotools_stage_all -} - -postinst_prologue() { -if [ "x$D" != "x" ]; then - exit 1 -fi - -} - -python populate_packages_prepend () { - prologue = bb.data.getVar("postinst_prologue", d, 1) - - modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d) - - do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules') -} diff --git a/packages/pango/pango_1.15.1.bb b/packages/pango/pango_1.15.1.bb deleted file mode 100644 index 82d1ad2b66..0000000000 --- a/packages/pango/pango_1.15.1.bb +++ /dev/null @@ -1,51 +0,0 @@ -DESCRIPTION = "The goal of the Pango project is to provide an \ -Open Source framework for the layout and rendering of \ -internationalized text." -LICENSE = "LGPL" -SECTION = "x11/libs" - -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc cairo" - -PR = "r0" - -PACKAGES_DYNAMIC = "pango-module-*" - -RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" - -# seems to go wrong with default cflags -FULL_OPTIMIZATION_arm = "-O2" - -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/pango/1.15/pango-${PV}.tar.bz2 \ - file://no-tests.patch;patch=1 \ - " -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-glibtest \ - --enable-explicit-deps=no \ - --disable-debug" - -LEAD_SONAME = "libpango-1.0*" -LIBV = "1.6.0" - -FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*" -FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" -FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" - -do_stage () { - autotools_stage_all -} - -postinst_prologue() { -if [ "x$D" != "x" ]; then - exit 1 -fi - -} - -python populate_packages_prepend () { - prologue = bb.data.getVar("postinst_prologue", d, 1) - - modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d) - - do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules') -} diff --git a/packages/pango/pango_1.15.2.bb b/packages/pango/pango_1.15.2.bb deleted file mode 100644 index 8e3e8e7d3a..0000000000 --- a/packages/pango/pango_1.15.2.bb +++ /dev/null @@ -1 +0,0 @@ -require pango.inc diff --git a/packages/pango/pango_1.16.0.bb b/packages/pango/pango_1.16.0.bb deleted file mode 100644 index 8e3e8e7d3a..0000000000 --- a/packages/pango/pango_1.16.0.bb +++ /dev/null @@ -1 +0,0 @@ -require pango.inc diff --git a/packages/pango/pango_1.16.2.bb b/packages/pango/pango_1.16.2.bb deleted file mode 100644 index 8e3e8e7d3a..0000000000 --- a/packages/pango/pango_1.16.2.bb +++ /dev/null @@ -1 +0,0 @@ -require pango.inc diff --git a/packages/pango/pango_1.16.4.bb b/packages/pango/pango_1.16.4.bb index 2749b0ba1e..ce81d89263 100644 --- a/packages/pango/pango_1.16.4.bb +++ b/packages/pango/pango_1.16.4.bb @@ -1,4 +1,2 @@ -DEFAULT_PREFERENCE = "-1" - require pango.inc diff --git a/packages/pango/pango_1.18.1.bb b/packages/pango/pango_1.18.1.bb deleted file mode 100644 index 8e3e8e7d3a..0000000000 --- a/packages/pango/pango_1.18.1.bb +++ /dev/null @@ -1 +0,0 @@ -require pango.inc diff --git a/packages/pango/pango_1.9.1.bb b/packages/pango/pango_1.9.1.bb deleted file mode 100644 index 66a6a84d22..0000000000 --- a/packages/pango/pango_1.9.1.bb +++ /dev/null @@ -1,52 +0,0 @@ -LICENSE = "LGPL" -SECTION = "x11/libs" -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc" -RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" -DESCRIPTION = "The goal of the Pango project is to provide an \ -Open Source framework for the layout and rendering of \ -internationalized text." -PR = "r1" - -# seems to go wrong with default cflags -FULL_OPTIMIZATION_arm = "-O2" - -SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.7/pango-${PV}.tar.bz2 \ - file://no-tests.patch;patch=1" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-glibtest \ - --enable-explicit-deps=no \ - --disable-debug" - -LEAD_SONAME = "libpango-1.0*" -LIBV = "1.4.0" - -FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*" -FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" -FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" - -do_stage () { - for lib in pango pangox pangoft2 pangoxft; do - oe_libinstall -so -C pango lib$lib-1.0 ${STAGING_LIBDIR}/ - done - install -d ${STAGING_INCDIR}/pango - install -m 0644 ${S}/pango/pango*.h ${STAGING_INCDIR}/pango/ -} - -postinst_prologue() { -if [ "x$D" != "x" ]; then - exit 1 -fi - -} - -PACKAGES_DYNAMIC = "pango-module-*" - -python populate_packages_prepend () { - prologue = bb.data.getVar("postinst_prologue", d, 1) - - modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d) - - do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules') -} -- cgit v1.2.3 From c7466a04f7f9a0c62d410ec548756816c6b6cea7 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 29 Feb 2008 20:07:15 +0000 Subject: u-boot-openmoko-devel git|svn build variant for gta02v5, remove variants for hardware almost no one has --- packages/u-boot/u-boot-openmoko-devel_git.bb | 6 ++++-- packages/u-boot/u-boot-openmoko_svn.bb | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/u-boot/u-boot-openmoko-devel_git.bb b/packages/u-boot/u-boot-openmoko-devel_git.bb index c2e21658ac..c1a5cefe77 100644 --- a/packages/u-boot/u-boot-openmoko-devel_git.bb +++ b/packages/u-boot/u-boot-openmoko-devel_git.bb @@ -6,14 +6,16 @@ PRIORITY = "optional" PROVIDES = "virtual/bootloader" LOCALVERSION = "+git${SRCREV}" PV = "1.3.1${LOCALVERSION}" -PR = "r0" +PR = "r1" -UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v1 gta02v2 gta02v3 gta02v4" +UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v4 gta02v5" DEFAULT_PREFERENCE = "-1" SRCREV_FORMAT = "git.openmoko.org" +SRCREV = "1dd080c17b105da5cd4720307fa62de38276796a" + SRC_URI = "git://git.openmoko.org/git/u-boot.git;protocol=git;branch=andy \ file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \ file://makefile-no-dirafter.patch;patch=1 \ diff --git a/packages/u-boot/u-boot-openmoko_svn.bb b/packages/u-boot/u-boot-openmoko_svn.bb index ca21f54f8a..ba172c094e 100644 --- a/packages/u-boot/u-boot-openmoko_svn.bb +++ b/packages/u-boot/u-boot-openmoko_svn.bb @@ -6,11 +6,11 @@ PRIORITY = "optional" PROVIDES = "virtual/bootloader" LOCALVERSION = "+git${SRCDATE}+svnr${SRCREV}" PV = "1.3.1${LOCALVERSION}" -PR = "r0" +PR = "r1" SRCREV_FORMAT = "patches" -UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v1 gta02v2 gta02v3 gta02v4" +UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v4 gta02v5" DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From d479680f08d4a632383adb8dcd7a129a60f6588c Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Fri, 29 Feb 2008 22:21:17 +0000 Subject: mtd-utils-1.0.0+git: Install headers for -dev. --- packages/mtd/mtd-utils_1.0.0+git.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/mtd/mtd-utils_1.0.0+git.bb b/packages/mtd/mtd-utils_1.0.0+git.bb index d4e67f3aae..42d92edd9a 100644 --- a/packages/mtd/mtd-utils_1.0.0+git.bb +++ b/packages/mtd/mtd-utils_1.0.0+git.bb @@ -3,7 +3,7 @@ SECTION = "base" DEPENDS = "zlib lzo" HOMEPAGE = "http://www.linux-mtd.infradead.org/" LICENSE = "GPLv2" -PR = "r7" +PR = "r8" # This is the default package, thus we lock to a specific git version so # upstream changes will not break builds. @@ -36,11 +36,16 @@ mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \ do_install () { install -d ${D}${bindir} + install -d ${D}${includedir} for binary in ${mtd_utils}; do install -m 0755 $binary ${D}${bindir} done + for f in ${S}/include/mtd/*.h; do + install -m 0644 $f ${D}${includedir} + done } PACKAGES =+ "mkfs-jffs mkfs-jffs2" FILES_mkfs-jffs = "${bindir}/mkfs.jffs" FILES_mkfs-jffs2 = "${bindir}/mkfs.jffs2" + -- cgit v1.2.3 From b091ff237321c4569a7ae6650eb35051f40ecd98 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Fri, 29 Feb 2008 22:31:30 +0000 Subject: mtd-utils: Added 1.1.0 with -1 preference (Scheduled for default 15-03-2008). --- packages/mtd/mtd-utils-native_1.1.0.bb | 5 ++++ packages/mtd/mtd-utils_1.1.0.bb | 48 ++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 packages/mtd/mtd-utils-native_1.1.0.bb create mode 100644 packages/mtd/mtd-utils_1.1.0.bb (limited to 'packages') diff --git a/packages/mtd/mtd-utils-native_1.1.0.bb b/packages/mtd/mtd-utils-native_1.1.0.bb new file mode 100644 index 0000000000..2b8d925c90 --- /dev/null +++ b/packages/mtd/mtd-utils-native_1.1.0.bb @@ -0,0 +1,5 @@ +# scheduled to enable 15-03-2008 +DEFAULT_PREFERENCE = "-1" + +require mtd-utils_${PV}.bb +require mtd-utils-native.inc diff --git a/packages/mtd/mtd-utils_1.1.0.bb b/packages/mtd/mtd-utils_1.1.0.bb new file mode 100644 index 0000000000..679fc7e79e --- /dev/null +++ b/packages/mtd/mtd-utils_1.1.0.bb @@ -0,0 +1,48 @@ +DESCRIPTION = "Tools for managing memory technology devices." +SECTION = "base" +DEPENDS = "zlib lzo" +HOMEPAGE = "http://www.linux-mtd.infradead.org/" +LICENSE = "GPLv2" +PR = "r1" + +# scheduled to enable 15-03-2008 +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.1.0.tar.bz2 \ + file://add-exclusion-to-mkfs-jffs2-git.patch;patch=1 \ + file://fix-ignoreerrors-git.patch;patch=1 \ + file://lzo_1x.patch;patch=1" + +S = "${WORKDIR}/mtd-utils-${PV}/" + +EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR'" + +do_stage () { + install -d ${STAGING_INCDIR}/mtd + for f in ${S}/include/mtd/*.h; do + install -m 0644 $f ${STAGING_INCDIR}/mtd/ + done + for binary in ${mtd_utils}; do + install -m 0755 $binary ${STAGING_BINDIR} + done +} + +mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \ + mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info mtd_debug \ + flashcp nandwrite jffs2dump sumtool" + +do_install () { + install -d ${D}${bindir} + install -d ${D}${includedir} + for binary in ${mtd_utils}; do + install -m 0755 $binary ${D}${bindir} + done + for f in ${S}/include/mtd/*.h; do + install -m 0644 $f ${D}${includedir} + done +} + +PACKAGES =+ "mkfs-jffs mkfs-jffs2" +FILES_mkfs-jffs = "${bindir}/mkfs.jffs" +FILES_mkfs-jffs2 = "${bindir}/mkfs.jffs2" + -- cgit v1.2.3 From 3db46e12e6f48196f5e80b3bb14b3ebfc1993bf9 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Fri, 29 Feb 2008 23:16:58 +0000 Subject: util-linux-ng: 2.13.1 final release, remove -rc2. --- packages/util-linux-ng/util-linux-ng.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/util-linux-ng/util-linux-ng.inc b/packages/util-linux-ng/util-linux-ng.inc index c01458d626..fa02f35356 100644 --- a/packages/util-linux-ng/util-linux-ng.inc +++ b/packages/util-linux-ng/util-linux-ng.inc @@ -9,7 +9,8 @@ inherit autotools # @todo Remove $RC later. See if patches are needed. Move files from /usr/*. # -- Leon 'likewise' Woestenberg -RC="-rc2" +#RC="-rc2" +RC="" DEFAULT_PREFERENCE = "-1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v2.13/util-linux-ng-${PV}${RC}.tar.bz2" -- cgit v1.2.3 From 07b305be5bd9ab2ae6bed80d81faf2b6f16a3a49 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Fri, 29 Feb 2008 23:40:40 +0000 Subject: ltp-20080229: Newly arrived, the leap day surprise. --- packages/linux/linux_2.6.24.bb | 2 + packages/ltp/ltp-20080229/.mtn2git_empty | 0 packages/ltp/ltp-20080229/cross-compile.patch | 31 ++++++++++ packages/ltp/ltp-20080229/ltp-run | 4 ++ packages/ltp/ltp-20080229/posix_shell_compat.patch | 33 +++++++++++ packages/ltp/ltp-20080229/runltp-path.patch | 24 ++++++++ packages/ltp/ltp_20080229.bb | 66 ++++++++++++++++++++++ packages/mtd/mtd-utils-native.inc | 1 - 8 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 packages/ltp/ltp-20080229/.mtn2git_empty create mode 100644 packages/ltp/ltp-20080229/cross-compile.patch create mode 100644 packages/ltp/ltp-20080229/ltp-run create mode 100644 packages/ltp/ltp-20080229/posix_shell_compat.patch create mode 100644 packages/ltp/ltp-20080229/runltp-path.patch create mode 100644 packages/ltp/ltp_20080229.bb (limited to 'packages') diff --git a/packages/linux/linux_2.6.24.bb b/packages/linux/linux_2.6.24.bb index 04470bdf03..1fddb12434 100644 --- a/packages/linux/linux_2.6.24.bb +++ b/packages/linux/linux_2.6.24.bb @@ -12,6 +12,8 @@ PR = "r6" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \ file://powerpc-clockres.patch;patch=1 \ + file://leds-cpu-activity.patch;patch=1 \ + file://leds-cpu-activity-powerpc.patch;patch=1 \ file://defconfig" # Real-time preemption. This is experimental and requires a different defconfig. diff --git a/packages/ltp/ltp-20080229/.mtn2git_empty b/packages/ltp/ltp-20080229/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/ltp/ltp-20080229/cross-compile.patch b/packages/ltp/ltp-20080229/cross-compile.patch new file mode 100644 index 0000000000..4aa4eefd18 --- /dev/null +++ b/packages/ltp/ltp-20080229/cross-compile.patch @@ -0,0 +1,31 @@ +Index: ltp-full-20080229/Makefile +=================================================================== +--- ltp-full-20080229.orig/Makefile 2008-02-29 08:55:41.000000000 +0100 ++++ ltp-full-20080229/Makefile 2008-03-01 00:27:33.000000000 +0100 +@@ -33,11 +33,12 @@ + endif + ifdef CROSS_COMPILER + CC=$(CROSS_COMPILER)gcc ++CPP=$(CROSS_COMPILER)g++ + AR=$(CROSS_COMPILER)ar + endif + + export CFLAGS += -Wall $(CROSS_CFLAGS) +-export CC AR LDFLAGS ++export CC AR LDFLAGS CPP + + -include config.mk + +Index: ltp-full-20080229/testcases/ballista/ballista/Makefile +=================================================================== +--- ltp-full-20080229.orig/testcases/ballista/ballista/Makefile 2008-02-29 08:55:46.000000000 +0100 ++++ ltp-full-20080229/testcases/ballista/ballista/Makefile 2008-03-01 00:27:33.000000000 +0100 +@@ -24,7 +24,7 @@ + ######################## + + # compiler info for the host +-CC = g++ -Wno-deprecated ++CC = $(CPP) -Wno-deprecated + CFLAGS = -w -O ${TARGET_DEF} + CLIBS = -lpthread -ldl -lnsl -rdynamic + TEST_MAN_FILE = selfHost diff --git a/packages/ltp/ltp-20080229/ltp-run b/packages/ltp/ltp-20080229/ltp-run new file mode 100644 index 0000000000..5d97f00532 --- /dev/null +++ b/packages/ltp/ltp-20080229/ltp-run @@ -0,0 +1,4 @@ +#!/bin/sh +/usr/libexec/ltp/runltp -t 180s > /home/root/testlog.txt +echo "Benchmark run finished...." +touch /home/root/testfinished.flag diff --git a/packages/ltp/ltp-20080229/posix_shell_compat.patch b/packages/ltp/ltp-20080229/posix_shell_compat.patch new file mode 100644 index 0000000000..b88d598deb --- /dev/null +++ b/packages/ltp/ltp-20080229/posix_shell_compat.patch @@ -0,0 +1,33 @@ +Index: ltp-full-20080229/testcases/network/generate.sh +=================================================================== +--- ltp-full-20080229.orig/testcases/network/generate.sh 2008-03-01 00:34:24.000000000 +0100 ++++ ltp-full-20080229/testcases/network/generate.sh 2008-03-01 00:35:13.000000000 +0100 +@@ -53,22 +53,24 @@ + $makeit $data_dir/$jumbo_file $jumbo_size + + if [ ! -e $data_dir/bin.sm ] ; then +- cnt=6 +- while [ $((cnt=cnt-1)) -ge 0 ] ; do ++ cnt=5 ++ while [ $cnt -ge 0 ] ; do + gzip -1 -c datafiles/ascii.sm >> $data_dir/bin.sm ++ cnt=$(($cnt-1)) + done + fi + + genfile() { + local input=$data_dir/$1 output=$data_dir/$2 +- local cnt=20 ++ local cnt=19 + + if [ -e $output ] ; then + return 0 + fi + +- while [ $((cnt=cnt-1)) -ge 0 ] ; do ++ while [ $cnt -ge 0 ] ; do + cat $input >> $output ++ cnt=$(($cnt-1)) + done + } + diff --git a/packages/ltp/ltp-20080229/runltp-path.patch b/packages/ltp/ltp-20080229/runltp-path.patch new file mode 100644 index 0000000000..d117b3c24e --- /dev/null +++ b/packages/ltp/ltp-20080229/runltp-path.patch @@ -0,0 +1,24 @@ +Index: runltp +=================================================================== +--- ltp-full-20060412.orig/runltp 2005-03-12 03:26:14.000000000 +0800 ++++ ltp-full-20060412/runltp 2006-04-26 16:42:13.000000000 +0800 +@@ -43,7 +43,7 @@ + echo "FATAL: unable to change directory to $(dirname $0)" + exit 1 + } +- export LTPROOT=${PWD} ++ export LTPROOT=/usr/libexec/ltp + export TMPBASE="/tmp" + export TMP="${TMPBASE}/ltp-$$" + export PATH="${PATH}:${LTPROOT}/testcases/bin" +--- ltp-full-20060412.orig/runltp 2007-02-28 20:40:17.000000000 -0800 ++++ ltp-full-20060412/runltp 2007-04-01 11:38:38.000000000 -0700 +@@ -285,7 +285,7 @@ + ${LTPROOT}/runtest/sched ${LTPROOT}/runtest/math \ + ${LTPROOT}/runtest/nptl ${LTPROOT}/runtest/pty + do +- [ -a "$SCENFILES" ] || \ ++ [ -e "$SCENFILES" ] || \ + { + echo "FATAL: missing scenario file $SCENFILES" + exit 1 diff --git a/packages/ltp/ltp_20080229.bb b/packages/ltp/ltp_20080229.bb new file mode 100644 index 0000000000..d23b5d7188 --- /dev/null +++ b/packages/ltp/ltp_20080229.bb @@ -0,0 +1,66 @@ +DESCRIPTION = "Linux Test Project" +HOMEPAGE = "http://ltp.sourceforge.net" +LICENSE = "GPL" +SECTION = "console/utils" + +SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.tgz \ + file://cross-compile.patch;patch=1 \ + file://runltp-path.patch;patch=1 \ + file://ltp-run \ + file://posix_shell_compat.patch;patch=1" + +S = "${WORKDIR}/ltp-full-${PV}" + +EXTRA_OEMAKE_append = " CROSS_COMPILE=${HOST_PREFIX}" + +FILES_${PN}-dbg = "${libexecdir}/ltp/*/*/*/*/*/.debug" +FILES_${PN}-dbg += "${libexecdir}/ltp/*/*/*/*/.debug" +FILES_${PN}-dbg += "${libexecdir}/ltp/*/*/*/.debug" +FILES_${PN}-dbg += "${libexecdir}/ltp/*/*/.debug" +FILES_${PN}-dbg += "${libexecdir}/ltp/*/.debug" +#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/misc/math/float/trigo/.debug" +#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/misc/math/float/iperb/.debug" +#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/misc/math/float/exp_log/.debug" +#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/misc/math/float/power/.debug" +#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/misc/math/float/bessel/.debug" +#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/misc/math/abs/.debug" +#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/misc/math/atof/.debug" +#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/misc/math/nextafter/.debug" +#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/misc/math/fptests/.debug" +#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/misc/f00f/.debug" +#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/misc/crash/.debug" +#FILES_${PN}-dbg += "${libexecdir}/ltp/pan/.debug" +#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/network/ipv6/*/.debug" +#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/network/rpc/rpc01/.debug" +#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/bin/.debug" +#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/kernel/syscalls/*/.debug" +#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/kernel/mem/*/.debug" + +do_compile(){ + oe_runmake CROSS_COMPILE=${HOST_PREFIX} +} + +do_install(){ + export CREATE=0 + export LTPROOT=${D}/usr/libexec/ltp/testcases + + oe_runmake install + + install -d ${D}/usr/libexec/ltp/testcases + install -d ${D}/usr/libexec/ltp/pan + + #install testcases + #install -m 0755 ${WORKDIR}/testcases ${D}/usr/libexec/ltp/testcases + #install -m 0755 ${WORKDIR}/testcases ${D}/usr/libexec/ltp/ + + # treecopy testcases pan/pan runtest ver_linux IDcheck.sh \ + # ${D}/usr/libexec/ltp + cp testcases ${D}/usr/libexec/ltp/ -rfp + rm ${D}/usr/libexec/ltp/ballista -rf + cp pan/pan ${D}/usr/libexec/ltp/pan -p + cp runtest ${D}/usr/libexec/ltp/ -rfp + cp ver_linux ${D}/usr/libexec/ltp/ -p + cp runltp ${D}/usr/libexec/ltp/ -p + cp IDcheck.sh ${D}/usr/libexec/ltp/ -p +} + diff --git a/packages/mtd/mtd-utils-native.inc b/packages/mtd/mtd-utils-native.inc index 8ac4673524..28696b46d5 100644 --- a/packages/mtd/mtd-utils-native.inc +++ b/packages/mtd/mtd-utils-native.inc @@ -11,4 +11,3 @@ do_stage () { install -m 0755 $binary ${STAGING_BINDIR} done } - -- cgit v1.2.3 From 9c6a4739250e77bd66c7e1d5b40f8a856a2d311a Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 1 Mar 2008 00:26:13 +0000 Subject: moko-underground-image: misc dependency fixes --- packages/images/moko-underground-image.bb | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) (limited to 'packages') diff --git a/packages/images/moko-underground-image.bb b/packages/images/moko-underground-image.bb index a7dc463faf..5752ce6037 100644 --- a/packages/images/moko-underground-image.bb +++ b/packages/images/moko-underground-image.bb @@ -5,7 +5,7 @@ IMAGE_LINGUAS = "" ADD_INSTALL = "\ - fontconfig \ + fontconfig-utils \ \ ttf-dejavu-common \ ttf-dejavu-sans \ @@ -13,40 +13,22 @@ ADD_INSTALL = "\ \ " + IMAGE_INSTALL = "\ ${MACHINE_TASK_PROVIDER} \ - task-base \ netbase \ sysfsutils \ - modutils-initscripts \ module-init-tools-depmod \ rsync \ screen \ fbset \ fbset-modes \ \ - matchbox-wm \ - ${XSERVER} \ - xserver-kdrive-common \ - xserver-nodm-init \ - xauth \ - xhost \ - xset \ - xrandr \ - \ - gsm0710muxd \ - pyneod \ - pyneog \ + task-pyneo \ \ ${ADD_INSTALL} \ " -DEPENDS = "\ - ${MACHINE_TASK_PROVIDER} \ - task-pyneo \ -" - - inherit image ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp' -- cgit v1.2.3 From 6ea7f59d1afd33c78c3f3542b3f3e419dbb65127 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Sat, 1 Mar 2008 00:29:47 +0000 Subject: ltp: 2008-02-29 release. Patched to build. ballista test still fails detecting native perl. Not tested on any target yet. --- packages/ltp/ltp-20080229/ballista.patch | 22 ++++++++++++++++++++ packages/ltp/ltp-20080229/cross-compile.patch | 30 +++++++++++++++++++++++++-- packages/ltp/ltp_20080229.bb | 3 ++- 3 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 packages/ltp/ltp-20080229/ballista.patch (limited to 'packages') diff --git a/packages/ltp/ltp-20080229/ballista.patch b/packages/ltp/ltp-20080229/ballista.patch new file mode 100644 index 0000000000..d318480208 --- /dev/null +++ b/packages/ltp/ltp-20080229/ballista.patch @@ -0,0 +1,22 @@ +Index: ltp-full-20080229/testcases/ballista/Makefile +=================================================================== +--- ltp-full-20080229.orig/testcases/ballista/Makefile 2008-02-29 08:55:46.000000000 +0100 ++++ ltp-full-20080229/testcases/ballista/Makefile 2008-03-01 01:21:16.000000000 +0100 +@@ -1,4 +1,4 @@ +-ifeq ($(shell perl -v &> /dev/null && echo yes),yes) ++ifeq ($(shell perl -v > /dev/null && echo yes),yes) + + all: bal + +Index: ltp-full-20080229/testcases/ballista/ballista/Makefile +=================================================================== +--- ltp-full-20080229.orig/testcases/ballista/ballista/Makefile 2008-03-01 01:21:16.000000000 +0100 ++++ ltp-full-20080229/testcases/ballista/ballista/Makefile 2008-03-01 01:22:22.000000000 +0100 +@@ -37,6 +37,7 @@ + + # build everything by default + all : callGen callGen_standAlone genCodeCreator replacer ballista ++ rm blexer bparser mut.out + + # run-of-of-the-mill rules for utility programs + callGen: callGen.cpp diff --git a/packages/ltp/ltp-20080229/cross-compile.patch b/packages/ltp/ltp-20080229/cross-compile.patch index 4aa4eefd18..456bf4f135 100644 --- a/packages/ltp/ltp-20080229/cross-compile.patch +++ b/packages/ltp/ltp-20080229/cross-compile.patch @@ -1,7 +1,7 @@ Index: ltp-full-20080229/Makefile =================================================================== --- ltp-full-20080229.orig/Makefile 2008-02-29 08:55:41.000000000 +0100 -+++ ltp-full-20080229/Makefile 2008-03-01 00:27:33.000000000 +0100 ++++ ltp-full-20080229/Makefile 2008-03-01 01:14:35.000000000 +0100 @@ -33,11 +33,12 @@ endif ifdef CROSS_COMPILER @@ -19,7 +19,7 @@ Index: ltp-full-20080229/Makefile Index: ltp-full-20080229/testcases/ballista/ballista/Makefile =================================================================== --- ltp-full-20080229.orig/testcases/ballista/ballista/Makefile 2008-02-29 08:55:46.000000000 +0100 -+++ ltp-full-20080229/testcases/ballista/ballista/Makefile 2008-03-01 00:27:33.000000000 +0100 ++++ ltp-full-20080229/testcases/ballista/ballista/Makefile 2008-03-01 01:14:35.000000000 +0100 @@ -24,7 +24,7 @@ ######################## @@ -29,3 +29,29 @@ Index: ltp-full-20080229/testcases/ballista/ballista/Makefile CFLAGS = -w -O ${TARGET_DEF} CLIBS = -lpthread -ldl -lnsl -rdynamic TEST_MAN_FILE = selfHost +Index: ltp-full-20080229/testcases/kernel/security/filecaps/Makefile +=================================================================== +--- ltp-full-20080229.orig/testcases/kernel/security/filecaps/Makefile 2008-03-01 01:14:49.000000000 +0100 ++++ ltp-full-20080229/testcases/kernel/security/filecaps/Makefile 2008-03-01 01:15:05.000000000 +0100 +@@ -20,7 +20,6 @@ + + SCRIPTS = filecapstest.sh checkforlibcap.sh checkforfilecaps.sh + ifeq ($(shell sh checkforlibcap.sh yesno),yes) +-CC=gcc + + CFLAGS += -I../../../../include -Wall + LDLIBS += -L../../../../lib -lltp -lcap +@@ -29,11 +28,11 @@ + TARGETS = $(patsubst %.c,%,$(SRCS)) + INSTALLTARGETS = $(TARGETS) $(SCRIPTS) + all: $(TARGETS) +- gcc -o checkforlibcap gotlibcap.c ++ $(CC) -o checkforlibcap gotlibcap.c + else + all: + @echo "setcap or xattr headers not installed. Please install libcap from"; echo "ftp://ftp.kernel.org/pub/linux/libs/security/linux-privs/libcap2"; echo "Then make clean in ltp or ltp/testcases/kernel/security/filecaps, and recompile ltp." +- gcc -o checkforlibcap nolibcap.c ++ $(CC) -o checkforlibcap nolibcap.c + TARGETS = + endif + diff --git a/packages/ltp/ltp_20080229.bb b/packages/ltp/ltp_20080229.bb index d23b5d7188..6ad102023b 100644 --- a/packages/ltp/ltp_20080229.bb +++ b/packages/ltp/ltp_20080229.bb @@ -7,7 +7,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.tgz \ file://cross-compile.patch;patch=1 \ file://runltp-path.patch;patch=1 \ file://ltp-run \ - file://posix_shell_compat.patch;patch=1" + file://posix_shell_compat.patch;patch=1 \ + file://ballista.patch;patch=1" S = "${WORKDIR}/ltp-full-${PV}" -- cgit v1.2.3 From e15c35e1b62574a05435b6184a2309b0980ad7e1 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Sat, 1 Mar 2008 13:02:50 +0000 Subject: rt-tests: New package, version 0.19. --- packages/rt-tests/.mtn2git_empty | 0 packages/rt-tests/rt-tests_0.19.bb | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 packages/rt-tests/.mtn2git_empty create mode 100644 packages/rt-tests/rt-tests_0.19.bb (limited to 'packages') diff --git a/packages/rt-tests/.mtn2git_empty b/packages/rt-tests/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/rt-tests/rt-tests_0.19.bb b/packages/rt-tests/rt-tests_0.19.bb new file mode 100644 index 0000000000..e2c9e17846 --- /dev/null +++ b/packages/rt-tests/rt-tests_0.19.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Real-time tests, such as cyclictest." +HOMEPAGE = "http://rt.wiki.kernel.org/index.php/Cyclictest" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.kernel.org/pub/linux/kernel/people/tglx/rt-tests/rt-tests-${PV}.tar.bz2" + +S = "${WORKDIR}/rt-tests" + +do_install() { + install -d ${D}${bindir} + for binary in `find . -perm 0755 -type f` + do + install -m 0755 $binary ${D}${bindir} + done +} + + -- cgit v1.2.3 From a7a15cdd49ee5c04e30f5732f10c5c009088e405 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Sat, 1 Mar 2008 13:58:48 +0000 Subject: gdb-6.6: Added early_debug_in_nptl.patch as recommended in eglibc.org FAQ. --- packages/gdb/gdb-6.6/.mtn2git_empty | 0 packages/gdb/gdb-6.6/early_debug_in_nptl.patch | 306 +++++++++++++++++++++++++ packages/gdb/gdb-cross_6.6.bb | 3 +- packages/gdb/gdb_6.6.bb | 4 +- 4 files changed, 311 insertions(+), 2 deletions(-) create mode 100644 packages/gdb/gdb-6.6/.mtn2git_empty create mode 100644 packages/gdb/gdb-6.6/early_debug_in_nptl.patch (limited to 'packages') diff --git a/packages/gdb/gdb-6.6/.mtn2git_empty b/packages/gdb/gdb-6.6/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gdb/gdb-6.6/early_debug_in_nptl.patch b/packages/gdb/gdb-6.6/early_debug_in_nptl.patch new file mode 100644 index 0000000000..c53f0d8ad5 --- /dev/null +++ b/packages/gdb/gdb-6.6/early_debug_in_nptl.patch @@ -0,0 +1,306 @@ +http://sourceware.org/ml/gdb-patches/2007-06/msg00479.html + +Index: gdb/linux-thread-db.c +=================================================================== +--- gdb/linux-thread-db.c.orig 2006-10-20 03:08:14.000000000 +0200 ++++ gdb/linux-thread-db.c 2008-03-01 14:45:52.000000000 +0100 +@@ -213,6 +213,21 @@ + } + } + ++/* Return 1 if any threads have been registered. There may be none if ++ the threading library is not fully initialized yet. */ ++ ++static int ++have_threads_callback (struct thread_info *thread, void *dummy) ++{ ++ return 1; ++} ++ ++static int ++have_threads (void) ++{ ++ return iterate_over_threads (have_threads_callback, NULL) != NULL; ++} ++ + /* A callback function for td_ta_thr_iter, which we use to map all + threads to LWPs. + +@@ -700,23 +715,6 @@ + } + + static void +-thread_db_attach (char *args, int from_tty) +-{ +- target_beneath->to_attach (args, from_tty); +- +- /* Destroy thread info; it's no longer valid. */ +- init_thread_list (); +- +- /* The child process is now the actual multi-threaded +- program. Snatch its process ID... */ +- proc_handle.pid = GET_PID (inferior_ptid); +- +- /* ...and perform the remaining initialization steps. */ +- enable_thread_event_reporting (); +- thread_db_find_new_threads (); +-} +- +-static void + detach_thread (ptid_t ptid, int verbose) + { + struct thread_info *thread_info; +@@ -742,14 +740,13 @@ + disable_thread_event_reporting (); + + /* There's no need to save & restore inferior_ptid here, since the +- inferior is supposed to be survive this function call. */ ++ inferior is not supposed to survive this function call. */ + inferior_ptid = lwp_from_thread (inferior_ptid); + +- /* Forget about the child's process ID. We shouldn't need it +- anymore. */ +- proc_handle.pid = 0; +- + target_beneath->to_detach (args, from_tty); ++ ++ /* Should this be done by detach_command? */ ++ target_mourn_inferior (); + } + + static int +@@ -870,12 +867,6 @@ + + ptid = target_beneath->to_wait (ptid, ourstatus); + +- if (proc_handle.pid == 0) +- /* The current child process isn't the actual multi-threaded +- program yet, so don't try to do any special thread-specific +- post-processing and bail out early. */ +- return ptid; +- + if (ourstatus->kind == TARGET_WAITKIND_EXITED + || ourstatus->kind == TARGET_WAITKIND_SIGNALLED) + return pid_to_ptid (-1); +@@ -889,23 +880,32 @@ + return pid_to_ptid (GET_PID (ptid)); + } + ++ /* If we do not know about the main thread yet, this would be a good time to ++ find it. */ ++ if (ourstatus->kind == TARGET_WAITKIND_STOPPED && !have_threads ()) ++ thread_db_find_new_threads (); ++ + if (ourstatus->kind == TARGET_WAITKIND_STOPPED + && ourstatus->value.sig == TARGET_SIGNAL_TRAP) + /* Check for a thread event. */ + check_event (ptid); + +- if (!ptid_equal (trap_ptid, null_ptid)) +- trap_ptid = thread_from_lwp (trap_ptid); ++ if (have_threads ()) ++ { ++ /* Change ptids back into the higher level PID + TID format. If ++ the thread is dead and no longer on the thread list, we will ++ get back a dead ptid. This can occur if the thread death ++ event gets postponed by other simultaneous events. In such a ++ case, we want to just ignore the event and continue on. */ ++ ++ if (!ptid_equal (trap_ptid, null_ptid)) ++ trap_ptid = thread_from_lwp (trap_ptid); ++ ++ ptid = thread_from_lwp (ptid); ++ if (GET_PID (ptid) == -1) ++ ourstatus->kind = TARGET_WAITKIND_SPURIOUS; ++ } + +- /* Change the ptid back into the higher level PID + TID format. +- If the thread is dead and no longer on the thread list, we will +- get back a dead ptid. This can occur if the thread death event +- gets postponed by other simultaneous events. In such a case, +- we want to just ignore the event and continue on. */ +- ptid = thread_from_lwp (ptid); +- if (GET_PID (ptid) == -1) +- ourstatus->kind = TARGET_WAITKIND_SPURIOUS; +- + return ptid; + } + +@@ -944,30 +944,6 @@ + } + + static void +-thread_db_create_inferior (char *exec_file, char *allargs, char **env, +- int from_tty) +-{ +- unpush_target (&thread_db_ops); +- using_thread_db = 0; +- target_beneath->to_create_inferior (exec_file, allargs, env, from_tty); +-} +- +-static void +-thread_db_post_startup_inferior (ptid_t ptid) +-{ +- if (proc_handle.pid == 0) +- { +- /* The child process is now the actual multi-threaded +- program. Snatch its process ID... */ +- proc_handle.pid = GET_PID (ptid); +- +- /* ...and perform the remaining initialization steps. */ +- enable_thread_event_reporting (); +- thread_db_find_new_threads (); +- } +-} +- +-static void + thread_db_mourn_inferior (void) + { + /* Forget about the child's process ID. We shouldn't need it +@@ -1002,6 +978,22 @@ + + ptid = ptid_build (GET_PID (inferior_ptid), ti.ti_lid, ti.ti_tid); + ++ if (ti.ti_tid == 0) ++ { ++ /* A thread ID of zero means that this is the main thread, but ++ glibc has not yet initialized thread-local storage and the ++ pthread library. We do not know what the thread's TID will ++ be yet. Just enable event reporting and otherwise ignore ++ it. */ ++ ++ err = td_thr_event_enable_p (th_p, 1); ++ if (err != TD_OK) ++ error (_("Cannot enable thread event reporting for %s: %s"), ++ target_pid_to_str (ptid), thread_db_err_str (err)); ++ ++ return 0; ++ } ++ + if (!in_thread_list (ptid)) + attach_thread (ptid, th_p, &ti, 1); + +@@ -1058,6 +1050,16 @@ + return NULL; + } + ++/* Return 1 if this thread has the same LWP as the passed PTID. */ ++ ++static int ++same_ptid_callback (struct thread_info *thread, void *arg) ++{ ++ ptid_t *ptid_p = arg; ++ ++ return GET_LWP (thread->ptid) == GET_LWP (*ptid_p); ++} ++ + /* Get the address of the thread local variable in load module LM which + is stored at OFFSET within the thread local storage for thread PTID. */ + +@@ -1066,6 +1068,21 @@ + CORE_ADDR lm, + CORE_ADDR offset) + { ++ /* If we have not discovered any threads yet, check now. */ ++ if (!is_thread (ptid) && !have_threads ()) ++ thread_db_find_new_threads (); ++ ++ /* Try to find a matching thread if we still have the LWP ID instead ++ of the thread ID. */ ++ if (!is_thread (ptid)) ++ { ++ struct thread_info *thread; ++ ++ thread = iterate_over_threads (same_ptid_callback, &ptid); ++ if (thread != NULL) ++ ptid = thread->ptid; ++ } ++ + if (is_thread (ptid)) + { + td_err_e err; +@@ -1125,14 +1142,11 @@ + thread_db_ops.to_shortname = "multi-thread"; + thread_db_ops.to_longname = "multi-threaded child process."; + thread_db_ops.to_doc = "Threads and pthreads support."; +- thread_db_ops.to_attach = thread_db_attach; + thread_db_ops.to_detach = thread_db_detach; + thread_db_ops.to_resume = thread_db_resume; + thread_db_ops.to_wait = thread_db_wait; + thread_db_ops.to_xfer_partial = thread_db_xfer_partial; + thread_db_ops.to_kill = thread_db_kill; +- thread_db_ops.to_create_inferior = thread_db_create_inferior; +- thread_db_ops.to_post_startup_inferior = thread_db_post_startup_inferior; + thread_db_ops.to_mourn_inferior = thread_db_mourn_inferior; + thread_db_ops.to_find_new_threads = thread_db_find_new_threads; + thread_db_ops.to_pid_to_str = thread_db_pid_to_str; +Index: gdb/gdbserver/thread-db.c +=================================================================== +--- gdb/gdbserver/thread-db.c.orig 2006-10-17 18:02:27.000000000 +0200 ++++ gdb/gdbserver/thread-db.c 2008-03-01 14:44:41.000000000 +0100 +@@ -40,6 +40,7 @@ + /* Connection to the libthread_db library. */ + static td_thragent_t *thread_agent; + ++static void thread_db_find_new_threads (void); + static int find_new_threads_callback (const td_thrhandle_t *th_p, void *data); + + static char * +@@ -134,6 +135,8 @@ + td_event_msg_t msg; + td_err_e err; + struct inferior_linux_data *tdata; ++ struct thread_info *inferior; ++ struct process_info *process; + + if (debug_threads) + fprintf (stderr, "Thread creation event.\n"); +@@ -149,6 +152,14 @@ + fprintf (stderr, "thread getmsg err: %s\n", + thread_db_err_str (err)); + ++ /* If we do not know about the main thread yet, this would be a good time to ++ find it. We need to do this to pick up the main thread before any newly ++ created threads. */ ++ inferior = (struct thread_info *) all_threads.head; ++ process = get_thread_process (inferior); ++ if (process->thread_known == 0) ++ thread_db_find_new_threads (); ++ + /* msg.event == TD_EVENT_CREATE */ + + find_new_threads_callback (msg.th_p, NULL); +@@ -231,8 +242,24 @@ + { + inferior = (struct thread_info *) all_threads.head; + process = get_thread_process (inferior); ++ + if (process->thread_known == 0) + { ++ /* If the new thread ID is zero, a final thread ID will be ++ available later. Do not enable thread debugging yet. */ ++ if (ti_p->ti_tid == 0) ++ { ++ err = td_thr_event_enable (th_p, 1); ++ if (err != TD_OK) ++ error ("Cannot enable thread event reporting for %d: %s", ++ ti_p->ti_lid, thread_db_err_str (err)); ++ return; ++ } ++ ++ if (process->lwpid != ti_p->ti_lid) ++ fatal ("PID mismatch! Expected %ld, got %ld", ++ (long) process->lwpid, (long) ti_p->ti_lid); ++ + /* Switch to indexing the threads list by TID. */ + change_inferior_id (&all_threads, ti_p->ti_tid); + goto found; +@@ -331,6 +358,8 @@ + + process = get_thread_process (thread); + if (!process->thread_known) ++ thread_db_find_new_threads (); ++ if (!process->thread_known) + return TD_NOTHR; + + err = td_thr_tls_get_addr (&process->th, (psaddr_t) load_module, offset, diff --git a/packages/gdb/gdb-cross_6.6.bb b/packages/gdb/gdb-cross_6.6.bb index c6992e4b6a..0fbd11015c 100644 --- a/packages/gdb/gdb-cross_6.6.bb +++ b/packages/gdb/gdb-cross_6.6.bb @@ -1,7 +1,8 @@ require gdb-cross.inc SRC_URI += "file://sim-install-6.6.patch;patch=1" +SRC_URI += "file://early_debug_in_nptl.patch;patch=1;pnum=0" inherit cross -PR = "r1" \ No newline at end of file +PR = "r2" diff --git a/packages/gdb/gdb_6.6.bb b/packages/gdb/gdb_6.6.bb index a558775ff4..c507a48aa8 100644 --- a/packages/gdb/gdb_6.6.bb +++ b/packages/gdb/gdb_6.6.bb @@ -1,3 +1,5 @@ require gdb.inc -PR = "r3" +PR = "r4" + +SRC_URI += "file://early_debug_in_nptl.patch;patch=1;pnum=0" -- cgit v1.2.3 From 3f8a14bc8b63968e904c7b53d83cbd5f09c2ad8b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 1 Mar 2008 16:25:41 +0000 Subject: libgcrypt (all except 1.9) refactor into libgcrypt.inc, inherit pkgconfig, remove 1.2.0, 1.2.1, 1.2.2 --- packages/libgcrypt/libgcrypt.inc | 21 +++++++++++++++++++++ packages/libgcrypt/libgcrypt_1.2.0.bb | 29 ----------------------------- packages/libgcrypt/libgcrypt_1.2.1.bb | 28 ---------------------------- packages/libgcrypt/libgcrypt_1.2.2.bb | 28 ---------------------------- packages/libgcrypt/libgcrypt_1.2.3.bb | 23 ++--------------------- packages/libgcrypt/libgcrypt_1.4.0.bb | 23 ++--------------------- 6 files changed, 25 insertions(+), 127 deletions(-) create mode 100644 packages/libgcrypt/libgcrypt.inc delete mode 100644 packages/libgcrypt/libgcrypt_1.2.0.bb delete mode 100644 packages/libgcrypt/libgcrypt_1.2.1.bb delete mode 100644 packages/libgcrypt/libgcrypt_1.2.2.bb (limited to 'packages') diff --git a/packages/libgcrypt/libgcrypt.inc b/packages/libgcrypt/libgcrypt.inc new file mode 100644 index 0000000000..2dc2459c09 --- /dev/null +++ b/packages/libgcrypt/libgcrypt.inc @@ -0,0 +1,21 @@ +DESCRIPTION = "A general purpose cryptographic library based on the code from GnuPG" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL LGPL FDL" +DEPENDS = "libgpg-error" + +SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz" + +inherit autotools binconfig pkgconfig + +EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities" + +ARM_INSTRUCTION_SET = "arm" + +do_stage() { + autotools_stage_all +} + +# move libgcrypt-config into -dev package +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${bindir}" diff --git a/packages/libgcrypt/libgcrypt_1.2.0.bb b/packages/libgcrypt/libgcrypt_1.2.0.bb deleted file mode 100644 index be0ad787da..0000000000 --- a/packages/libgcrypt/libgcrypt_1.2.0.bb +++ /dev/null @@ -1,29 +0,0 @@ -PR = "r2" -DESCRIPTION = "A general purpose cryptographic library based on the code from GnuPG" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL LGPL FDL" -DEPENDS = "libgpg-error" - -# move libgcrypt-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" - -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz" - -inherit autotools binconfig - -EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities" - -do_stage() { - oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR} - oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR} - install -m 0755 src/libgcrypt-config ${STAGING_BINDIR_CROSS}/ - - install -d ${STAGING_INCDIR}/ - for X in gcrypt.h gcrypt-module.h - do - install -m 0644 src/${X} ${STAGING_INCDIR}/${X} - done - -} diff --git a/packages/libgcrypt/libgcrypt_1.2.1.bb b/packages/libgcrypt/libgcrypt_1.2.1.bb deleted file mode 100644 index 3f4942cae5..0000000000 --- a/packages/libgcrypt/libgcrypt_1.2.1.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "A general purpose cryptographic library based on the code from GnuPG" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL LGPL FDL" -DEPENDS = "libgpg-error" - -# move libgcrypt-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" - -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz" - -inherit autotools binconfig - -EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities" - -do_stage() { - oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR} - oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR} - install -m 0755 src/libgcrypt-config ${STAGING_BINDIR_CROSS}/ - - install -d ${STAGING_INCDIR}/ - for X in gcrypt.h gcrypt-module.h - do - install -m 0644 src/${X} ${STAGING_INCDIR}/${X} - done - -} diff --git a/packages/libgcrypt/libgcrypt_1.2.2.bb b/packages/libgcrypt/libgcrypt_1.2.2.bb deleted file mode 100644 index 3f4942cae5..0000000000 --- a/packages/libgcrypt/libgcrypt_1.2.2.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "A general purpose cryptographic library based on the code from GnuPG" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL LGPL FDL" -DEPENDS = "libgpg-error" - -# move libgcrypt-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" - -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz" - -inherit autotools binconfig - -EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities" - -do_stage() { - oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR} - oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR} - install -m 0755 src/libgcrypt-config ${STAGING_BINDIR_CROSS}/ - - install -d ${STAGING_INCDIR}/ - for X in gcrypt.h gcrypt-module.h - do - install -m 0644 src/${X} ${STAGING_INCDIR}/${X} - done - -} diff --git a/packages/libgcrypt/libgcrypt_1.2.3.bb b/packages/libgcrypt/libgcrypt_1.2.3.bb index 74205da673..2fe98d62e3 100644 --- a/packages/libgcrypt/libgcrypt_1.2.3.bb +++ b/packages/libgcrypt/libgcrypt_1.2.3.bb @@ -1,22 +1,3 @@ -DESCRIPTION = "A general purpose cryptographic library based on the code from GnuPG" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL LGPL FDL" -DEPENDS = "libgpg-error" -PR = "r1" +require libgcrypt.inc -# move libgcrypt-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" - -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz" - -inherit autotools binconfig - -EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities" - -ARM_INSTRUCTION_SET = "arm" - -do_stage() { - autotools_stage_all -} +PR = "r2" diff --git a/packages/libgcrypt/libgcrypt_1.4.0.bb b/packages/libgcrypt/libgcrypt_1.4.0.bb index 74205da673..2fe98d62e3 100644 --- a/packages/libgcrypt/libgcrypt_1.4.0.bb +++ b/packages/libgcrypt/libgcrypt_1.4.0.bb @@ -1,22 +1,3 @@ -DESCRIPTION = "A general purpose cryptographic library based on the code from GnuPG" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL LGPL FDL" -DEPENDS = "libgpg-error" -PR = "r1" +require libgcrypt.inc -# move libgcrypt-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" - -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz" - -inherit autotools binconfig - -EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities" - -ARM_INSTRUCTION_SET = "arm" - -do_stage() { - autotools_stage_all -} +PR = "r2" -- cgit v1.2.3 From 4e5bcb9a3dbcb17d5f60c4740fbb3dc058e17a0c Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 1 Mar 2008 16:45:25 +0000 Subject: libgcrypt (all) add pkgconfig support to it. patch unmergable since upstream doesn't like pkgconfig *sigh* --- packages/libgcrypt/files/.mtn2git_empty | 0 .../libgcrypt/files/add-pkgconfig-support.patch | 62 ++++++++++++++++++++++ packages/libgcrypt/libgcrypt-1.4.0/.mtn2git_empty | 0 .../libgcrypt-1.4.0/add-pkgconfig-support.patch | 49 +++++++++++++++++ packages/libgcrypt/libgcrypt.inc | 3 +- packages/libgcrypt/libgcrypt_1.2.3.bb | 3 -- packages/libgcrypt/libgcrypt_1.2.4.bb | 3 ++ 7 files changed, 116 insertions(+), 4 deletions(-) create mode 100644 packages/libgcrypt/files/.mtn2git_empty create mode 100644 packages/libgcrypt/files/add-pkgconfig-support.patch create mode 100644 packages/libgcrypt/libgcrypt-1.4.0/.mtn2git_empty create mode 100644 packages/libgcrypt/libgcrypt-1.4.0/add-pkgconfig-support.patch delete mode 100644 packages/libgcrypt/libgcrypt_1.2.3.bb create mode 100644 packages/libgcrypt/libgcrypt_1.2.4.bb (limited to 'packages') diff --git a/packages/libgcrypt/files/.mtn2git_empty b/packages/libgcrypt/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libgcrypt/files/add-pkgconfig-support.patch b/packages/libgcrypt/files/add-pkgconfig-support.patch new file mode 100644 index 0000000000..9b00e8262a --- /dev/null +++ b/packages/libgcrypt/files/add-pkgconfig-support.patch @@ -0,0 +1,62 @@ +diff -Nur libgcrypt-1.2.4/configure.ac libgcrypt11-1.2.4/configure.ac +--- libgcrypt-1.2.4/configure.ac 2007-02-01 19:41:06.000000000 +0100 ++++ libgcrypt11-1.2.4/configure.ac 2007-02-11 13:05:36.000000000 +0100 +@@ -808,6 +808,7 @@ + src/Makefile + src/gcrypt.h + src/libgcrypt-config ++src/libgcrypt.pc + tests/Makefile + w32-dll/Makefile + ]) +diff -Nur libgcrypt-1.2.4/src/libgcrypt.pc.in libgcrypt11-1.2.4/src/libgcrypt.pc.in +--- libgcrypt-1.2.4/src/libgcrypt.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ libgcrypt11-1.2.4/src/libgcrypt.pc.in 2007-02-11 13:03:30.000000000 +0100 +@@ -0,0 +1,32 @@ ++# Process this file with autoconf to produce a pkg-config metadata file. ++# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation ++# Author: Simon Josefsson ++# ++# This file is free software; as a special exception the author gives ++# unlimited permission to copy and/or distribute it, with or without ++# modifications, as long as this notice is preserved. ++# ++# This file is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the ++# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ++ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++# API info ++api_version=@LIBGCRYPT_CONFIG_API_VERSION@ ++ ++# Misc information. ++symmetric_ciphers=@LIBGCRYPT_CIPHERS@ ++asymmetric_ciphers=@LIBGCRYPT_PUBKEY_CIPHERS@ ++digests=@LIBGCRYPT_DIGESTS@ ++ ++Name: libgcrypt ++Description: GNU crypto library ++URL: http://www.gnupg.org ++Version: @VERSION@ ++Libs: -L${libdir} @LIBGCRYPT_CONFIG_LIBS@ ++Libs.private: @GPG_ERROR_LIBS@ ++Cflags: -I${includedir} @LIBGCRYPT_CONFIG_CFLAGS@ @GPG_ERROR_CFLAGS@ +diff -Nur libgcrypt-1.2.4/src/Makefile.am libgcrypt11-1.2.4/src/Makefile.am +--- libgcrypt-1.2.4/src/Makefile.am 2006-11-30 16:38:18.000000000 +0100 ++++ libgcrypt11-1.2.4/src/Makefile.am 2007-02-11 13:10:03.000000000 +0100 +@@ -27,6 +27,11 @@ + + lib_LTLIBRARIES = libgcrypt.la + ++# Pkg-config script. ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = libgcrypt.pc ++DISTCLEANFILES = $(pkgconfig_DATA) ++ + if HAVE_LD_VERSION_SCRIPT + libgcrypt_version_script_cmd = -Wl,--version-script=$(srcdir)/libgcrypt.vers + else diff --git a/packages/libgcrypt/libgcrypt-1.4.0/.mtn2git_empty b/packages/libgcrypt/libgcrypt-1.4.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libgcrypt/libgcrypt-1.4.0/add-pkgconfig-support.patch b/packages/libgcrypt/libgcrypt-1.4.0/add-pkgconfig-support.patch new file mode 100644 index 0000000000..dd5917e900 --- /dev/null +++ b/packages/libgcrypt/libgcrypt-1.4.0/add-pkgconfig-support.patch @@ -0,0 +1,49 @@ +Index: libgcrypt-1.4.0/configure.ac +=================================================================== +--- libgcrypt-1.4.0.orig/configure.ac ++++ libgcrypt-1.4.0/configure.ac +@@ -1072,6 +1072,7 @@ cipher/Makefile + doc/Makefile + src/Makefile + src/gcrypt.h ++src/libgcrypt.pc + src/libgcrypt-config + src/versioninfo.rc + tests/Makefile +Index: libgcrypt-1.4.0/src/libgcrypt.pc.in +=================================================================== +--- /dev/null ++++ libgcrypt-1.4.0/src/libgcrypt.pc.in +@@ -0,0 +1,32 @@ ++# Process this file with autoconf to produce a pkg-config metadata file. ++# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation ++# Author: Simon Josefsson ++# ++# This file is free software; as a special exception the author gives ++# unlimited permission to copy and/or distribute it, with or without ++# modifications, as long as this notice is preserved. ++# ++# This file is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the ++# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ++ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++# API info ++api_version=@LIBGCRYPT_CONFIG_API_VERSION@ ++ ++# Misc information. ++symmetric_ciphers=@LIBGCRYPT_CIPHERS@ ++asymmetric_ciphers=@LIBGCRYPT_PUBKEY_CIPHERS@ ++digests=@LIBGCRYPT_DIGESTS@ ++ ++Name: libgcrypt ++Description: GNU crypto library ++URL: http://www.gnupg.org ++Version: @VERSION@ ++Libs: -L${libdir} @LIBGCRYPT_CONFIG_LIBS@ ++Libs.private: @GPG_ERROR_LIBS@ ++Cflags: -I${includedir} @LIBGCRYPT_CONFIG_CFLAGS@ @GPG_ERROR_CFLAGS@ diff --git a/packages/libgcrypt/libgcrypt.inc b/packages/libgcrypt/libgcrypt.inc index 2dc2459c09..65f78db647 100644 --- a/packages/libgcrypt/libgcrypt.inc +++ b/packages/libgcrypt/libgcrypt.inc @@ -4,7 +4,8 @@ PRIORITY = "optional" LICENSE = "GPL LGPL FDL" DEPENDS = "libgpg-error" -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz" +SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \ + file://add-pkgconfig-support.patch;patch=1" inherit autotools binconfig pkgconfig diff --git a/packages/libgcrypt/libgcrypt_1.2.3.bb b/packages/libgcrypt/libgcrypt_1.2.3.bb deleted file mode 100644 index 2fe98d62e3..0000000000 --- a/packages/libgcrypt/libgcrypt_1.2.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -require libgcrypt.inc - -PR = "r2" diff --git a/packages/libgcrypt/libgcrypt_1.2.4.bb b/packages/libgcrypt/libgcrypt_1.2.4.bb new file mode 100644 index 0000000000..2fe98d62e3 --- /dev/null +++ b/packages/libgcrypt/libgcrypt_1.2.4.bb @@ -0,0 +1,3 @@ +require libgcrypt.inc + +PR = "r2" -- cgit v1.2.3 From 4feb6b6a6332b972493e0dbfe60b8cce64d247cc Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 1 Mar 2008 16:55:49 +0000 Subject: gnutls (all) fix wrong dependency in .pc file --- packages/gnutls/gnutls.inc | 6 +++++- packages/gnutls/gnutls_1.4.5.bb | 2 +- packages/gnutls/gnutls_1.6.3.bb | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/gnutls/gnutls.inc b/packages/gnutls/gnutls.inc index d08b0ca931..781267093c 100644 --- a/packages/gnutls/gnutls.inc +++ b/packages/gnutls/gnutls.inc @@ -1,7 +1,6 @@ DESCRIPTION = "GNU Transport Layer Security Library" HOMEPAGE = "http://www.gnu.org/software/gnutls/" DEPENDS = "zlib libgcrypt lzo" - LICENSE = "LGPL" SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2" @@ -10,6 +9,11 @@ inherit autotools binconfig pkgconfig EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1" +# fix wrong dependency +do_configure_append() { + sed -i s,gcrypt,libgcrypt, lib/gnutls.pc.in +} + do_stage() { oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR} oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR} diff --git a/packages/gnutls/gnutls_1.4.5.bb b/packages/gnutls/gnutls_1.4.5.bb index 3337e0b370..4c247717ae 100644 --- a/packages/gnutls/gnutls_1.4.5.bb +++ b/packages/gnutls/gnutls_1.4.5.bb @@ -1,3 +1,3 @@ require gnutls.inc -PR = "r1" +PR = "r2" diff --git a/packages/gnutls/gnutls_1.6.3.bb b/packages/gnutls/gnutls_1.6.3.bb index be68b55d04..cc35d8b7a3 100644 --- a/packages/gnutls/gnutls_1.6.3.bb +++ b/packages/gnutls/gnutls_1.6.3.bb @@ -6,4 +6,4 @@ SRC_URI += "\ file://configure_madness.patch;patch=1 \ " -PR = "r4" +PR = "r5" -- cgit v1.2.3 From b690ceb60f016853f3705c0d7c854723253806e7 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sat, 1 Mar 2008 21:05:00 +0000 Subject: glibc: use QEMU_OPTIONS to generate binary locales for armv6 machines (from Poky) --- packages/glibc/glibc-package.bbclass | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index 50fae44bf3..bd1cb4f4e4 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -271,7 +271,12 @@ python package_do_split_gconvs () { i18npath = base_path_join(treedir, datadir, "i18n") localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, name) - cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, treedir, localedef_opts) + + qemu_options = bb.data.getVar("QEMU_OPTIONS_%s" % bb.data.getVar('PACKAGE_ARCH', d, 1), d, 1) + if not qemu_options: + qemu_options = bb.data.getVar('QEMU_OPTIONS', d, 1) + + cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, qemu_options, treedir, localedef_opts) bb.note("generating locale %s (%s)" % (locale, encoding)) if os.system(cmd): raise bb.build.FuncFailed("localedef returned an error (command was %s)." % cmd) -- cgit v1.2.3