From 2163649b4eb57d8f2aa4ceb931464fd4233ec508 Mon Sep 17 00:00:00 2001 From: Nicolas Dechesne Date: Fri, 20 Nov 2009 17:47:18 +0000 Subject: sato: move pam from meta-moblin to meta pam recipe is required to build a sato image, and it was moved in the meta-moblin collection by mistake, and sato build was broken. pam is a dependency of policykit which is a dependency of networkmanager. Signed-off-by: Nicolas Dechesne Signed-off-by: Richard Purdie --- .../packages/pam/files/disable_crossbinary.patch | 34 ---------------------- meta-moblin/packages/pam/pam_1.0.2.bb | 24 --------------- meta/packages/pam/files/disable_crossbinary.patch | 34 ++++++++++++++++++++++ meta/packages/pam/pam_1.0.2.bb | 24 +++++++++++++++ 4 files changed, 58 insertions(+), 58 deletions(-) delete mode 100644 meta-moblin/packages/pam/files/disable_crossbinary.patch delete mode 100644 meta-moblin/packages/pam/pam_1.0.2.bb create mode 100644 meta/packages/pam/files/disable_crossbinary.patch create mode 100644 meta/packages/pam/pam_1.0.2.bb diff --git a/meta-moblin/packages/pam/files/disable_crossbinary.patch b/meta-moblin/packages/pam/files/disable_crossbinary.patch deleted file mode 100644 index 43359b08fe..0000000000 --- a/meta-moblin/packages/pam/files/disable_crossbinary.patch +++ /dev/null @@ -1,34 +0,0 @@ -padout should be compiled using the native compiler but isn't. -Disable this piece of documentation for now. - -RP - -Index: Linux-PAM-1.0.2/doc/specs/Makefile.am -=================================================================== ---- Linux-PAM-1.0.2.orig/doc/specs/Makefile.am 2008-11-04 21:06:23.000000000 +0000 -+++ Linux-PAM-1.0.2/doc/specs/Makefile.am 2008-11-04 21:07:06.000000000 +0000 -@@ -2,21 +2,8 @@ - # Copyright (c) 2005, 2006 Thorsten Kukuk - # - --CLEANFILES = draft-morgan-pam-current.txt *~ -+CLEANFILES = *~ - --EXTRA_DIST = draft-morgan-pam.raw std-agent-id.raw rfc86.0.txt -+EXTRA_DIST = std-agent-id.raw rfc86.0.txt - --draft-morgan-pam-current.txt: padout draft-morgan-pam.raw -- ./padout < $(srcdir)/draft-morgan-pam.raw > draft-morgan-pam-current.txt -- --AM_YFLAGS = -d -- --BUILT_SOURCES = parse_y.h -- --noinst_PROGRAMS = padout -- --padout_SOURCES = parse_l.l parse_y.y -- --padout_LDADD = @LEXLIB@ -- --doc_DATA = draft-morgan-pam-current.txt rfc86.0.txt -+doc_DATA = rfc86.0.txt diff --git a/meta-moblin/packages/pam/pam_1.0.2.bb b/meta-moblin/packages/pam/pam_1.0.2.bb deleted file mode 100644 index 4ef9511c95..0000000000 --- a/meta-moblin/packages/pam/pam_1.0.2.bb +++ /dev/null @@ -1,24 +0,0 @@ -HOMEPAGE = "http://www.kernel.org/pub/linux/libs/pam/" -PR = "r7" - -SRC_URI = "http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-1.0.2.tar.bz2 \ - file://disable_crossbinary.patch;patch=1 " - -EXTRA_OECONF = "--with-db-uniquename=_pam \ - --includedir=${includedir}/security \ - --libdir=/lib" -DEPENDS = "bison flex" -CFLAGS_append = " -fPIC " - -S = "${WORKDIR}/Linux-PAM-${PV}" - -inherit autotools_stage pkgconfig - -FILES_${PN}-dbg += "${base_libdir}/security/.debug" -FILES_${PN}-dbg += "${base_libdir}/security/pam_filter/.debug" -FILES_${PN} += "${base_libdir}/security/*.so" -FILES_${PN} += "${base_libdir}/security/pam_filter/upperLOWER" -FILES_${PN} += "${base_libdir}/security/*.so" -FILES_${PN}-dev += "${base_libdir}/security/*.la" -FILES_${PN}-dev += "${base_libdir}/*.la" -FILES_${PN} += "${base_libdir}/*.so*" diff --git a/meta/packages/pam/files/disable_crossbinary.patch b/meta/packages/pam/files/disable_crossbinary.patch new file mode 100644 index 0000000000..43359b08fe --- /dev/null +++ b/meta/packages/pam/files/disable_crossbinary.patch @@ -0,0 +1,34 @@ +padout should be compiled using the native compiler but isn't. +Disable this piece of documentation for now. + +RP + +Index: Linux-PAM-1.0.2/doc/specs/Makefile.am +=================================================================== +--- Linux-PAM-1.0.2.orig/doc/specs/Makefile.am 2008-11-04 21:06:23.000000000 +0000 ++++ Linux-PAM-1.0.2/doc/specs/Makefile.am 2008-11-04 21:07:06.000000000 +0000 +@@ -2,21 +2,8 @@ + # Copyright (c) 2005, 2006 Thorsten Kukuk + # + +-CLEANFILES = draft-morgan-pam-current.txt *~ ++CLEANFILES = *~ + +-EXTRA_DIST = draft-morgan-pam.raw std-agent-id.raw rfc86.0.txt ++EXTRA_DIST = std-agent-id.raw rfc86.0.txt + +-draft-morgan-pam-current.txt: padout draft-morgan-pam.raw +- ./padout < $(srcdir)/draft-morgan-pam.raw > draft-morgan-pam-current.txt +- +-AM_YFLAGS = -d +- +-BUILT_SOURCES = parse_y.h +- +-noinst_PROGRAMS = padout +- +-padout_SOURCES = parse_l.l parse_y.y +- +-padout_LDADD = @LEXLIB@ +- +-doc_DATA = draft-morgan-pam-current.txt rfc86.0.txt ++doc_DATA = rfc86.0.txt diff --git a/meta/packages/pam/pam_1.0.2.bb b/meta/packages/pam/pam_1.0.2.bb new file mode 100644 index 0000000000..4ef9511c95 --- /dev/null +++ b/meta/packages/pam/pam_1.0.2.bb @@ -0,0 +1,24 @@ +HOMEPAGE = "http://www.kernel.org/pub/linux/libs/pam/" +PR = "r7" + +SRC_URI = "http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-1.0.2.tar.bz2 \ + file://disable_crossbinary.patch;patch=1 " + +EXTRA_OECONF = "--with-db-uniquename=_pam \ + --includedir=${includedir}/security \ + --libdir=/lib" +DEPENDS = "bison flex" +CFLAGS_append = " -fPIC " + +S = "${WORKDIR}/Linux-PAM-${PV}" + +inherit autotools_stage pkgconfig + +FILES_${PN}-dbg += "${base_libdir}/security/.debug" +FILES_${PN}-dbg += "${base_libdir}/security/pam_filter/.debug" +FILES_${PN} += "${base_libdir}/security/*.so" +FILES_${PN} += "${base_libdir}/security/pam_filter/upperLOWER" +FILES_${PN} += "${base_libdir}/security/*.so" +FILES_${PN}-dev += "${base_libdir}/security/*.la" +FILES_${PN}-dev += "${base_libdir}/*.la" +FILES_${PN} += "${base_libdir}/*.so*" -- cgit v1.2.3