From 7232c201c164dbc3fceb3e58223e2c5f80b0cc21 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Fri, 12 Jan 2007 18:19:07 +0000 Subject: mark fonts that rprovide "virtual/japanese-font" --- packages/qpf-fonts/qpf-qte_2.3.10.bb | 2 ++ packages/qpf-fonts/qpf-unifont_1.0.bb | 1 + 2 files changed, 3 insertions(+) diff --git a/packages/qpf-fonts/qpf-qte_2.3.10.bb b/packages/qpf-fonts/qpf-qte_2.3.10.bb index 33e7d87e32..4d7d739f79 100644 --- a/packages/qpf-fonts/qpf-qte_2.3.10.bb +++ b/packages/qpf-fonts/qpf-qte_2.3.10.bb @@ -20,6 +20,8 @@ PROVIDES += "qte-font-smoothserif-140 qte-font-smoothserif-180 qte-font-smooths PROVIDES += "qte-font-smoothtimes-100 qte-font-smoothtimes-160 qte-font-smoothtimes-170" PROVIDES += "qte-font-smoothtimes-220 qte-font-smoothtimes-250 qte-font-smoothtimes-440" PROVIDES += "qte-font-unifont" +RPROVIDES_qte-font-unifont += "virtual/japanese-font" +RPROVIDES_qte-font-japanese += "virtual/japanese-font" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz" S = "${WORKDIR}/qt-${PV}" diff --git a/packages/qpf-fonts/qpf-unifont_1.0.bb b/packages/qpf-fonts/qpf-unifont_1.0.bb index 6eefff1c20..ec3a9de4ca 100644 --- a/packages/qpf-fonts/qpf-unifont_1.0.bb +++ b/packages/qpf-fonts/qpf-unifont_1.0.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Unicode fonts - QPF Edition" LICENSE = "GPL QPL" SECTION = "opie/fonts" PRIORITY = "optional" +RPROVIDES = "virtual/japanese-font" PACKAGE_ARCH = "all" PR = "r1" -- cgit v1.2.3 From 2cd333daa8322617cc933113902bba032f352275 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Jan 2007 12:24:49 +0000 Subject: abiword-2.5.inc: add include file for abiword 2.5 series, based on the one present in Poky. * abiword 2.5.0 is missing the perl cdump and doesn't compile, so that's why the actual recipe is missing --- packages/abiword/abiword-2.5.inc | 62 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 packages/abiword/abiword-2.5.inc diff --git a/packages/abiword/abiword-2.5.inc b/packages/abiword/abiword-2.5.inc new file mode 100644 index 0000000000..cd95777227 --- /dev/null +++ b/packages/abiword/abiword-2.5.inc @@ -0,0 +1,62 @@ +DESCRIPTION = "AbiWord is free word processing program similar to Microsoft(r) Word" +SECTION = "gnome/office" +HOMEPAGE = "http://www.abiword.org"" +LICENSE = "GPLv2" + +DEPENDS = "perl-native wv libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng libxml2" +RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \ + glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" + +SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" + +#want 2.x from 2.x.y for the installation directory +SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" + +FILES_${PN} += " \ + ${datadir}/icons/* \ + ${datadir}/AbiSuite-${SHRT_VER}/AbiWord/glade \ + ${datadir}/AbiSuite-${SHRT_VER}/AbiWord/scripts \ + ${datadir}/AbiSuite-${SHRT_VER}/AbiWord/system.profile-en \ + ${datadir}/AbiSuite-${SHRT_VER}/AbiWord/system.profile-en_GB \ +# ${datadir}/AbiSuite-${SHRT_VER}/templates/A4.awt \ +# ${datadir}/AbiSuite-${SHRT_VER}/templates/US-Letter.awt \ + ${datadir}/AbiSuite-${SHRT_VER}/templates/normal.awt \ + ${datadir}/AbiSuite-${SHRT_VER}/templates/normal.awt-en_GB \ + ${datadir}/AbiSuite-${SHRT_VER}/templates/Employee-Directory.awt \ + ${datadir}/AbiSuite-${SHRT_VER}/templates/Business-Report.awt \ + ${datadir}/AbiSuite-${SHRT_VER}/templates/Fax-Coversheet.awt \ + ${datadir}/AbiSuite-${SHRT_VER}/templates/Resume.awt \ + ${datadir}/AbiSuite-${SHRT_VER}/templates/Two-Columns.awt \ + ${datadir}/AbiSuite-${SHRT_VER}/templates/Memo.awt \ + ${datadir}/AbiSuite-${SHRT_VER}/templates/Press-Release.awt " + +inherit autotools pkgconfig + +PARALLEL_MAKE = "" + +EXTRA_OECONF = " --disable-pspell \ + --enable-enchant \ + --with-sys-wv" + +# AbiWord configure.ac does not play nicely with autoreconf +# so use the autogen.sh script that comes with AbiWord +# +do_configure() { + cd ${S} + export NOCONFIGURE="no"; ./autogen.sh + oe_runconf +} + + +do_install_append() { + install -d ${D}${datadir}/pixmaps/ + mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/ +} + +PACKAGES += " abiword-clipart abiword-icons abiword-strings abiword-systemprofiles abiword-templates " + +FILES_abiword-clipart += "${datadir}/AbiSuite-${SHRT_VER}/clipart" +FILES_abiword-icons += "${datadir}/AbiSuite-${SHRT_VER}/icons" +FILES_abiword-strings += "${datadir}/AbiSuite-${SHRT_VER}/AbiWord/strings" +FILES_abiword-systemprofiles += "${datadir}/AbiSuite-${SHRT_VER}/AbiWord/system.profile*" +FILES_abiword-templates += "${datadir}/AbiSuite-${SHRT_VER}/templates" -- cgit v1.2.3 From c95d5e23ce088516b69c98aa9cc13fdd65d8aefc Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 15 Jan 2007 12:58:54 +0000 Subject: bluez: update libs and utils to 3.8, hcidump to 1.33 --- packages/bluez/bluez-hcidump_1.25.bb | 15 ---------- packages/bluez/bluez-hcidump_1.33.bb | 13 +++++++++ packages/bluez/bluez-libs_3.1.bb | 22 --------------- packages/bluez/bluez-libs_3.8.bb | 22 +++++++++++++++ packages/bluez/bluez-utils_3.1.bb | 52 ----------------------------------- packages/bluez/bluez-utils_3.8.bb | 53 ++++++++++++++++++++++++++++++++++++ 6 files changed, 88 insertions(+), 89 deletions(-) delete mode 100644 packages/bluez/bluez-hcidump_1.25.bb create mode 100644 packages/bluez/bluez-hcidump_1.33.bb delete mode 100644 packages/bluez/bluez-libs_3.1.bb create mode 100644 packages/bluez/bluez-libs_3.8.bb delete mode 100644 packages/bluez/bluez-utils_3.1.bb create mode 100644 packages/bluez/bluez-utils_3.8.bb diff --git a/packages/bluez/bluez-hcidump_1.25.bb b/packages/bluez/bluez-hcidump_1.25.bb deleted file mode 100644 index 0cbc0fd6ec..0000000000 --- a/packages/bluez/bluez-hcidump_1.25.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool." -SECTION = "console" -PRIORITY = "optional" -DEPENDS = "bluez-libs" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz" -S = "${WORKDIR}/bluez-hcidump-${PV}" - -EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}" - -inherit autotools - - diff --git a/packages/bluez/bluez-hcidump_1.33.bb b/packages/bluez/bluez-hcidump_1.33.bb new file mode 100644 index 0000000000..877c8db33c --- /dev/null +++ b/packages/bluez/bluez-hcidump_1.33.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool." +SECTION = "console" +PRIORITY = "optional" +DEPENDS = "bluez-libs" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz" +S = "${WORKDIR}/bluez-hcidump-${PV}" + +EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}" + +inherit autotools diff --git a/packages/bluez/bluez-libs_3.1.bb b/packages/bluez/bluez-libs_3.1.bb deleted file mode 100644 index d740bd80a9..0000000000 --- a/packages/bluez/bluez-libs_3.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack Userland Libaries." -SECTION = "libs" -PRIORITY = "optional" -HOMEPAGE = "http://www.bluez.org" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz" - -inherit autotools pkgconfig - -HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h" - -do_stage() { - oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/bluetooth/ - for f in ${HEADERS} - do - install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f - done -} diff --git a/packages/bluez/bluez-libs_3.8.bb b/packages/bluez/bluez-libs_3.8.bb new file mode 100644 index 0000000000..d740bd80a9 --- /dev/null +++ b/packages/bluez/bluez-libs_3.8.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Linux Bluetooth Stack Userland Libaries." +SECTION = "libs" +PRIORITY = "optional" +HOMEPAGE = "http://www.bluez.org" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz" + +inherit autotools pkgconfig + +HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h" + +do_stage() { + oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/bluetooth/ + for f in ${HEADERS} + do + install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f + done +} diff --git a/packages/bluez/bluez-utils_3.1.bb b/packages/bluez/bluez-utils_3.1.bb deleted file mode 100644 index 40aabaab50..0000000000 --- a/packages/bluez/bluez-utils_3.1.bb +++ /dev/null @@ -1,52 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack Userland Utilities." -SECTION = "console" -PRIORITY = "optional" -DEPENDS = "bluez-libs-${PV} dbus" -RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus" -RREPLACES = "bluez-utils-dbus" -RCONFLICTS = "bluez-utils-dbus bluez-utils-nodbus" -LICENSE = "GPL" -PR = "r1" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ - file://hcid.conf \ - file://02dtl1_cs.sh \ - file://hciattach-ti-bts.patch;patch=1" - -# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol -# Let's default to that instead of 'any' until further notice... -SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1" - -S = "${WORKDIR}/bluez-utils-${PV}" - -EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci" -# --enable-obex enable OBEX support -# --enable-alsa enable ALSA support -# --enable-cups install CUPS backend support -# --enable-bccmd install BCCMD interface utility -# --enable-avctrl install Audio/Video control utility -# --enable-hid2hci install HID mode switching utility -# --enable-dfutool install DFU firmware upgrade utility - -inherit autotools update-rc.d - -INITSCRIPT_NAME = "bluetooth" -INITSCRIPT_PARAMS = "defaults 23 19" - -do_install_append() { - install -d ${D}${base_sbindir} ${D}${base_bindir}/ ${D}${sysconfdir}/apm/event.d/ - mv ${D}${sbindir}/* ${D}${base_sbindir}/ - mv ${D}${bindir}/* ${D}${base_bindir}/ - rmdir ${D}${bindir} ${D}${sbindir} - chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig - install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/ - install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/ -} - -CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ - ${sysconfdir}/default/bluetooth" - -PACKAGES =+ "${PN}-ciptool" -FILES_${PN}-ciptool = "/bin/ciptool" -RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool" -RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus" diff --git a/packages/bluez/bluez-utils_3.8.bb b/packages/bluez/bluez-utils_3.8.bb new file mode 100644 index 0000000000..d549d12d30 --- /dev/null +++ b/packages/bluez/bluez-utils_3.8.bb @@ -0,0 +1,53 @@ +DESCRIPTION = "Linux Bluetooth Stack Userland Utilities." +SECTION = "console" +PRIORITY = "optional" +DEPENDS = "bluez-libs-${PV} dbus" +PROVIDES = "bluez-utils-dbus" +RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus" +RREPLACES = "bluez-utils-dbus" +RCONFLICTS_${PN} = "bluez-utils-nodbus" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ + file://hcid.conf \ + file://02dtl1_cs.sh \ + file://hciattach-ti-bts.patch;patch=1" + +# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol +# Let's default to that instead of 'any' until further notice... +SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1" + +S = "${WORKDIR}/bluez-utils-${PV}" + +EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci" +# --enable-obex enable OBEX support +# --enable-alsa enable ALSA support +# --enable-cups install CUPS backend support +# --enable-bccmd install BCCMD interface utility +# --enable-avctrl install Audio/Video control utility +# --enable-hid2hci install HID mode switching utility +# --enable-dfutool install DFU firmware upgrade utility + +inherit autotools update-rc.d + +INITSCRIPT_NAME = "bluetooth" +INITSCRIPT_PARAMS = "defaults 23 19" + +do_install_append() { + install -d ${D}${base_sbindir} ${D}${base_bindir}/ ${D}${sysconfdir}/apm/event.d/ + mv ${D}${sbindir}/* ${D}${base_sbindir}/ + mv ${D}${bindir}/* ${D}${base_bindir}/ + rmdir ${D}${bindir} ${D}${sbindir} + chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig + install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/ + install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/ +} + +CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ + ${sysconfdir}/default/bluetooth" + +PACKAGES =+ "${PN}-ciptool" +FILES_${PN}-ciptool = "/bin/ciptool" +RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool" +RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus" -- cgit v1.2.3 From 8e87aa5a55e8f6c1b8f43b98a01efdd9bea5523f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Jan 2007 13:11:37 +0000 Subject: abiword: add 2.5.0 so abi-master Xora can play with it --- packages/abiword/abiword_2.5.0.bb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 packages/abiword/abiword_2.5.0.bb diff --git a/packages/abiword/abiword_2.5.0.bb b/packages/abiword/abiword_2.5.0.bb new file mode 100644 index 0000000000..32b703c9ae --- /dev/null +++ b/packages/abiword/abiword_2.5.0.bb @@ -0,0 +1,8 @@ +require abiword-2.5.inc + +DEFAULT_PREFERENCE = "-1" + +PR = "r0" + +RCONFLICTS = "abiword-embedded" + -- cgit v1.2.3 From 14bf4d2ccae8bce7f73e77a3a1e05de280fd6ed0 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 15 Jan 2007 13:34:14 +0000 Subject: avahi: update to 0.6.16 and remove old versions --- packages/avahi/avahi_0.6.10.bb | 3 --- packages/avahi/avahi_0.6.11.bb | 3 --- packages/avahi/avahi_0.6.12.bb | 7 ------- packages/avahi/avahi_0.6.13.bb | 7 ------- packages/avahi/avahi_0.6.14.bb | 8 -------- packages/avahi/avahi_0.6.16.bb | 8 ++++++++ packages/avahi/avahi_0.6.5.bb | 1 - packages/avahi/avahi_0.6.8.bb | 1 - 8 files changed, 8 insertions(+), 30 deletions(-) delete mode 100644 packages/avahi/avahi_0.6.10.bb delete mode 100644 packages/avahi/avahi_0.6.11.bb delete mode 100644 packages/avahi/avahi_0.6.12.bb delete mode 100644 packages/avahi/avahi_0.6.13.bb delete mode 100644 packages/avahi/avahi_0.6.14.bb create mode 100644 packages/avahi/avahi_0.6.16.bb delete mode 100644 packages/avahi/avahi_0.6.5.bb delete mode 100644 packages/avahi/avahi_0.6.8.bb diff --git a/packages/avahi/avahi_0.6.10.bb b/packages/avahi/avahi_0.6.10.bb deleted file mode 100644 index 27dcdcffcb..0000000000 --- a/packages/avahi/avahi_0.6.10.bb +++ /dev/null @@ -1,3 +0,0 @@ -require avahi.inc - -PR = "r1" diff --git a/packages/avahi/avahi_0.6.11.bb b/packages/avahi/avahi_0.6.11.bb deleted file mode 100644 index 27dcdcffcb..0000000000 --- a/packages/avahi/avahi_0.6.11.bb +++ /dev/null @@ -1,3 +0,0 @@ -require avahi.inc - -PR = "r1" diff --git a/packages/avahi/avahi_0.6.12.bb b/packages/avahi/avahi_0.6.12.bb deleted file mode 100644 index aad7d2661c..0000000000 --- a/packages/avahi/avahi_0.6.12.bb +++ /dev/null @@ -1,7 +0,0 @@ -require avahi.inc - -PR = "r2" - -do_stage() { - autotools_stage_all -} diff --git a/packages/avahi/avahi_0.6.13.bb b/packages/avahi/avahi_0.6.13.bb deleted file mode 100644 index 076dc0d148..0000000000 --- a/packages/avahi/avahi_0.6.13.bb +++ /dev/null @@ -1,7 +0,0 @@ -require avahi.inc - -PR = "r1" - -do_stage() { - autotools_stage_all -} diff --git a/packages/avahi/avahi_0.6.14.bb b/packages/avahi/avahi_0.6.14.bb deleted file mode 100644 index e42f4bbc13..0000000000 --- a/packages/avahi/avahi_0.6.14.bb +++ /dev/null @@ -1,8 +0,0 @@ -require avahi.inc - -FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ - ${sysconfdir}/avahi/avahi-autoipd.action" - -do_stage() { - autotools_stage_all -} diff --git a/packages/avahi/avahi_0.6.16.bb b/packages/avahi/avahi_0.6.16.bb new file mode 100644 index 0000000000..e42f4bbc13 --- /dev/null +++ b/packages/avahi/avahi_0.6.16.bb @@ -0,0 +1,8 @@ +require avahi.inc + +FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ + ${sysconfdir}/avahi/avahi-autoipd.action" + +do_stage() { + autotools_stage_all +} diff --git a/packages/avahi/avahi_0.6.5.bb b/packages/avahi/avahi_0.6.5.bb deleted file mode 100644 index 9189734dfa..0000000000 --- a/packages/avahi/avahi_0.6.5.bb +++ /dev/null @@ -1 +0,0 @@ -require avahi.inc diff --git a/packages/avahi/avahi_0.6.8.bb b/packages/avahi/avahi_0.6.8.bb deleted file mode 100644 index 9189734dfa..0000000000 --- a/packages/avahi/avahi_0.6.8.bb +++ /dev/null @@ -1 +0,0 @@ -require avahi.inc -- cgit v1.2.3 From c5d9be54bc0be29cd6197be90a8bf2666a3031d2 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 15 Jan 2007 13:34:50 +0000 Subject: libnss-mdns: update to 0.9, bugfix release --- packages/libnss-mdns/libnss-mdns_0.8.bb | 33 --------------------------------- packages/libnss-mdns/libnss-mdns_0.9.bb | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 packages/libnss-mdns/libnss-mdns_0.8.bb create mode 100644 packages/libnss-mdns/libnss-mdns_0.9.bb diff --git a/packages/libnss-mdns/libnss-mdns_0.8.bb b/packages/libnss-mdns/libnss-mdns_0.8.bb deleted file mode 100644 index a4a9cd00d1..0000000000 --- a/packages/libnss-mdns/libnss-mdns_0.8.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "NSS module for Multicast DNS name resolution" -HOMEPAGE = "http://0pointer.de/lennart/projects/nss-mdns/" -LICENSE = "GPL" -SECTION = "libs" -PRIORITY = "optional" - -RRECOMMENDS_${PN} = "zeroconf" -PR = "r1" - -EXTRA_OECONF = "--libdir=/lib" -S = "${WORKDIR}/nss-mdns-${PV}" - -SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz" - -inherit autotools - -pkg_postinst () { - # can't do this offline - if [ "x$D" != "x" ]; then - exit 1 - fi - cat /etc/nsswitch.conf | grep "hosts:\s*files dns$" > /dev/null && { - cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files \)dns/\1mdns4_minimal [NOTFOUND=return] dns mdns4/' > /tmp/nsswitch.conf - mv /tmp/nsswitch.conf /etc/nsswitch.conf - } -} - -pkg_prerm () { - cat /etc/nsswitch.conf | grep "hosts:\s*files dns mdns$" > /dev/null && { - cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files \)mdns4_minimal [NOTFOUND=return] dns mdns4/\1dns/' > /tmp/nsswitch.conf - mv /tmp/nsswitch.conf /etc/nsswitch.conf - } -} diff --git a/packages/libnss-mdns/libnss-mdns_0.9.bb b/packages/libnss-mdns/libnss-mdns_0.9.bb new file mode 100644 index 0000000000..171ff5113b --- /dev/null +++ b/packages/libnss-mdns/libnss-mdns_0.9.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "NSS module for Multicast DNS name resolution" +HOMEPAGE = "http://0pointer.de/lennart/projects/nss-mdns/" +LICENSE = "GPL" +SECTION = "libs" +PRIORITY = "optional" + +RRECOMMENDS_${PN} = "zeroconf" +PR = "r0" + +EXTRA_OECONF = "--libdir=/lib" +S = "${WORKDIR}/nss-mdns-${PV}" + +SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz" + +inherit autotools + +pkg_postinst () { + # can't do this offline + if [ "x$D" != "x" ]; then + exit 1 + fi + cat /etc/nsswitch.conf | grep "hosts:\s*files dns$" > /dev/null && { + cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files \)dns/\1mdns4_minimal [NOTFOUND=return] dns mdns4/' > /tmp/nsswitch.conf + mv /tmp/nsswitch.conf /etc/nsswitch.conf + } +} + +pkg_prerm () { + cat /etc/nsswitch.conf | grep "hosts:\s*files dns mdns$" > /dev/null && { + cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files \)mdns4_minimal [NOTFOUND=return] dns mdns4/\1dns/' > /tmp/nsswitch.conf + mv /tmp/nsswitch.conf /etc/nsswitch.conf + } +} -- cgit v1.2.3 From eb3ad275253b32d30962c312757cf290ea47218c Mon Sep 17 00:00:00 2001 From: Dirk Opfer Date: Mon, 15 Jan 2007 13:43:54 +0000 Subject: wlan-ng: add version 0.2.7 --- .../wlan-ng/wlan-ng-modules-0.2.7/.mtn2git_empty | 0 .../wlan-ng-modules-0.2.7/only-the-modules.patch | 26 ++++++++ packages/wlan-ng/wlan-ng-modules_0.2.7.bb | 6 ++ .../wlan-ng/wlan-ng-utils-0.2.7/.mtn2git_empty | 0 packages/wlan-ng/wlan-ng-utils-0.2.7/config.in | 21 +++++++ .../wlan-ng-utils-0.2.7/only-the-utils.patch | 26 ++++++++ packages/wlan-ng/wlan-ng-utils_0.2.7.bb | 69 ++++++++++++++++++++++ 7 files changed, 148 insertions(+) create mode 100644 packages/wlan-ng/wlan-ng-modules-0.2.7/.mtn2git_empty create mode 100644 packages/wlan-ng/wlan-ng-modules-0.2.7/only-the-modules.patch create mode 100644 packages/wlan-ng/wlan-ng-modules_0.2.7.bb create mode 100644 packages/wlan-ng/wlan-ng-utils-0.2.7/.mtn2git_empty create mode 100644 packages/wlan-ng/wlan-ng-utils-0.2.7/config.in create mode 100644 packages/wlan-ng/wlan-ng-utils-0.2.7/only-the-utils.patch create mode 100644 packages/wlan-ng/wlan-ng-utils_0.2.7.bb diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.7/.mtn2git_empty b/packages/wlan-ng/wlan-ng-modules-0.2.7/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.7/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.7/only-the-modules.patch new file mode 100644 index 0000000000..abb3b137da --- /dev/null +++ b/packages/wlan-ng/wlan-ng-modules-0.2.7/only-the-modules.patch @@ -0,0 +1,26 @@ +Index: trunk/src/Makefile +=================================================================== +--- trunk.orig/src/Makefile 2006-08-23 12:50:56.000000000 +0200 ++++ trunk/src/Makefile 2006-08-23 12:52:45.000000000 +0200 +@@ -44,7 +44,7 @@ + + -include ../config.mk + +-DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2 ++DIRS=mkmeta shared p80211 prism2 + + ifneq ($(wildcard *.addon),) + DIRS+=`cat *.addon` +Index: trunk/src/prism2/Makefile +=================================================================== +--- trunk.orig/src/prism2/Makefile 2006-08-23 12:50:55.000000000 +0200 ++++ trunk/src/prism2/Makefile 2006-08-23 12:52:09.000000000 +0200 +@@ -44,7 +44,7 @@ + + -include ../../config.mk + +-DIRS=driver ridlist download ++DIRS=driver ridlist + + ifneq ($(wildcard *.addon),) + DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.7.bb b/packages/wlan-ng/wlan-ng-modules_0.2.7.bb new file mode 100644 index 0000000000..169b72dd0b --- /dev/null +++ b/packages/wlan-ng/wlan-ng-modules_0.2.7.bb @@ -0,0 +1,6 @@ +require wlan-ng-modules.inc + +SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2" + +S = "${WORKDIR}/linux-wlan-ng-${PV}" + diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.7/.mtn2git_empty b/packages/wlan-ng/wlan-ng-utils-0.2.7/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.7/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.7/config.in new file mode 100644 index 0000000000..be01488a92 --- /dev/null +++ b/packages/wlan-ng/wlan-ng-utils-0.2.7/config.in @@ -0,0 +1,21 @@ +WLAN_VERSION=0 +WLAN_PATCHLEVEL=2 +WLAN_SUBLEVEL=3 +WLAN_EXTRAVERSION= +#LINUX_SRC=$(KERNEL_SOURCE) +PCMCIA_SRC=. +PREFIX= +INST_EXEDIR=/sbin +#TARGET_ROOT_ON_HOST= +#RC_DIR=/etc/init.d +PCMCIA_DIR=/etc/pcmcia +SYSV_INIT=y +INSTALL_DEPMOD= +WLAN_DEBUG=n +CROSS_COMPILE_ENABLED=n +CROSS_COMPILE= +HOST_COMPILE= +PRISM2_PLX=y +PRISM2_PCMCIA=y +PRISM2_PCI=y +PRISM2_USB=y diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.7/only-the-utils.patch b/packages/wlan-ng/wlan-ng-utils-0.2.7/only-the-utils.patch new file mode 100644 index 0000000000..af1f442a4c --- /dev/null +++ b/packages/wlan-ng/wlan-ng-utils-0.2.7/only-the-utils.patch @@ -0,0 +1,26 @@ +Index: trunk/src/Makefile +=================================================================== +--- trunk.orig/src/Makefile 2006-08-21 16:24:58.000000000 +0200 ++++ trunk/src/Makefile 2006-08-23 12:49:08.000000000 +0200 +@@ -44,7 +44,7 @@ + + -include ../config.mk + +-DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2 ++DIRS=mkmeta shared wlanctl nwepgen wlancfg prism2 + + ifneq ($(wildcard *.addon),) + DIRS+=`cat *.addon` +Index: trunk/src/prism2/Makefile +=================================================================== +--- trunk.orig/src/prism2/Makefile 2006-08-21 16:24:57.000000000 +0200 ++++ trunk/src/prism2/Makefile 2006-08-23 12:48:32.000000000 +0200 +@@ -44,7 +44,7 @@ + + -include ../../config.mk + +-DIRS=driver ridlist download ++DIRS=ridlist download + + ifneq ($(wildcard *.addon),) + DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.7.bb b/packages/wlan-ng/wlan-ng-utils_0.2.7.bb new file mode 100644 index 0000000000..929f67fe16 --- /dev/null +++ b/packages/wlan-ng/wlan-ng-utils_0.2.7.bb @@ -0,0 +1,69 @@ +DESCRIPTION = "linux-wlan-ng userland utilities" +HOMEPAGE = "http://www.linux-wlan.org" +SECTION = "kernel/userland" +DEPENDS = "virtual/kernel" +LICENSE = "GPL" + +SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ + file://only-the-utils.patch;patch=1 \ + file://scripts-makefile-hostcc.patch;patch=1 \ + file://pcmciasrc.patch;patch=1 \ + file://hostldflags.patch;patch=1 \ + file://wlan-ng.modutils \ + file://wlan.agent \ + file://usbctl \ + file://resume \ + file://pre-up \ + file://post-down \ + file://config.in" +S = "${WORKDIR}/linux-wlan-ng-${PV}" + +# yeah, it's kind of backwards, but otherwise the config step will fail +inherit module + +do_configure() { + install -m 0655 ${WORKDIR}/config.in ${S}/config.in + oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config + + if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then + echo "PRISM2_PCMCIA=y" >> config.mk + echo "WLAN_KERN_PCMCIA=y" >> config.mk + fi + echo "TARGET_ROOT_ON_HOST=${D}/" >> config.mk + echo "FIRMWARE_DIR=/etc/wlan" >> config.mk + echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk + echo "TARGET_INST_EXEDIR=${D}/sbin" >> config.mk + echo "RC_DIR=${sysconfdir}/" >> config.mk + echo "CC=${CC}" >> config.mk + echo "LD=${LD}" >> config.mk + + # Shut up, you broken buildsystem + install -m 0655 config.mk src/prism2/config.mk + install -d src/prism2/driver/include + ln -sf ${S}/src/include/wlan src/prism2/driver/include/wlan + ln -sf ${S}/src/prism2/include/prism2 src/prism2/driver/include/prism2 +} + +do_compile() { + oe_runmake all +} + +do_install() { + oe_runmake install + mkdir -p ${D}${sysconfdir}/modutils/ + mkdir -p ${D}${sysconfdir}/hotplug/ + mkdir -p ${D}${base_sbindir}/ + install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf + install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent + install -d ${D}${sysconfdir}/network/if-pre-up.d + install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng + install -d ${D}${sysconfdir}/network/if-post-down.d + install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng + install -d ${D}${sysconfdir}/apm/resume.d + install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng + install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl + install -d ${D}${mandir}/man1 + install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/ +} + +FILES_${PN} = "/etc /sbin" -- cgit v1.2.3 From 04c9590b70dbfc6de6c8e40353c6206937cd35a3 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 15 Jan 2007 13:45:54 +0000 Subject: magician: add "phone" MACHINE_FEATURE and autoload some kernel modules --- conf/machine/magician.conf | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index 4e6c9a625a..3d1b602def 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -17,7 +17,7 @@ require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "80" VOLATILE_STORAGE_SIZE = "64" GUI_MACHINE_CLASS = "smallscreen" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen" +MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget" # # Software/packages selection @@ -34,7 +34,11 @@ MACHINE_EXTRA_RRECOMMENDS = " \ kernel-module-pxaficp-ir \ kernel-module-uinput \ kernel-module-hci-usb \ - " + kernel-module-magician-flash \ + kernel-module-magician-ds1wm \ + kernel-module-magician-battery \ + kernel-module-magician-phone \ + kernel-module-snd-soc-magician" # # Modules autoload and other boot properties @@ -44,6 +48,11 @@ module_autoload_leds-magician = "leds-magician" module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-mixer-oss = "snd-mixer-oss" module_autoload_pxa27x_udc = "pxa27x_udc" +module_autoload_magician_ds1wm = "magician_ds1wm" +module_autoload_magician-battery = "magician-battery" +module_autoload_magician_phone = "magician_phone" +module_autoload_snd-soc-magician = "snd-soc-magician" +module_autoload_hci_usb = "hci_usb" #FIXME: this should be controlled by a userspace utility later. module_autoload_g_ether = "g_ether" -- cgit v1.2.3 From 77c460e2fa2b9755ae35f80299791ff28d71b6d4 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 15 Jan 2007 14:26:45 +0000 Subject: portmap: fix occurence of http://${DEBIAN_MIRROR} - these variables include the protocol --- packages/portmap/portmap.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/portmap/portmap.inc b/packages/portmap/portmap.inc index e7e7673001..bb9d2b6652 100644 --- a/packages/portmap/portmap.inc +++ b/packages/portmap/portmap.inc @@ -3,7 +3,7 @@ SECTION = "console/network" LICENSE = "GPL" SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \ - http://${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ + ${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ file://no-libwrap.patch;patch=1;pnum=0 \ file://portmap.init \ file://make.patch;patch=1" -- cgit v1.2.3 From e68c4472cce34d6ebf1a48c07212a471e3c24bf0 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 15 Jan 2007 14:27:18 +0000 Subject: libnotify: update to 0.4.3 --- packages/libnotify/libnotify_0.3.2.bb | 13 ------------- packages/libnotify/libnotify_0.4.3.bb | 13 +++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 packages/libnotify/libnotify_0.3.2.bb create mode 100644 packages/libnotify/libnotify_0.4.3.bb diff --git a/packages/libnotify/libnotify_0.3.2.bb b/packages/libnotify/libnotify_0.3.2.bb deleted file mode 100644 index f3f3aff334..0000000000 --- a/packages/libnotify/libnotify_0.3.2.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "sends desktop notifications to a notification daemon" -HOMEPAGE = "http://www.galago-project.org/" -LICENSE = "LGPL" -DEPENDS = "dbus gtk+" -PR = "r0" - -SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${PN}-${PV}.tar.gz" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/libnotify/libnotify_0.4.3.bb b/packages/libnotify/libnotify_0.4.3.bb new file mode 100644 index 0000000000..f3f3aff334 --- /dev/null +++ b/packages/libnotify/libnotify_0.4.3.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "sends desktop notifications to a notification daemon" +HOMEPAGE = "http://www.galago-project.org/" +LICENSE = "LGPL" +DEPENDS = "dbus gtk+" +PR = "r0" + +SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${PN}-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From c23afbe7c1cc18b96616cd2c2e83353d340a77cf Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 15 Jan 2007 14:36:29 +0000 Subject: libsexy: unify recipes, add 0.1.10, drop 0.1.[45] --- packages/libsexy/libsexy.inc | 16 ++++++++++++++++ packages/libsexy/libsexy_0.1.10.bb | 2 ++ packages/libsexy/libsexy_0.1.4.bb | 16 ---------------- packages/libsexy/libsexy_0.1.5.bb | 16 ---------------- packages/libsexy/libsexy_0.1.6.bb | 16 +--------------- packages/libsexy/libsexy_0.1.8.bb | 17 +---------------- 6 files changed, 20 insertions(+), 63 deletions(-) create mode 100644 packages/libsexy/libsexy.inc create mode 100644 packages/libsexy/libsexy_0.1.10.bb delete mode 100644 packages/libsexy/libsexy_0.1.4.bb delete mode 100644 packages/libsexy/libsexy_0.1.5.bb diff --git a/packages/libsexy/libsexy.inc b/packages/libsexy/libsexy.inc new file mode 100644 index 0000000000..522b7e0d63 --- /dev/null +++ b/packages/libsexy/libsexy.inc @@ -0,0 +1,16 @@ +DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel" +HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy" +AUTHOR = "Christian Hammond " +SECTION = "x11/libs" + +DEPENDS = "gtk+ enchant libxml2" + +SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage() { +autotools_stage_all +} + + diff --git a/packages/libsexy/libsexy_0.1.10.bb b/packages/libsexy/libsexy_0.1.10.bb new file mode 100644 index 0000000000..042ea757e9 --- /dev/null +++ b/packages/libsexy/libsexy_0.1.10.bb @@ -0,0 +1,2 @@ +require libsexy.inc +PR = "r0" diff --git a/packages/libsexy/libsexy_0.1.4.bb b/packages/libsexy/libsexy_0.1.4.bb deleted file mode 100644 index b3e7e7ad7d..0000000000 --- a/packages/libsexy/libsexy_0.1.4.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel" -HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy" -AUTHOR = "Christian Hammond " -PR = "r1" - -DEPENDS = "gtk+ enchant libxml2" - -SRC_URI = "http://osiris.chipx86.com/projects/libsexy/releases/${P}.tar.gz" - -inherit autotools pkgconfig - -do_stage() { -autotools_stage_all -} - - diff --git a/packages/libsexy/libsexy_0.1.5.bb b/packages/libsexy/libsexy_0.1.5.bb deleted file mode 100644 index 964c381c7d..0000000000 --- a/packages/libsexy/libsexy_0.1.5.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel" -HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy" -AUTHOR = "Christian Hammond " -PR = "r0" - -DEPENDS = "gtk+ enchant libxml2" - -SRC_URI = "http://osiris.chipx86.com/projects/libsexy/releases/${P}.tar.gz" - -inherit autotools pkgconfig - -do_stage() { -autotools_stage_all -} - - diff --git a/packages/libsexy/libsexy_0.1.6.bb b/packages/libsexy/libsexy_0.1.6.bb index 964c381c7d..042ea757e9 100644 --- a/packages/libsexy/libsexy_0.1.6.bb +++ b/packages/libsexy/libsexy_0.1.6.bb @@ -1,16 +1,2 @@ -DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel" -HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy" -AUTHOR = "Christian Hammond " +require libsexy.inc PR = "r0" - -DEPENDS = "gtk+ enchant libxml2" - -SRC_URI = "http://osiris.chipx86.com/projects/libsexy/releases/${P}.tar.gz" - -inherit autotools pkgconfig - -do_stage() { -autotools_stage_all -} - - diff --git a/packages/libsexy/libsexy_0.1.8.bb b/packages/libsexy/libsexy_0.1.8.bb index 1de4a9175a..91784ffb49 100644 --- a/packages/libsexy/libsexy_0.1.8.bb +++ b/packages/libsexy/libsexy_0.1.8.bb @@ -1,17 +1,2 @@ -DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel" -HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy" -AUTHOR = "Christian Hammond " -SECTION = "x11/libs" +require libsexy.inc PR = "r1" - -DEPENDS = "gtk+ enchant libxml2" - -SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz" - -inherit autotools pkgconfig - -do_stage() { -autotools_stage_all -} - - -- cgit v1.2.3 From 13efca366dab9df6dead91a1273270ec2cbd068a Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 15 Jan 2007 15:12:56 +0000 Subject: abiword_2.5.0.bb : finish the .bb --- packages/abiword/abiword_2.5.0.bb | 6 ++++++ packages/abiword/files/cdump.pl | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100755 packages/abiword/files/cdump.pl diff --git a/packages/abiword/abiword_2.5.0.bb b/packages/abiword/abiword_2.5.0.bb index 32b703c9ae..82d4e0e944 100644 --- a/packages/abiword/abiword_2.5.0.bb +++ b/packages/abiword/abiword_2.5.0.bb @@ -2,7 +2,13 @@ require abiword-2.5.inc DEFAULT_PREFERENCE = "-1" +SRC_URI += " file://cdump.pl " + PR = "r0" RCONFLICTS = "abiword-embedded" +do_compile_prepend () { + cp ${WORKDIR}/cdump.pl ${S}/src/tools/cdump/xp/ +} + diff --git a/packages/abiword/files/cdump.pl b/packages/abiword/files/cdump.pl new file mode 100755 index 0000000000..76f9c8841b --- /dev/null +++ b/packages/abiword/files/cdump.pl @@ -0,0 +1,32 @@ +#!/usr/bin/perl + +# This script replace the cdump tool we used to build the ap_wp_Splash.cpp +# Because the cdump tool has to be run as a part of building the AW package, +# it breaks cross-compilation. A perl script seemed like a generic solution + + +if ($#ARGV != 1 ) +{ + print "Usage: $0 datafile arrayname $#ARGV $ARGV[0] $ARGV[1]\n"; + exit(-1); +} + +open FROM, "<$ARGV[0]" or die "Could not open file $ARGV[0]"; +binmode FROM; + +print "unsigned char $ARGV[1] [] = {\n"; + +while ($len = read(FROM, $buf, 16)) +{ + foreach(split(//,$buf)) + { + printf("0x%02x,", ord($_)); + } + + print "\n"; +} + + +printf "};\nunsigned long $ARGV[1]_sizeof = sizeof($ARGV[1]);\n"; + +close FROM; \ No newline at end of file -- cgit v1.2.3 From ced19f9eb4ea93154a74e2abb0e051c9a6490cd9 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 15 Jan 2007 15:18:05 +0000 Subject: notification-daemon: add 0.3.6, drop 0.3.4 --- packages/notification-daemon/notification-daemon_0.3.4.bb | 15 --------------- packages/notification-daemon/notification-daemon_0.3.6.bb | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 packages/notification-daemon/notification-daemon_0.3.4.bb create mode 100644 packages/notification-daemon/notification-daemon_0.3.6.bb diff --git a/packages/notification-daemon/notification-daemon_0.3.4.bb b/packages/notification-daemon/notification-daemon_0.3.4.bb deleted file mode 100644 index 8acabfae73..0000000000 --- a/packages/notification-daemon/notification-daemon_0.3.4.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "a dbus service that listens to desktop notification requests and displays them" -HOMEPAGE = "http://www.galago-project.org/" -LICENSE = "GPL" -DEPENDS = "gettext dbus gtk+ libsexy gconf libwnck" - -PACKAGES = "${PN}" -FILES_${PN} = "${libexecdir}/notification-daemon \ - ${datadir}/dbus-1/services/notification-daemon.service \ - ${libdir}/notification-daemon-1.0/engines/libstandard.so \ - ${sysconfdir}/gconf/schemas/notification-daemon.schemas" - -SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz" -EXTRA_OECONF = "--disable-binreloc" - -inherit autotools pkgconfig diff --git a/packages/notification-daemon/notification-daemon_0.3.6.bb b/packages/notification-daemon/notification-daemon_0.3.6.bb new file mode 100644 index 0000000000..8acabfae73 --- /dev/null +++ b/packages/notification-daemon/notification-daemon_0.3.6.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "a dbus service that listens to desktop notification requests and displays them" +HOMEPAGE = "http://www.galago-project.org/" +LICENSE = "GPL" +DEPENDS = "gettext dbus gtk+ libsexy gconf libwnck" + +PACKAGES = "${PN}" +FILES_${PN} = "${libexecdir}/notification-daemon \ + ${datadir}/dbus-1/services/notification-daemon.service \ + ${libdir}/notification-daemon-1.0/engines/libstandard.so \ + ${sysconfdir}/gconf/schemas/notification-daemon.schemas" + +SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz" +EXTRA_OECONF = "--disable-binreloc" + +inherit autotools pkgconfig -- cgit v1.2.3 From 46d8ea463e08dfeed19f68984e45c8b8426e5894 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Mon, 15 Jan 2007 15:31:11 +0000 Subject: mysql-native: clobber RDEPENDS_${PN} to avoid circular dependency nightmare --- packages/mysql/mysql-native_4.1.18.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/mysql/mysql-native_4.1.18.bb b/packages/mysql/mysql-native_4.1.18.bb index ebef572fbb..dc87549e24 100644 --- a/packages/mysql/mysql-native_4.1.18.bb +++ b/packages/mysql/mysql-native_4.1.18.bb @@ -2,6 +2,8 @@ SECTION = "console/network" require mysql_${PV}.bb inherit native +RDEPENDS_${PN} = "" + PACKAGES = "" DEPENDS = "ncurses-native" EXTRA_OEMAKE = "" -- cgit v1.2.3 From dddb2e26017c226a72ca58339c86b5ee1a475b90 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 15 Jan 2007 15:43:24 +0000 Subject: notification-daemon: add obligatory --prefix parameter to dbus-binding-tool - fixes compilation against dbus-glib >= 0.72 --- packages/notification-daemon/files/.mtn2git_empty | 0 .../notification-daemon/files/dbus-glib-tool-prefix.patch | 13 +++++++++++++ packages/notification-daemon/notification-daemon_0.3.6.bb | 3 ++- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 packages/notification-daemon/files/.mtn2git_empty create mode 100644 packages/notification-daemon/files/dbus-glib-tool-prefix.patch diff --git a/packages/notification-daemon/files/.mtn2git_empty b/packages/notification-daemon/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/notification-daemon/files/dbus-glib-tool-prefix.patch b/packages/notification-daemon/files/dbus-glib-tool-prefix.patch new file mode 100644 index 0000000000..bfe06f7737 --- /dev/null +++ b/packages/notification-daemon/files/dbus-glib-tool-prefix.patch @@ -0,0 +1,13 @@ +Index: notification-daemon-0.3.6/src/Makefile.am +=================================================================== +--- notification-daemon-0.3.6.orig/src/Makefile.am 2007-01-15 16:25:37.000000000 +0100 ++++ notification-daemon-0.3.6/src/Makefile.am 2007-01-15 16:26:01.000000000 +0100 +@@ -13,7 +13,7 @@ + BUILT_SOURCES = notificationdaemon-dbus-glue.h + + notificationdaemon-dbus-glue.h: notificationdaemon.xml +- dbus-binding-tool --mode=glib-server \ ++ dbus-binding-tool --mode=glib-server --prefix= \ + $(srcdir)/notificationdaemon.xml > notificationdaemon-dbus-glue.h + + INCLUDES = \ diff --git a/packages/notification-daemon/notification-daemon_0.3.6.bb b/packages/notification-daemon/notification-daemon_0.3.6.bb index 8acabfae73..1fdf6f2762 100644 --- a/packages/notification-daemon/notification-daemon_0.3.6.bb +++ b/packages/notification-daemon/notification-daemon_0.3.6.bb @@ -9,7 +9,8 @@ FILES_${PN} = "${libexecdir}/notification-daemon \ ${libdir}/notification-daemon-1.0/engines/libstandard.so \ ${sysconfdir}/gconf/schemas/notification-daemon.schemas" -SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz" +SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \ + file://dbus-glib-tool-prefix.patch;patch=1" EXTRA_OECONF = "--disable-binreloc" inherit autotools pkgconfig -- cgit v1.2.3 From 6eafd8a3f7ce813e5c2e33a606d2b2754d6aacb1 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 15 Jan 2007 16:32:04 +0000 Subject: neon: fix SRC_URI to make older versions fetchable again --- packages/neon/neon_0.25.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/neon/neon_0.25.5.bb b/packages/neon/neon_0.25.5.bb index d73081e249..eec428136d 100644 --- a/packages/neon/neon_0.25.5.bb +++ b/packages/neon/neon_0.25.5.bb @@ -6,7 +6,7 @@ DEPENDS = "zlib libxml2 expat time" PR = "r1" -SRC_URI = "http://be.lunar-linux.org/lunar/cache/neon-${PV}.tar.gz" +SRC_URI = "http://www.webdav.org/${PN}/${P}.tar.gz" inherit autotools binconfig lib_package -- cgit v1.2.3 From 78cfbc9c82c7acab44b6ba4d619f422760b9f03a Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Mon, 15 Jan 2007 16:39:21 +0000 Subject: compulab-pxa270.conf: change serial console baud to 38400 to match BL --- conf/machine/compulab-pxa270.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf index 3968bcb6f2..95be1624f0 100644 --- a/conf/machine/compulab-pxa270.conf +++ b/conf/machine/compulab-pxa270.conf @@ -12,7 +12,7 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv5te" require conf/machine/include/tune-xscale.conf # used by sysvinit_2 -SERIAL_CONSOLE = "115200 ttySA0" +SERIAL_CONSOLE = "38400 ttySA0" # used by opie-collections.inc ROOT_FLASH_SIZE = "32" -- cgit v1.2.3 From f00b2ecc4057866b860837d4ff8f4e76f3b9e15e Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 15 Jan 2007 16:46:31 +0000 Subject: asterisk: Upstream upgrade to 1.2.14 --- packages/asterisk/asterisk-1.2.14/.mtn2git_empty | 0 packages/asterisk/asterisk-1.2.14/asterisk.patch | 221 +++++++++++++++++++++ .../asterisk-1.2.14/uclibc-compat-getloadavg.patch | 13 ++ packages/asterisk/asterisk-1.2.14/uclibc-dsn.patch | 18 ++ packages/asterisk/asterisk_1.2.14.bb | 38 ++++ 5 files changed, 290 insertions(+) create mode 100644 packages/asterisk/asterisk-1.2.14/.mtn2git_empty create mode 100644 packages/asterisk/asterisk-1.2.14/asterisk.patch create mode 100644 packages/asterisk/asterisk-1.2.14/uclibc-compat-getloadavg.patch create mode 100644 packages/asterisk/asterisk-1.2.14/uclibc-dsn.patch create mode 100644 packages/asterisk/asterisk_1.2.14.bb diff --git a/packages/asterisk/asterisk-1.2.14/.mtn2git_empty b/packages/asterisk/asterisk-1.2.14/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/asterisk/asterisk-1.2.14/asterisk.patch b/packages/asterisk/asterisk-1.2.14/asterisk.patch new file mode 100644 index 0000000000..006b8e9291 --- /dev/null +++ b/packages/asterisk/asterisk-1.2.14/asterisk.patch @@ -0,0 +1,221 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- asterisk-1.2.9.1/./Makefile~asterisk ++++ asterisk-1.2.9.1/./Makefile +@@ -331,7 +331,7 @@ + ASTCFLAGS+= $(TRACE_FRAMES) + ASTCFLAGS+= $(MALLOC_DEBUG) + ASTCFLAGS+= $(BUSYDETECT) +-ASTCFLAGS+= $(OPTIONS) ++#ASTCFLAGS+= $(OPTIONS) + ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize) + ASTCFLAGS+= -fomit-frame-pointer + endif +@@ -347,12 +347,12 @@ + netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \ + cryptostub.o + +-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sys/poll.h),) ++ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/include/sys/poll.h),) + OBJS+= poll.o + ASTCFLAGS+=-DPOLLCOMPAT + endif + +-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/dlfcn.h),) ++ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/include/dlfcn.h),) + OBJS+= dlfcn.o + ASTCFLAGS+=-DDLFCNCOMPAT + endif +@@ -397,7 +397,7 @@ + endif + + ifeq ($(MAKETOPLEVEL),$(MAKELEVEL)) +- CFLAGS+=$(ASTCFLAGS) ++override CFLAGS+=$(ASTCFLAGS) + endif + + # This is used when generating the doxygen documentation +@@ -519,7 +519,7 @@ + fi + rm -f include/asterisk/build.h.tmp + $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c +- $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS) ++ $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LDFLAGS) $(LIBS) + + muted: muted.o + $(CC) $(AUDIO_LIBS) -o muted muted.o +--- asterisk-1.2.9.1/codecs/gsm/Makefile~asterisk ++++ asterisk-1.2.9.1/codecs/gsm/Makefile +@@ -51,7 +51,7 @@ + ifneq (${PROC},ppc) + ifneq (${PROC},ppc64) + ifneq (${PROC},s390) +-OPTIMIZE+=-march=$(PROC) ++#OPTIMIZE+=-march=$(PROC) + endif + endif + endif +@@ -243,7 +243,7 @@ + ifneq (${PROC},arm) + ifneq ($(shell uname -m), parisc) + ifneq ($(shell uname -m),s390) +-GSM_SOURCES+= $(SRC)/k6opt.s ++#GSM_SOURCES+= $(SRC)/k6opt.s + endif + endif + endif +@@ -309,7 +309,7 @@ + ifneq ($(shell uname -m), armv4l) + ifneq ($(shell uname -m), parisc) + ifneq ($(shell uname -m),s390) +-GSM_OBJECTS+= $(SRC)/k6opt.o ++#GSM_OBJECTS+= $(SRC)/k6opt.o + endif + endif + endif +--- asterisk-1.2.9.1/res/Makefile~asterisk ++++ asterisk-1.2.9.1/res/Makefile +@@ -89,7 +89,7 @@ + fi + + res_crypto.so: res_crypto.o +- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CRYPTO_LIBS) ++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} $(CRYPTO_LIBS) + + clean: + rm -f *.so *.o .depend +--- asterisk-1.2.9.1/channels/Makefile~asterisk ++++ asterisk-1.2.9.1/channels/Makefile +@@ -73,7 +73,7 @@ + SOLINK+=-lrt + endif + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/linux/ixjuser.h),) + CHANNEL_LIBS+=chan_phone.so + endif + +@@ -88,16 +88,16 @@ + + CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/alsa/asoundlib.h),) + CHANNEL_LIBS+=chan_alsa.so + endif + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/lib/libpri.so.1),) + CFLAGS+=-DZAPATA_PRI + ZAPPRI=-lpri + endif + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/lib/libmfcr2.so.1),) + CFLAGS+=-DZAPATA_R2 + ZAPR2=-lmfcr2 + endif +@@ -110,7 +110,7 @@ + endif + + ifndef WITHOUT_ZAPTEL +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/linux/zaptel.h),) + ifeq (${OSARCH},NetBSD) + SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib + endif +@@ -122,7 +122,7 @@ + endif + endif # WITHOUT_ZAPTEL + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/vpbapi.h),) + CHANNEL_LIBS+=chan_vpb.so + CFLAGS+=-DLINUX + endif +@@ -137,7 +137,7 @@ + + ZAPDIR=/usr/lib + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/nbs.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/nbs.h),) + CHANNEL_LIBS+=chan_nbs.so + endif + +@@ -158,7 +158,7 @@ + rm -f busy.h ringtone.h gentone gentone-ulaw + + %.so : %.o +- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} ${LIBS} ++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} ${LIBS} + + ifneq ($(wildcard .depend),) + include .depend +@@ -215,7 +215,7 @@ + chan_alsa.o: $(ALSA_SRC) + + chan_alsa.so: chan_alsa.o +- $(CC) $(SOLINK) -o $@ $< -lasound -lm -ldl ++ $(CC) $(SOLINK) -o $@ $< -lasound -lm -ldl $(LDFLAGS) + + chan_nbs.so: chan_nbs.o + $(CC) $(SOLINK) -o $@ $< -lnbs +--- asterisk-1.2.9.1/pbx/Makefile~asterisk ++++ asterisk-1.2.9.1/pbx/Makefile +@@ -59,7 +59,7 @@ + $(CC) $(SOLINK) -o $@ $(KDE_CONSOLE_OBJS) $(KDE_LIBS) + + pbx_dundi.so: dundi-parser.o pbx_dundi.o +- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o -lz ${CYGSOLIB} ++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o -lz ${CYGSOLIB} $(LDFLAGS) + + %.moc : %.h + $(MOC) $< -o $@ +--- asterisk-1.2.9.1/formats/Makefile~asterisk ++++ asterisk-1.2.9.1/formats/Makefile +@@ -25,7 +25,7 @@ + # + # OGG/Vorbis format + # +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vorbis/codec.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/vorbis/codec.h),) + FORMAT_LIBS+=format_ogg_vorbis.so + endif + +@@ -57,7 +57,7 @@ + $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lm + + format_ogg_vorbis.so : format_ogg_vorbis.o +- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm ++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm $(LDFLAGS) + + install: all + for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done +--- asterisk-1.2.9.1/utils/Makefile~asterisk ++++ asterisk-1.2.9.1/utils/Makefile +@@ -22,11 +22,11 @@ + + TARGET=stereorize streamplayer + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/popt.h),) + TARGET+=smsq + endif + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/newt.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/newt.h),) + TARGET+=astman + endif + +@@ -64,7 +64,7 @@ + $(CC) $(CFLAGS) -o $@ $^ + + smsq: smsq.o +- $(CC) $(CFLAGS) -o smsq ${SOL} smsq.o -lpopt ++ $(CC) $(CFLAGS) -o smsq ${SOL} smsq.o -lpopt $(LDFLAGS) + + streamplayer: streamplayer.o + $(CC) $(CFLAGS) -o streamplayer ${SOL} streamplayer.o ${SOLLIBS} diff --git a/packages/asterisk/asterisk-1.2.14/uclibc-compat-getloadavg.patch b/packages/asterisk/asterisk-1.2.14/uclibc-compat-getloadavg.patch new file mode 100644 index 0000000000..a909513b1c --- /dev/null +++ b/packages/asterisk/asterisk-1.2.14/uclibc-compat-getloadavg.patch @@ -0,0 +1,13 @@ +diff -ruN asterisk-1.2.0-old/include/asterisk/compat.h asterisk-1.2.0-new/include/asterisk/compat.h +--- asterisk-1.2.0-old/include/asterisk/compat.h 2005-11-08 05:13:19.000000000 +0100 ++++ asterisk-1.2.0-new/include/asterisk/compat.h 2005-12-04 05:32:31.000000000 +0100 +@@ -75,7 +75,9 @@ + #define HAVE_STRTOQ + + #ifdef _BSD_SOURCE ++#ifndef __UCLIBC__ + #define HAVE_GETLOADAVG ++#endif /* __UCLIBC__ */ + #endif + + #ifdef __linux__ diff --git a/packages/asterisk/asterisk-1.2.14/uclibc-dsn.patch b/packages/asterisk/asterisk-1.2.14/uclibc-dsn.patch new file mode 100644 index 0000000000..23657bcc76 --- /dev/null +++ b/packages/asterisk/asterisk-1.2.14/uclibc-dsn.patch @@ -0,0 +1,18 @@ +diff -ruN asterisk-1.0.7-old/dns.c asterisk-1.0.7-new/dns.c +--- asterisk-1.0.7-old/dns.c 2004-06-22 22:11:15.000000000 +0200 ++++ asterisk-1.0.7-new/dns.c 2005-03-19 17:38:06.000000000 +0100 +@@ -153,7 +153,13 @@ + + #if defined(res_ninit) + #define HAS_RES_NINIT +-#else ++#endif ++ ++#ifdef __UCLIBC__ ++#undef HAS_RES_NINIT ++#endif ++ ++#ifndef HAS_RES_NINIT + AST_MUTEX_DEFINE_STATIC(res_lock); + #if 0 + #warning "Warning, res_ninit is missing... Could have reentrancy issues" diff --git a/packages/asterisk/asterisk_1.2.14.bb b/packages/asterisk/asterisk_1.2.14.bb new file mode 100644 index 0000000000..42a3214f0a --- /dev/null +++ b/packages/asterisk/asterisk_1.2.14.bb @@ -0,0 +1,38 @@ +DESCRIPTION="The Asterisk open source software PBX" +HOMEPAGE="www.asterisk.org" +LICENSE="GPL" +DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis popt" +PR = "r1" + +SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \ + file://uclibc-compat-getloadavg.patch;patch=1 \ + file://uclibc-dsn.patch;patch=1 \ + file://asterisk.patch;patch=1" + + +export CROSS_COMPILE="${CCACHE}${HOST_PREFIX}" +export CROSS_COMPILE_BIN="${STAGING_BINDIR_CROSS}" +export CROSS_COMPILE_TARGET="${STAGING_DIR}/${HOST_SYS}" + +export CROSS_ARCH="Linux" +export CROSS_PROC="arm" +export SUB_PROC="xscale" + +export MAKECMDGOALS="dont-optimize" + +# We will probably have to edit the CFLAG in the Makefile + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake DESTDIR=${D} install +} + +do_stage () { + install -d ${STAGING_INCDIR}/asterisk + install -m 0644 ${S}/include/asterisk/*.h ${STAGING_INCDIR}/asterisk/ +} + + -- cgit v1.2.3 From 547d37e3dc0dd43dc86d45ab2490dc622b0c386d Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 15 Jan 2007 16:53:35 +0000 Subject: busybox: Upstream upgrade to 1.3.1, DEFAULT_PREFERENCE=-1 --- packages/busybox/busybox-1.3.1/.mtn2git_empty | 0 .../busybox/busybox-1.3.1/add-getkey-applet.patch | 167 ++++++ .../busybox/busybox-1.3.1/angstrom/.mtn2git_empty | 0 packages/busybox/busybox-1.3.1/angstrom/defconfig | 647 +++++++++++++++++++++ packages/busybox/busybox-1.3.1/below.patch | 46 ++ packages/busybox/busybox-1.3.1/busybox-mdev.sh | 69 +++ packages/busybox/busybox-1.3.1/defconfig | 647 +++++++++++++++++++++ packages/busybox/busybox-1.3.1/dhcp-hostname.patch | 30 + packages/busybox/busybox-1.3.1/dhcpretrytime.patch | 85 +++ packages/busybox/busybox-1.3.1/fbset.patch | 24 + packages/busybox/busybox-1.3.1/hdparm_M.patch | 47 ++ .../busybox-1.3.1/ifupdown-spurious-environ.patch | 12 + .../busybox-1.3.1/iproute-flush-cache.patch | 23 + packages/busybox/busybox-1.3.1/mnci/.mtn2git_empty | 0 packages/busybox/busybox-1.3.1/mnci/defconfig | 643 ++++++++++++++++++++ .../busybox/busybox-1.3.1/mount-all-type.patch | 84 +++ .../busybox/busybox-1.3.1/nylon/.mtn2git_empty | 0 packages/busybox/busybox-1.3.1/nylon/defconfig | 568 ++++++++++++++++++ .../busybox/busybox-1.3.1/openmn/.mtn2git_empty | 0 packages/busybox/busybox-1.3.1/readlink.patch | 85 +++ packages/busybox/busybox-1.3.1/rmmod.patch | 40 ++ .../busybox/busybox-1.3.1/slugos/.mtn2git_empty | 0 packages/busybox/busybox-1.3.1/slugos/defconfig | 610 +++++++++++++++++++ .../busybox/busybox-1.3.1/slugos/udhcpscript.patch | 133 +++++ .../busybox/busybox-1.3.1/sparc/.mtn2git_empty | 0 .../busybox-1.3.1/udhcppidfile-breakage.patch | 57 ++ packages/busybox/busybox-1.3.1/udhcppidfile.patch | 274 +++++++++ packages/busybox/busybox-1.3.1/udhcpscript.patch | 17 + .../busybox/busybox-1.3.1/wget-long-options.patch | 20 + .../busybox/busybox-1.3.1/wrt54/.mtn2git_empty | 0 .../busybox/busybox-1.3.1/xargs-double-size.patch | 13 + packages/busybox/busybox_1.3.1.bb | 100 ++++ 32 files changed, 4441 insertions(+) create mode 100644 packages/busybox/busybox-1.3.1/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.3.1/add-getkey-applet.patch create mode 100644 packages/busybox/busybox-1.3.1/angstrom/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.3.1/angstrom/defconfig create mode 100644 packages/busybox/busybox-1.3.1/below.patch create mode 100755 packages/busybox/busybox-1.3.1/busybox-mdev.sh create mode 100644 packages/busybox/busybox-1.3.1/defconfig create mode 100644 packages/busybox/busybox-1.3.1/dhcp-hostname.patch create mode 100644 packages/busybox/busybox-1.3.1/dhcpretrytime.patch create mode 100644 packages/busybox/busybox-1.3.1/fbset.patch create mode 100644 packages/busybox/busybox-1.3.1/hdparm_M.patch create mode 100644 packages/busybox/busybox-1.3.1/ifupdown-spurious-environ.patch create mode 100644 packages/busybox/busybox-1.3.1/iproute-flush-cache.patch create mode 100644 packages/busybox/busybox-1.3.1/mnci/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.3.1/mnci/defconfig create mode 100644 packages/busybox/busybox-1.3.1/mount-all-type.patch create mode 100644 packages/busybox/busybox-1.3.1/nylon/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.3.1/nylon/defconfig create mode 100644 packages/busybox/busybox-1.3.1/openmn/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.3.1/readlink.patch create mode 100644 packages/busybox/busybox-1.3.1/rmmod.patch create mode 100644 packages/busybox/busybox-1.3.1/slugos/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.3.1/slugos/defconfig create mode 100644 packages/busybox/busybox-1.3.1/slugos/udhcpscript.patch create mode 100644 packages/busybox/busybox-1.3.1/sparc/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.3.1/udhcppidfile-breakage.patch create mode 100644 packages/busybox/busybox-1.3.1/udhcppidfile.patch create mode 100644 packages/busybox/busybox-1.3.1/udhcpscript.patch create mode 100644 packages/busybox/busybox-1.3.1/wget-long-options.patch create mode 100644 packages/busybox/busybox-1.3.1/wrt54/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.3.1/xargs-double-size.patch create mode 100644 packages/busybox/busybox_1.3.1.bb diff --git a/packages/busybox/busybox-1.3.1/.mtn2git_empty b/packages/busybox/busybox-1.3.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/busybox/busybox-1.3.1/add-getkey-applet.patch b/packages/busybox/busybox-1.3.1/add-getkey-applet.patch new file mode 100644 index 0000000000..a75cf823c7 --- /dev/null +++ b/packages/busybox/busybox-1.3.1/add-getkey-applet.patch @@ -0,0 +1,167 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: busybox-1.1.0/console-tools/getkey.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.1.0/console-tools/getkey.c 2006-03-14 17:17:28.000000000 +0100 +@@ -0,0 +1,94 @@ ++/* vi: set sw=4 ts=4: */ ++/* ++ * getkey.c - Michael 'Mickey' Lauer ++ * ++ * Version 0.1 ++ * ++ * A simple keygrapper. Displays a configurable message and waits a dedicated number ++ * of seconds for a keypress. Sets the exit code accordingly (SUCCESS on keypress). ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "busybox.h" ++ ++extern int getkey_main(int argc, char **argv) ++{ ++ int status = EXIT_FAILURE; ++ ++ if ( argc < 2 ) ++ { ++ bb_show_usage(); ++ } ++ ++ /* ++ * If no terminal is attached it is quite useless ++ * to treat it like one. ++ */ ++ if( !isatty(STDIN_FILENO) ) ++ { ++ goto error_hard; ++ } ++ ++ //bb_printf( "DEBUG: time = '%s'\n", argv[1] ); ++ //bb_printf( "DEBUG: mesg = '%s'\n", argv[2] ); ++ ++ struct termios orig; ++ struct termios attr; ++ ++ if ( tcgetattr(STDIN_FILENO, &orig) == -1 ) ++ { ++ goto error_hard; ++ } ++ ++ attr = orig; ++ attr.c_cc[VMIN] = 0; ++ attr.c_cc[VTIME] = 0; ++ attr.c_iflag |= INLCR; ++ attr.c_oflag |= OPOST|ONLCR; ++ attr.c_cflag &= ~PARENB; ++ attr.c_lflag &= ~(ICANON/*|ECHO*/); ++ if ( tcsetattr(STDIN_FILENO,TCSANOW,&attr) == -1 ) ++ { ++ goto error_hard; ++ } ++ ++ fd_set rfds; ++ struct timeval tv; ++ int retval; ++ ++ FD_ZERO(&rfds); ++ FD_SET(0, &rfds); ++ ++ tv.tv_sec = atoi( argv[1] ); ++ tv.tv_usec = 0; ++ ++ if ( argc == 3 ) ++ { ++ bb_printf( argv[2], tv.tv_sec ); ++ bb_printf( "\n" ); ++ fflush(stdout); ++ } ++ retval = select(1, &rfds, NULL, NULL, &tv); ++ if (retval > 0) ++ { ++ status = EXIT_SUCCESS; ++ } ++ ++ if (tcsetattr(STDIN_FILENO,TCSANOW,&orig) == -1 ) ++ { ++ goto error_hard; ++ } ++ ++ return status; ++ ++error_hard : ++ return EXIT_FAILURE; ++}; ++ +Index: busybox-1.1.0/console-tools/Makefile.in +=================================================================== +--- busybox-1.1.0.orig/console-tools/Makefile.in 2006-01-11 06:43:57.000000000 +0100 ++++ busybox-1.1.0/console-tools/Makefile.in 2006-03-14 17:18:18.000000000 +0100 +@@ -21,6 +21,7 @@ + CONSOLETOOLS_DIR-$(CONFIG_OPENVT) += openvt.o + CONSOLETOOLS_DIR-$(CONFIG_RESET) += reset.o + CONSOLETOOLS_DIR-$(CONFIG_SETKEYCODES) += setkeycodes.o ++CONSOLETOOLS_DIR-$(CONFIG_GETKEY) += getkey.o + + libraries-y+=$(CONSOLETOOLS_DIR)$(CONSOLETOOLS_AR) + +Index: busybox-1.1.0/console-tools/Config.in +=================================================================== +--- busybox-1.1.0.orig/console-tools/Config.in 2006-01-11 06:43:57.000000000 +0100 ++++ busybox-1.1.0/console-tools/Config.in 2006-03-14 17:17:28.000000000 +0100 +@@ -31,6 +31,14 @@ + This program dumps the kernel's keyboard translation table to + stdout, in binary format. You can then use loadkmap to load it. + ++config CONFIG_GETKEY ++ bool "getkey" ++ default n ++ help ++ This program displays a configurable message and waits ++ a dedicated number of seconds for a keypress. It sets ++ the ex