[PATCH 1/3] xinetd: added gnu-configize for AArch64 support

[PATCH 1/3] xinetd: added gnu-configize for AArch64 support

[Marcin Juszkiewicz]

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 meta/recipes-extended/xinetd/xinetd_2.3.15.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
index 2139e74..3bde512 100644
--- a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
+++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
@@ -31,6 +31,7 @@ EXTRA_OECONF="--disable-nls"
 do_configure() {
 	# Looks like configure.in is broken, so we are skipping
 	# rebuilding configure and are just using the shipped one
+	gnu-configize --force
 	oe_runconf
 }
 
-- 
1.8.0

[PATCH 2/3] slang: added gnu-configize for AArch64 support

[Marcin Juszkiewicz]

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 meta/recipes-extended/slang/slang_2.2.4.bb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/meta/recipes-extended/slang/slang_2.2.4.bb b/meta/recipes-extended/slang/slang_2.2.4.bb
index 60aac66..946e9f6 100644
--- a/meta/recipes-extended/slang/slang_2.2.4.bb
+++ b/meta/recipes-extended/slang/slang_2.2.4.bb
@@ -29,6 +29,14 @@ SRC_URI[sha256sum] = "9a8257a9a2a55099af858b13338dc8f3a06dd2069f46f0df2c9c3bb84a
 
 EXTRA_OECONF += " --without-z --without-png --without-onig --x-includes=${STAGING_DIR_HOST}/usr/include/X11 --x-libraries=${STAGING_DIR_HOST}/usr/lib"
 
+do_configure_prepend() {
+    # slang keeps configure.ac and rest of autoconf files in autoconf/ directory
+    # we have to go there to be able to run gnu-configize cause it expects configure.{in,ac}
+    # to be present. Resulting files land in autoconf/autoconf/ so we need to move them.
+    cd ${S}/autoconf && gnu-configize --force && mv autoconf/config.* .
+    cd ${S}
+}
+
 do_install() {
 	oe_runmake install DESTDIR=${D} -e 'INST_LIB_DIR=${STAGING_DIR_HOST}/usr/lib'
 }
-- 
1.8.0

Re: [PATCH 2/3] slang: added gnu-configize for AArch64 support

[Saul Wold]

On 12/18/2012 01:03 AM, Marcin Juszkiewicz wrote:
> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> ---
>   meta/recipes-extended/slang/slang_2.2.4.bb | 8 ++++++++
>   1 file changed, 8 insertions(+)
>
> diff --git a/meta/recipes-extended/slang/slang_2.2.4.bb b/meta/recipes-extended/slang/slang_2.2.4.bb
> index 60aac66..946e9f6 100644
> --- a/meta/recipes-extended/slang/slang_2.2.4.bb
> +++ b/meta/recipes-extended/slang/slang_2.2.4.bb
> @@ -29,6 +29,14 @@ SRC_URI[sha256sum] = "9a8257a9a2a55099af858b13338dc8f3a06dd2069f46f0df2c9c3bb84a
>
>   EXTRA_OECONF += " --without-z --without-png --without-onig --x-includes=${STAGING_DIR_HOST}/usr/include/X11 --x-libraries=${STAGING_DIR_HOST}/usr/lib"
>
> +do_configure_prepend() {
> +    # slang keeps configure.ac and rest of autoconf files in autoconf/ directory
> +    # we have to go there to be able to run gnu-configize cause it expects configure.{in,ac}
> +    # to be present. Resulting files land in autoconf/autoconf/ so we need to move them.
> +    cd ${S}/autoconf && gnu-configize --force && mv autoconf/config.* .
> +    cd ${S}
> +}
Should these be ${S} or ${B} (or some combination), I believe we are 
trying to allow for builds to be in a different dir where ${S} != ${B}?

Sau!

> +
>   do_install() {
>   	oe_runmake install DESTDIR=${D} -e 'INST_LIB_DIR=${STAGING_DIR_HOST}/usr/lib'
>   }
>

Re: [PATCH 2/3] slang: added gnu-configize for AArch64 support

[Burton, Ross]

On 18 December 2012 19:17, Saul Wold <sgw@linux.intel.com> wrote:
>> +do_configure_prepend() {
>> +    # slang keeps configure.ac and rest of autoconf files in autoconf/
>> directory
>> +    # we have to go there to be able to run gnu-configize cause it
>> expects configure.{in,ac}
>> +    # to be present. Resulting files land in autoconf/autoconf/ so we
>> need to move them.
>> +    cd ${S}/autoconf && gnu-configize --force && mv autoconf/config.* .
>> +    cd ${S}
>> +}
>
> Should these be ${S} or ${B} (or some combination), I believe we are trying
> to allow for builds to be in a different dir where ${S} != ${B}?

Yes, I would like people to consider $S and $B when writing things
like this - whilst at the moment it's a disaster to attempt S!=B, I've
a branch (ross/bnots on poky-contrib) where I'm fixing/disabling the
problem recipes.

I this case, $S then $B should be right, afaik.

Ross

Re: [PATCH 2/3] slang: added gnu-configize for AArch64 support

[Marcin Juszkiewicz]

W dniu 18.12.2012 20:56, Burton, Ross pisze:
> On 18 December 2012 19:17, Saul Wold <sgw@linux.intel.com> wrote:
>>> +do_configure_prepend() {
>>> +    # slang keeps configure.ac and rest of autoconf files in autoconf/
>>> directory
>>> +    # we have to go there to be able to run gnu-configize cause it
>>> expects configure.{in,ac}
>>> +    # to be present. Resulting files land in autoconf/autoconf/ so we
>>> need to move them.
>>> +    cd ${S}/autoconf && gnu-configize --force && mv autoconf/config.* .
>>> +    cd ${S}
>>> +}
>>
>> Should these be ${S} or ${B} (or some combination), I believe we are trying
>> to allow for builds to be in a different dir where ${S} != ${B}?
> 
> Yes, I would like people to consider $S and $B when writing things
> like this - whilst at the moment it's a disaster to attempt S!=B, I've
> a branch (ross/bnots on poky-contrib) where I'm fixing/disabling the
> problem recipes.
> 
> I this case, $S then $B should be right, afaik.

The problem is that $S == $B in this case so hard to check which is
proper (for me). I would love to use pushd/popd but they are bashisms iirc.

[PATCH] slang: added gnu-configize for AArch64 support

[Marcin Juszkiewicz]

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 meta/recipes-extended/slang/slang_2.2.4.bb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/meta/recipes-extended/slang/slang_2.2.4.bb b/meta/recipes-extended/slang/slang_2.2.4.bb
index 60aac66..b70e663 100644
--- a/meta/recipes-extended/slang/slang_2.2.4.bb
+++ b/meta/recipes-extended/slang/slang_2.2.4.bb
@@ -29,6 +29,14 @@ SRC_URI[sha256sum] = "9a8257a9a2a55099af858b13338dc8f3a06dd2069f46f0df2c9c3bb84a
 
 EXTRA_OECONF += " --without-z --without-png --without-onig --x-includes=${STAGING_DIR_HOST}/usr/include/X11 --x-libraries=${STAGING_DIR_HOST}/usr/lib"
 
+do_configure_prepend() {
+    # slang keeps configure.ac and rest of autoconf files in autoconf/ directory
+    # we have to go there to be able to run gnu-configize cause it expects configure.{in,ac}
+    # to be present. Resulting files land in autoconf/autoconf/ so we need to move them.
+    cd ${S}/autoconf && gnu-configize --force && mv autoconf/config.* .
+    cd ${B}
+}
+
 do_install() {
 	oe_runmake install DESTDIR=${D} -e 'INST_LIB_DIR=${STAGING_DIR_HOST}/usr/lib'
 }
-- 
1.8.0

[PATCH 3/3] net-tools: disable Token Ring and Strip support - both got removed in 3.7 kernel

[Marcin Juszkiewicz]

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 meta/recipes-extended/net-tools/net-tools-1.60-23/net-tools-config.h | 4 ++--
 meta/recipes-extended/net-tools/net-tools_1.60-23.bb                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-extended/net-tools/net-tools-1.60-23/net-tools-config.h b/meta/recipes-extended/net-tools/net-tools-1.60-23/net-tools-config.h
index 92c527a..6d39c2a 100644
--- a/meta/recipes-extended/net-tools/net-tools-1.60-23/net-tools-config.h
+++ b/meta/recipes-extended/net-tools/net-tools-1.60-23/net-tools-config.h
@@ -49,8 +49,8 @@
 #define HAVE_HWSLIP 1
 #define HAVE_HWPPP 1
 #define HAVE_HWTUNNEL 1
-#define HAVE_HWSTRIP 1
-#define HAVE_HWTR 1
+#define HAVE_HWSTRIP 0
+#define HAVE_HWTR 0
 #define HAVE_HWAX25 0
 #define HAVE_HWROSE 0
 #define HAVE_HWNETROM 1
diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-23.bb b/meta/recipes-extended/net-tools/net-tools_1.60-23.bb
index 7760877..bc61d21 100644
--- a/meta/recipes-extended/net-tools/net-tools_1.60-23.bb
+++ b/meta/recipes-extended/net-tools/net-tools_1.60-23.bb
@@ -5,7 +5,7 @@ BUGTRACKER = "http://bugs.debian.org/net-tools"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
                     file://ifconfig.c;beginline=11;endline=15;md5=d1ca372080ad5401e23ca0afc35cf9ba"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/n/net-tools/net-tools_1.60.orig.tar.gz;name=tarball \
            ${DEBIAN_MIRROR}/main/n/net-tools/${BPN}_${PV}.diff.gz;apply=no;name=patch \
-- 
1.8.0