From 4b36634fe8f9c86146e2e78c6fc4cc4dec086243 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Thu, 22 Feb 2007 12:40:06 +0000 Subject: nfs-utils: Fix compile for kernels > 2.6.18 --- packages/nfs-utils/nfs-utils-1.0.6/kernel-2.6.18+.patch | 13 +++++++++++++ packages/nfs-utils/nfs-utils_1.0.6.bb | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 packages/nfs-utils/nfs-utils-1.0.6/kernel-2.6.18+.patch (limited to 'packages') diff --git a/packages/nfs-utils/nfs-utils-1.0.6/kernel-2.6.18+.patch b/packages/nfs-utils/nfs-utils-1.0.6/kernel-2.6.18+.patch new file mode 100644 index 0000000000..219bed094b --- /dev/null +++ b/packages/nfs-utils/nfs-utils-1.0.6/kernel-2.6.18+.patch @@ -0,0 +1,13 @@ +--- nfs-utils-1.0.6/tools/getkversion/getkversion.c.orig 2007-02-22 12:33:54.000000000 +0000 ++++ nfs-utils-1.0.6/tools/getkversion/getkversion.c 2007-02-22 12:33:56.000000000 +0000 +@@ -12,6 +12,10 @@ + int + main(void) /* This is for Dan Popp ;) */ + { ++ ++#ifdef UTS_RELEASE + printf("%s\n", UTS_RELEASE); ++#endif ++ + return 0; + } diff --git a/packages/nfs-utils/nfs-utils_1.0.6.bb b/packages/nfs-utils/nfs-utils_1.0.6.bb index 2072bd3157..8ca082114e 100644 --- a/packages/nfs-utils/nfs-utils_1.0.6.bb +++ b/packages/nfs-utils/nfs-utils_1.0.6.bb @@ -2,13 +2,14 @@ DESCRIPTION = "userspace utilities for kernel nfs" PRIORITY = "optional" SECTION = "console/network" LICENSE = "GPL" -PR = "r7" +PR = "r8" SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \ file://acinclude-lossage.patch;patch=1 \ file://rpcgen-lossage.patch;patch=1 \ file://stat-include.patch;patch=1 \ file://nfs-utils-1.0.6-uclibc.patch;patch=1 \ + file://kernel-2.6.18+.patch;patch=1 \ file://nfsserver \ file://forgotten-defines" -- cgit v1.2.3 From 0b236b10691098062613d9cd17865a86b71355e1 Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Thu, 22 Feb 2007 14:48:51 +0000 Subject: packages/memtester: Fix download URL for memtester_4.0.5.bb Add memtester_4.0.6.bb --- packages/memtester/memtester_4.0.5.bb | 4 ++-- packages/memtester/memtester_4.0.6.bb | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 packages/memtester/memtester_4.0.6.bb (limited to 'packages') diff --git a/packages/memtester/memtester_4.0.5.bb b/packages/memtester/memtester_4.0.5.bb index ec0fbf2216..6a84471cee 100644 --- a/packages/memtester/memtester_4.0.5.bb +++ b/packages/memtester/memtester_4.0.5.bb @@ -1,9 +1,9 @@ SECTION = "console/utils" DESCRIPTION = "Utility to test for faulty memory subsystem" LICENSE = "GPLv2" -PR = "r1" +PR = "r2" -SRC_URI = "http://pyropus.ca/software/memtester/memtester-${PV}.tar.gz" +SRC_URI = "http://pyropus.ca/software/memtester/old-versions/memtester-${PV}.tar.gz" SRC_URI += "file://Makefile.patch;patch=1" S = "${WORKDIR}/memtester-${PV}" diff --git a/packages/memtester/memtester_4.0.6.bb b/packages/memtester/memtester_4.0.6.bb new file mode 100644 index 0000000000..1fb4541eb6 --- /dev/null +++ b/packages/memtester/memtester_4.0.6.bb @@ -0,0 +1,22 @@ +SECTION = "console/utils" +DESCRIPTION = "Utility to test for faulty memory subsystem" +LICENSE = "GPLv2" +PR = "r0" + +SRC_URI = "http://pyropus.ca/software/memtester/old-versions/memtester-${PV}.tar.gz" +SRC_URI += "file://Makefile.patch;patch=1" + +S = "${WORKDIR}/memtester-${PV}" + +do_compile () { + echo '${CC} ${CFLAGS} -DPOSIX -c' > conf-cc + echo '${CC} ${LDFLAGS}' > conf-ld + oe_runmake +} + +do_install () { + install -d ${D}${bindir} + install -d ${D}${mandir}/man8 + install -m 0755 memtester ${D}${bindir}/ + install -m 0755 memtester.8 ${D}${mandir}/man8/ +} -- cgit v1.2.3 From 3be447302b930764d434b759e27ac7493ed59df7 Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Thu, 22 Feb 2007 14:50:24 +0000 Subject: packages/modphp/modphp_5.1.6.bb: modphp requires apxs from apache2 to build. Point to the correct dir where apxs is --- packages/modphp/modphp5.inc | 2 +- packages/modphp/modphp_5.1.6.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/modphp/modphp5.inc b/packages/modphp/modphp5.inc index 11e7bc3a87..b4bdd15f5b 100644 --- a/packages/modphp/modphp5.inc +++ b/packages/modphp/modphp5.inc @@ -14,7 +14,7 @@ FILES_${PN} = "${libdir}/apache2 /etc" FILES_${PN}-dbg = "${libdir}/apache2/modules/.debug" CFLAGS += " -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" -EXTRA_OECONF = "--with-apxs2=${STAGING_BINDIR}/apxs \ +EXTRA_OECONF = "--with-apxs2=${STAGING_BINDIR_NATIVE}/apxs \ --without-mysql \ --enable-force-cgi-redirect \ --disable-cgi \ diff --git a/packages/modphp/modphp_5.1.6.bb b/packages/modphp/modphp_5.1.6.bb index cc0287b102..382789975d 100644 --- a/packages/modphp/modphp_5.1.6.bb +++ b/packages/modphp/modphp_5.1.6.bb @@ -1,2 +1,2 @@ include modphp5.inc -PR='r1' +PR='r2' -- cgit v1.2.3 From e82e0fefd8171f2fc9ab86324cb1b8a7c70cf542 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 22 Feb 2007 15:00:03 +0000 Subject: dropbear, sysvinit, linux-nokia770: fix bashisms (from Poky) --- packages/dropbear/dropbear.inc | 2 +- packages/linux/linux-nokia770_2.6.16-osso26.bb | 2 +- packages/sysvinit/sysvinit_2.86.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/dropbear/dropbear.inc b/packages/dropbear/dropbear.inc index 301ac24cb2..a53d2dbb87 100644 --- a/packages/dropbear/dropbear.inc +++ b/packages/dropbear/dropbear.inc @@ -26,7 +26,7 @@ BINCOMMANDS = "dbclient ssh scp" EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' do_configure_prepend() { - if [ "x${DISTRO}" != "xfamiliar" -a "${DISTRO_TYPE}" == "debug" ]; then + if [ "x${DISTRO}" != "xfamiliar" -a "${DISTRO_TYPE}" = "debug" ]; then oenote "WARNING: applying allow-nopw.patch which allows password-less logins!" patch -p1 < ${WORKDIR}/allow-nopw.patch fi diff --git a/packages/linux/linux-nokia770_2.6.16-osso26.bb b/packages/linux/linux-nokia770_2.6.16-osso26.bb index ea0f2d5b41..6370643f98 100644 --- a/packages/linux/linux-nokia770_2.6.16-osso26.bb +++ b/packages/linux/linux-nokia770_2.6.16-osso26.bb @@ -22,7 +22,7 @@ do_configure_prepend() { rm -f ${S}/.config || true - if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config else diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb index 53634b7556..1a2d79c9be 100644 --- a/packages/sysvinit/sysvinit_2.86.bb +++ b/packages/sysvinit/sysvinit_2.86.bb @@ -62,7 +62,7 @@ do_install () { if [ ! -z "${SERIAL_CONSOLE}" ]; then echo "S:2345:respawn:${base_sbindir}/getty ${SERIAL_CONSOLE}" >> ${D}${sysconfdir}/inittab fi - if [ "${USE_VT}" == "1" ]; then + if [ "${USE_VT}" = "1" ]; then cat <>${D}${sysconfdir}/inittab # ${base_sbindir}/getty invocations for the runlevels. # -- cgit v1.2.3 From 1dae69bdb0d41e96655d849de94b85d4fd6ccfda Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Thu, 22 Feb 2007 15:07:26 +0000 Subject: packages/nmap/nmap_3.81.bb: Change URI to point to new download location --- packages/nmap/nmap_3.81.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/nmap/nmap_3.81.bb b/packages/nmap/nmap_3.81.bb index 478474645b..7aa5928191 100644 --- a/packages/nmap/nmap_3.81.bb +++ b/packages/nmap/nmap_3.81.bb @@ -3,11 +3,11 @@ HOMEPAGE = "http://www.insecure.org/nmap/" SECTION = "console/network" LICENSE = "GPL" DEPENDS = "libpcap libpcre" -PR = "r1" +PR = "r2" inherit autotools -SRC_URI = "http://download.insecure.org/nmap/dist/nmap-${PV}.tar.bz2 \ +SRC_URI = "http://download.insecure.org/nmap/dist-old/nmap-${PV}.tar.bz2 \ file://autofoo.patch;patch=1 \ file://remove_gtk.patch;patch=1" S = "${WORKDIR}/nmap-${PV}" -- cgit v1.2.3 From 36b472e7c1c0f948e9ab364399203daf3139c5d6 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 22 Feb 2007 15:08:42 +0000 Subject: contacts: update to 0.3, drop older (from poky) --- packages/contacts/contacts_0.1.bb | 23 -- packages/contacts/contacts_0.2.bb | 22 -- packages/contacts/contacts_0.3.bb | 25 ++ packages/contacts/files/index.theme | 654 ------------------------------------ 4 files changed, 25 insertions(+), 699 deletions(-) delete mode 100644 packages/contacts/contacts_0.1.bb delete mode 100644 packages/contacts/contacts_0.2.bb create mode 100644 packages/contacts/contacts_0.3.bb delete mode 100644 packages/contacts/files/index.theme (limited to 'packages') diff --git a/packages/contacts/contacts_0.1.bb b/packages/contacts/contacts_0.1.bb deleted file mode 100644 index a7904a6576..0000000000 --- a/packages/contacts/contacts_0.1.bb +++ /dev/null @@ -1,23 +0,0 @@ -LICENSE = "LGPL" -SECTION = "x11" -DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" -DESCRIPTION = "Contacts is an address-book application." -PR = "r1" - -SRC_URI = "svn://svn.o-hand.com/repos/${PN}/tags;module=release-0.1;proto=http \ - file://stock_contact.png \ - file://stock_person.png" - -inherit autotools pkgconfig - -S = "${WORKDIR}/release-0.1" - -do_install_append () { - install -d ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps -} - -FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \ - ${datadir}/pixmaps/stock_person.png" - diff --git a/packages/contacts/contacts_0.2.bb b/packages/contacts/contacts_0.2.bb deleted file mode 100644 index 0f1b0d29ae..0000000000 --- a/packages/contacts/contacts_0.2.bb +++ /dev/null @@ -1,22 +0,0 @@ -LICENSE = "LGPL" -SECTION = "x11" -DEPENDS = "glib-2.0 gtk+ libglade libbacon eds-dbus" -DESCRIPTION = "Contacts is an address-book application." -PR = "r1" - -SRC_URI = "http://projects.o-hand.com/sources/contacts/contacts-0.2.tar.gz \ - file://stock_contact.png \ - file://stock_person.png" - -inherit autotools pkgconfig - - -do_install_append () { - install -d ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps -} - -FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \ - ${datadir}/pixmaps/stock_person.png" - diff --git a/packages/contacts/contacts_0.3.bb b/packages/contacts/contacts_0.3.bb new file mode 100644 index 0000000000..799698b7a0 --- /dev/null +++ b/packages/contacts/contacts_0.3.bb @@ -0,0 +1,25 @@ +LICENSE = "LGPL" +SECTION = "x11" +DEPENDS = "glib-2.0 gtk+ eds-dbus" +RDEPENDS = "libedata-book" +DESCRIPTION = "Contacts is an address-book application." + +PR = "r1" + +SRC_URI = "http://projects.o-hand.com/sources/${PN}/${PN}-${PV}.tar.gz \ + file://stock_contact.png \ + file://stock_person.png" + +inherit autotools pkgconfig + +S = "${WORKDIR}/${PN}-${PV}" + +do_install_append () { + install -d ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps +} + +FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \ + ${datadir}/pixmaps/stock_person.png" + diff --git a/packages/contacts/files/index.theme b/packages/contacts/files/index.theme deleted file mode 100644 index 4e9cf67820..0000000000 --- a/packages/contacts/files/index.theme +++ /dev/null @@ -1,654 +0,0 @@ -[Icon Theme] -Name=Hicolor -Comment=Fallback icon theme -Hidden=true -Directories=192x192/apps,128x128/actions,128x128/apps,128x128/devices,128x128/filesystems,128x128/mimetypes,96x96/actions,96x96/apps,96x96/devices,96x96/filesystems,96x96/mimetypes,72x72/apps,64x64/actions,64x64/apps,64x64/devices,64x64/filesystems,64x64/mimetypes,48x48/actions,48x48/apps,48x48/devices,48x48/filesystems,48x48/mimetypes,36x36/apps,32x32/actions,32x32/apps,32x32/devices,32x32/filesystems,32x32/mimetypes,22x22/actions,22x22/apps,22x22/devices,22x22/filesystems,22x22/mimetypes,16x16/actions,16x16/apps,16x16/devices,16x16/filesystems,16x16/mimetypes,scalable/actions,scalable/apps,scalable/devices,scalable/filesystems,scalable/mimetypes,16x16/stock/chart,16x16/stock/code,16x16/stock/data,16x16/stock/document,16x16/stock/form,16x16/stock/generic,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,24x24/actions,24x24/apps,24x24/devices,24x24/filesystems,24x24/mimetypes,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/document,24x24/stock/form,24x24/stock/generic,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,32x32/stock/chart,32x32/stock/code,32x32/stock/data,32x32/stock/document,32x32/stock/form,32x32/stock/generic,32x32/stock/image,32x32/stock/io,32x32/stock/media,32x32/stock/navigation,32x32/stock/net,32x32/stock/object,32x32/stock/table,32x32/stock/text,36x36/stock/chart,36x36/stock/code,36x36/stock/data,36x36/stock/document,36x36/stock/form,36x36/stock/generic,36x36/stock/image,36x36/stock/io,36x36/stock/media,36x36/stock/navigation,36x36/stock/net,36x36/stock/object,36x36/stock/table,36x36/stock/text,48x48/stock/chart,48x48/stock/code,48x48/stock/data,48x48/stock/document,48x48/stock/form,48x48/stock/generic,48x48/stock/image,48x48/stock/io,48x48/stock/media,48x48/stock/navigation,48x48/stock/net,48x48/stock/object,48x48/stock/table,48x48/stock/text,scalable/emblems,192x192/emblems,96x96/emblems,72x72/emblems,48x48/emblems,36x36/emblems,24x24/emblems,16x16/emblems,12x12/emblems - -[16x16/actions] -Size=16 -Context=Actions -Type=Threshold - -[16x16/apps] -Size=16 -Context=Applications -Type=Threshold - -[16x16/devices] -Size=16 -Context=Devices -Type=Threshold - -[16x16/filesystems] -Size=16 -Context=FileSystems -Type=Threshold - -[16x16/mimetypes] -Size=16 -Context=MimeTypes -Type=Threshold - -[22x22/actions] -Size=22 -Context=Actions -Type=Threshold - -[22x22/apps] -Size=22 -Context=Applications -Type=Threshold - -[22x22/devices] -Size=22 -Context=Devices -Type=Threshold - -[22x22/filesystems] -Size=22 -Context=FileSystems -Type=Threshold - -[22x22/mimetypes] -Size=22 -Context=MimeTypes -Type=Threshold - -[24x24/actions] -Size=24 -Context=Actions -Type=Threshold - -[24x24/apps] -Size=24 -Context=Applications -Type=Threshold - -[24x24/devices] -Size=24 -Context=Devices -Type=Threshold - -[24x24/filesystems] -Size=24 -Context=FileSystems -Type=Threshold - -[24x24/mimetypes] -Size=24 -Context=MimeTypes -Type=Threshold - -[32x32/actions] -Size=32 -Context=Actions -Type=Threshold - -[32x32/apps] -Size=32 -Context=Applications -Type=Threshold - -[32x32/devices] -Size=32 -Context=Devices -Type=Threshold - -[32x32/filesystems] -Size=32 -Context=FileSystems -Type=Threshold - -[32x32/mimetypes] -Size=32 -Context=MimeTypes -Type=Threshold - -[36x36/apps] -Size=36 -Context=Applications -Type=Threshold - -[48x48/actions] -Size=48 -Context=Actions -Type=Threshold - -[48x48/apps] -Size=48 -Context=Applications -Type=Threshold - -[48x48/devices] -Size=48 -Context=Devices -Type=Threshold - -[48x48/filesystems] -Size=48 -Context=FileSystems -Type=Threshold - -[48x48/mimetypes] -Size=48 -Context=MimeTypes -Type=Threshold - -[64x64/actions] -Size=64 -Context=Actions -Type=Threshold - -[64x64/apps] -Size=64 -Context=Applications -Type=Threshold - -[64x64/devices] -Size=64 -Context=Devices -Type=Threshold - -[64x64/filesystems] -Size=64 -Context=FileSystems -Type=Threshold - -[64x64/mimetypes] -Size=64 -Context=MimeTypes -Type=Threshold - -[72x72/apps] -Size=72 -Context=Applications -Type=Threshold - -[96x96/actions] -Size=96 -Context=Actions -Type=Threshold - -[96x96/apps] -Size=96 -Context=Applications -Type=Threshold - -[96x96/devices] -Size=96 -Context=Devices -Type=Threshold - -[96x96/filesystems] -Size=96 -Context=FileSystems -Type=Threshold - -[96x96/mimetypes] -Size=96 -Context=MimeTypes -Type=Threshold - -[128x128/actions] -Size=128 -Context=Actions -Type=Threshold - -[128x128/apps] -Size=128 -Context=Applications -Type=Threshold - -[128x128/devices] -Size=128 -Context=Devices -Type=Threshold - -[128x128/filesystems] -Size=128 -Context=FileSystems -Type=Threshold - -[128x128/mimetypes] -Size=128 -Context=MimeTypes -Type=Threshold - -[192x192/apps] -Size=192 -Context=Applications -Type=Threshold - - -[scalable/actions] -MinSize=1 -Size=128 -MaxSize=256 -Context=Actions -Type=Scalable - -[scalable/apps] -MinSize=1 -Size=128 -MaxSize=256 -Context=Applications -Type=Scalable - -[scalable/devices] -MinSize=1 -Size=128 -MaxSize=256 -Context=Devices -Type=Scalable - -[scalable/filesystems] -MinSize=1 -Size=128 -MaxSize=256 -Context=FileSystems -Type=Scalable - -[scalable/mimetypes] -MinSize=1 -Size=128 -MaxSize=256 -Context=MimeTypes -Type=Scalable - -[16x16/stock/chart] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/code] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/data] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/document] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/form] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/generic] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/image] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/io] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/media] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/navigation] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/net] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/object] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/table] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/text] -Size=16 -Context=Stock -Type=Threshold - -[24x24/stock/chart] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/code] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/data] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/document] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/form] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/generic] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/image] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/io] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/media] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/navigation] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/net] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/object] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/table] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/text] -Size=24 -Context=Stock -Type=Threshold - -[32x32/stock/chart] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/code] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/data] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/document] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/form] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/generic] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/image] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/io] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/media] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/navigation] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/net] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/object] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/table] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/text] -Size=32 -Context=Stock -Type=Threshold - -[36x36/stock/chart] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/code] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/data] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/document] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/form] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/generic] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/image] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/io] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/media] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/navigation] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/net] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/object] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/table] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/text] -Size=36 -Context=Stock -Type=Threshold - -[48x48/stock/chart] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/code] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/data] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/document] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/form] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/generic] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/image] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/io] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/media] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/navigation] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/net] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/object] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/table] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/text] -Size=48 -Context=Stock -Type=Threshold - -[scalable/emblems] -MinSize=1 -Size=128 -MaxSize=256 -Context=Emblems -Type=Scalable - -[192x192/emblems] -Size=192 -Context=Emblems -Type=Threshold - -[96x96/emblems] -Size=96 -Context=Emblems -Type=Threshold - -[72x72/emblems] -Size=72 -Context=Emblems -Type=Threshold - -[48x48/emblems] -Size=48 -Context=Emblems -Type=Threshold - -[36x36/emblems] -Size=36 -Context=Emblems -Type=Threshold - -[24x24/emblems] -Size=24 -Context=Emblems -Type=Threshold - -[16x16/emblems] -Size=16 -Context=Emblems -Type=Threshold - -[12x12/emblems] -Size=12 -Context=Emblems -Type=Threshold - -- cgit v1.2.3 From 9ef172ad58f335f33d91043fb36fb647a1d0c569 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 22 Feb 2007 15:09:36 +0000 Subject: dates: dropped 0.1 and 0.2 --- packages/dates/dates_0.1.bb | 18 ------------------ packages/dates/dates_0.2.bb | 12 ------------ 2 files changed, 30 deletions(-) delete mode 100755 packages/dates/dates_0.1.bb delete mode 100755 packages/dates/dates_0.2.bb (limited to 'packages') diff --git a/packages/dates/dates_0.1.bb b/packages/dates/dates_0.1.bb deleted file mode 100755 index 3245b07af5..0000000000 --- a/packages/dates/dates_0.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -LICENSE = "LGPL" -SECTION = "x11" -DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" -DESCRIPTION = "Dates is a calendar application." - -SRC_URI = "http://projects.o-hand.com/sources/dates/dates-0.1.tar.gz" - -inherit autotools pkgconfig gtk-icon-cache - -# EXTRA_OECONF = "--disable-debug" - -FILES_${PN} += "${datadir}/pixmaps/dates.png" - -do_install_append () { - install -d ${D}/${datadir}/pixmaps - install -m 0644 ${D}/${datadir}/icons/hicolor/48x48/apps/dates.png ${D}/${datadir}/pixmaps/ -} - diff --git a/packages/dates/dates_0.2.bb b/packages/dates/dates_0.2.bb deleted file mode 100755 index 0870313df1..0000000000 --- a/packages/dates/dates_0.2.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Dates is a calendar application." -SECTION = "x11" -LICENSE = "LGPL" - -DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" - -SRC_URI = "http://projects.o-hand.com/sources/dates/${P}.tar.gz" - -inherit autotools pkgconfig gtk-icon-cache - -FILES_${PN} += "${datadir}/pixmaps/dates.png" - -- cgit v1.2.3 From 4a22bd5670ed88be24bc78af36f983a8e7e76fa8 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 22 Feb 2007 15:13:09 +0000 Subject: util-macros: added 1.1.5 from poky --- packages/xorg-util/util-macros_X11R7.1-1.1.5.bb | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 packages/xorg-util/util-macros_X11R7.1-1.1.5.bb (limited to 'packages') diff --git a/packages/xorg-util/util-macros_X11R7.1-1.1.5.bb b/packages/xorg-util/util-macros_X11R7.1-1.1.5.bb new file mode 100644 index 0000000000..06dd0a5d73 --- /dev/null +++ b/packages/xorg-util/util-macros_X11R7.1-1.1.5.bb @@ -0,0 +1,10 @@ +require xorg-util-common.inc + +DESCRIPTION = "X autotools macros" + +PR = "r1" + +SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-1.1.5.tar.gz \ + file://unbreak_cross_compile.patch;patch=1 " +S = "${WORKDIR}/${XORG_PN}-1.1.5" + -- cgit v1.2.3 From a56af0e28abb819387d23c156ca5312f2d13984f Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 22 Feb 2007 15:14:10 +0000 Subject: util-macros: added patch to get it cross compiled (from poky) --- packages/xorg-util/files/.mtn2git_empty | 0 .../xorg-util/files/unbreak_cross_compile.patch | 26 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 packages/xorg-util/files/.mtn2git_empty create mode 100644 packages/xorg-util/files/unbreak_cross_compile.patch (limited to 'packages') diff --git a/packages/xorg-util/files/.mtn2git_empty b/packages/xorg-util/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-util/files/unbreak_cross_compile.patch b/packages/xorg-util/files/unbreak_cross_compile.patch new file mode 100644 index 0000000000..fd84aade1e --- /dev/null +++ b/packages/xorg-util/files/unbreak_cross_compile.patch @@ -0,0 +1,26 @@ +--- + xorg-macros.m4.in | 4 ---- + 1 file changed, 4 deletions(-) + +Index: util-macros-1.1.5/xorg-macros.m4.in +=================================================================== +--- util-macros-1.1.5.orig/xorg-macros.m4.in 2006-11-08 14:23:10.000000000 +0000 ++++ util-macros-1.1.5/xorg-macros.m4.in 2007-01-31 15:28:55.000000000 +0000 +@@ -194,8 +194,6 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[ + XORG_SGML_PATH=$prefix/share/sgml + HAVE_DEFS_ENT= + +-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) +- + AC_PATH_PROG(LINUXDOC, linuxdoc) + AC_PATH_PROG(PS2PDF, ps2pdf) + +@@ -250,8 +248,6 @@ BUILDPDFDOC=no + BUILDPSDOC=no + BUILDHTMLDOC=no + +-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) +- + AC_PATH_PROG(DOCBOOKPS, docbook2ps) + AC_PATH_PROG(DOCBOOKPDF, docbook2pdf) + AC_PATH_PROG(DOCBOOKHTML, docbook2html) -- cgit v1.2.3 From c1558d6638a4c959230d19ebd24a9c1559cf0746 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 22 Feb 2007 15:29:40 +0000 Subject: inputproto: added 1.4 from poky --- packages/xorg-proto/inputproto_X11R7.1-1.4.bb | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 packages/xorg-proto/inputproto_X11R7.1-1.4.bb (limited to 'packages') diff --git a/packages/xorg-proto/inputproto_X11R7.1-1.4.bb b/packages/xorg-proto/inputproto_X11R7.1-1.4.bb new file mode 100644 index 0000000000..26260c401e --- /dev/null +++ b/packages/xorg-proto/inputproto_X11R7.1-1.4.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +SRC_URI = "${XORG_MIRROR}/individual/proto/inputproto-1.4.tar.gz" +S = "${WORKDIR}/${XORG_PN}-1.4" -- cgit v1.2.3 From 54a9a3b0e379095506bcc229f51151965cc4538e Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 22 Feb 2007 15:30:55 +0000 Subject: xproto: added 7.0.8 from poky --- packages/xorg-proto/xproto_X11R7.1-7.0.8.bb | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 packages/xorg-proto/xproto_X11R7.1-7.0.8.bb (limited to 'packages') diff --git a/packages/xorg-proto/xproto_X11R7.1-7.0.8.bb b/packages/xorg-proto/xproto_X11R7.1-7.0.8.bb new file mode 100644 index 0000000000..a901c5b61b --- /dev/null +++ b/packages/xorg-proto/xproto_X11R7.1-7.0.8.bb @@ -0,0 +1,10 @@ +require xorg-proto-common.inc + +XORG_PN = "${PN}" +SRC_URI = "${XORG_MIRROR}/development/X11R7.2-RC3/proto/${XORG_PN}-7.0.9.tar.gz" +S = "${WORKDIR}/${XORG_PN}-7.0.9" + + +#DESCRIPTION = "" + +#DEPENDS += " " -- cgit v1.2.3 From dfcfc88429e696c517e2268f57c60c98e31ad1b0 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 22 Feb 2007 15:41:16 +0000 Subject: dhcp: Fix dbg packaging and clean up hardcoded paths (from poky) --- packages/dhcp/dhcp_3.0.2.bb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'packages') diff --git a/packages/dhcp/dhcp_3.0.2.bb b/packages/dhcp/dhcp_3.0.2.bb index c4843b7bda..851ae5ca95 100644 --- a/packages/dhcp/dhcp_3.0.2.bb +++ b/packages/dhcp/dhcp_3.0.2.bb @@ -2,11 +2,11 @@ SECTION = "console/network" DESCRIPTION = "Internet Software Consortium DHCP package" HOMEPAGE = "http://www.isc.org/" LICENSE = "BSD" -PR = "r4" +PR = "r5" SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \ file://noattrmode.patch;patch=1 \ file://fixincludes.patch;patch=1 \ - file://dhcp-3.0.3-dhclient-dbus.patch;patch=1;pnum=0 \ + file://dhcp-3.0.3-dhclient-dbus.patch;patch=1;pnum=0 \ file://init-relay file://default-relay \ file://init-server file://default-server \ file://dhclient.conf file://dhcpd.conf" @@ -36,11 +36,12 @@ do_install() { install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf } -PACKAGES =+ "dhcp-server dhcp-client dhcp-relay dhcp-omshell" -FILES_dhcp-server = "${sbindir}/dhcpd /etc/init.d/dhcp-server /etc/default/dhcp-server /etc/dhcp/dhcpd.conf" -FILES_dhcp-relay = "${sbindir}/dhcrelay /etc/init.d/dhcp-relay /etc/default/dhcp-relay" +PACKAGES += "dhcp-server dhcp-client dhcp-relay dhcp-omshell" +FILES_${PN} = "" +FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server ${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf" +FILES_dhcp-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay" -FILES_dhcp-client = "/sbin/ /etc/dhcp/dhclient.conf" +FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf" RDEPENDS_dhcp-client = "bash" FILES_dhcp-omshell = "${bindir}/omshell" -- cgit v1.2.3 From 0cedb29392cc207583cdc75384ab00cd11ce30da Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 22 Feb 2007 15:42:42 +0000 Subject: zaurus-updater: Fix typo in description (from poky) --- packages/zaurus-updater/encdec-updater.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/zaurus-updater/encdec-updater.bb b/packages/zaurus-updater/encdec-updater.bb index 797a762ebf..c03e9b4454 100644 --- a/packages/zaurus-updater/encdec-updater.bb +++ b/packages/zaurus-updater/encdec-updater.bb @@ -1,6 +1,6 @@ SECTION = "console/utils" LICENSE = "GPL" -DESCRIPTION = "A tool to encode and decode the Sharp Zaurus updater.sh skript" +DESCRIPTION = "A tool to encode and decode the Sharp Zaurus updater.sh script" SRC_URI = "file://encdec-updater.c" -- cgit v1.2.3 From 0e07add49553c15def42e2aced6cdb19b2eb6294 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 22 Feb 2007 15:45:04 +0000 Subject: alsa-lib: Fix packaging of alsa.m4 * TODO: alsa-conf packages lots of unneeded stuff (like bunch of card definitions, not needed on handheld). Figure out and throw away. --- packages/alsa/alsa-lib_1.0.11.bb | 6 +++--- packages/alsa/alsa-lib_1.0.13.bb | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'packages') diff --git a/packages/alsa/alsa-lib_1.0.11.bb b/packages/alsa/alsa-lib_1.0.11.bb index 95b788ef8e..5192e420a3 100644 --- a/packages/alsa/alsa-lib_1.0.11.bb +++ b/packages/alsa/alsa-lib_1.0.11.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" LICENSE = "GPL" -PR = "r2" +PR = "r3" # 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, @@ -29,5 +29,5 @@ PACKAGES =+ "alsa-server libasound 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}" -FILES_alsa-dev = "${libdir}/pkgconfig/ /usr/include/" +FILES_alsa-conf = "${datadir}/alsa/" +FILES_alsa-dev = "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*" diff --git a/packages/alsa/alsa-lib_1.0.13.bb b/packages/alsa/alsa-lib_1.0.13.bb index 8b6b7af409..276067c27f 100644 --- a/packages/alsa/alsa-lib_1.0.13.bb +++ b/packages/alsa/alsa-lib_1.0.13.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" LICENSE = "GPL" -PR = "r1" +PR = "r2" # 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, @@ -30,5 +30,5 @@ PACKAGES =+ "alsa-server libasound 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}" -FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/" +FILES_alsa-conf = "${datadir}/alsa/" +FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*" -- cgit v1.2.3 From c4ed7646db10239a47ea23c197f9df0c1773ec7e Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 22 Feb 2007 16:19:27 +0000 Subject: alsa-lib: ship needed configs in alsa-conf-base and rest of them in alsa-conf (backward compatibility), also added dependency on configs to library --- packages/alsa/alsa-lib_1.0.11.bb | 12 ++++++++++-- packages/alsa/alsa-lib_1.0.13.bb | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/alsa/alsa-lib_1.0.11.bb b/packages/alsa/alsa-lib_1.0.11.bb index 95b788ef8e..8676d7aa87 100644 --- a/packages/alsa/alsa-lib_1.0.11.bb +++ b/packages/alsa/alsa-lib_1.0.11.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" LICENSE = "GPL" -PR = "r2" +PR = "r3" # 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, @@ -25,9 +25,17 @@ do_stage() { install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/ } -PACKAGES =+ "alsa-server libasound alsa-conf alsa-doc alsa-dev" +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}" FILES_alsa-dev = "${libdir}/pkgconfig/ /usr/include/" +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/packages/alsa/alsa-lib_1.0.13.bb b/packages/alsa/alsa-lib_1.0.13.bb index 8b6b7af409..35cf843c5f 100644 --- a/packages/alsa/alsa-lib_1.0.13.bb +++ b/packages/alsa/alsa-lib_1.0.13.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" LICENSE = "GPL" -PR = "r1" +PR = "r2" # 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, @@ -26,9 +26,17 @@ do_stage() { install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/ } -PACKAGES =+ "alsa-server libasound alsa-conf alsa-doc alsa-dev" +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}" FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/" +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" -- cgit v1.2.3 From 7a2184fc17168261e68cfb7e1eedfa96c8646626 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 22 Feb 2007 16:20:41 +0000 Subject: task-base: do not ship alsa-conf as this will be added as rdependency of alsa-lib --- packages/tasks/task-base.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index fdbf9f75d2..1faf3e948e 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r17" +PR = "r18" PACKAGES = "task-base \ task-base-minimal \ @@ -161,8 +161,7 @@ task-base-ext2-rdepends = "\ task-base-alsa-rdepends = "\ alsa-utils-alsactl \ - alsa-utils-alsamixer \ - alsa-conf" + alsa-utils-alsamixer" task-base-alsa-rrecommends = "\ kernel-module-snd-mixer-oss \ -- cgit v1.2.3