diff options
author | Ross Burton <ross.burton@intel.com> | 2019-12-10 10:52:03 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-28 23:25:41 +0000 |
commit | ba6d88d8fa7b7a82ad8e265ff6f590fe2d640d34 (patch) | |
tree | e3151858943bda96386b7150462d83b0dc78cd00 /meta/recipes-extended/pam/libpam | |
parent | e14ccae9efa17747160a8010b3cdf9617721788e (diff) | |
download | poky-ba6d88d8fa7b7a82ad8e265ff6f590fe2d640d34.tar.gz |
libpam: consolidate a patch to a patch
(From OE-Core rev: 6d79a39856c1b325d0ed6f057d8eaef64e31569f)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/pam/libpam')
-rw-r--r-- | meta/recipes-extended/pam/libpam/fixsepbuild.patch | 24 | ||||
-rw-r--r-- | meta/recipes-extended/pam/libpam/libpam-xtests.patch | 2 |
2 files changed, 1 insertions, 25 deletions
diff --git a/meta/recipes-extended/pam/libpam/fixsepbuild.patch b/meta/recipes-extended/pam/libpam/fixsepbuild.patch deleted file mode 100644 index 8a9c3b2fa1..0000000000 --- a/meta/recipes-extended/pam/libpam/fixsepbuild.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | Fix the build error when a separate build directory is used: | ||
2 | |||
3 | Making install in xtestsmake[1]: Entering directory `/media/build1/poky/build1/tmp/work/i586-poky-linux/libpam/1.1.6-r2/build/xtests'/usr/bin/install -c -d /media/build1/poky/build1/tmp/work/i586-poky-linux/libpam/1.1.6-r2/image/usr/share/Linux-PAM/xtestsfor file in run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd tst-pam_dispatch3.pamd tst-pam_dispatch4.pamd tst-pam_dispatch5.pamd tst-pam_cracklib1.pamd tst-pam_cracklib2.pamd tst-pam_unix1.pamd tst-pam_unix2.pamd tst-pam_unix3.pamd tst-pam_unix4.pamd tst-pam_unix1.sh tst-pam_unix2.sh tst-pam_unix3.sh tst-pam_unix4.sh access.conf tst-pam_access1.pamd tst-pam_access1.sh tst-pam_access2.pamd tst-pam_access2.sh tst-pam_access3.pamd tst-pam_access3.sh tst-pam_access4.pamd tst-pam_access4.sh limits.conf tst-pam_limits1.pamd tst-pam_limits1.sh tst-pam_succeed_if1.pamd tst-pam_succeed_if1.sh group.conf tst-pam_group1.pamd tst-pam_group1.sh tst-pam_authfail.pamd tst-pam_authsucceed.pamd tst-pam_substack1.pamd tst-pam_substack1a.pamd tst-pam_substack1.sh tst-pam_substack2.pamd tst-pam_substack2a.pamd tst-pam_substack2.sh tst-pam_substack3.pamd tst-pam_substack3a.pamd tst-pam_substack3.sh tst-pam_substack4.pamd tst-pam_substack4a.pamd tst-pam_substack4.sh tst-pam_substack5.pamd tst-pam_substack5a.pamd tst-pam_substack5.sh tst-pam_assemble_line1.pamd tst-pam_assemble_line1.sh tst-pam_pwhistory1.pamd tst-pam_pwhistory1.sh tst-pam_time1.pamd time.conf ; do \/usr/bin/install -c $file /media/build1/poky/build1/tmp/work/i586-poky-linux/libpam/1.1.6-r2/image/usr/share/Linux-PAM/xtests ; \ done | ||
4 | /usr/bin/install: cannot stat `run-xtests.sh': No such file or directory | ||
5 | /usr/bin/install: cannot stat `tst-pam_dispatch1.pamd': No such file or directory | ||
6 | /usr/bin/install: cannot stat `tst-pam_dispatch2.pamd': No such file or directory | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | RP 2013/03/21 | ||
11 | |||
12 | Index: Linux-PAM-1.1.6/xtests/Makefile.am | ||
13 | =================================================================== | ||
14 | --- Linux-PAM-1.1.6.orig/xtests/Makefile.am 2013-03-08 12:26:30.360266000 +0000 | ||
15 | +++ Linux-PAM-1.1.6/xtests/Makefile.am 2013-03-21 11:39:58.557166650 +0000 | ||
16 | @@ -59,7 +59,7 @@ | ||
17 | install_xtests: | ||
18 | $(INSTALL) -d $(DESTDIR)$(pkgdatadir)/xtests | ||
19 | for file in $(EXTRA_DIST) ; do \ | ||
20 | - $(INSTALL) $$file $(DESTDIR)$(pkgdatadir)/xtests ; \ | ||
21 | + $(INSTALL) $(srcdir)/$$file $(DESTDIR)$(pkgdatadir)/xtests ; \ | ||
22 | done | ||
23 | for file in $(XTESTS); do \ | ||
24 | $(INSTALL) .libs/$$file $(DESTDIR)$(pkgdatadir)/xtests ; \ | ||
diff --git a/meta/recipes-extended/pam/libpam/libpam-xtests.patch b/meta/recipes-extended/pam/libpam/libpam-xtests.patch index 7edf66f915..ea145899b4 100644 --- a/meta/recipes-extended/pam/libpam/libpam-xtests.patch +++ b/meta/recipes-extended/pam/libpam/libpam-xtests.patch | |||
@@ -28,7 +28,7 @@ Index: Linux-PAM-1.3.0/xtests/Makefile.am | |||
28 | +install_xtests: | 28 | +install_xtests: |
29 | + $(INSTALL) -d $(DESTDIR)$(pkgdatadir)/xtests | 29 | + $(INSTALL) -d $(DESTDIR)$(pkgdatadir)/xtests |
30 | + for file in $(EXTRA_DIST) ; do \ | 30 | + for file in $(EXTRA_DIST) ; do \ |
31 | + $(INSTALL) $$file $(DESTDIR)$(pkgdatadir)/xtests ; \ | 31 | + $(INSTALL) $(srcdir)/$$file $(DESTDIR)$(pkgdatadir)/xtests ; \ |
32 | + done | 32 | + done |
33 | + for file in $(XTESTS); do \ | 33 | + for file in $(XTESTS); do \ |
34 | + $(INSTALL) .libs/$$file $(DESTDIR)$(pkgdatadir)/xtests ; \ | 34 | + $(INSTALL) .libs/$$file $(DESTDIR)$(pkgdatadir)/xtests ; \ |