diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-19 12:30:07 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-19 13:32:06 +0100 |
commit | 91ece5d5668ee1adb5c5e3d757426a0d5187bd84 (patch) | |
tree | 461fd30bb3fac79cfca404ea93724e593a618ab5 | |
parent | d7a6aafea3c76dd8acea5e3b93833c4f521e5290 (diff) | |
download | poky-91ece5d5668ee1adb5c5e3d757426a0d5187bd84.tar.gz |
libpam: Fix missing DESTDIR for a mkdir causing build failures
(From OE-Core rev: c39e823138cbf4210e17bdb95ca322ec0a6c8f78)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/pam/libpam/destdirfix.patch | 24 | ||||
-rw-r--r-- | meta/recipes-extended/pam/libpam_1.1.6.bb | 3 |
2 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-extended/pam/libpam/destdirfix.patch b/meta/recipes-extended/pam/libpam/destdirfix.patch new file mode 100644 index 0000000000..52145ecb34 --- /dev/null +++ b/meta/recipes-extended/pam/libpam/destdirfix.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | Avoid the failure: | ||
2 | |||
3 | | mkdir -p /etc/security/namespace.d | ||
4 | | mkdir: cannot create directory `/etc/security/namespace.d': Permission denied | ||
5 | |||
6 | if /etc/security/namespace.d doesn't exist. The DESTDIR prefix is missing. | ||
7 | |||
8 | RP 2012/8/19 | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Index: Linux-PAM-1.1.6/modules/pam_namespace/Makefile.am | ||
13 | =================================================================== | ||
14 | --- Linux-PAM-1.1.6.orig/modules/pam_namespace/Makefile.am 2012-08-15 11:08:43.000000000 +0000 | ||
15 | +++ Linux-PAM-1.1.6/modules/pam_namespace/Makefile.am 2012-08-19 12:25:32.311038943 +0000 | ||
16 | @@ -40,7 +40,7 @@ | ||
17 | secureconf_SCRIPTS = namespace.init | ||
18 | |||
19 | install-data-local: | ||
20 | - mkdir -p $(namespaceddir) | ||
21 | + mkdir -p $(DESTDIR)$(namespaceddir) | ||
22 | endif | ||
23 | |||
24 | |||
diff --git a/meta/recipes-extended/pam/libpam_1.1.6.bb b/meta/recipes-extended/pam/libpam_1.1.6.bb index dd03df106d..c32cb146cd 100644 --- a/meta/recipes-extended/pam/libpam_1.1.6.bb +++ b/meta/recipes-extended/pam/libpam_1.1.6.bb | |||
@@ -13,6 +13,7 @@ SRC_URI = "http://linux-pam.org/library/Linux-PAM-${PV}.tar.bz2 \ | |||
13 | file://99_pam \ | 13 | file://99_pam \ |
14 | file://pam.d/* \ | 14 | file://pam.d/* \ |
15 | file://libpam-xtests.patch \ | 15 | file://libpam-xtests.patch \ |
16 | file://destdirfix.patch \ | ||
16 | " | 17 | " |
17 | SRC_URI[md5sum] = "7b73e58b7ce79ffa321d408de06db2c4" | 18 | SRC_URI[md5sum] = "7b73e58b7ce79ffa321d408de06db2c4" |
18 | SRC_URI[sha256sum] = "bab887d6280f47fc3963df3b95735a27a16f0f663636163ddf3acab5f1149fc2" | 19 | SRC_URI[sha256sum] = "bab887d6280f47fc3963df3b95735a27a16f0f663636163ddf3acab5f1149fc2" |
@@ -29,6 +30,8 @@ EXTRA_OECONF = "--with-db-uniquename=_pam \ | |||
29 | 30 | ||
30 | CFLAGS_append = " -fPIC " | 31 | CFLAGS_append = " -fPIC " |
31 | 32 | ||
33 | PR = "r1" | ||
34 | |||
32 | S = "${WORKDIR}/Linux-PAM-${PV}" | 35 | S = "${WORKDIR}/Linux-PAM-${PV}" |
33 | 36 | ||
34 | inherit autotools gettext | 37 | inherit autotools gettext |