package upgrade, 2011/10/28
Hi Saul,
This pull request upgrade several recipes, please help to review and pull.
Thanks,
Dongxiao
The following changes since commit ddc9a58b8553599d2328ac1c4449b41681ae45d1:
Add readline as dependecy for gdb-cross-canadian (2011-10-27 08:37:53 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib dxu4/upgrade
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/upgrade
Dongxiao Xu (11):
polkit: upgrade to latest 0.102
libsndfile1: upgrade to version 1.0.25
neon: upgrade to version 0.29.6
netbase: upgrade to version 4.46
libogg: upgrade to version 1.3.0
telepathy-idle: upgrade to version 0.1.10
telepathy-glib: upgrade to version 0.16.0
telepathy-mission-control: Upgrade to version 5.9.3
iptables: upgrade to version 1.4.12.1
connman: add xtables_version to fix xtables API change
distro_tracking: polkit, libsndfile, etc
.../conf/distro/include/distro_tracking_fields.inc | 66 ++++++++++----------
.../connman/connman-0.75/xtables_version.patch | 64 +++++++++++++++++++
meta/recipes-connectivity/connman/connman_0.75.bb | 3 +-
...thy-glib_0.14.3.bb => telepathy-glib_0.16.0.bb} | 4 +-
...athy-idle_0.1.8.bb => telepathy-idle_0.1.10.bb} | 4 +-
...5.7.9.bb => telepathy-mission-control_5.9.3.bb} | 4 +-
.../netbase/{netbase-4.45 => netbase-4.46}/hosts | 0
.../netbase/{netbase-4.45 => netbase-4.46}/init | 0
.../{netbase-4.45 => netbase-4.46}/interfaces | 0
.../netbase/{netbase-4.45 => netbase-4.46}/nfsroot | 0
.../qemuarm/interfaces | 0
.../qemuarmv6/interfaces | 0
.../qemuarmv7/interfaces | 0
.../qemumips/interfaces | 0
.../qemuppc/interfaces | 0
.../qemux86-64/interfaces | 0
.../qemux86/interfaces | 0
.../netbase/{netbase_4.45.bb => netbase_4.46.bb} | 6 +-
.../{iptables_1.4.9.bb => iptables_1.4.12.1.bb} | 16 ++---
.../introspection.patch | 0
.../polkit-1_pam.patch | 0
.../polkit/{polkit_0.101.bb => polkit_0.102.bb} | 8 +-
.../libogg/{libogg_1.2.2.bb => libogg_1.3.0.bb} | 4 +-
...libsndfile1_1.0.24.bb => libsndfile1_1.0.25.bb} | 6 +-
.../{neon-0.29.5 => neon-0.29.6}/pkgconfig.patch | 0
.../neon/{neon_0.29.5.bb => neon_0.29.6.bb} | 6 +-
26 files changed, 126 insertions(+), 65 deletions(-)
create mode 100644 meta/recipes-connectivity/connman/connman-0.75/xtables_version.patch
rename meta/recipes-connectivity/telepathy/{telepathy-glib_0.14.3.bb => telepathy-glib_0.16.0.bb} (80%)
rename meta/recipes-connectivity/telepathy/{telepathy-idle_0.1.8.bb => telepathy-idle_0.1.10.bb} (81%)
rename meta/recipes-connectivity/telepathy/{telepathy-mission-control_5.7.9.bb => telepathy-mission-control_5.9.3.bb} (92%)
rename meta/recipes-core/netbase/{netbase-4.45 => netbase-4.46}/hosts (100%)
rename meta/recipes-core/netbase/{netbase-4.45 => netbase-4.46}/init (100%)
rename meta/recipes-core/netbase/{netbase-4.45 => netbase-4.46}/interfaces (100%)
rename meta/recipes-core/netbase/{netbase-4.45 => netbase-4.46}/nfsroot (100%)
rename meta/recipes-core/netbase/{netbase-4.45 => netbase-4.46}/qemuarm/interfaces (100%)
rename meta/recipes-core/netbase/{netbase-4.45 => netbase-4.46}/qemuarmv6/interfaces (100%)
rename meta/recipes-core/netbase/{netbase-4.45 => netbase-4.46}/qemuarmv7/interfaces (100%)
rename meta/recipes-core/netbase/{netbase-4.45 => netbase-4.46}/qemumips/interfaces (100%)
rename meta/recipes-core/netbase/{netbase-4.45 => netbase-4.46}/qemuppc/interfaces (100%)
rename meta/recipes-core/netbase/{netbase-4.45 => netbase-4.46}/qemux86-64/interfaces (100%)
rename meta/recipes-core/netbase/{netbase-4.45 => netbase-4.46}/qemux86/interfaces (100%)
rename meta/recipes-core/netbase/{netbase_4.45.bb => netbase_4.46.bb} (92%)
rename meta/recipes-extended/iptables/{iptables_1.4.9.bb => iptables_1.4.12.1.bb} (69%)
rename meta/recipes-extended/polkit/{polkit-0.101 => polkit-0.102}/introspection.patch (100%)
rename meta/recipes-extended/polkit/{polkit-0.101 => polkit-0.102}/polkit-1_pam.patch (100%)
rename meta/recipes-extended/polkit/{polkit_0.101.bb => polkit_0.102.bb} (83%)
rename meta/recipes-multimedia/libogg/{libogg_1.2.2.bb => libogg_1.3.0.bb} (81%)
rename meta/recipes-multimedia/libsndfile/{libsndfile1_1.0.24.bb => libsndfile1_1.0.25.bb} (79%)
rename meta/recipes-support/neon/{neon-0.29.5 => neon-0.29.6}/pkgconfig.patch (100%)
rename meta/recipes-support/neon/{neon_0.29.5.bb => neon_0.29.6.bb} (82%)PATCH 1/11 polkit: upgrade to latest 0.102
---
.../introspection.patch | 0
.../polkit-1_pam.patch | 0
.../polkit/{polkit_0.101.bb => polkit_0.102.bb} | 8 ++++----
3 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-extended/polkit/{polkit-0.101 => polkit-0.102}/introspection.patch (100%)
rename meta/recipes-extended/polkit/{polkit-0.101 => polkit-0.102}/polkit-1_pam.patch (100%)
rename meta/recipes-extended/polkit/{polkit_0.101.bb => polkit_0.102.bb} (83%)meta/recipes-extended/polkit/polkit-0.102/introspection.patch renamed from meta/recipes-extended/polkit/polkit-0.101/introspection.patch +0 -0
meta/recipes-extended/polkit/polkit-0.102/polkit-1_pam.patch renamed from meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch +0 -0
meta/recipes-extended/polkit/polkit_0.102.bb renamed from meta/recipes-extended/polkit/polkit_0.101.bb +4 -4
@@ -4,14 +4,14 @@ HOMEPAGE = "http://code.google.com/p/polkit/" LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \ file://src/polkit/polkit.h;beginline=1;endilne=20;md5=9f797b8912dac8a806be820c14e783f8 \ - file://docs/polkit/html/license.html;md5=07ddbf5f29e44c80c99be19c1690ec1f" + file://docs/polkit/html/license.html;md5=570dd8c794dc8df913cb03b86e78d936" SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \ file://introspection.patch \ ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" PAM_SRC_URI = "file://polkit-1_pam.patch" -PR = "r2" +PR = "r0" DEPENDS = "libpam expat dbus-glib eggdbus intltool-native" RDEPENDS_${PN} = "libpam" EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection"
@@ -28,5 +28,5 @@ do_install_append() { rm -f ${D}${libdir}/${PN}-1/extensions/*.a } -SRC_URI[md5sum] = "f925ac93aba3c072977370c1e27feb7f" -SRC_URI[sha256sum] = "927f65760e4fce23d7cdeae90245c22986eb0a39335a344915302158f73f9f1b" +SRC_URI[md5sum] = "a3726bdb9728c103e58f62131e26693a" +SRC_URI[sha256sum] = "0a6573da841c6f5c428218f1456aed45724a0127932af0de563d568bb9058641"
Signature · 1 line
1.7.1
PATCH 2/11 libsndfile1: upgrade to version 1.0.25
In reply to Dongxiao Xu---
...libsndfile1_1.0.24.bb => libsndfile1_1.0.25.bb} | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-multimedia/libsndfile/{libsndfile1_1.0.24.bb => libsndfile1_1.0.25.bb} (79%)meta/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bb renamed from meta/recipes-multimedia/libsndfile/libsndfile1_1.0.24.bb +3 -3
@@ -4,12 +4,12 @@ AUTHOR = "Erik de Castro Lopo" DEPENDS = "sqlite3" SECTION = "libs/multimedia" LICENSE = "LGPLv2.1" -PR = "r1" +PR = "r0" SRC_URI = "http://www.mega-nerd.com/libsndfile/files/libsndfile-${PV}.tar.gz" -SRC_URI[md5sum] = "8f823c30c1d8d44830db6ab845d6679e" -SRC_URI[sha256sum] = "b6050e6fbfbb72c8bfbc895104697a4af1d49077a64e4846e0be7af87c9e56a4" +SRC_URI[md5sum] = "e2b7bb637e01022c7d20f95f9c3990a2" +SRC_URI[sha256sum] = "59016dbd326abe7e2366ded5c344c853829bebfd1702ef26a07ef662d6aa4882" LIC_FILES_CHKSUM = "file://COPYING;md5=e77fe93202736b47c07035910f47974a"
Signature · 1 line
1.7.1
PATCH 3/11 neon: upgrade to version 0.29.6
In reply to Dongxiao Xu---
.../{neon-0.29.5 => neon-0.29.6}/pkgconfig.patch | 0
.../neon/{neon_0.29.5.bb => neon_0.29.6.bb} | 6 +++---
2 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-support/neon/{neon-0.29.5 => neon-0.29.6}/pkgconfig.patch (100%)
rename meta/recipes-support/neon/{neon_0.29.5.bb => neon_0.29.6.bb} (82%)meta/recipes-support/neon/neon-0.29.6/pkgconfig.patch renamed from meta/recipes-support/neon/neon-0.29.5/pkgconfig.patch +0 -0
meta/recipes-support/neon/neon_0.29.6.bb renamed from meta/recipes-support/neon/neon_0.29.5.bb +3 -3
@@ -7,15 +7,15 @@ LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a DEPENDS = "zlib libxml2 expat time gnutls libproxy" DEPENDS_virtclass-native = "zlib-native libxml2-native expat-native gnutls-native" -PR = "r1" +PR = "r0" BBCLASSEXTEND = "native" SRC_URI = "http://www.webdav.org/${BPN}/${BPN}-${PV}.tar.gz \ file://pkgconfig.patch" -SRC_URI[md5sum] = "ff369e69ef0f0143beb5626164e87ae2" -SRC_URI[sha256sum] = "dea3c52b9f3f915651c6279c76758acf7c427727e8b9b0130f8b138f24012290" +SRC_URI[md5sum] = "591e0c82e6979e7e615211b386b8f6bc" +SRC_URI[sha256sum] = "9c640b728d6dc80ef1e48f83181166ab6bc95309cece5537e01ffdd01b96eb43" inherit autotools binconfig lib_package pkgconfig
Signature · 1 line
1.7.1
PATCH 4/11 netbase: upgrade to version 4.46
In reply to Dongxiao Xu---
.../netbase/{netbase-4.45 => netbase-4.46}/hosts | 0
.../netbase/{netbase-4.45 => netbase-4.46}/init | 0
.../{netbase-4.45 => netbase-4.46}/interfaces | 0
.../netbase/{netbase-4.45 => netbase-4.46}/nfsroot | 0
.../qemuarm/interfaces | 0
.../qemuarmv6/interfaces | 0
.../qemuarmv7/interfaces | 0
.../qemumips/interfaces | 0
.../qemuppc/interfaces | 0
.../qemux86-64/interfaces | 0
.../qemux86/interfaces | 0
.../netbase/{netbase_4.45.bb => netbase_4.46.bb} | 6 +++---
12 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-core/netbase/{netbase-4.45 => netbase-4.46}/hosts (100%)
rename meta/recipes-core/netbase/{netbase-4.45 => netbase-4.46}/init (100%)
rename meta/recipes-core/netbase/{netbase-4.45 => netbase-4.46}/interfaces (100%)
rename meta/recipes-core/netbase/{netbase-4.45 => netbase-4.46}/nfsroot (100%)
rename meta/recipes-core/netbase/{netbase-4.45 => netbase-4.46}/qemuarm/interfaces (100%)
rename meta/recipes-core/netbase/{netbase-4.45 => netbase-4.46}/qemuarmv6/interfaces (100%)
rename meta/recipes-core/netbase/{netbase-4.45 => netbase-4.46}/qemuarmv7/interfaces (100%)
rename meta/recipes-core/netbase/{netbase-4.45 => netbase-4.46}/qemumips/interfaces (100%)
rename meta/recipes-core/netbase/{netbase-4.45 => netbase-4.46}/qemuppc/interfaces (100%)
rename meta/recipes-core/netbase/{netbase-4.45 => netbase-4.46}/qemux86-64/interfaces (100%)
rename meta/recipes-core/netbase/{netbase-4.45 => netbase-4.46}/qemux86/interfaces (100%)
rename meta/recipes-core/netbase/{netbase_4.45.bb => netbase_4.46.bb} (92%)meta/recipes-core/netbase/netbase-4.46/hosts renamed from meta/recipes-core/netbase/netbase-4.45/hosts +0 -0
meta/recipes-core/netbase/netbase-4.46/init renamed from meta/recipes-core/netbase/netbase-4.45/init +0 -0
meta/recipes-core/netbase/netbase-4.46/interfaces renamed from meta/recipes-core/netbase/netbase-4.45/interfaces +0 -0
meta/recipes-core/netbase/netbase-4.46/nfsroot renamed from meta/recipes-core/netbase/netbase-4.45/nfsroot +0 -0
meta/recipes-core/netbase/netbase-4.46/qemuarm/interfaces renamed from meta/recipes-core/netbase/netbase-4.45/qemuarm/interfaces +0 -0
meta/recipes-core/netbase/netbase-4.46/qemuarmv6/interfaces renamed from meta/recipes-core/netbase/netbase-4.45/qemuarmv6/interfaces +0 -0
meta/recipes-core/netbase/netbase-4.46/qemuarmv7/interfaces renamed from meta/recipes-core/netbase/netbase-4.45/qemuarmv7/interfaces +0 -0
meta/recipes-core/netbase/netbase-4.46/qemumips/interfaces renamed from meta/recipes-core/netbase/netbase-4.45/qemumips/interfaces +0 -0
meta/recipes-core/netbase/netbase-4.46/qemuppc/interfaces renamed from meta/recipes-core/netbase/netbase-4.45/qemuppc/interfaces +0 -0
meta/recipes-core/netbase/netbase-4.46/qemux86-64/interfaces renamed from meta/recipes-core/netbase/netbase-4.45/qemux86-64/interfaces +0 -0
meta/recipes-core/netbase/netbase-4.46/qemux86/interfaces renamed from meta/recipes-core/netbase/netbase-4.45/qemux86/interfaces +0 -0
meta/recipes-core/netbase/netbase_4.46.bb renamed from meta/recipes-core/netbase/netbase_4.45.bb +3 -3
@@ -4,7 +4,7 @@ HOMEPAGE = "http://packages.debian.org/netbase" SECTION = "base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab" -PR = "r1" +PR = "r0" inherit update-rc.d
@@ -49,5 +49,5 @@ PACKAGE_ARCH_qemuarm = "${MACHINE_ARCH}" PACKAGE_ARCH_qemux86 = "${MACHINE_ARCH}" PACKAGE_ARCH_qemux86-64 = "${MACHINE_ARCH}" -SRC_URI[md5sum] = "a56cb362ece358a5b3b8972e5c7be534" -SRC_URI[sha256sum] = "dea29d60b3d751f0c5669b5299af312ad269c48e6440e0072d0d68d9544ebad3" +SRC_URI[md5sum] = "e15762f4a8280a62f7ddfea6093120f1" +SRC_URI[sha256sum] = "2fdee144112731ee0028fee2584cc82d664857ca7004c2eb59de7bda5b159838"
Signature · 1 line
1.7.1
PATCH 5/11 libogg: upgrade to version 1.3.0
In reply to Dongxiao Xu---
.../libogg/{libogg_1.2.2.bb => libogg_1.3.0.bb} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-multimedia/libogg/{libogg_1.2.2.bb => libogg_1.3.0.bb} (81%)meta/recipes-multimedia/libogg/libogg_1.3.0.bb renamed from meta/recipes-multimedia/libogg/libogg_1.2.2.bb +2 -2
@@ -13,7 +13,7 @@ PR = "r0" SRC_URI = "http://downloads.xiph.org/releases/ogg/libogg-${PV}.tar.gz" -SRC_URI[md5sum] = "5a9fcabc9a1b7c6f1cd75ddc78f36c56" -SRC_URI[sha256sum] = "ab000574bc26d5f01284f5b0f50e12dc761d035c429f2e9c70cb2a9487d8cfba" +SRC_URI[md5sum] = "0a7eb40b86ac050db3a789ab65fe21c2" +SRC_URI[sha256sum] = "a8de807631014615549d2356fd36641833b8288221cea214f8a72750efe93780" inherit autotools pkgconfig
Signature · 1 line
1.7.1
PATCH 6/11 telepathy-idle: upgrade to version 0.1.10
In reply to Dongxiao Xu---
...athy-idle_0.1.8.bb => telepathy-idle_0.1.10.bb} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-connectivity/telepathy/{telepathy-idle_0.1.8.bb => telepathy-idle_0.1.10.bb} (81%)meta/recipes-connectivity/telepathy/telepathy-idle_0.1.10.bb renamed from meta/recipes-connectivity/telepathy/telepathy-idle_0.1.8.bb +2 -2
@@ -9,8 +9,8 @@ PR = "r0" SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "82f5eafa07df5e1abc785061143bbfd2" -SRC_URI[sha256sum] = "384119cc64022626b6f51aaaef605abf248602d8fae25baff82762a097f20fe9" +SRC_URI[md5sum] = "570a431e3e28ca6ebf3f0c84198f0b9a" +SRC_URI[sha256sum] = "e14327a8b47c83ed32c73c5fdad1d9c2291ae8592d3da4482e0a6cbd541f35b0" inherit autotools pkgconfig
Signature · 1 line
1.7.1
PATCH 7/11 telepathy-glib: upgrade to version 0.16.0
In reply to Dongxiao Xu---
...thy-glib_0.14.3.bb => telepathy-glib_0.16.0.bb} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-connectivity/telepathy/{telepathy-glib_0.14.3.bb => telepathy-glib_0.16.0.bb} (80%)meta/recipes-connectivity/telepathy/telepathy-glib_0.16.0.bb renamed from meta/recipes-connectivity/telepathy/telepathy-glib_0.14.3.bb +2 -2
@@ -7,8 +7,8 @@ PR = "r0" SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "fe9a4f781651593fd4afddb343ff50bf" -SRC_URI[sha256sum] = "62e759084355ac0fce61feb561a7535a6707b223f0d1e4305fd47c83fa5494d0" +SRC_URI[md5sum] = "071ed1b34ace45109188df73933609e4" +SRC_URI[sha256sum] = "dae3dd7c06044951e7780cdc3e5524c7c9d12cd8aae6fe42bc88aca39a40b318" LIC_FILES_CHKSUM = "file://COPYING;md5=e413d83db6ee8f2c8e6055719096a48e"
Signature · 1 line
1.7.1
PATCH 8/11 telepathy-mission-control: Upgrade to version 5.9.3
In reply to Dongxiao Xu---
...5.7.9.bb => telepathy-mission-control_5.9.3.bb} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-connectivity/telepathy/{telepathy-mission-control_5.7.9.bb => telepathy-mission-control_5.9.3.bb} (92%)meta/recipes-connectivity/telepathy/telepathy-mission-control_5.9.3.bb renamed from meta/recipes-connectivity/telepathy/telepathy-mission-control_5.7.9.bb +2 -2
@@ -40,5 +40,5 @@ FILES_libmissioncontrol-dbg = "${libdir}/.debug/libmissioncontrol.so.*" FILES_libmissioncontrol-config-dbg = "${libdir}/.debug/libmissioncontrol-config.so.*" FILES_libmissioncontrol-server-dbg = "${libdir}/.debug/libmissioncontrol-server.so.*" -SRC_URI[md5sum] = "df7e63d857676fab9ec2261cffe5eb4a" -SRC_URI[sha256sum] = "bc430238d2fb6663d8376702a43251000a75b741ab55af88006cbdb37d8cc086" +SRC_URI[md5sum] = "15fc8e560bc67a86393a3138d7ac38e3" +SRC_URI[sha256sum] = "774af104627513e7881fa6695912c962ddedcc7628ec859e020fa30000e32cab"
Signature · 1 line
1.7.1
PATCH 9/11 iptables: upgrade to version 1.4.12.1
In reply to Dongxiao XuRemove the do_configure_prepend() since some m4 files are needed when doing configuration.
Define correct FILE for iptables and iptables-dbg packages.
---
.../{iptables_1.4.9.bb => iptables_1.4.12.1.bb} | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
rename meta/recipes-extended/iptables/{iptables_1.4.9.bb => iptables_1.4.12.1.bb} (69%)meta/recipes-extended/iptables/iptables_1.4.12.1.bb renamed from meta/recipes-extended/iptables/iptables_1.4.9.bb +6 -10
@@ -4,8 +4,8 @@ filtering code in Linux." HOMEPAGE = "http://www.netfilter.org/" BUGTRACKER = "http://bugzilla.netfilter.org/" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ - file://iptables.c;firstline=13;endline=25;md5=f1028f2401da1c120df27594b2be50ef" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263\ + file://iptables/iptables.c;firstline=13;endline=25;md5=f1028f2401da1c120df27594b2be50ef" PR = "r0"
@@ -18,19 +18,15 @@ RRECOMMENDS_${PN} = "kernel-module-x-tables \ kernel-module-nf-conntrack-ipv4 \ kernel-module-nf-nat \ kernel-module-ipt-masquerade" -FILES_${PN}-dbg =+ "${libexecdir}/xtables/.debug" +FILES_${PN} =+ "${libdir}/xtables/" +FILES_${PN}-dbg =+ "${libdir}/xtables/.debug" SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2" -SRC_URI[md5sum] = "db1312f7ce5a4c11dc981a2ac76b26e8" -SRC_URI[sha256sum] = "1ac719d6265cf64220c80c0974ed9d35febdac2986bb96eeaa9c8c7959a1d306" +SRC_URI[md5sum] = "b08a1195ec2c1ebeaf072db3c55fdf43" +SRC_URI[sha256sum] = "77e6581f21f15946a814fa311236e5f3f7c6593180f9d695cea06aa95e464aba" inherit autotools EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR} \ ${@base_contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6', d)}" - -do_configure_prepend() { - # they are all libtool m4 files - rm -rf ${S}/m4 -}
Signature · 1 line
1.7.1
Re: [PATCH 09/11] iptables: upgrade to version 1.4.12.1
Quoted 2 lines · Dongxiao Xu
Remove the
do_configure_prepend()since some m4 files are needed when doing configuration.
I think we're going to have to specifically delete the libtool m4 files here. I know we've had problems with them being present in the past.
Also, there is no mention of the licence change here in the commit message?
Cheers,
Richard
Quoted 50 lines
Define correct FILE for iptables and iptables-dbg packages.
Signed-off-by Dongxiao Xu <[email protected]>--- .../{iptables_1.4.9.bb => iptables_1.4.12.1.bb} | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) rename meta/recipes-extended/iptables/{iptables_1.4.9.bb => iptables_1.4.12.1.bb} (69%)meta/recipes-extended/iptables/iptables_1.4.12.1.bb renamed from meta/recipes-extended/iptables/iptables_1.4.9.bb +6
-10@@ -4,8 +4,8 @@ filtering code in Linux." HOMEPAGE = "http://www.netfilter.org/" BUGTRACKER = "http://bugzilla.netfilter.org/" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ - file://iptables.c;firstline=13;endline=25;md5=f1028f2401da1c120df27594b2be50ef" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263\ + file://iptables/iptables.c;firstline=13;endline=25;md5=f1028f2401da1c120df27594b2be50ef" PR = "r0"@@ -18,19 +18,15 @@ RRECOMMENDS_${PN} = "kernel-module-x-tables \ kernel-module-nf-conntrack-ipv4 \ kernel-module-nf-nat \ kernel-module-ipt-masquerade" -FILES_${PN}-dbg =+ "${libexecdir}/xtables/.debug" +FILES_${PN} =+ "${libdir}/xtables/" +FILES_${PN}-dbg =+ "${libdir}/xtables/.debug" SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2" -SRC_URI[md5sum] = "db1312f7ce5a4c11dc981a2ac76b26e8" -SRC_URI[sha256sum] = "1ac719d6265cf64220c80c0974ed9d35febdac2986bb96eeaa9c8c7959a1d306" +SRC_URI[md5sum] = "b08a1195ec2c1ebeaf072db3c55fdf43" +SRC_URI[sha256sum] = "77e6581f21f15946a814fa311236e5f3f7c6593180f9d695cea06aa95e464aba" inherit autotools EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR} \ ${@base_contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6', d)}" - -do_configure_prepend() { - # they are all libtool m4 files - rm -rf ${S}/m4 -}
PATCH 10/11 connman: add xtables_version to fix xtables API change
In reply to Dongxiao XuAfter upgrade iptables to a newer version, some of its API are changed. Therefore we add related fixes to the current connman.
Currently we don't upgrade connman since kernel.org still doesn't work and we could not fetch the newer sources.
--- .../connman/connman-0.75/xtables_version.patch | 64 ++++++++++++++++++++ meta/recipes-connectivity/connman/connman_0.75.bb | 3 +- 2 files changed, 66 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-connectivity/connman/connman-0.75/xtables_version.patch
meta/recipes-connectivity/connman/connman-0.75/xtables_version.patch new file +64 -0
@@ -0,0 +1,64 @@ +xtables_merge_options API change, fix its calling in connman. + +Signed-off-by: Dongxiao Xu <[email protected]> + +Upstream-Status: Backport + +diff -ruN connman-0.75-orig//src/iptables.c connman-0.75/src/iptables.c +--- connman-0.75-orig//src/iptables.c 2011-02-22 12:16:25.000000000 +0800 ++++ connman-0.75/src/iptables.c 2011-10-26 09:21:33.941164000 +0800 +@@ -1089,7 +1089,11 @@ + if (xt_t->init != NULL) + xt_t->init(xt_t->t); + iptables_globals.opts = +- xtables_merge_options(iptables_globals.opts, ++ xtables_merge_options( ++#if XTABLES_VERSION_CODE > 5 ++ iptables_globals.orig_opts, ++#endif ++ iptables_globals.opts, + xt_t->extra_opts, + &xt_t->option_offset); + if (iptables_globals.opts == NULL) +@@ -1113,7 +1117,11 @@ + xt_m->init(xt_m->m); + if (xt_m != xt_m->next) { + iptables_globals.opts = +- xtables_merge_options(iptables_globals.opts, ++ xtables_merge_options( ++#if XTABLES_VERSION_CODE > 5 ++ iptables_globals.orig_opts, ++#endif ++ iptables_globals.opts, + xt_m->extra_opts, + &xt_m->option_offset); + if (iptables_globals.opts == NULL) +diff -ruN connman-0.75-orig//tools/iptables-test.c connman-0.75/tools/iptables-test.c +--- connman-0.75-orig//tools/iptables-test.c 2011-02-22 12:16:25.000000000 +0800 ++++ connman-0.75/tools/iptables-test.c 2011-10-26 09:23:25.701164000 +0800 +@@ -1076,7 +1076,11 @@ + if (xt_t->init != NULL) + xt_t->init(xt_t->t); + connman_iptables_globals.opts = +- xtables_merge_options(connman_iptables_globals.opts, ++ xtables_merge_options( ++#if XTABLES_VERSION_CODE > 5 ++ connman_iptables_globals.orig_opts, ++#endif ++ connman_iptables_globals.opts, + xt_t->extra_opts, + &xt_t->option_offset); + if (connman_iptables_globals.opts == NULL) +@@ -1102,7 +1106,11 @@ + xt_m->init(xt_m->m); + if (xt_m != xt_m->next) { + connman_iptables_globals.opts = +- xtables_merge_options(connman_iptables_globals.opts, ++ xtables_merge_options( ++#if XTABLES_VERSION_CODE > 5 ++ connman_iptables_globals.orig_opts, ++#endif ++ connman_iptables_globals.opts, + xt_m->extra_opts, + &xt_m->option_offset); + if (connman_iptables_globals.opts == NULL)
meta/recipes-connectivity/connman/connman_0.75.bb +2 -1
@@ -1,5 +1,5 @@ require connman.inc -PR = "r1" +PR = "r2" EXTRA_OECONF += "\ ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \
@@ -21,6 +21,7 @@ EXTRA_OECONF += "\ SRC_URI = "\ ${KERNELORG_MIRROR}/linux/network/connman/connman-${PV}.tar.gz \ file://add_xuser_dbus_permission.patch \ + file://xtables_version.patch \ file://connman \ "
Signature · 1 line
1.7.1
PATCH 11/11 distro_tracking: polkit, libsndfile, etc
In reply to Dongxiao Xupolkit
libsndfile1
neon
netbase
libogg
telepathy-idle
telepathy-glib
telepathy-mission-control
iptables
--- .../conf/distro/include/distro_tracking_fields.inc | 66 ++++++++++---------- 1 files changed, 33 insertions(+), 33 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +33 -33
@@ -244,13 +244,13 @@ RECIPE_MAINTAINER_pn-dbus-glib = "Scott Garman <[email protected]>" RECIPE_STATUS_pn-neon="green" RECIPE_DEPENDENCY_CHECK_pn-neon = "not done" -RECIPE_LATEST_VERSION_pn-neon="0.29.5" +RECIPE_LATEST_VERSION_pn-neon="0.29.6" RECIPE_NO_OF_PATCHES_pn-neon="0" RECIPE_INTEL_SECTION_pn-neon = "base libs" -RECIPE_LATEST_RELEASE_DATE_pn-neon="2010/10/14" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-neon="10 days" +RECIPE_LATEST_RELEASE_DATE_pn-neon="2011/05/03" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-neon="7 months" RECIPE_COMMENTS_pn-neon = "" -RECIPE_LAST_UPDATE_pn-neon = "Nov 15, 2010" +RECIPE_LAST_UPDATE_pn-neon = "Oct 28, 2011" RECIPE_MAINTAINER_pn-neon = "Dongxiao Xu <[email protected]>" RECIPE_STATUS_pn-libpng = "green"
@@ -782,12 +782,12 @@ DISTRO_PN_ALIAS_pn-opkg-utils = "OSPDT upstream=http://svn.openmoko.org/trunk/sr RECIPE_STATUS_pn-polkit = "green" RECIPE_DEPENDENCY_CHECK_pn-polkit = "not done" -RECIPE_LATEST_VERSION_pn-polkit = "0.101" +RECIPE_LATEST_VERSION_pn-polkit = "0.102" RECIPE_INTEL_SECTION_pn-polkit = "base utils" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-polkit = "1 months" -RECIPE_LATEST_RELEASE_DATE_pn-polkit = "2011/03/03" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-polkit = "5 months" +RECIPE_LATEST_RELEASE_DATE_pn-polkit = "2011/08/01" RECIPE_COMMENTS_pn-polkit = "" -RECIPE_LAST_UPDATE_pn-polkit = "Apr 26, 2011" +RECIPE_LAST_UPDATE_pn-polkit = "Oct 28, 2011" RECIPE_MAINTAINER_pn-polkit = "Dongxiao Xu <[email protected]>" RECIPE_STATUS_pn-psplash = "not done"
@@ -847,14 +847,14 @@ RECIPE_MAINTAINER_pn-iproute2 = "Dongxiao Xu <[email protected]>" RECIPE_STATUS_pn-netbase = "green" RECIPE_DEPENDENCY_CHECK_pn-netbase = "not done" -RECIPE_LATEST_VERSION_pn-netbase = "4.44" +RECIPE_LATEST_VERSION_pn-netbase = "4.46" RECIPE_PATCH_pn-netbase+busybox = "marked as REMOVAL" RECIPE_PATCH_pn-many = "local scripts" RECIPE_INTEL_SECTION_pn-netbase = "base utils" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-netbase = "2 months" -RECIPE_LATEST_RELEASE_DATE_pn-netbase = "2010/12/13" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-netbase = "5 months" +RECIPE_LATEST_RELEASE_DATE_pn-netbase = "2011/06/26" RECIPE_COMMENTS_pn-netbase = "" -RECIPE_LAST_UPDATE_pn-netbase = "Dec 30, 2010" +RECIPE_LAST_UPDATE_pn-netbase = "Oct 28, 2011" RECIPE_MAINTAINER_pn-netbase = "Dongxiao Xu <[email protected]>" RECIPE_STATUS_pn-busybox = "green"
@@ -1034,9 +1034,9 @@ RECIPE_LAST_UPDATE_pn-gzip = "Jun 4, 2011" RECIPE_MAINTAINER_pn-gzip = "Scott Garman <[email protected]>" RECIPE_STATUS_pn-iptables = "green" -RECIPE_LAST_UPDATE_pn-iptables = "Nov 10, 2010" +RECIPE_LAST_UPDATE_pn-iptables = "Oct 28, 2011" RECIPE_MAINTAINER_pn-iptables = "Dongxiao Xu <[email protected]>" -RECIPE_LATEST_VERSION_pn-iptables = "1.4.8" +RECIPE_LATEST_VERSION_pn-iptables = "1.4.12.1" RECIPE_STATUS_pn-ethtool = "green" RECIPE_LATEST_VERSION_pn-ethtool = "2.6.36"
@@ -2222,18 +2222,18 @@ RECIPE_MAINTAINER_pn-telepathy-gabble = "Dongxiao Xu <[email protected]>" RECIPE_STATUS_pn-telepathy-glib = "green" RECIPE_NO_OF_PATCHES_pn-telepathy-glib ="0" -RECIPE_LATEST_RELEASE_DATE_pn-telepathy-glib = "2011/03/31" -RECIPE_LATEST_VERSION_pn-telepathy-glib = "0.14.3" +RECIPE_LATEST_RELEASE_DATE_pn-telepathy-glib = "2011/10/14" +RECIPE_LATEST_VERSION_pn-telepathy-glib = "0.16.0" RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-telepathy-glib = "10 days" -RECIPE_LAST_UPDATE_pn-telepathy-glib = "Apr 15, 2011" +RECIPE_LAST_UPDATE_pn-telepathy-glib = "Oct 28, 2011" RECIPE_MAINTAINER_pn-telepathy-glib = "Dongxiao Xu <[email protected]>" RECIPE_STATUS_pn-telepathy-idle = "green" RECIPE_NO_OF_PATCHES_pn-telepathy-idle ="0" -RECIPE_LATEST_RELEASE_DATE_pn-telepathy-glib ="2011/02/11" -RECIPE_LATEST_VERSION_pn-telepathy-idle = "0.1.8" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-telepathy-idle = "3 months" -RECIPE_LAST_UPDATE_pn-telepathy-idle = "Apr 15, 2011" +RECIPE_LATEST_RELEASE_DATE_pn-telepathy-glib ="2011/05/11" +RECIPE_LATEST_VERSION_pn-telepathy-idle = "0.1.10" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-telepathy-idle = "1 months" +RECIPE_LAST_UPDATE_pn-telepathy-idle = "Oct 28, 2011" RECIPE_MAINTAINER_pn-telepathy-idle = "Dongxiao Xu <[email protected]>" RECIPE_STATUS_pn-telepathy-python = "green"
@@ -2297,11 +2297,11 @@ RECIPE_LAST_UPDATE_pn-libsyncml = "Jul 31, 2009" RECIPE_MAINTAINER_pn-libsyncml = "Dongxiao Xu <[email protected]>" RECIPE_STATUS_pn-telepathy-mission-control = "green" -RECIPE_LATEST_VERSION_pn-telepathy-mission-control = "5.7.9" +RECIPE_LATEST_VERSION_pn-telepathy-mission-control = "5.9.3" RECIPE_NO_OF_PATCHES_pn-telepathy-mission-control ="0" -RECIPE_LATEST_RELEASE_DATE_pn-telepathy-mission-control ="2011/04/05" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-telepathy-mission-control ="2 months" -RECIPE_LAST_UPDATE_pn-telepathy-mission-control = "Apr 15, 2011" +RECIPE_LATEST_RELEASE_DATE_pn-telepathy-mission-control ="2011/10/04" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-telepathy-mission-control ="1 months" +RECIPE_LAST_UPDATE_pn-telepathy-mission-control = "Oct 28, 2011" RECIPE_MAINTAINER_pn-telepathy-mission-control = "Dongxiao Xu <[email protected]>" RECIPE_STATUS_pn-libetpan = "red"
@@ -2559,11 +2559,11 @@ RECIPE_LAST_UPDATE_pn-libvorbis = "Nov 15, 2010" RECIPE_MAINTAINER_pn-libvorbis = "Dongxiao Xu <[email protected]>" RECIPE_STATUS_pn-libogg="green" -RECIPE_LATEST_VERSION_pn-libogg="1.2.2" +RECIPE_LATEST_VERSION_pn-libogg="1.3.0" RECIPE_NO_OF_PATCHES_pn-libogg="0" -RECIPE_LATEST_RELEASE_DATE_pn-libogg="2010/12/07" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libogg="1 months" -RECIPE_LAST_UPDATE_pn-libogg = "Dec 30, 2010" +RECIPE_LATEST_RELEASE_DATE_pn-libogg="2011/08/04" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libogg="8 months" +RECIPE_LAST_UPDATE_pn-libogg = "Oct 28, 2011" RECIPE_MAINTAINER_pn-libogg = "Dongxiao Xu <[email protected]>" RECIPE_STATUS_pn-gstreamer="green"
@@ -2698,11 +2698,11 @@ RECIPE_MAINTAINER_pn-gst-ffmpeg = "Dongxiao Xu <[email protected]>" RECIPE_STATUS_pn-libsndfile1 = "green" DISTRO_PN_ALIAS_pn-libsndfile1 = "Meego=libsndfile Fedora=libsndfile OpenSuSE=libsndfile Ubuntu=libsndfile Mandriva=libsndfile Debian=libsndfile" -RECIPE_LATEST_VERSION_pn-libsndfile1 = "1.0.24" +RECIPE_LATEST_VERSION_pn-libsndfile1 = "1.0.25" RECIPE_NO_OF_PATCHES_pn-libsndfile1 = "0" -RECIPE_LATEST_RELEASE_DATE_pn-libsndfile1 = "2011/03/23" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libsndfile1 = "5 months" -RECIPE_LAST_UPDATE_pn-libsndfile1 = "Apr 26, 2011" +RECIPE_LATEST_RELEASE_DATE_pn-libsndfile1 = "2011/07/13" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libsndfile1 = "4 months" +RECIPE_LAST_UPDATE_pn-libsndfile1 = "Oct 28, 2011" RECIPE_MAINTAINER_pn-libsndfile1 = "Dongxiao Xu <[email protected]>" RECIPE_STATUS_pn-pulseaudio = "green"
Signature · 1 line
1.7.1