summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-05-02 17:53:08 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-25 11:17:57 +0100
commit0d4d9bd61bcc1a451c226044f2ffee3236f56550 (patch)
tree7892a9edbdad2873d55174d0ed2c986f94455d5e
parent2e45e31149fb79d307a2089547da7abf8f171cf8 (diff)
downloadpoky-0d4d9bd61bcc1a451c226044f2ffee3236f56550.tar.gz
shadow shadow-native: fix build with automake 1.12
(From OE-Core rev: dec7696b737e5921fcac0dbb346851e31a81537b) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/shadow/files/shadow_fix_for_automake-1.12.patch23
-rw-r--r--meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb6
-rw-r--r--meta/recipes-extended/shadow/shadow_4.1.4.3.bb6
3 files changed, 31 insertions, 4 deletions
diff --git a/meta/recipes-extended/shadow/files/shadow_fix_for_automake-1.12.patch b/meta/recipes-extended/shadow/files/shadow_fix_for_automake-1.12.patch
new file mode 100644
index 0000000000..6a27ed387d
--- /dev/null
+++ b/meta/recipes-extended/shadow/files/shadow_fix_for_automake-1.12.patch
@@ -0,0 +1,23 @@
1Upstream-Status: pending
2
3Automake 1.12 has deprecated automatic de-ANSI-fication support
4
5This patch avoids this issue with automake 1.12:
6
7| configure.in:22: error: automatic de-ANSI-fication support has been removed
8
9Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
102012/05/02
11
12Index: shadow-4.1.4.3/configure.in
13===================================================================
14--- shadow-4.1.4.3.orig/configure.in
15+++ shadow-4.1.4.3/configure.in
16@@ -19,7 +19,6 @@ AC_PROG_CC
17 AC_ISC_POSIX
18 AC_PROG_LN_S
19 AC_PROG_YACC
20-AM_C_PROTOTYPES
21 AM_PROG_LIBTOOL
22
23 dnl Checks for libraries.
diff --git a/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb
index 38bb922282..61fccbac26 100644
--- a/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb
@@ -7,7 +7,7 @@ LICENSE = "BSD | Artistic-1.0"
7LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \ 7LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \
8 file://src/passwd.c;firstline=8;endline=30;md5=2899a045e90511d0e043b85a7db7e2fe" 8 file://src/passwd.c;firstline=8;endline=30;md5=2899a045e90511d0e043b85a7db7e2fe"
9 9
10PR = "r4" 10PR = "r5"
11 11
12SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \ 12SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \
13 file://shadow.automake-1.11.patch \ 13 file://shadow.automake-1.11.patch \
@@ -15,7 +15,9 @@ SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \
15 file://shadow-4.1.4.2-env-reset-keep-locale.patch \ 15 file://shadow-4.1.4.2-env-reset-keep-locale.patch \
16 file://add_root_cmd_options.patch \ 16 file://add_root_cmd_options.patch \
17 file://disable-syslog.patch \ 17 file://disable-syslog.patch \
18 file://useradd.patch" 18 file://useradd.patch \
19 file://shadow_fix_for_automake-1.12.patch \
20 "
19 21
20SRC_URI[md5sum] = "b8608d8294ac88974f27b20f991c0e79" 22SRC_URI[md5sum] = "b8608d8294ac88974f27b20f991c0e79"
21SRC_URI[sha256sum] = "633f5bb4ea0c88c55f3642c97f9d25cbef74f82e0b4cf8d54e7ad6f9f9caa778" 23SRC_URI[sha256sum] = "633f5bb4ea0c88c55f3642c97f9d25cbef74f82e0b4cf8d54e7ad6f9f9caa778"
diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
index 60fb78b37c..098b0b0584 100644
--- a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \
9 9
10DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 10DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
11RDEPENDS_${PN} = "shadow-securetty ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" 11RDEPENDS_${PN} = "shadow-securetty ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}"
12PR = "r9" 12PR = "r10"
13 13
14SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \ 14SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \
15 file://login_defs_pam.sed \ 15 file://login_defs_pam.sed \
@@ -19,7 +19,9 @@ SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \
19 file://shadow-4.1.4.2-env-reset-keep-locale.patch \ 19 file://shadow-4.1.4.2-env-reset-keep-locale.patch \
20 file://shadow-4.1.4.2-groupmod-pam-check.patch \ 20 file://shadow-4.1.4.2-groupmod-pam-check.patch \
21 file://shadow-4.1.4.2-su_no_sanitize_env.patch \ 21 file://shadow-4.1.4.2-su_no_sanitize_env.patch \
22 file://shadow-update-pam-conf.patch" 22 file://shadow-update-pam-conf.patch \
23 file://shadow_fix_for_automake-1.12.patch \
24 "
23 25
24SRC_URI[md5sum] = "b8608d8294ac88974f27b20f991c0e79" 26SRC_URI[md5sum] = "b8608d8294ac88974f27b20f991c0e79"
25SRC_URI[sha256sum] = "633f5bb4ea0c88c55f3642c97f9d25cbef74f82e0b4cf8d54e7ad6f9f9caa778" 27SRC_URI[sha256sum] = "633f5bb4ea0c88c55f3642c97f9d25cbef74f82e0b4cf8d54e7ad6f9f9caa778"