From 6bd858afbb69cdad533dc8d1e1a1c67a066b26d4 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Tue, 16 Jun 2009 13:11:05 +0200 Subject: openssl: add support for compilation on Via C3 host. Many thanks to Phil Blundell. --- recipes/openssl/openssl.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/openssl/openssl.inc b/recipes/openssl/openssl.inc index e722db5d1a..e6e345b43b 100644 --- a/recipes/openssl/openssl.inc +++ b/recipes/openssl/openssl.inc @@ -49,7 +49,7 @@ do_configure () { linux-i486) target=debian-i386-i486 ;; - linux-i586) + linux-i586 | linux-viac3) target=debian-i386-i586 ;; linux-i686) -- cgit v1.2.3 From 851c3641b59a93b582774e626710360bbdddd7d4 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 24 Jun 2009 11:08:46 +0200 Subject: bluez: update bluez-libs to 4.42. unify. --- recipes/bluez/bluez-libs_4.40.bb | 26 -------------------------- recipes/bluez/bluez-libs_4.42.bb | 4 ++++ recipes/bluez/bluez4-libs.inc | 25 +++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 26 deletions(-) delete mode 100644 recipes/bluez/bluez-libs_4.40.bb create mode 100644 recipes/bluez/bluez-libs_4.42.bb create mode 100644 recipes/bluez/bluez4-libs.inc diff --git a/recipes/bluez/bluez-libs_4.40.bb b/recipes/bluez/bluez-libs_4.40.bb deleted file mode 100644 index 578afaa5ec..0000000000 --- a/recipes/bluez/bluez-libs_4.40.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack Userland V4" -SECTION = "libs" -PRIORITY = "optional" -HOMEPAGE = "http://www.bluez.org" -LICENSE = "GPL" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \ - file://avinfo-link.patch;patch=1;pnum=0" - -S = "${WORKDIR}/bluez-${PV}" - -inherit autotools_stage -AUTOTOOLS_STAGE_PKGCONFIG = "1" - -EXTRA_OECONF = "\ - --disable-tools \ - --disable-audio \ - --disable-network \ - --disable-serial \ - --disable-service \ - --disable-usb \ -" - -FILES_${PN} = "${libdir}/libbluetooth.so.*" diff --git a/recipes/bluez/bluez-libs_4.42.bb b/recipes/bluez/bluez-libs_4.42.bb new file mode 100644 index 0000000000..524b6643d6 --- /dev/null +++ b/recipes/bluez/bluez-libs_4.42.bb @@ -0,0 +1,4 @@ +require bluez4-libs.inc + +PR = "${INC_PR}.1" +DEFAULT_PREFERENCE = "-1" diff --git a/recipes/bluez/bluez4-libs.inc b/recipes/bluez/bluez4-libs.inc new file mode 100644 index 0000000000..4da389cdbb --- /dev/null +++ b/recipes/bluez/bluez4-libs.inc @@ -0,0 +1,25 @@ +DESCRIPTION = "Linux Bluetooth Stack Userland libraries V4" +SECTION = "libs" +PRIORITY = "optional" +HOMEPAGE = "http://www.bluez.org" +LICENSE = "GPL" +INC_PR = "r1" + +SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \ + file://avinfo-link.patch;patch=1;pnum=0" + +S = "${WORKDIR}/bluez-${PV}" + +inherit autotools_stage +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +EXTRA_OECONF = "\ + --disable-tools \ + --disable-audio \ + --disable-network \ + --disable-serial \ + --disable-service \ + --disable-usb \ +" + +FILES_${PN} = "${libdir}/libbluetooth.so.*" -- cgit v1.2.3 From 079c832e0088566d0762779868b622e71626cf44 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 24 Jun 2009 11:16:26 +0200 Subject: bluez: document upstream status of avinfo-link.patch as not applicable upstream. --- recipes/bluez/bluez-libs/avinfo-link.patch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipes/bluez/bluez-libs/avinfo-link.patch b/recipes/bluez/bluez-libs/avinfo-link.patch index 944a98abca..9951b34bde 100644 --- a/recipes/bluez/bluez-libs/avinfo-link.patch +++ b/recipes/bluez/bluez-libs/avinfo-link.patch @@ -1,3 +1,8 @@ +upstream: not applicable +comment from pb: not needed upstream, it's just a consequence of splitting the + package into -libs and -apps. But, equally, it wouldn't do any harm upstream + either. I might send it to them and see what they say. + --- tools/Makefile.am.old 2009-05-22 11:27:06.000000000 +0100 +++ tools/Makefile.am 2009-05-22 11:27:29.000000000 +0100 @@ -1,8 +1,10 @@ -- cgit v1.2.3 From cb429c4b7ae91b538603e771685aa39f020a5b6e Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 24 Jun 2009 12:08:48 +0200 Subject: obexftp: version 0.23 compiles fine against bluez-libs 3.x. Relax DEPENDS accordingly. --- recipes/obexftp/obexftp_0.23.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/obexftp/obexftp_0.23.bb b/recipes/obexftp/obexftp_0.23.bb index d3924f6039..037fbbfa67 100644 --- a/recipes/obexftp/obexftp_0.23.bb +++ b/recipes/obexftp/obexftp_0.23.bb @@ -2,7 +2,7 @@ DESCRIPTION = "OBEX Ftp Client based on openobex." SECTION = "console/network" HOMEPAGE = "http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp" LICENSE = "GPL" -DEPENDS = "openobex bluez4 libusb-compat virtual/libiconv" +DEPENDS = "openobex bluez-libs libusb-compat virtual/libiconv" SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/obexftp-${PV}.tar.bz2 \ " -- cgit v1.2.3 From 614b2f8ee4e1fe6022679ea7448151fd05afade2 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Wed, 24 Jun 2009 10:13:04 -0700 Subject: packaged-staging.bbclass: use ?= for PSTAGE_PKG. Signed-off-by: Chris Larson --- classes/packaged-staging.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index bd7b9ea398..33acb90a2b 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -17,7 +17,7 @@ PSTAGE_EXTRAPATH ?= "/${OELAYOUT_ABI}/${DISTRO_PR}/" PSTAGE_PKGPATH = "${DISTRO}${PSTAGE_EXTRAPATH}" PSTAGE_PKGPN = "${@bb.data.expand('staging-${PN}-${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}', d).replace('_', '-')}" PSTAGE_PKGNAME = "${PSTAGE_PKGPN}_${PSTAGE_PKGVERSION}_${PSTAGE_PKGARCH}.ipk" -PSTAGE_PKG = "${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGPATH}/${PSTAGE_PKGNAME}" +PSTAGE_PKG ?= "${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGPATH}/${PSTAGE_PKGNAME}" PSTAGE_NATIVEDEPENDS = "\ shasum-native \ -- cgit v1.2.3 From 151de3a580e0d8a28125b880293f82abf468f2a2 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 14 May 2009 09:30:35 -0700 Subject: bitbake.conf, base.bbclass: Changed build config summary header to be a variable. Default in bitbake.conf for BUILDCFG_HEADER is "Build Configuration". This lets distributions make their builds ever so slightly prettier :) Signed-off-by: Chris Larson Acked-by: Marcin Juszkiewicz --- classes/base.bbclass | 2 +- conf/bitbake.conf | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index 116605fff8..bc50c67d4b 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -923,7 +923,7 @@ python base_eventhandler() { bb.data.setVar( 'BB_VERSION', bb.__version__, e.data ) statusvars = bb.data.getVar("BUILDCFG_VARS", e.data, 1).split() statuslines = ["%-17s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars] - statusmsg = "\nOE Build Configuration:\n%s\n" % '\n'.join(statuslines) + statusmsg = "\n%s\n%s\n" % (bb.data.getVar("BUILDCFG_HEADER", e.data, 1), "\n".join(statuslines)) print statusmsg needed_vars = bb.data.getVar("BUILDCFG_NEEDEDVARS", e.data, 1).split() diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 4f00be73e6..8b6956453b 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -608,6 +608,8 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}" ENTERPRISE_DISTRO ?= "0" # Pre-build configuration output + +BUILDCFG_HEADER = "Build Configuration:" BUILDCFG_VARS ?= "BB_VERSION METADATA_BRANCH METADATA_REVISION TARGET_ARCH TARGET_OS MACHINE DISTRO DISTRO_VERSION" BUILDCFG_VARS_append_arm = " TARGET_FPU" BUILDCFG_VARS_append_armeb = " TARGET_FPU" -- cgit v1.2.3 From 33615f3f32bac19adb3666dce0eb2fe3f6c931f3 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 24 Jun 2009 12:22:11 -0400 Subject: alsa: Add alsa-lib/plugins/utils 1.0.19 --- conf/checksums.ini | 12 ++++ recipes/alsa/alsa-lib_1.0.19.bb | 48 ++++++++++++++++ recipes/alsa/alsa-plugins_1.0.19.bb | 20 +++++++ .../alsa-utils-remove-xmlto.patch | 18 ++++++ recipes/alsa/alsa-utils_1.0.19.bb | 66 ++++++++++++++++++++++ 5 files changed, 164 insertions(+) create mode 100644 recipes/alsa/alsa-lib_1.0.19.bb create mode 100644 recipes/alsa/alsa-plugins_1.0.19.bb create mode 100644 recipes/alsa/alsa-utils-1.0.19/alsa-utils-remove-xmlto.patch create mode 100644 recipes/alsa/alsa-utils_1.0.19.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index f1a79720f2..3829512918 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1422,6 +1422,10 @@ sha256=bc691463af8506c1c84db0edab727ee8f8ee4ecd1777b0e264db2525d4500833 md5=de60df7541fafe8c6a3397e0f105ff0e sha256=c487645d32b8124b9ae224b8929e5aa45e581bd8d8c8da666add423cf927d1ea +[ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.19.tar.bz2] +md5=73db3666c211e5fb023bb77450cf430d +sha256=32ee26d93a25963fdc49b4b5ccd014749d675e33f419022c646a61c31a4a2886 + [ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.20.tar.bz2] md5=6e9080ba1faa5d3739d14dd76c62d8dc sha256=15f8d0eef1da10c62136107e7b585bc8beb9c9e9b7ad177654097f8c15e57a63 @@ -1454,6 +1458,10 @@ sha256=35a7e1411ab7b34353136ecfbd2267201d37b671f48b946bf238a6d1f7fdf560 md5=4a798b47ba10c17aed66dff234d31b24 sha256=deb7652a3c1360febbbffb5d0150e5ad8547063d37969ad24d13359f75a424ba +[ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-1.0.19.tar.bz2] +md5=29ae9cac05423cf6a49f66eeb1a79eb6 +sha256=67be087c24af9d2a380b29d6e90b7187b337a0c484c31438a0d38ff429c71100 + [ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.11.tar.bz2] md5=ba9b8010120701d0f6daf061d392cfa2 sha256=4b33229437ddab4196b8fd0bdfaf074314185a5afd3e24bbe28025022b42d01b @@ -1478,6 +1486,10 @@ sha256=6a06f457d66eca75ac1ab065e64539e4ccf22ed4e53703a70194cb85203b3125 md5=0a6b26d27cc2adfd591d91d8c155fdb7 sha256=ea0ae914cc8d46254dc02ca2b227d379d0eb1d76a3960907e57f26f2ec584aef +[ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.19.tar.bz2] +md5=5ff0379c707c1a29083233edc9ab4e06 +sha256=1f4924f5ae7857ce64a3d6ecbeb98133c74ff1ead2b0f48187623d6e4b838cad + [http://www.panix.com/~gesslein/am.tgz] md5=df7535050d4bbe57c5d1243c8ec2479e sha256=13ab5d2045d902b627725e7cf4fc82df3ec2e714e85e42b93bd48af7af9bffdc diff --git a/recipes/alsa/alsa-lib_1.0.19.bb b/recipes/alsa/alsa-lib_1.0.19.bb new file mode 100644 index 0000000000..eff114de4b --- /dev/null +++ b/recipes/alsa/alsa-lib_1.0.19.bb @@ -0,0 +1,48 @@ +DESCRIPTION = "Alsa sound library" +HOMEPAGE = "http://www.alsa-project.org" +SECTION = "libs/multimedia" +LICENSE = "LGPL" + +# configure.in sets -D__arm__ on the command line for any arm system +# (not just those with the ARM instruction set), this should be removed, +# (or replaced by a permitted #define). +#FIXME: remove the following +ARM_INSTRUCTION_SET = "arm" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ + file://fix-tstamp-declaration.patch;patch=1 \ + file://fix_libmath.patch;patch=1 \ + " + +inherit autotools pkgconfig + + +EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python" + + +require alsa-fpu.inc +EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} " + + +require alsa-versym.inc +EXTRA_OECONF += "${@get_alsa_versym_setting(bb, d)} " + + +do_stage () { + autotools_stage_all +} + +PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev" +FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*" +FILES_libasound = "${libdir}/libasound.so.*" +FILES_alsa-server = "${bindir}/*" +FILES_alsa-conf = "${datadir}/alsa/" +FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*" +FILES_alsa-conf-base = "\ +${datadir}/alsa/alsa.conf \ +${datadir}/alsa/cards/aliases.conf \ +${datadir}/alsa/pcm/default.conf \ +${datadir}/alsa/pcm/dmix.conf \ +${datadir}/alsa/pcm/dsnoop.conf" + +RDEPENDS_libasound = "alsa-conf-base" diff --git a/recipes/alsa/alsa-plugins_1.0.19.bb b/recipes/alsa/alsa-plugins_1.0.19.bb new file mode 100644 index 0000000000..b17a3265e8 --- /dev/null +++ b/recipes/alsa/alsa-plugins_1.0.19.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "ALSA Plugins" +HOMEPAGE = "http://www.alsa-project.org" +SECTION = "multimedia/alsa/plugins" +LICENSE = "GPL" +DEPENDS = "alsa-lib pulseaudio" +PR = "r0" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-${PV}.tar.bz2" + +inherit autotools + +PACKAGES_DYNAMIC = "libasound-module*" + +python populate_packages_prepend() { + plugindir = bb.data.expand('${libdir}/alsa-lib/', d) + do_split_packages(d, plugindir, '^libasound_module_(.*)\.so$', 'libasound-module-%s', 'Alsa plugin for %s', extra_depends='' ) +} + +FILES_${PN}-dev += "${libdir}/alsa-lib/libasound*.a ${libdir}/alsa-lib/libasound*.la" +FILES_${PN}-dbg += "${libdir}/alsa-lib/.debug" diff --git a/recipes/alsa/alsa-utils-1.0.19/alsa-utils-remove-xmlto.patch b/recipes/alsa/alsa-utils-1.0.19/alsa-utils-remove-xmlto.patch new file mode 100644 index 0000000000..53ff95a886 --- /dev/null +++ b/recipes/alsa/alsa-utils-1.0.19/alsa-utils-remove-xmlto.patch @@ -0,0 +1,18 @@ +Index: alsa-utils-1.0.19/alsactl/Makefile.am +=================================================================== +--- alsa-utils-1.0.19.orig/alsactl/Makefile.am 2009-06-24 01:08:16.000000000 -0400 ++++ alsa-utils-1.0.19/alsactl/Makefile.am 2009-06-24 01:08:26.000000000 -0400 +@@ -2,13 +2,7 @@ + + sbin_PROGRAMS=alsactl + man_MANS=alsactl.1 +-if USE_XMLTO +-man_MANS += alsactl_init.7 +-endif + EXTRA_DIST=alsactl.1 alsactl_init.xml + + alsactl_SOURCES=alsactl.c state.c utils.c init_parse.c + noinst_HEADERS=alsactl.h list.h init_sysdeps.c init_utils_string.c init_utils_run.c init_sysfs.c +- +-%.7: %.xml +- xmlto man $? diff --git a/recipes/alsa/alsa-utils_1.0.19.bb b/recipes/alsa/alsa-utils_1.0.19.bb new file mode 100644 index 0000000000..9ff129f233 --- /dev/null +++ b/recipes/alsa/alsa-utils_1.0.19.bb @@ -0,0 +1,66 @@ +DESCRIPTION = "ALSA Utilities" +HOMEPAGE = "http://www.alsa-project.org" +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "alsa-lib ncurses" +PR = "r0" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ + file://alsa-utils-remove-xmlto.patch;patch=1 \ + " + + +inherit autotools + +# This are all packages that we need to make. Also, the now empty alsa-utils +# ipk depend on them. + + +do_configure_append() { + for i in $(find ${S} -name Makefile) ; do + sed -i -e s:/usr/include/ncurses:${STAGING_INCDIR}/ncurses:g $i + sed -i -e 's:-L/usr/lib -lncurses:-L${STAGING_LIBDIR} -lncurses:g' $i + done +} + +PACKAGES += "\ + alsa-utils-alsamixer \ + alsa-utils-midi \ + alsa-utils-aplay \ + alsa-utils-amixer \ + alsa-utils-aconnect \ + alsa-utils-iecset \ + alsa-utils-speakertest \ + alsa-utils-aseqnet \ + alsa-utils-aseqdump \ + alsa-utils-alsaconf \ + alsa-utils-alsactl " + +# We omit alsaconf, because +# a) this is a bash script +# b) it creates config files not suitable for OE-based distros + +FILES_${PN} = "" +FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord" +FILES_alsa-utils-amixer = "${bindir}/amixer" +FILES_alsa-utils-alsamixer = "${bindir}/alsamixer" +FILES_alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/" +FILES_alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi" +FILES_alsa-utils-aconnect = "${bindir}/aconnect" +FILES_alsa-utils-aseqnet = "${bindir}/aseqnet" +FILES_alsa-utils-iecset = "${bindir}/iecset" +FILES_alsa-utils-alsactl = "${sbindir}/alsactl" +FILES_alsa-utils-aseqdump = "${bindir}/aseqdump" +FILES_alsa-utils-alsaconf = "${sbindir}/alsaconf" + +DESCRIPTION_alsa-utils-aplay = "play (and record) sound files via ALSA" +DESCRIPTION_alsa-utils-amixer = "command-line based control for ALSA mixer and settings" +DESCRIPTION_alsa-utils-alsamixer = "ncurses based control for ALSA mixer and settings" +DESCRIPTION_alsa-utils-speakertest = "ALSA surround speaker test utility" +DESCRIPTION_alsa-utils-midi = "miscalleanous MIDI utilities for ALSA" +DESCRIPTION_alsa-utils-aconnect = "ALSA sequencer connection manager" +DESCRIPTION_alsa-utils-aseqnet = "network client/server on ALSA sequencer" +DESCRIPTION_alsa-utils-alsactl = "saves/restores ALSA-settings in /etc/asound.state" +DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configuration files" + +ALLOW_EMPTY_alsa-utils = "1" -- cgit v1.2.3 From c90998b8752a7a817f99b14dd1276dc6076c5a97 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 24 Jun 2009 12:25:36 -0400 Subject: pulseaudio: Switch to INC_PR, add openssl to DEPENDS. Also remove dbus from the version specific DEPENDS lines as it's in the inc file --- recipes/pulseaudio/pulseaudio.inc | 3 ++- recipes/pulseaudio/pulseaudio_0.9.10.bb | 3 +-- recipes/pulseaudio/pulseaudio_0.9.11.bb | 4 ++-- recipes/pulseaudio/pulseaudio_0.9.15.bb | 3 ++- recipes/pulseaudio/pulseaudio_0.9.6.bb | 3 +-- recipes/pulseaudio/pulseaudio_0.9.9.bb | 3 +-- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/recipes/pulseaudio/pulseaudio.inc b/recipes/pulseaudio/pulseaudio.inc index f2f54dd3dc..912d5b9a79 100644 --- a/recipes/pulseaudio/pulseaudio.inc +++ b/recipes/pulseaudio/pulseaudio.inc @@ -5,7 +5,8 @@ SECTION = "libs/multimedia" LICENSE = "LGPL" DEPENDS = "bluez4 libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool hal virtual/libx11" # optional -DEPENDS += "alsa-lib glib-2.0 dbus consolekit hal" +DEPENDS += "alsa-lib glib-2.0 dbus consolekit hal openssl" +INC_PR = "r8" SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \ file://gcc4-compile-fix.patch;patch=1 \ diff --git a/recipes/pulseaudio/pulseaudio_0.9.10.bb b/recipes/pulseaudio/pulseaudio_0.9.10.bb index f26d583fdb..ec190fa558 100644 --- a/recipes/pulseaudio/pulseaudio_0.9.10.bb +++ b/recipes/pulseaudio/pulseaudio_0.9.10.bb @@ -1,7 +1,6 @@ require pulseaudio.inc -DEPENDS += "dbus" -PR = "r5" +PR = "${INC_PR}.1" SRC_URI += "\ file://disable-using-glibc-tls.patch;patch=1 \ diff --git a/recipes/pulseaudio/pulseaudio_0.9.11.bb b/recipes/pulseaudio/pulseaudio_0.9.11.bb index b0b5541713..9f91912177 100644 --- a/recipes/pulseaudio/pulseaudio_0.9.11.bb +++ b/recipes/pulseaudio/pulseaudio_0.9.11.bb @@ -1,7 +1,7 @@ require pulseaudio.inc -DEPENDS += "dbus gdbm speex" -PR = "r1" +DEPENDS += "gdbm speex" +PR = "${INC_PR}.1" # work in progress DEFAULT_PREFERENCE = "-1" diff --git a/recipes/pulseaudio/pulseaudio_0.9.15.bb b/recipes/pulseaudio/pulseaudio_0.9.15.bb index 4358454002..4b16b474d2 100644 --- a/recipes/pulseaudio/pulseaudio_0.9.15.bb +++ b/recipes/pulseaudio/pulseaudio_0.9.15.bb @@ -1,6 +1,7 @@ require pulseaudio.inc -DEPENDS += "dbus gdbm speex" +DEPENDS += "gdbm speex" +PR = "${INC_PR}.1" SRC_URI += "\ file://buildfix.patch;patch=1 \ diff --git a/recipes/pulseaudio/pulseaudio_0.9.6.bb b/recipes/pulseaudio/pulseaudio_0.9.6.bb index 8944b664c0..4d10af5561 100644 --- a/recipes/pulseaudio/pulseaudio_0.9.6.bb +++ b/recipes/pulseaudio/pulseaudio_0.9.6.bb @@ -1,4 +1,3 @@ require pulseaudio.inc -PR = "r8" - +PR = "${INC_PR}.1" diff --git a/recipes/pulseaudio/pulseaudio_0.9.9.bb b/recipes/pulseaudio/pulseaudio_0.9.9.bb index 764f891654..0c36cd483f 100644 --- a/recipes/pulseaudio/pulseaudio_0.9.9.bb +++ b/recipes/pulseaudio/pulseaudio_0.9.9.bb @@ -1,7 +1,6 @@ require pulseaudio.inc -DEPENDS += "dbus" -PR = "r5" +PR = "${INC_PR}.1" # this is not correct (see below) SRC_URI += "\ -- cgit v1.2.3 From 0b3740da98794340ceb866b14ab6efba6ffaa6b4 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 24 Jun 2009 15:14:06 -0400 Subject: gdbserver: Switch to INC_PR, add LICENSE, only build gdbserver, drop DEPENDS To build just gdbserver, we don't need ncurses or readline, so drop the DEPENDS and pass --without- for configure. Also, we don't need to build anything more than 'gdbserver'. --- recipes/gdb/gdbserver.inc | 10 +++++----- recipes/gdb/gdbserver_6.7.1.bb | 4 ++++ recipes/gdb/gdbserver_6.8.bb | 4 ++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/recipes/gdb/gdbserver.inc b/recipes/gdb/gdbserver.inc index a1610daff8..e02f276cb6 100644 --- a/recipes/gdb/gdbserver.inc +++ b/recipes/gdb/gdbserver.inc @@ -1,8 +1,8 @@ require gdb-common.inc -DEFAULT_PREFERENCE_avr32 = "-99" +INC_PR = "r1" -DEPENDS = "ncurses readline" +DEFAULT_PREFERENCE_avr32 = "-99" FILES_gdbserver = "${bindir}/gdbserver" @@ -15,10 +15,10 @@ SRC_URI += "file://kill_arm_map_symbols.patch;patch=1 \ file://gdbserver-cflags-last.diff;patch=1;pnum=0" #FIXME file://uclibc.patch;patch=1 \ -EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'" +EXTRA_OEMAKE = "gdbserver" -EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \ - --with-curses --disable-multilib --with-readline --disable-sim \ +EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x --without-curses \ + --disable-multilib --without-readline --disable-sim \ --program-prefix=''" LDFLAGS_append = " -s" diff --git a/recipes/gdb/gdbserver_6.7.1.bb b/recipes/gdb/gdbserver_6.7.1.bb index fb92ebc424..cb83d6f2c7 100644 --- a/recipes/gdb/gdbserver_6.7.1.bb +++ b/recipes/gdb/gdbserver_6.7.1.bb @@ -1,5 +1,9 @@ require gdbserver.inc +LICENSE = "GPLv3" + +PR = "${INC_PR}.1" + DEFAULT_PREFERENCE_avr32 = "99" SRC_URI_avr32 = " http://avr32linux.org/twiki/pub/Main/GDBPatches/gdb-6.7.1.atmel.1.0.3.tar.bz2" S_avr32 = "${WORKDIR}/gdb-6.7.1.atmel.1.0.3" diff --git a/recipes/gdb/gdbserver_6.8.bb b/recipes/gdb/gdbserver_6.8.bb index 67fc280ea2..a6639b420d 100644 --- a/recipes/gdb/gdbserver_6.8.bb +++ b/recipes/gdb/gdbserver_6.8.bb @@ -1 +1,5 @@ require gdbserver.inc + +LICENSE = "GPLv3" + +PR = "${INC_PR}.1" -- cgit v1.2.3 From cdfc5e8896451d77887f218b2f584481df0c9863 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 24 Jun 2009 15:15:26 -0400 Subject: meta-toolchain: Oops, we want layout_libdir not layout_base_libdir for opkg --- recipes/meta/meta-toolchain.bb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/meta/meta-toolchain.bb b/recipes/meta/meta-toolchain.bb index 6bb12ea663..2e83b1d02f 100644 --- a/recipes/meta/meta-toolchain.bb +++ b/recipes/meta/meta-toolchain.bb @@ -62,18 +62,18 @@ do_populate_sdk() { revipkgarchs="$arch $revipkgarchs" done - mkdir -p ${SDK_OUTPUT}/${layout_base_libdir}/opkg + mkdir -p ${SDK_OUTPUT}/${layout_libdir}/opkg ${IPKG_HOST} update ${IPKG_HOST} -force-depends install ${TOOLCHAIN_HOST_TASK} - mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/${layout_base_libdir}/opkg + mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/${layout_libdir}/opkg ${IPKG_TARGET} update ${IPKG_TARGET} install ${TOOLCHAIN_TARGET_TASK} - install -d ${SDK_OUTPUT}/${prefix}/${layout_base_libdir}/opkg - mv ${SDK_OUTPUT}/${layout_base_libdir}/opkg/* \ - ${SDK_OUTPUT}/${prefix}/${layout_base_libdir}/opkg/ - rm -Rf ${SDK_OUTPUT}/${layout_base_libdir} + install -d ${SDK_OUTPUT}/${prefix}/${layout_libdir}/opkg + mv ${SDK_OUTPUT}/${layout_libdir}/opkg/* \ + ${SDK_OUTPUT}/${prefix}/${layout_libdir}/opkg/ + rm -Rf ${SDK_OUTPUT}/${layout_libdir} install -d ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/${layout_sysconfdir} install -m 0644 ${IPKGCONF_TARGET} ${IPKGCONF_SDK} ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/${layout_sysconfdir}/ -- cgit v1.2.3 From 14b1edc93587a9f647dd99e4db1a00d90f2c5f42 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 24 Jun 2009 22:56:11 +0200 Subject: conf: remove bluetooth from DISTRO_FEATURES in minimal.conf --- conf/distro/minimal.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index f9c4670c67..8b834d0f4a 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -24,7 +24,7 @@ DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove thi # Use bluetooth 4.0 DISTRO_BLUETOOTH_MANAGER = "bluez4" # We want images supporting the following features (for task-base) -DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 vfat pcmcia usbgadget usbhost pci" +DISTRO_FEATURES = "nfs smbfs wifi ppp alsa ext2 vfat pcmcia usbgadget usbhost pci" ############################################################################# # LIBRARY NAMES -- cgit v1.2.3 From 3dede602a93dfe2657a14fd620bf397edeca98c0 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 24 Jun 2009 23:34:35 +0200 Subject: opie-image: make inclusion of irda and bluetooth tasks contingent upon COMBINED_FEATURES --- recipes/images/opie-image.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/images/opie-image.bb b/recipes/images/opie-image.bb index fec6103ca9..4a984a03b8 100644 --- a/recipes/images/opie-image.bb +++ b/recipes/images/opie-image.bb @@ -8,7 +8,8 @@ IMAGE_INSTALL = "task-base-extended task-opie-base task-opie-base-applets \ task-opie-base-settings task-opie-base-decorations \ task-opie-base-styles task-opie-base-pim \ task-opie-extra-settings \ - task-opie-bluetooth task-opie-irda \ + ${@base_contains("COMBINED_FEATURES", "bluetooth", "task-opie-bluetooth", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "irda", "task-opie-irda", "",d)} \ ${ANGSTROM_EXTRA_INSTALL} " # create /etc/timestamp from build date -- cgit v1.2.3 From a4ee92d0a8ce317edbc36288e79236865ba87118 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 24 Jun 2009 23:36:03 +0200 Subject: task-opie: make inclusion of irda and bluetooth tasks contingent upon COMBINED_FEATURES --- recipes/tasks/task-opie.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/tasks/task-opie.bb b/recipes/tasks/task-opie.bb index 41dd92ac7a..a1699ad785 100644 --- a/recipes/tasks/task-opie.bb +++ b/recipes/tasks/task-opie.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Tasks for OPIE stuff" SECTION = "opie/base" LICENSE = "MIT" -PR = "r12" +PR = "r13" inherit task @@ -12,11 +12,11 @@ PACKAGES = "task-opie-base \ task-opie-base-applets task-opie-base-apps \ task-opie-base-decorations task-opie-base-inputmethods \ task-opie-base-pim task-opie-base-settings \ - task-opie-base-styles task-opie-bluetooth \ - task-opie-base-todayplugins \ + task-opie-base-styles task-opie-base-todayplugins \ task-opie-extra-settings \ task-opie-extra-styles \ - task-opie-irda \ + ${@base_contains("COMBINED_FEATURES", "bluetooth", "task-opie-bluetooth", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "irda", "task-opie-irda", "",d)} \ " RDEPENDS_task-opie-everything := "${PACKAGES}" -- cgit v1.2.3 From e141e38cd9daeb89f3aa563ed31845ee4c1b4faf Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Thu, 25 Jun 2009 01:56:07 +0200 Subject: embedix kernels: set COMPATIBLE_MACHINE = "none" - silence the notes like: - ERROR: '[]' RDEPENDS/RRECOMMENDS or otherwise - requires the runtime entity 'virtual/arm-angstrom-linux-gcc-2.95' - but it wasn't found in any PACKAGE or RPROVIDES variables - COMPATIBLE_MACHINE is set in sharprom-compatible --- conf/distro/sharprom-compatible.conf | 6 ++++++ recipes/linux/collie-kernels-2.4-embedix.bb | 6 +++++- recipes/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb | 7 +++++-- recipes/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc | 7 +++++-- recipes/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb | 7 +++++-- 5 files changed, 26 insertions(+), 7 deletions(-) diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf index 93077e1025..81f919bed2 100644 --- a/conf/distro/sharprom-compatible.conf +++ b/conf/distro/sharprom-compatible.conf @@ -25,6 +25,12 @@ export TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}/${layout_includedir}" #DEBUG_OPTIMIZATION = "-O -g3" #DEBUG_BUILD = "1" +# We are still using 2.4 embedix kernels +COMPATIBLE_MACHINE_pn-openzaurus-pxa27x = "(akita|spitz)" +COMPATIBLE_MACHINE_pn-openzaurus-pxa = "(c7x0|poodle|poodle255|tosa)" +COMPATIBLE_MACHINE_pn-collie-kernels = "collie" +COMPATIBLE_MACHINE_pn-openzaurus-sa = "collie" + # # Base # diff --git a/recipes/linux/collie-kernels-2.4-embedix.bb b/recipes/linux/collie-kernels-2.4-embedix.bb index b7dfa377f2..1445e41151 100644 --- a/recipes/linux/collie-kernels-2.4-embedix.bb +++ b/recipes/linux/collie-kernels-2.4-embedix.bb @@ -5,7 +5,11 @@ PROVIDES = "virtual/kernel" PR = "r2" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = "collie" + +# For these old 2.4 kernels we override in sharprom-compatible.conf +#COMPATIBLE_MACHINE = "collie" +COMPATIBLE_MACHINE = "none" + DEPENDS = '${@base_conditional("DISTRO_TYPE", "debug", "openzaurus-sa", "collie-kernel-64-0 collie-kernel-24-8 collie-kernel-32-0 collie-kernel-32-32 collie-kernel-40-24 collie-kernel-48-16 collie-kernel-58-6",d)}' PACKAGES = "" diff --git a/recipes/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb b/recipes/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb index 5a90d415fb..e65f293de8 100644 --- a/recipes/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb +++ b/recipes/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb @@ -5,7 +5,6 @@ PV = "2.4.20-rmk2-embedix" LICENSE = "GPL" KV = "2.4.20" PR = "r18" -COMPATIBLE_MACHINE = "(akita|spitz)" SRC_URI = "http://developer.ezaurus.com/sl_j/source/c3100/20050602/linux-c3100-20050602-rom1_01.tar.bz2 \ file://P01-C3000-clockup_050221.patch;pnum=2;patch=1 \ @@ -76,7 +75,11 @@ EXTRA_OEMAKE = "OPENZAURUS_RELEASE=-${DISTRO_VERSION}" KERNEL_CCSUFFIX = "-2.95" KERNEL_LDSUFFIX = "-2.11.2" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = '(akita|spitz|borzoi)' + +# For these old 2.4 kernels we override in sharprom-compatible.conf +#COMPATIBLE_MACHINE = "(akita|spitz|borzoi)" +COMPATIBLE_MACHINE = "none" + PARALLEL_MAKE = "" # diff --git a/recipes/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/recipes/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc index 7b20b4fa99..6428629316 100644 --- a/recipes/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc +++ b/recipes/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc @@ -7,7 +7,6 @@ KV = "2.4.18" RMKV = "7" PXAV = "3" SHARPV = "20031107" -COMPATIBLE_MACHINE = "(poodle|corgi|shepherd|husky|poodle255|tosa)" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}" @@ -89,7 +88,11 @@ EXTRA_OEMAKE = " EMBEDIXRELEASE=-${DISTRO_VERSION}" KERNEL_CCSUFFIX = "-2.95" KERNEL_LDSUFFIX = "-2.11.2" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = '(corgi|husky|shepherd|poodle|poodle255)' + +# For these old 2.4 kernels we override in sharprom-compatible.conf +#COMPATIBLE_MACHINE = "(poodle|corgi|shepherd|husky|poodle255|tosa)" +COMPATIBLE_MACHINE = "none" + PARALLEL_MAKE = "" # diff --git a/recipes/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb b/recipes/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb index b21a0c9328..4c9e9a1840 100644 --- a/recipes/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb +++ b/recipes/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb @@ -8,7 +8,6 @@ PXAV = "3" SHARPV = "20030509" PR = "r23" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-sa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}" -COMPATIBLE_MACHINE = "collie" SRC_URI = "http://www.openzaurus.org/mirror/linux-sl5500-${SHARPV}-rom3_10.tar.bz2 \ file://cacko.patch;patch=1 \ @@ -58,7 +57,11 @@ ALLOW_EMPTY = "1" KERNEL_CCSUFFIX = "-2.95" KERNEL_LDSUFFIX = "-2.11.2" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = "collie" + +# For these old 2.4 kernels we override in sharprom-compatible.conf +#COMPATIBLE_MACHINE = "collie" +COMPATIBLE_MACHINE = "none" + EXTRA_OEMAKE = " EMBEDIXRELEASE=-${DISTRO_VERSION}" module_conf_usbdmonitor = "alias usbd0 usbdmonitor" -- cgit v1.2.3 From f3a000b477131fb5b65b20c08eaaf9ff79c85ca5 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Thu, 25 Jun 2009 02:01:12 +0200 Subject: zaurus-installer: set LICENSE --- recipes/zaurus-updater/zaurus-installer.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/zaurus-updater/zaurus-installer.bb b/recipes/zaurus-updater/zaurus-installer.bb index 70dca30031..e24f2aafaf 100644 --- a/recipes/zaurus-updater/zaurus-installer.bb +++ b/recipes/zaurus-updater/zaurus-installer.bb @@ -1,5 +1,6 @@ DESCRIPTION = "Installkit for kexecboot-kernel" DEPENDS = "${@base_conditional('MACHINE', 'collie', 'linux-kexecboot', 'zaurus-updater linux-kexecboot', d)}" +LICENSE = "zaurus-installer" PR = "r1" PACKAGES = "" -- cgit v1.2.3 From 02941550212f7b61a011d328f7be5df9e7b1be19 Mon Sep 17 00:00:00 2001 From: Marco Cavallini Date: Wed, 24 Jun 2009 04:05:12 +0000 Subject: recipes/images/x11-jvm-image.bb replaced typo '$(ADD_JVM)' Signed-off-by: Marco Cavallini --- recipes/images/x11-jvm-image.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/images/x11-jvm-image.bb b/recipes/images/x11-jvm-image.bb index 8387112a66..fd0e5f09ad 100644 --- a/recipes/images/x11-jvm-image.bb +++ b/recipes/images/x11-jvm-image.bb @@ -12,7 +12,7 @@ ADD_JVM = "\ classpath \ classpath-common \ classpath-dev \ - classpath-example \ + classpath-examples \ classpath-gconf \ classpath-gtk \ classpath-tools \ @@ -29,8 +29,8 @@ IMAGE_INSTALL = "\ angstrom-gpe-task-base \ angstrom-gpe-task-settings \ ${SPLASH} \ - $(ADD_JVM) \ - $(ADD_OTHER) \ + ${ADD_JVM} \ + ${ADD_OTHER} \ ${ANGSTROM_EXTRA_INSTALL}" IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" -- cgit v1.2.3 From 7d4e6e08a42f4b2bdb91f2ec7c6e65d3f579a7b2 Mon Sep 17 00:00:00 2001 From: Dirk Opfer Date: Thu, 25 Jun 2009 13:09:57 +0200 Subject: gcc: get rid of fix-ICE-in-arm_unwind_emit_set.diff Remove fix-ICE-in-arm_unwind_emit_set.diff from gcc versions >= 4.2.1 upstream gcc already includes this fix. Instead of patching arm_unwind_emit_set the patch was modified and slipped into thumb_pushpop and can cause a gcc segfault. Signed-off-by: Dirk Opfer --- recipes/gcc/gcc-4.2.1.inc | 1 - .../gcc-4.2.1/fix-ICE-in-arm_unwind_emit_set.diff | 18 -------------- recipes/gcc/gcc-4.2.2.inc | 3 +-- .../gcc-4.2.2/fix-ICE-in-arm_unwind_emit_set.diff | 18 -------------- recipes/gcc/gcc-4.2.3.inc | 3 +-- .../gcc-4.2.3/fix-ICE-in-arm_unwind_emit_set.diff | 18 -------------- recipes/gcc/gcc-4.2.4.inc | 3 +-- .../gcc-4.2.4/fix-ICE-in-arm_unwind_emit_set.diff | 18 -------------- recipes/gcc/gcc-4.3.1.inc | 3 +-- .../gcc-4.3.1/fix-ICE-in-arm_unwind_emit_set.diff | 28 ---------------------- recipes/gcc/gcc-4.3.2.inc | 3 +-- .../gcc-4.3.2/fix-ICE-in-arm_unwind_emit_set.diff | 28 ---------------------- recipes/gcc/gcc-4.3.3.inc | 3 +-- .../gcc-4.3.3/fix-ICE-in-arm_unwind_emit_set.diff | 28 ---------------------- .../gcc-4.4.0/fix-ICE-in-arm_unwind_emit_set.diff | 28 ---------------------- recipes/gcc/gcc-cross_4.2.1.bb | 2 +- recipes/gcc/gcc_4.2.1.bb | 2 +- 17 files changed, 8 insertions(+), 199 deletions(-) delete mode 100644 recipes/gcc/gcc-4.2.1/fix-ICE-in-arm_unwind_emit_set.diff delete mode 100644 recipes/gcc/gcc-4.2.2/fix-ICE-in-arm_unwind_emit_set.diff delete mode 100644 recipes/gcc/gcc-4.2.3/fix-ICE-in-arm_unwind_emit_set.diff delete mode 100644 recipes/gcc/gcc-4.2.4/fix-ICE-in-arm_unwind_emit_set.diff delete mode 100644 recipes/gcc/gcc-4.3.1/fix-ICE-in-arm_unwind_emit_set.diff delete mode 100644 recipes/gcc/gcc-4.3.2/fix-ICE-in-arm_unwind_emit_set.diff delete mode 100644 recipes/gcc/gcc-4.3.3/fix-ICE-in-arm_unwind_emit_set.diff delete mode 100644 recipes/gcc/gcc-4.4.0/fix-ICE-in-arm_unwind_emit_set.diff diff --git a/recipes/gcc/gcc-4.2.1.inc b/recipes/gcc/gcc-4.2.1.inc index b48d709115..c4e2c3a0c6 100644 --- a/recipes/gcc/gcc-4.2.1.inc +++ b/recipes/gcc/gcc-4.2.1.inc @@ -29,7 +29,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://arm-thumb-cache.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 \ file://unbreak-armv4t.patch;patch=1 \ - file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ file://cache-amnesia.patch;patch=1 \ file://gfortran.patch;patch=1 \ file://pr34130.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.2.1/fix-ICE-in-arm_unwind_emit_set.diff b/recipes/gcc/gcc-4.2.1/fix-ICE-in-arm_unwind_emit_set.diff deleted file mode 100644 index 568e15abff..0000000000 --- a/recipes/gcc/gcc-4.2.1/fix-ICE-in-arm_unwind_emit_set.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- trunk/gcc/config/arm/arm.c 2006/09/19 13:18:27 117055 -+++ trunk/gcc/config/arm/arm.c 2006/09/19 13:19:24 117056 -@@ -15415,6 +15415,15 @@ - /* Move from sp to reg. */ - asm_fprintf (asm_out_file, "\t.movsp %r\n", REGNO (e0)); - } -+ else if (GET_CODE (e1) == PLUS -+ && GET_CODE (XEXP (e1, 0)) == REG -+ && REGNO (XEXP (e1, 0)) == SP_REGNUM -+ && GET_CODE (XEXP (e1, 1)) == CONST_INT) -+ { -+ /* Set reg to offset from sp. */ -+ asm_fprintf (asm_out_file, "\t.movsp %r, #%d\n", -+ REGNO (e0), (int)INTVAL(XEXP (e1, 1))); -+ } - else - abort (); - break; diff --git a/recipes/gcc/gcc-4.2.2.inc b/recipes/gcc/gcc-4.2.2.inc index fcebabc112..0eb1223727 100644 --- a/recipes/gcc/gcc-4.2.2.inc +++ b/recipes/gcc/gcc-4.2.2.inc @@ -3,7 +3,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" -INC_PR = "r14" +INC_PR = "r15" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://100-uclibc-conf.patch;patch=1 \ @@ -33,7 +33,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://arm-thumb-cache.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 \ file://unbreak-armv4t.patch;patch=1 \ - file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ file://cache-amnesia.patch;patch=1 \ file://gfortran.patch;patch=1 \ file://gcc-4.0.2-e300c2c3.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.2.2/fix-ICE-in-arm_unwind_emit_set.diff b/recipes/gcc/gcc-4.2.2/fix-ICE-in-arm_unwind_emit_set.diff deleted file mode 100644 index 568e15abff..0000000000 --- a/recipes/gcc/gcc-4.2.2/fix-ICE-in-arm_unwind_emit_set.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- trunk/gcc/config/arm/arm.c 2006/09/19 13:18:27 117055 -+++ trunk/gcc/config/arm/arm.c 2006/09/19 13:19:24 117056 -@@ -15415,6 +15415,15 @@ - /* Move from sp to reg. */ - asm_fprintf (asm_out_file, "\t.movsp %r\n", REGNO (e0)); - } -+ else if (GET_CODE (e1) == PLUS -+ && GET_CODE (XEXP (e1, 0)) == REG -+ && REGNO (XEXP (e1, 0)) == SP_REGNUM -+ && GET_CODE (XEXP (e1, 1)) == CONST_INT) -+ { -+ /* Set reg to offset from sp. */ -+ asm_fprintf (asm_out_file, "\t.movsp %r, #%d\n", -+ REGNO (e0), (int)INTVAL(XEXP (e1, 1))); -+ } - else - abort (); - break; diff --git a/recipes/gcc/gcc-4.2.3.inc b/recipes/gcc/gcc-4.2.3.inc index b324f176dd..1627a96e38 100644 --- a/recipes/gcc/gcc-4.2.3.inc +++ b/recipes/gcc/gcc-4.2.3.inc @@ -3,7 +3,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" -INC_PR = "r10" +INC_PR = "r11" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://100-uclibc-conf.patch;patch=1 \ @@ -33,7 +33,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://arm-thumb-cache.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 \ file://unbreak-armv4t.patch;patch=1 \ - file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ file://cache-amnesia.patch;patch=1 \ file://gfortran.patch;patch=1 \ file://gcc-4.0.2-e300c2c3.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.2.3/fix-ICE-in-arm_unwind_emit_set.diff b/recipes/gcc/gcc-4.2.3/fix-ICE-in-arm_unwind_emit_set.diff deleted file mode 100644 index 568e15abff..0000000000 --- a/recipes/gcc/gcc-4.2.3/fix-ICE-in-arm_unwind_emit_set.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- trunk/gcc/config/arm/arm.c 2006/09/19 13:18:27 117055 -+++ trunk/gcc/config/arm/arm.c 2006/09/19 13:19:24 117056 -@@ -15415,6 +15415,15 @@ - /* Move from sp to reg. */ - asm_fprintf (asm_out_file, "\t.movsp %r\n", REGNO (e0)); - } -+ else if (GET_CODE (e1) == PLUS -+ && GET_CODE (XEXP (e1, 0)) == REG -+ && REGNO (XEXP (e1, 0)) == SP_REGNUM -+ && GET_CODE (XEXP (e1, 1)) == CONST_INT) -+ { -+ /* Set reg to offset from sp. */ -+ asm_fprintf (asm_out_file, "\t.movsp %r, #%d\n", -+ REGNO (e0), (int)INTVAL(XEXP (e1, 1))); -+ } - else - abort (); - break; diff --git a/recipes/gcc/gcc-4.2.4.inc b/recipes/gcc/gcc-4.2.4.inc index 80d38f91cf..5afd08ba7c 100644 --- a/recipes/gcc/gcc-4.2.4.inc +++ b/recipes/gcc/gcc-4.2.4.inc @@ -3,7 +3,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" -INC_PR = "r6" +INC_PR = "r7" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://100-uclibc-conf.patch;patch=1 \ @@ -33,7 +33,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://arm-thumb-cache.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 \ file://unbreak-armv4t.patch;patch=1 \ - file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ file://cache-amnesia.patch;patch=1 \ file://gfortran.patch;patch=1 \ file://gcc-4.0.2-e300c2c3.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.2.4/fix-ICE-in-arm_unwind_emit_set.diff b/recipes/gcc/gcc-4.2.4/fix-ICE-in-arm_unwind_emit_set.diff deleted file mode 100644 index 568e15abff..0000000000 --- a/recipes/gcc/gcc-4.2.4/fix-ICE-in-arm_unwind_emit_set.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- trunk/gcc/config/arm/arm.c 2006/09/19 13:18:27 117055 -+++ trunk/gcc/config/arm/arm.c 2006/09/19 13:19:24 117056 -@@ -15415,6 +15415,15 @@ - /* Move from sp to reg. */ - asm_fprintf (asm_out_file, "\t.movsp %r\n", REGNO (e0)); - } -+ else if (GET_CODE (e1) == PLUS -+ && GET_CODE (XEXP (e1, 0)) == REG -+ && REGNO (XEXP (e1, 0)) == SP_REGNUM -+ && GET_CODE (XEXP (e1, 1)) == CONST_INT) -+ { -+ /* Set reg to offset from sp. */ -+ asm_fprintf (asm_out_file, "\t.movsp %r, #%d\n", -+ REGNO (e0), (int)INTVAL(XEXP (e1, 1))); -+ } - else - abort (); - break; diff --git a/recipes/gcc/gcc-4.3.1.inc b/recipes/gcc/gcc-4.3.1.inc index f475eba417..0b05f0a88c 100644 --- a/recipes/gcc/gcc-4.3.1.inc +++ b/recipes/gcc/gcc-4.3.1.inc @@ -7,7 +7,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" -INC_PR = "r18" +INC_PR = "r19" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \ @@ -50,7 +50,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://arm-softfloat.patch;patch=1 \ file://arm-thumb.patch;patch=1 \ file://arm-thumb-cache.patch;patch=1 \ - file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ file://cache-amnesia.patch;patch=1 \ file://gfortran-4.3.x.patch;patch=1 \ file://gcc-4.0.2-e300c2c3.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.3.1/fix-ICE-in-arm_unwind_emit_set.diff b/recipes/gcc/gcc-4.3.1/fix-ICE-in-arm_unwind_emit_set.diff deleted file mode 100644 index b8a147d3d9..0000000000 --- a/recipes/gcc/gcc-4.3.1/fix-ICE-in-arm_unwind_emit_set.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- /tmp/arm.c 2008-03-17 14:24:39.590464969 +0100 -+++ gcc-4.3.0/gcc/config/arm/arm.c 2008-03-17 14:12:21.614701982 +0100 -@@ -15959,6 +15959,9 @@ - int regno; - int lo_mask = mask & 0xFF; - int pushed_words = 0; -+ rtx e0; -+ rtx e1; -+ unsigned reg; - - gcc_assert (mask); - -@@ -16025,6 +16028,15 @@ - - return; - } -+ else if (GET_CODE (e1) == PLUS -+ && GET_CODE (XEXP (e1, 0)) == REG -+ && REGNO (XEXP (e1, 0)) == SP_REGNUM -+ && GET_CODE (XEXP (e1, 1)) == CONST_INT) -+ { -+ /* Set reg to offset from sp. */ -+ asm_fprintf (asm_out_file, "\t.movsp %r, #%d\n", -+ REGNO (e0), (int)INTVAL(XEXP (e1, 1))); -+ } - else - { - if (mask & 0xFF) diff --git a/recipes/gcc/gcc-4.3.2.inc b/recipes/gcc/gcc-4.3.2.inc index a6e6b7bd19..5483b8fd66 100644 --- a/recipes/gcc/gcc-4.3.2.inc +++ b/recipes/gcc/gcc-4.3.2.inc @@ -7,7 +7,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" -INC_PR = "r8" +INC_PR = "r9" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \ @@ -47,7 +47,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://904-flatten-switch-stmt-00.patch;patch=1 \ file://arm-nolibfloat.patch;patch=1 \ file://arm-softfloat.patch;patch=1 \ - file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ file://cache-amnesia.patch;patch=1 \ file://gfortran-4.3.x.patch;patch=1 \ file://gcc-4.0.2-e300c2c3.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.3.2/fix-ICE-in-arm_unwind_emit_set.diff b/recipes/gcc/gcc-4.3.2/fix-ICE-in-arm_unwind_emit_set.diff deleted file mode 100644 index b8a147d3d9..0000000000 --- a/recipes/gcc/gcc-4.3.2/fix-ICE-in-arm_unwind_emit_set.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- /tmp/arm.c 2008-03-17 14:24:39.590464969 +0100 -+++ gcc-4.3.0/gcc/config/arm/arm.c 2008-03-17 14:12:21.614701982 +0100 -@@ -15959,6 +15959,9 @@ - int regno; - int lo_mask = mask & 0xFF; - int pushed_words = 0; -+ rtx e0; -+ rtx e1; -+ unsigned reg; - - gcc_assert (mask); - -@@ -16025,6 +16028,15 @@ - - return; - } -+ else if (GET_CODE (e1) == PLUS -+ && GET_CODE (XEXP (e1, 0)) == REG -+ && REGNO (XEXP (e1, 0)) == SP_REGNUM -+ && GET_CODE (XEXP (e1, 1)) == CONST_INT) -+ { -+ /* Set reg to offset from sp. */ -+ asm_fprintf (asm_out_file, "\t.movsp %r, #%d\n", -+ REGNO (e0), (int)INTVAL(XEXP (e1, 1))); -+ } - else - { - if (mask & 0xFF) diff --git a/recipes/gcc/gcc-4.3.3.inc b/recipes/gcc/gcc-4.3.3.inc index 6ccb0f1895..5802492d58 100644 --- a/recipes/gcc/gcc-4.3.3.inc +++ b/recipes/gcc/gcc-4.3.3.inc @@ -7,7 +7,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" -INC_PR = "r4" +INC_PR = "r5" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \ @@ -47,7 +47,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://904-flatten-switch-stmt-00.patch;patch=1 \ file://arm-nolibfloat.patch;patch=1 \ file://arm-softfloat.patch;patch=1 \ - file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ file://cache-amnesia.patch;patch=1 \ file://gfortran-4.3.x.patch;patch=1 \ file://gcc-4.0.2-e300c2c3.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.3.3/fix-ICE-in-arm_unwind_emit_set.diff b/recipes/gcc/gcc-4.3.3/fix-ICE-in-arm_unwind_emit_set.diff deleted file mode 100644 index b8a147d3d9..0000000000 --- a/recipes/gcc/gcc-4.3.3/fix-ICE-in-arm_unwind_emit_set.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- /tmp/arm.c 2008-03-17 14:24:39.590464969 +0100 -+++ gcc-4.3.0/gcc/config/arm/arm.c 2008-03-17 14:12:21.614701982 +0100 -@@ -15959,6 +15959,9 @@ - int regno; - int lo_mask = mask & 0xFF; - int pushed_words = 0; -+ rtx e0; -+ rtx e1; -+ unsigned reg; - - gcc_assert (mask); - -@@ -16025,6 +16028,15 @@ - - return; - } -+ else if (GET_CODE (e1) == PLUS -+ && GET_CODE (XEXP (e1, 0)) == REG -+ && REGNO (XEXP (e1, 0)) == SP_REGNUM -+ && GET_CODE (XEXP (e1, 1)) == CONST_INT) -+ { -+ /* Set reg to offset from sp. */ -+ asm_fprintf (asm_out_file, "\t.movsp %r, #%d\n", -+ REGNO (e0), (int)INTVAL(XEXP (e1, 1))); -+ } - else - { - if (mask & 0xFF) diff --git a/recipes/gcc/gcc-4.4.0/fix-ICE-in-arm_unwind_emit_set.diff b/recipes/gcc/gcc-4.4.0/fix-ICE-in-arm_unwind_emit_set.diff deleted file mode 100644 index b8a147d3d9..0000000000 --- a/recipes/gcc/gcc-4.4.0/fix-ICE-in-arm_unwind_emit_set.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- /tmp/arm.c 2008-03-17 14:24:39.590464969 +0100 -+++ gcc-4.3.0/gcc/config/arm/arm.c 2008-03-17 14:12:21.614701982 +0100 -@@ -15959,6 +15959,9 @@ - int regno; - int lo_mask = mask & 0xFF; - int pushed_words = 0; -+ rtx e0; -+ rtx e1; -+ unsigned reg; - - gcc_assert (mask); - -@@ -16025,6 +16028,15 @@ - - return; - } -+ else if (GET_CODE (e1) == PLUS -+ && GET_CODE (XEXP (e1, 0)) == REG -+ && REGNO (XEXP (e1, 0)) == SP_REGNUM -+ && GET_CODE (XEXP (e1, 1)) == CONST_INT) -+ { -+ /* Set reg to offset from sp. */ -+ asm_fprintf (asm_out_file, "\t.movsp %r, #%d\n", -+ REGNO (e0), (int)INTVAL(XEXP (e1, 1))); -+ } - else - { - if (mask & 0xFF) diff --git a/recipes/gcc/gcc-cross_4.2.1.bb b/recipes/gcc/gcc-cross_4.2.1.bb index b2dba3956a..c080143517 100644 --- a/recipes/gcc/gcc-cross_4.2.1.bb +++ b/recipes/gcc/gcc-cross_4.2.1.bb @@ -1,4 +1,4 @@ -PR = "r20" +PR = "r21" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc_4.2.1.bb b/recipes/gcc/gcc_4.2.1.bb index dd88ccdc27..711aa35a32 100644 --- a/recipes/gcc/gcc_4.2.1.bb +++ b/recipes/gcc/gcc_4.2.1.bb @@ -1,4 +1,4 @@ -PR = "r14" +PR = "r15" require gcc-${PV}.inc require gcc-configure-target.inc -- cgit v1.2.3 From 8e19e74c7d26b37aacf6d05641487129afe6c4c5 Mon Sep 17 00:00:00 2001 From: woglinde Date: Thu, 25 Jun 2009 21:33:22 +0200 Subject: mgetty: add mgetty-fax to the package and honor our LDLFAGS --- recipes/mgetty/mgetty-1.1.30/faxqhelper_ldflags.patch | 13 +++++++++++++ recipes/mgetty/mgetty-1.1.30/newslock_ldflags.patch | 13 +++++++++++++ recipes/mgetty/mgetty_1.1.30.bb | 8 +++++++- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 recipes/mgetty/mgetty-1.1.30/faxqhelper_ldflags.patch create mode 100644 recipes/mgetty/mgetty-1.1.30/newslock_ldflags.patch diff --git a/recipes/mgetty/mgetty-1.1.30/faxqhelper_ldflags.patch b/recipes/mgetty/mgetty-1.1.30/faxqhelper_ldflags.patch new file mode 100644 index 0000000000..4d3ea24b57 --- /dev/null +++ b/recipes/mgetty/mgetty-1.1.30/faxqhelper_ldflags.patch @@ -0,0 +1,13 @@ +Index: mgetty-1.1.30/fax/Makefile +=================================================================== +--- mgetty-1.1.30.orig/fax/Makefile 2009-05-09 22:00:37.814162343 +0200 ++++ mgetty-1.1.30/fax/Makefile 2009-05-09 22:01:04.209581406 +0200 +@@ -36,7 +36,7 @@ + @cd .. ; $(MAKE) sedscript + + faxq-helper: faxq-helper.o +- $(CC) $(CFLAGS) -o faxq-helper faxq-helper.o ++ $(CC) $(CFLAGS) $(LDFLAGS) -o faxq-helper faxq-helper.o + + faxq-helper.o: faxq-helper.c + $(CC) $(CFLAGS) -DFAX_SPOOL_OUT=\"$(FAX_SPOOL_OUT)\" \ diff --git a/recipes/mgetty/mgetty-1.1.30/newslock_ldflags.patch b/recipes/mgetty/mgetty-1.1.30/newslock_ldflags.patch new file mode 100644 index 0000000000..a4fc814bd0 --- /dev/null +++ b/recipes/mgetty/mgetty-1.1.30/newslock_ldflags.patch @@ -0,0 +1,13 @@ +Index: mgetty-1.1.30/Makefile +=================================================================== +--- mgetty-1.1.30.orig/Makefile 2009-05-09 21:55:50.072936310 +0200 ++++ mgetty-1.1.30/Makefile 2009-05-09 21:56:09.401939481 +0200 +@@ -569,7 +569,7 @@ + ./sedscript sendfax.config + + newslock: compat/newslock.c +- $(CC) $(CFLAGS) -o newslock compat/newslock.c ++ $(CC) $(CFLAGS) $(LDFLAGS) -o newslock compat/newslock.c + + # internal: use this to create a "clean" mgetty+sendfax tree + bindist: all doc-all sedscript diff --git a/recipes/mgetty/mgetty_1.1.30.bb b/recipes/mgetty/mgetty_1.1.30.bb index 375ea90f0d..37a830f5a7 100644 --- a/recipes/mgetty/mgetty_1.1.30.bb +++ b/recipes/mgetty/mgetty_1.1.30.bb @@ -3,7 +3,7 @@ DESCRIPTION = "The mgetty package contains an intelligent \ getty for allowing logins over a serial line (such as \ through a modem) and receiving incoming faxes." LICENSE = "GPL" -PR ="r3" +PR ="r4" # The source can no longer be found at ${DEBIAN_MIRROR}/main/m/mgetty/mgetty_${PV}.orig.tar.gz # so the nslu2-linux project has mirrored it until someone updates this package to a newer version. @@ -38,6 +38,8 @@ SRC_URI = "http://nslu.sf.net/downloads/mgetty_1.1.30.orig.tar.gz \ file://51-pending-faxq-time;patch=1 \ file://52-pending-metamail;patch=1 \ file://install.patch;patch=1 \ + file://newslock_ldflags.patch;patch=1 \ + file://faxqhelper_ldflags.patch;patch=1 \ file://policy.h \ file://voice-defs.h" @@ -79,3 +81,7 @@ do_install () { CONFFILES_${PN} = "${sysconfdir}/mgetty/mgetty.config \ ${sysconfdir}/mgetty/login.config ${sysconfdir}/mgetty/sendfax.config" + +FILES_${PN} += "${libdir}/mgetty-fax" + +FILES_${PN}-dbg += "${libdir}/mgetty-fax/.debug" -- cgit v1.2.3 From 4b8fe99bfac4f890990a4a1186a7ba1107d70ca0 Mon Sep 17 00:00:00 2001 From: woglinde Date: Sun, 19 Apr 2009 22:30:07 +0200 Subject: popt: use the better way for generating or not generationg locales * bump PR --- recipes/popt/popt_1.14.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes/popt/popt_1.14.bb b/recipes/popt/popt_1.14.bb index b3f8a89e91..bce74c6710 100644 --- a/recipes/popt/popt_1.14.bb +++ b/recipes/popt/popt_1.14.bb @@ -1,8 +1,7 @@ require popt.inc -DEPENDS = "gettext virtual/libintl" -PR = "r1" +PR = "r2" -inherit autotools_stage +inherit autotools_stage gettext SRC_URI = "\ http://rpm5.org/files/popt/popt-${PV}.tar.gz \ -- cgit v1.2.3 From 65b9a5b9d38aba409fc218ef11fb57c0e1f17239 Mon Sep 17 00:00:00 2001 From: woglinde Date: Sat, 18 Apr 2009 22:03:16 +0200 Subject: schroedinger: extra recipe for the gst-plguins * no need for compiling half of gnome when we want libschroe * bump PR --- .../schroedinger/gst-plugin-schroedinger_1.0.5.bb | 14 ++++++++++++++ recipes/schroedinger/schroedinger.inc | 10 ++++++++++ recipes/schroedinger/schroedinger_1.0.5.bb | 20 +++----------------- 3 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 recipes/schroedinger/gst-plugin-schroedinger_1.0.5.bb create mode 100644 recipes/schroedinger/schroedinger.inc diff --git a/recipes/schroedinger/gst-plugin-schroedinger_1.0.5.bb b/recipes/schroedinger/gst-plugin-schroedinger_1.0.5.bb new file mode 100644 index 0000000000..64660bb7f2 --- /dev/null +++ b/recipes/schroedinger/gst-plugin-schroedinger_1.0.5.bb @@ -0,0 +1,14 @@ +require schroedinger.inc +PR = "r2" + +DEPENDS += "gstreamer gst-plugins-base" + +SRC_URI = "http://www.diracvideo.org/download/schroedinger/schroedinger-${PV}.tar.gz" + +S = "${WORKDIR}/schroedinger-${PV}" + +PACKAGES = "gst-plugin-schroedinger gst-plugin-schroedinger-dev gst-plugin-schroedinger-dbg" +FILES_gst-plugin-schroedinger += "${libdir}/gstreamer-0.10/libgstschro.so" +FILES_gst-plugin-schroedinger-dev += "${libdir}/gstreamer-0.10/libgstschro.*" +FILES_gst-plugin-schroedinger-dbg += "${libdir}/gstreamer-0.10/.debug/libgstschro.so" + diff --git a/recipes/schroedinger/schroedinger.inc b/recipes/schroedinger/schroedinger.inc new file mode 100644 index 0000000000..f907613fd1 --- /dev/null +++ b/recipes/schroedinger/schroedinger.inc @@ -0,0 +1,10 @@ +HOMEPAGE = "http://schrodinger.sourceforge.net/" +LICENSE = "MPL GPL LGPL MIT" +DEPENDS = "liboil" + +PR = "r2" + +SRC_URI = "http://www.diracvideo.org/download/schroedinger/${P}.tar.gz" + +inherit autotools + diff --git a/recipes/schroedinger/schroedinger_1.0.5.bb b/recipes/schroedinger/schroedinger_1.0.5.bb index defb758046..66d24c1d97 100644 --- a/recipes/schroedinger/schroedinger_1.0.5.bb +++ b/recipes/schroedinger/schroedinger_1.0.5.bb @@ -1,22 +1,8 @@ -HOMEPAGE = "http://schrodinger.sourceforge.net/" -LICENSE = "MPL GPL LGPL MIT" -DEPENDS = "liboil gstreamer gst-plugins-base" +require schroedinger.inc -PR = "r1" +PR = "r2" -SRC_URI = "http://www.diracvideo.org/download/schroedinger/${P}.tar.gz" - -inherit autotools - -PACKAGES =+ "gst-plugin-schroedinger gst-plugin-schroedinger-dev gst-plugin-schroedinger-dbg" -FILES_gst-plugin-schroedinger += "${libdir}/gstreamer-0.10/libgstschro.so" -FILES_gst-plugin-schroedinger-dev += "${libdir}/gstreamer-0.10/libgstschro.*" -FILES_gst-plugin-schroedinger-dbg += "${libdir}/gstreamer-0.10/.debug/libgstschro.so" +inherit autotools_stage AUTOTOOLS_STAGE_PKGCONFIG = "1" -do_stage() { - autotools_stage_all -} - - -- cgit v1.2.3 From dbd4dfc7c9f1b9bcd9dc514088abb8a1f3c84e91 Mon Sep 17 00:00:00 2001 From: woglinde Date: Sat, 18 Apr 2009 21:26:47 +0200 Subject: libxine: update to version 1.1.16.3 --- conf/checksums.ini | 4 ++++ recipes/libxine/libxine_1.1.16.3.bb | 39 +++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 recipes/libxine/libxine_1.1.16.3.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 3829512918..caba61cf9e 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -26846,6 +26846,10 @@ sha256=795085a067b3a11c1b3de48b4d07b01d8ffb6123bd188a73cb53b0605f875c64 md5=acd1a210c5a6444e8fd44696469352bb sha256=27df9c8f962797b235d69154705cfdf18d3e325f028f54e3e804f6dadb8237be +[http://downloads.sourceforge.net/xine/xine-lib-1.1.16.3.tar.bz2] +md5=4f508abf088cf427a731f85634c8260d +sha256=d25a241efa55dc7d8f482336efa8bb7b9bb9d69b6df8a8a37f2660948fd67b52 + [http://folks.o-hand.com/dodji/0xdeadbabe/xine.tgz] md5=8b78ce490cde6eb3c586656e9bc5ead8 sha256=86402c93b332c44b4e79c568137257d567de1f95cd5f6f6e5433b7e67b40050a diff --git a/recipes/libxine/libxine_1.1.16.3.bb b/recipes/libxine/libxine_1.1.16.3.bb new file mode 100644 index 0000000000..21e5a6bd21 --- /dev/null +++ b/recipes/libxine/libxine_1.1.16.3.bb @@ -0,0 +1,39 @@ +require libxine.inc + +PPDIR = "1.26" +PR = "r0" + +FILESPATHPKG .= ":libxine-1.1.16" + +SRC_URI += " \ + file://libxine-arm-configure.patch;patch=1 \ + file://iconv.patch;patch=1 \ + " + +python populate_packages_prepend () { + bb.data.setVar('PKG_libxine', 'libxine', d) + + plugindir = bb.data.expand('${libdir}/xine/plugins/${PPDIR}', d) + do_split_packages(d, plugindir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s', extra_depends='' ) + + vidixdir = bb.data.expand('${libdir}/xine/plugins/${PPDIR}/vidix', d) + do_split_packages(d, vidixdir, '^(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s', extra_depends='' ) + + postdir = bb.data.expand('${libdir}/xine/plugins/${PPDIR}/post', d) + do_split_packages(d, postdir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s', extra_depends='' ) + + fontdir = bb.data.expand('${datadir}/xine/libxine1/fonts', d) + do_split_packages(d, fontdir, '^(.*).xinefont.gz$', 'libxine-font-%s', 'Xine font %s', extra_depends='' ) + +} + +FILES_${PN}-dbg =+ "${libdir}/xine/plugins/${PPDIR}/.debug \ + ${libdir}/xine/plugins/${PPDIR}/post/.debug \ + ${libdir}/xine/plugins/${PPDIR}/vidix/.debug \ + " + +FILES_${PN}-dev =+ "${libdir}/xine/plugins/${PPDIR}/*.a \ + ${libdir}/xine/plugins/${PPDIR}/post/*.a \ + ${libdir}/xine/plugins/${PPDIR}/vidix/*.a \ + " + -- cgit v1.2.3 From 8cbb8558a7439678d43f006412317ad6c0436825 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Fri, 26 Jun 2009 01:42:51 +0200 Subject: kernel-2.4-embedix: revert commit 2f0fcff486dba9daa7b35cc96a3dce86f16ae30d - COMPATIBLE_MACHINE will be set in sharprom-compatible --- recipes/linux/corgi-kernel-2.4-embedix.bb | 2 +- recipes/linux/husky-kernel-2.4-embedix.bb | 2 +- recipes/linux/poodle-kernel-2.4-embedix.bb | 2 +- recipes/linux/poodle255-kernel-2.4-embedix.bb | 2 +- recipes/linux/shepherd-kernel-2.4-embedix.bb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes/linux/corgi-kernel-2.4-embedix.bb b/recipes/linux/corgi-kernel-2.4-embedix.bb index 594a431ffb..986ee7ac40 100644 --- a/recipes/linux/corgi-kernel-2.4-embedix.bb +++ b/recipes/linux/corgi-kernel-2.4-embedix.bb @@ -1,3 +1,3 @@ -COMPATIBLE_MACHINE = "corgi" +MACHINE = "corgi" COMPATIBLE_HOST = "arm.*-linux" require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc diff --git a/recipes/linux/husky-kernel-2.4-embedix.bb b/recipes/linux/husky-kernel-2.4-embedix.bb index ac253cc7c2..81f859594c 100644 --- a/recipes/linux/husky-kernel-2.4-embedix.bb +++ b/recipes/linux/husky-kernel-2.4-embedix.bb @@ -1,5 +1,5 @@ COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = "husky" +MACHINE = "husky" require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc diff --git a/recipes/linux/poodle-kernel-2.4-embedix.bb b/recipes/linux/poodle-kernel-2.4-embedix.bb index b3133f11ba..2f26cbc863 100644 --- a/recipes/linux/poodle-kernel-2.4-embedix.bb +++ b/recipes/linux/poodle-kernel-2.4-embedix.bb @@ -1,4 +1,4 @@ -COMPATIBLE_MACHINE = "poodle" +MACHINE = "poodle" COMPATIBLE_HOST = "arm.*-linux" require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc diff --git a/recipes/linux/poodle255-kernel-2.4-embedix.bb b/recipes/linux/poodle255-kernel-2.4-embedix.bb index 28bb32d222..f3044f4e67 100644 --- a/recipes/linux/poodle255-kernel-2.4-embedix.bb +++ b/recipes/linux/poodle255-kernel-2.4-embedix.bb @@ -1,4 +1,4 @@ -COMPATIBLE_MACHINE = "poodle255" +MACHINE = "poodle255" COMPATIBLE_HOST = "arm.*-linux" require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc diff --git a/recipes/linux/shepherd-kernel-2.4-embedix.bb b/recipes/linux/shepherd-kernel-2.4-embedix.bb index ed1899a7ff..c52fb4767d 100644 --- a/recipes/linux/shepherd-kernel-2.4-embedix.bb +++ b/recipes/linux/shepherd-kernel-2.4-embedix.bb @@ -1,4 +1,4 @@ -COMPATIBLE_MACHINE = "shepherd" +MACHINE = "shepherd" COMPATIBLE_HOST = "arm.*-linux" require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc -- cgit v1.2.3 From 5b8e90765bafd4871489c35040af7a2e5163ad03 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Fri, 26 Jun 2009 01:57:07 +0200 Subject: sharprom-compatible: add custom COMPATIBLE_MACHINE for c7x0/poodle embedix kernels --- conf/distro/sharprom-compatible.conf | 7 +++++-- recipes/linux/c7x0-kernels-2.4-embedix.bb | 5 ++++- recipes/linux/poodle-kernels-2.4-embedix.bb | 6 +++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf index 81f919bed2..bd3b93ec17 100644 --- a/conf/distro/sharprom-compatible.conf +++ b/conf/distro/sharprom-compatible.conf @@ -26,11 +26,14 @@ export TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}/${layout_includedir}" #DEBUG_BUILD = "1" # We are still using 2.4 embedix kernels -COMPATIBLE_MACHINE_pn-openzaurus-pxa27x = "(akita|spitz)" -COMPATIBLE_MACHINE_pn-openzaurus-pxa = "(c7x0|poodle|poodle255|tosa)" +COMPATIBLE_MACHINE_pn-c7x0-kernels = "(c7x0|corgi|husky|shepherd)" COMPATIBLE_MACHINE_pn-collie-kernels = "collie" +COMPATIBLE_MACHINE_pn-poodle-kernels = "(poodle|poodle255)" +COMPATIBLE_MACHINE_pn-openzaurus-pxa27x = "(akita|spitz|borzoi)" +COMPATIBLE_MACHINE_pn-openzaurus-pxa = "(c7x0|corgi|husky|shepherd|poodle|poodle255|tosa)" COMPATIBLE_MACHINE_pn-openzaurus-sa = "collie" + # # Base # diff --git a/recipes/linux/c7x0-kernels-2.4-embedix.bb b/recipes/linux/c7x0-kernels-2.4-embedix.bb index 44c9ad2036..60b7a5cafb 100644 --- a/recipes/linux/c7x0-kernels-2.4-embedix.bb +++ b/recipes/linux/c7x0-kernels-2.4-embedix.bb @@ -5,7 +5,10 @@ PROVIDES = "virtual/kernel" PR = "r1" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = '(corgi|husky|shepherd)' + +# For these old 2.4 kernels we override in sharprom-compatible.conf +#COMPATIBLE_MACHINE = "(corgi|husky|shepherd)" +COMPATIBLE_MACHINE = "none" DEPENDS = "corgi-kernel-2.4-embedix shepherd-kernel-2.4-embedix husky-kernel-2.4-embedix" diff --git a/recipes/linux/poodle-kernels-2.4-embedix.bb b/recipes/linux/poodle-kernels-2.4-embedix.bb index 21d334fec3..256ef7125c 100644 --- a/recipes/linux/poodle-kernels-2.4-embedix.bb +++ b/recipes/linux/poodle-kernels-2.4-embedix.bb @@ -1,3 +1,7 @@ -COMPATIBLE_MACHINE = "poodle" COMPATIBLE_HOST = "arm.*-linux" + +# For these old 2.4 kernels we ov