Fix Valgrind configure broken when your host PC has newer kernel and glibc

Eric Lee
1 parent a4da62b885
Showing 5 changed files with 84 additions and 66 deletions Inline Diff
recipes-connectivity/ifplugd/files/ifplugd.conf
recipes-connectivity/ifplugd/ifplugd_0.28.bb
recipes-core/packagegroups/packagegroup-arago-smarct335x-sdk.bb
recipes-devtools/valgrind/valgrind/enable.building.on.4.x.kernel.patch
recipes-devtools/valgrind/valgrind_3.8.1.bbappend
-# -*-sh-*-
 File was deleted
-# $Id: ifplugd.conf 43 2003-09-13 11:25:11Z lennart $
-# This file is part of ifplugd.
-#
-# ifplugd is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your
-# option) any later version.
-#
-# ifplugd is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ifplugd; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-# ifplugd configuration file
-# Please note that this is a bourne shell fragment sourced by the
-# init script of ifplugd.
-# Specify the interfaces to control here, separated by spaces.
-# Ifplugd processes will be started for each of these interfaces when
-# the ifplugd init script is called with the "start" argument. You may
-# use the magic string "auto" to make the init script start or stop
-# ifplugd processes for ALL eth and wlan interfaces that are available
-# according to /proc/net/dev. Note that the list of interfaces
-# appearing in /proc/net/dev may depend on which kernel modules you
-# have loaded.
-INTERFACES="eth0"
-# Additional parameters for ifplugd.
-# (Run "ifplugd -h" for further information.)
-ARGS="-fwI -u0 -d10"
-# Additional parameters for ifplugd for the specified interface.  Note
-# that $ARGS is ignored, when a variable like this is set for an
-# interface
-#ARGS_wlan0="-MwI -u5 -d5"
 # -*-sh-*-
-LICENSE     = "GPLv2"
 File was deleted
-SUMMARY = "Daemon for monitoring ethernet device link state"
-DEPENDS     = "libdaemon"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
-SRC_URI     = "http://0pointer.de/lennart/projects/ifplugd/ifplugd-${PV}.tar.gz;name=u1 \
-               file://ifplugd.conf"
-SRC_URI[u1.md5sum] = "df6f4bab52f46ffd6eb1f5912d4ccee3"
-SRC_URI[u1.sha256sum] = "474754ac4ab32d738cbf2a4a3e87ee0a2c71b9048a38bdcd7df1e4f9fd6541f0"
-EXTRA_OECONF_append = "--disable-lynx"
-INITSCRIPT_PACKAGES = "${PN}"
-INITSCRIPT_NAME_${PN} = "${PN}"
-INITSCRIPT_PARAMS_${PN} = "defaults 90"
-do_install_append() {
-	install -m 644 ${WORKDIR}/ifplugd.conf ${D}${sysconfdir}/ifplugd/
-}
-inherit autotools update-rc.d
 LICENSE     = "GPLv2"
 DESCRIPTION = "Target packages for the Embedian SMARC T335X standalone SDK"
 PR = "r15"
 LICENSE = "MIT"
 inherit packagegroup
 RDEPENDS_${PN} = "\
    sudo \
    screen \
    boost \
    nodejs \
    tzdata \
    ntp \
    lftp \
    vim \
    procps \
    git \
    cronie \
    rsyslog \
-    ifplugd \
    gcc \
    "
 File was created
+diff --git a/configure.in b/configure.in
+index 82700ef..d82d517 100644
+--- a/configure.in
+++ b/configure.in
+@@ -263,9 +263,9 @@ case "${host_os}" in
+         kernel=`uname -r`
+         case "${kernel}" in
+-             2.6.*|3.*) 
+-        	    AC_MSG_RESULT([2.6.x/3.x family (${kernel})])
+-        	    AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x or Linux 3.x])
+             2.6.*|3.*|4.*) 
+        	    AC_MSG_RESULT([2.6.x/3.x/4.x family (${kernel})])
+        	    AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x or Linux 3.x or Linux 4.x])
+         	    ;;
+              2.4.*) 
+@@ -276,10 +276,14 @@ case "${host_os}" in
+                     AC_MSG_RESULT([3 family (${kernel})])
+                     AC_DEFINE([KERNEL_3], 1, [Define to 1 if you're using Linux 3.x])
+                     ;;
+             4.*)
+                    AC_MSG_RESULT([4 family (${kernel})])
+                    AC_DEFINE([KERNEL_4], 1, [Define to 1 if you're using Linux 4.x])
+                    ;;
+              *) 
+         	    AC_MSG_RESULT([unsupported (${kernel})])
+-        	    AC_MSG_ERROR([Valgrind works on kernels 2.4, 2.6, 3.x])
+        	    AC_MSG_ERROR([Valgrind works on kernels 2.4, 2.6, 3.x, 4.x])
+         	    ;;
+         esac
+@@ -924,6 +928,34 @@ case "${GLIBC_VERSION}" in
+ 	DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
+     2.18)
+        AC_MSG_RESULT(2.18 family)
+        AC_DEFINE([GLIBC_2_18], 1, [Define to 1 if you're using glibc 2.18.x])
+        DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
+        DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+        DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+        ;;
+     2.19)
+        AC_MSG_RESULT(2.19 family)
+        AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.x])
+        DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
+        DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+        DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+        ;;
+     2.20)
+        AC_MSG_RESULT(2.20 family)
+        AC_DEFINE([GLIBC_2_20], 1, [Define to 1 if you're using glibc 2.20.x])
+        DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
+        DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+        DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+        ;;
+     2.21)
+        AC_MSG_RESULT(2.21 family)
+        AC_DEFINE([GLIBC_2_21], 1, [Define to 1 if you're using glibc 2.21.x])
+        DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
+        DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+        DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+        ;;
+      darwin)
+ 	AC_MSG_RESULT(Darwin)
+ 	AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
+@@ -937,7 +969,7 @@ case "${GLIBC_VERSION}" in
+      *)
+ 	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
+-	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.17])
+	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.21])
+ 	AC_MSG_ERROR([or Darwin libc])
+ 	;;
+ esac
 File was created
+# Fix configure error for newer kernel and glibc in your host pc
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+PR_append = "-smarc0"
+SRC_URI += "file://enable.building.on.4.x.kernel.patch \
+	   "
1	# --sh--		File was deleted
2	# $Id: ifplugd.conf 43 2003-09-13 11:25:11Z lennart $
3
4	# This file is part of ifplugd.
5	#
6	# ifplugd is free software; you can redistribute it and/or modify it under
7	# the terms of the GNU General Public License as published by the Free
8	# Software Foundation; either version 2 of the License, or (at your
9	# option) any later version.
10	#
11	# ifplugd is distributed in the hope that it will be useful, but WITHOUT
12	# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13	# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14	# for more details.
15	#
16	# You should have received a copy of the GNU General Public License
17	# along with ifplugd; if not, write to the Free Software Foundation,
18	# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
19
20	# ifplugd configuration file
21
22	# Please note that this is a bourne shell fragment sourced by the
23	# init script of ifplugd.
24
25	# Specify the interfaces to control here, separated by spaces.
26	# Ifplugd processes will be started for each of these interfaces when
27	# the ifplugd init script is called with the "start" argument. You may
28	# use the magic string "auto" to make the init script start or stop
29	# ifplugd processes for ALL eth and wlan interfaces that are available
30	# according to /proc/net/dev. Note that the list of interfaces
31	# appearing in /proc/net/dev may depend on which kernel modules you
32	# have loaded.
33	INTERFACES="eth0"
34
35	# Additional parameters for ifplugd.
36	# (Run "ifplugd -h" for further information.)
37	ARGS="-fwI -u0 -d10"
38
39	# Additional parameters for ifplugd for the specified interface. Note
40	# that $ARGS is ignored, when a variable like this is set for an
41	# interface
42	#ARGS_wlan0="-MwI -u5 -d5"
43		1	# --sh--
1	LICENSE = "GPLv2"		File was deleted
2	SUMMARY = "Daemon for monitoring ethernet device link state"
3	DEPENDS = "libdaemon"
4	LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
5
6	SRC_URI = "http://0pointer.de/lennart/projects/ifplugd/ifplugd-${PV}.tar.gz;name=u1 \
7	file://ifplugd.conf"
8
9	SRC_URI[u1.md5sum] = "df6f4bab52f46ffd6eb1f5912d4ccee3"
10	SRC_URI[u1.sha256sum] = "474754ac4ab32d738cbf2a4a3e87ee0a2c71b9048a38bdcd7df1e4f9fd6541f0"
11
12	EXTRA_OECONF_append = "--disable-lynx"
13
14
15	INITSCRIPT_PACKAGES = "${PN}"
16	INITSCRIPT_NAME_${PN} = "${PN}"
17	INITSCRIPT_PARAMS_${PN} = "defaults 90"
18
19	do_install_append() {
20	install -m 644 ${WORKDIR}/ifplugd.conf ${D}${sysconfdir}/ifplugd/
21	}
22
23	inherit autotools update-rc.d
24		1	LICENSE = "GPLv2"
File was created	1	diff --git a/configure.in b/configure.in
	2	index 82700ef..d82d517 100644
	3	--- a/configure.in
	4	+++ b/configure.in
	5	@@ -263,9 +263,9 @@ case "${host_os}" in
	6	kernel=`uname -r`
	7
	8	case "${kernel}" in
	9	- 2.6.\|3.)
	10	- AC_MSG_RESULT([2.6.x/3.x family (${kernel})])
	11	- AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x or Linux 3.x])
	12	+ 2.6.\|3.\|4.*)
	13	+ AC_MSG_RESULT([2.6.x/3.x/4.x family (${kernel})])
	14	+ AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x or Linux 3.x or Linux 4.x])
	15	;;
	16
	17	2.4.*)
	18	@@ -276,10 +276,14 @@ case "${host_os}" in
	19	AC_MSG_RESULT([3 family (${kernel})])
	20	AC_DEFINE([KERNEL_3], 1, [Define to 1 if you're using Linux 3.x])
	21	;;
	22	+ 4.*)
	23	+ AC_MSG_RESULT([4 family (${kernel})])
	24	+ AC_DEFINE([KERNEL_4], 1, [Define to 1 if you're using Linux 4.x])
	25	+ ;;
	26
	27	*)
	28	AC_MSG_RESULT([unsupported (${kernel})])
	29	- AC_MSG_ERROR([Valgrind works on kernels 2.4, 2.6, 3.x])
	30	+ AC_MSG_ERROR([Valgrind works on kernels 2.4, 2.6, 3.x, 4.x])
	31	;;
	32	esac
	33
	34	@@ -924,6 +928,34 @@ case "${GLIBC_VERSION}" in
	35	DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
	36	DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
	37	;;
	38	+ 2.18)
	39	+ AC_MSG_RESULT(2.18 family)
	40	+ AC_DEFINE([GLIBC_2_18], 1, [Define to 1 if you're using glibc 2.18.x])
	41	+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
	42	+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
	43	+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
	44	+ ;;
	45	+ 2.19)
	46	+ AC_MSG_RESULT(2.19 family)
	47	+ AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.x])
	48	+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
	49	+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
	50	+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
	51	+ ;;
	52	+ 2.20)
	53	+ AC_MSG_RESULT(2.20 family)
	54	+ AC_DEFINE([GLIBC_2_20], 1, [Define to 1 if you're using glibc 2.20.x])
	55	+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
	56	+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
	57	+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
	58	+ ;;
	59	+ 2.21)
	60	+ AC_MSG_RESULT(2.21 family)
	61	+ AC_DEFINE([GLIBC_2_21], 1, [Define to 1 if you're using glibc 2.21.x])
	62	+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
	63	+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
	64	+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
	65	+ ;;
	66	darwin)
	67	AC_MSG_RESULT(Darwin)
	68	AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
	69	@@ -937,7 +969,7 @@ case "${GLIBC_VERSION}" in
	70
	71	*)
	72	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
	73	- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.17])
	74	+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.21])
	75	AC_MSG_ERROR([or Darwin libc])
	76	;;
	77	esac
	78
File was created	1	# Fix configure error for newer kernel and glibc in your host pc
	2	FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
	3
	4	PR_append = "-smarc0"
	5
	6	SRC_URI += "file://enable.building.on.4.x.kernel.patch \
	7	"
	8