Patchwork [09/11] iptables: upgrade to version 1.4.12.1

login
register
mail settings
Submitter Dongxiao Xu
Date Oct. 28, 2011, 3:35 a.m.
Message ID <83141bc3f748c34d7f19a03c0517d804fadc6024.1319772853.git.dongxiao.xu@intel.com>
Download mbox | patch
Permalink /patch/13975/
State New, archived
Headers show

Comments

Dongxiao Xu - Oct. 28, 2011, 3:35 a.m.
Remove the do_configure_prepend() since some m4 files are needed when
doing configuration.

Define correct FILE for iptables and iptables-dbg packages.

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
 .../{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%)
Richard Purdie - Oct. 31, 2011, 10:57 p.m.
On Fri, 2011-10-28 at 11:35 +0800, Dongxiao Xu wrote:
> 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


> Define correct FILE for iptables and iptables-dbg packages.
> 
> Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
> ---
>  .../{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%)
> 
> diff --git a/meta/recipes-extended/iptables/iptables_1.4.9.bb b/meta/recipes-extended/iptables/iptables_1.4.12.1.bb
> similarity index 69%
> rename from meta/recipes-extended/iptables/iptables_1.4.9.bb
> rename to meta/recipes-extended/iptables/iptables_1.4.12.1.bb
> index 7c9fbea..59a1bcb 100644
> --- a/meta/recipes-extended/iptables/iptables_1.4.9.bb
> +++ b/meta/recipes-extended/iptables/iptables_1.4.12.1.bb
> @@ -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

diff --git a/meta/recipes-extended/iptables/iptables_1.4.9.bb b/meta/recipes-extended/iptables/iptables_1.4.12.1.bb
similarity index 69%
rename from meta/recipes-extended/iptables/iptables_1.4.9.bb
rename to meta/recipes-extended/iptables/iptables_1.4.12.1.bb
index 7c9fbea..59a1bcb 100644
--- a/meta/recipes-extended/iptables/iptables_1.4.9.bb
+++ b/meta/recipes-extended/iptables/iptables_1.4.12.1.bb
@@ -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
-}