From ba6d88d8fa7b7a82ad8e265ff6f590fe2d640d34 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 10 Dec 2019 10:52:03 +0000 Subject: libpam: consolidate a patch to a patch (From OE-Core rev: 6d79a39856c1b325d0ed6f057d8eaef64e31569f) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-extended/pam/libpam/fixsepbuild.patch | 24 ---------------------- .../pam/libpam/libpam-xtests.patch | 2 +- meta/recipes-extended/pam/libpam_1.3.1.bb | 2 +- 3 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 meta/recipes-extended/pam/libpam/fixsepbuild.patch (limited to 'meta/recipes-extended/pam') 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 @@ -Fix the build error when a separate build directory is used: - -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 -/usr/bin/install: cannot stat `run-xtests.sh': No such file or directory -/usr/bin/install: cannot stat `tst-pam_dispatch1.pamd': No such file or directory -/usr/bin/install: cannot stat `tst-pam_dispatch2.pamd': No such file or directory - -Upstream-Status: Pending - -RP 2013/03/21 - -Index: Linux-PAM-1.1.6/xtests/Makefile.am -=================================================================== ---- Linux-PAM-1.1.6.orig/xtests/Makefile.am 2013-03-08 12:26:30.360266000 +0000 -+++ Linux-PAM-1.1.6/xtests/Makefile.am 2013-03-21 11:39:58.557166650 +0000 -@@ -59,7 +59,7 @@ - install_xtests: - $(INSTALL) -d $(DESTDIR)$(pkgdatadir)/xtests - for file in $(EXTRA_DIST) ; do \ -- $(INSTALL) $$file $(DESTDIR)$(pkgdatadir)/xtests ; \ -+ $(INSTALL) $(srcdir)/$$file $(DESTDIR)$(pkgdatadir)/xtests ; \ - done - for file in $(XTESTS); do \ - $(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 +install_xtests: + $(INSTALL) -d $(DESTDIR)$(pkgdatadir)/xtests + for file in $(EXTRA_DIST) ; do \ -+ $(INSTALL) $$file $(DESTDIR)$(pkgdatadir)/xtests ; \ ++ $(INSTALL) $(srcdir)/$$file $(DESTDIR)$(pkgdatadir)/xtests ; \ + done + for file in $(XTESTS); do \ + $(INSTALL) .libs/$$file $(DESTDIR)$(pkgdatadir)/xtests ; \ diff --git a/meta/recipes-extended/pam/libpam_1.3.1.bb b/meta/recipes-extended/pam/libpam_1.3.1.bb index 1194933827..ac8694ec26 100644 --- a/meta/recipes-extended/pam/libpam_1.3.1.bb +++ b/meta/recipes-extended/pam/libpam_1.3.1.bb @@ -1,3 +1,4 @@ +DISABLE_STATIC = "" SUMMARY = "Linux-PAM (Pluggable Authentication Modules)" DESCRIPTION = "Linux-PAM (Pluggable Authentication Modules for Linux), a flexible mechanism for authenticating users" HOMEPAGE = "https://fedorahosted.org/linux-pam/" @@ -20,7 +21,6 @@ SRC_URI = "https://github.com/linux-pam/linux-pam/releases/download/v${PV}/Linux file://pam.d/common-session-noninteractive \ file://pam.d/other \ file://libpam-xtests.patch \ - file://fixsepbuild.patch \ file://pam-security-abstract-securetty-handling.patch \ file://pam-unix-nullok-secure.patch \ file://crypt_configure.patch \ -- cgit v1.2.3-54-g00ecf