Skip to contentSkip to conversation

kmod: add host-automake dependency

PATCH New Vicente Olivert Riera 3 participants 5 messages Oct 10, 2014

lore
Share & tools
lore

Vicente Olivert Riera

author
#0 lore raw

PATCH 1/1 kmod: add host-automake dependency

kmod can fail to build in systems which have old automake versions like CentOS 6.5, for instance. It will cause an error like this one:

/buildroot/output/build/kmod-18/build-aux/missing: line 81:
aclocal-1.14: command not found

Adding host-automake as a dependency fixes the problem.

Signed-off-by Vicente Olivert Riera <[email protected]>
Reviewed-by Markos Chandras <[email protected]>
---
 package/kmod/kmod.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
package/kmod/kmod.mk +2 -2
index 1f170dd..c0212bb 100644
@@ -8,8 +8,8 @@ KMOD_VERSION = 18
 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
 KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod
 KMOD_INSTALL_STAGING = YES
-KMOD_DEPENDENCIES = host-pkgconf
-HOST_KMOD_DEPENDENCIES = host-pkgconf
+KMOD_DEPENDENCIES = host-automake host-pkgconf
+HOST_KMOD_DEPENDENCIES = host-automake host-pkgconf
 
 # license info for libkmod only, conditionally add more below
 KMOD_LICENSE = LGPLv2.1+
Signature · 1 line
1.7.1
#1 lore raw

PATCH 1/1 kmod: add host-automake dependency

Dear Vicente Olivert Riera,

Quoted 19 lines · Vicente Olivert Riera

kmod can fail to build in systems which have old automake versions like CentOS 6.5, for instance. It will cause an error like this one:

/buildroot/output/build/kmod-18/build-aux/missing: line 81:
aclocal-1.14: command not found

Adding host-automake as a dependency fixes the problem.

Signed-off-by Vicente Olivert Riera <[email protected]>
Reviewed-by Markos Chandras <[email protected]>
---
 package/kmod/kmod.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
package/kmod/kmod.mk +0 -0
index 1f170dd..c0212bb 100644

package/kmod/kmod.mk KMOD_VERSION = 18 · line 15

Quoted 10 lines
package/kmod/kmod.mk +2 -2
@@ -8,8 +8,8 @@ KMOD_VERSION = 18
 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
 KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod
 KMOD_INSTALL_STAGING = YES
-KMOD_DEPENDENCIES = host-pkgconf
-HOST_KMOD_DEPENDENCIES = host-pkgconf
+KMOD_DEPENDENCIES = host-automake host-pkgconf
+HOST_KMOD_DEPENDENCIES = host-automake host-pkgconf
 
 # license info for libkmod only, conditionally add more below
 KMOD_LICENSE = LGPLv2.1+

This seems wrong. Why not use KMOD_AUTORECONF = YES instead?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#2 lore raw

PATCH 1/1 kmod: add host-automake dependency

Dear Thomas Petazzoni,

Quoted 30 lines · Thomas Petazzoni

Dear Vicente Olivert Riera,

Quoted 27 lines · Vicente Olivert Riera

kmod can fail to build in systems which have old automake versions like CentOS 6.5, for instance. It will cause an error like this one:

/buildroot/output/build/kmod-18/build-aux/missing: line 81:
aclocal-1.14: command not found

Adding host-automake as a dependency fixes the problem.

Signed-off-by Vicente Olivert Riera <[email protected]>
Reviewed-by Markos Chandras <[email protected]>
---
  package/kmod/kmod.mk |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)
package/kmod/kmod.mk +2 -2
index 1f170dd..c0212bb 100644
@@ -8,8 +8,8 @@ KMOD_VERSION = 18
  KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
  KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod
  KMOD_INSTALL_STAGING = YES
-KMOD_DEPENDENCIES = host-pkgconf
-HOST_KMOD_DEPENDENCIES = host-pkgconf
+KMOD_DEPENDENCIES = host-automake host-pkgconf
+HOST_KMOD_DEPENDENCIES = host-automake host-pkgconf
Quoted 4 lines

package/kmod/kmod.mk KMOD_VERSION = 18 · line 15

Quoted 2 lines
package/kmod/kmod.mk +0 -0
  # license info for libkmod only, conditionally add more below
  KMOD_LICENSE = LGPLv2.1+

This seems wrong. Why not use KMOD_AUTORECONF = YES instead?

I have tried it and it fails:

Quoted 1 line
Quoted 1 line
Quoted 1 line

kmod 18 Autoreconfiguring

libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
libtoolize: copying file `build-aux/ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4' libkmod/docs/gtk-doc.make:270: error: HAVE_GTK_DOC does not appear in AM_CONDITIONAL
libkmod/docs/Makefile.am:33: 'libkmod/docs/gtk-doc.make' included from
here

And also, if the kmod-0002-add-backup-implementation-of-be32toh.patch modifies the configure.ac file, and there is no KMOD_AUTORECONF = YES in the kmod.mk file, why don't we clean that patch by removing the configure.ac bit?

Regards,

Signature · 5 lines
Vicente Olivert Riera
Graduate Software Engineer, MIPS Processor IP
Imagination Technologies Limited
t: +44 (0)113 2429814
www.imgtec.com
author
#3 lore raw

PATCH 1/1 kmod: add host-automake dependency

Dear Thomas Petazzoni,

Quoted 54 lines · Vicente Olivert Riera

Dear Thomas Petazzoni,

Quoted 30 lines · Thomas Petazzoni

Dear Vicente Olivert Riera,

Quoted 27 lines · Vicente Olivert Riera

kmod can fail to build in systems which have old automake versions like CentOS 6.5, for instance. It will cause an error like this one:

/buildroot/output/build/kmod-18/build-aux/missing: line 81:
aclocal-1.14: command not found

Adding host-automake as a dependency fixes the problem.

Signed-off-by Vicente Olivert Riera <[email protected]>
Reviewed-by Markos Chandras <[email protected]>
---
  package/kmod/kmod.mk |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)
package/kmod/kmod.mk +2 -2
index 1f170dd..c0212bb 100644
@@ -8,8 +8,8 @@ KMOD_VERSION = 18
  KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
  KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod
  KMOD_INSTALL_STAGING = YES
-KMOD_DEPENDENCIES = host-pkgconf
-HOST_KMOD_DEPENDENCIES = host-pkgconf
+KMOD_DEPENDENCIES = host-automake host-pkgconf
+HOST_KMOD_DEPENDENCIES = host-automake host-pkgconf
Quoted 4 lines

package/kmod/kmod.mk KMOD_VERSION = 18 · line 15

Quoted 2 lines
package/kmod/kmod.mk +0 -0
  # license info for libkmod only, conditionally add more below
  KMOD_LICENSE = LGPLv2.1+

This seems wrong. Why not use KMOD_AUTORECONF = YES instead?

I have tried it and it fails:

Quoted 1 line
Quoted 1 line
Quoted 1 line

kmod 18 Autoreconfiguring

libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
libtoolize: copying file `build-aux/ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4' libkmod/docs/gtk-doc.make:270: error: HAVE_GTK_DOC does not appear in AM_CONDITIONAL
libkmod/docs/Makefile.am:33: 'libkmod/docs/gtk-doc.make' included from
here

Quoted 7 lines

And also, if the kmod-0002-add-backup-implementation-of-be32toh.patch modifies the configure.ac file, and there is no KMOD_AUTORECONF = YES in the kmod.mk file, why don't we clean that patch by removing the configure.ac bit?

Regards,

this patch also fixes the problem, and it doesn't have host-autoreconf the the dependencies. Do you think it's better?

===== BEGIN PATCH =====
From 2ccaa31b38ce1da075e5fb59d4addbd9bb1db10b Mon Sep 17 00:00:00 2001
From: Vicente Olivert Riera <[email protected]>
Date: Fri, 10 Oct 2014 10:32:59 +0100
Subject: [PATCH] kmod: Disable documentation

And also add AUTORECONF = YES since the configure.ac script is modified.

Signed-off-by Vicente Olivert Riera <[email protected]>
---
  package/kmod/kmod-0003-disable-documentation.patch |   22 
++++++++++++++++++++
  package/kmod/kmod.mk                               |    1 +
  2 files changed, 23 insertions(+), 0 deletions(-)

create mode 100644 package/kmod/kmod-0003-disable-documentation.patch

(quoted diff) +0 -0

b/package/kmod/kmod-0003-disable-documentation.patch new file mode 100644
index 0000000..edbd131

package/kmod/kmod-0003-disable-documentation.patch new file +22 -0
@@ -0,0 +1,22 @@
+diff -rup a/configure.ac b/configure.ac
+--- a/configure.ac	2014-10-10 10:26:16.441334151 +0100
++++ b/configure.ac	2014-10-10 10:27:12.757298124 +0100
+@@ -220,9 +220,6 @@ AC_SUBST([GCLDFLAGS], $with_ldflags)
+ AC_CONFIG_HEADERS(config.h)
+ AC_CONFIG_FILES([
+ 	Makefile
+-	man/Makefile
+-	libkmod/docs/Makefile
+-	libkmod/docs/version.xml
+ ])
+
+
+diff -rup a/Makefile.am b/Makefile.am
+--- a/Makefile.am	2014-06-14 16:32:32.546850173 +0100
++++ b/Makefile.am	2014-10-10 10:29:32.405688866 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS = . libkmod/docs
++SUBDIRS = .
+
+ if BUILD_MANPAGES
+ SUBDIRS += man
package/kmod/kmod.mk +1 -0
index 1f170dd..fda7843 100644
@@ -8,6 +8,7 @@ KMOD_VERSION = 18
  KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
  KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod
  KMOD_INSTALL_STAGING = YES
+KMOD_AUTORECONF = YES
  KMOD_DEPENDENCIES = host-pkgconf
  HOST_KMOD_DEPENDENCIES = host-pkgconf
Signature · 10 lines
1.7.1

===== END PATCH =====

-- 
Vicente Olivert Riera
Graduate Software Engineer, MIPS Processor IP
Imagination Technologies Limited
t: +44 (0)113 2429814
www.imgtec.com
#4 lore raw

PATCH 1/1 kmod: add host-automake dependency

In reply to Vicente Olivert Riera

Hi Vicente, Thomas, all,

Quoted 59 lines · Vicente Olivert Riera

Dear Thomas Petazzoni,

Quoted 32 lines · Thomas Petazzoni

Dear Vicente Olivert Riera,

Quoted 28 lines · Vicente Olivert Riera

kmod can fail to build in systems which have old automake versions like CentOS 6.5, for instance. It will cause an error like this one:

/buildroot/output/build/kmod-18/build-aux/missing: line 81:
aclocal-1.14: command not found

Adding host-automake as a dependency fixes the problem.

Signed-off-by Vicente Olivert Riera <[email protected]>
Reviewed-by Markos Chandras <[email protected]>
---
  package/kmod/kmod.mk |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)
package/kmod/kmod.mk +2 -2
index 1f170dd..c0212bb 100644
@@ -8,8 +8,8 @@ KMOD_VERSION = 18
  KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
  KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod
  KMOD_INSTALL_STAGING = YES
-KMOD_DEPENDENCIES = host-pkgconf
-HOST_KMOD_DEPENDENCIES = host-pkgconf
+KMOD_DEPENDENCIES = host-automake host-pkgconf
+HOST_KMOD_DEPENDENCIES = host-automake host-pkgconf
Quoted 5 lines

package/kmod/kmod.mk KMOD_VERSION = 18 · line 15

Quoted 2 lines
package/kmod/kmod.mk +0 -0
  # license info for libkmod only, conditionally add more below
  KMOD_LICENSE = LGPLv2.1+

This seems wrong. Why not use KMOD_AUTORECONF = YES instead?

I have tried it and it fails:

Quoted 1 line
Quoted 1 line
Quoted 1 line

kmod 18 Autoreconfiguring

libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
libtoolize: copying file `build-aux/ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4' libkmod/docs/gtk-doc.make:270: error: HAVE_GTK_DOC does not appear in AM_CONDITIONAL
libkmod/docs/Makefile.am:33: 'libkmod/docs/gtk-doc.make' included from
here

Quoted 4 lines

And also, if the kmod-0002-add-backup-implementation-of-be32toh.patch modifies the configure.ac file, and there is no KMOD_AUTORECONF = YES in the kmod.mk file, why don't we clean that patch by removing the configure.ac bit?

Both problems were mentioned yesterday by Gustavo. Apparently, KMOD_AUTORECONF is broken due to something with gtk-doc. This should be fixed.

At the same time, my recent new patch to kmod did not correctly add AUTORECONF (broken, but anyway) and thus does not yet take effect. If AUTORECONF cannot be fixed, then the patch should be adapted to change configure directly instead of configure.ac.

I did not yet have the time to look into this second thing.

Best regards,
Thomas