diff options
| author |   Richard Purdie <rpurdie@linux.intel.com> | 2008-11-04 21:46:02 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-11-04 21:46:02 +0000 |
| commit | 4b0098b26111909ba8a6f5a1c1795bf275cc8346 (patch) | |
| tree | 1e328e1210e453f7804e459c3a8e4adab4b4e205 /meta | |
| parent | 76e51a83e1af6c95a8ba780d8d543ddda52e1597 (diff) | |
| download | openembedded-core-contrib-4b0098b26111909ba8a6f5a1c1795bf275cc8346.tar.gz | |
packagekit: Fix DEPENDS and configure
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/packkagekit/files/no_validate.patch | 21 | ||||
| -rw-r--r-- | meta/packages/packkagekit/packagekit_0.3.8.bb | 9 | ||||
| -rw-r--r-- | meta/packages/pam/files/disable_crossbinary.patch | 34 |
3 files changed, 60 insertions, 4 deletions
diff --git a/meta/packages/packkagekit/files/no_validate.patch b/meta/packages/packkagekit/files/no_validate.patch new file mode 100644 index 0000000000..f987b567df --- /dev/null +++ b/meta/packages/packkagekit/files/no_validate.patch @@ -0,0 +1,21 @@ +Index: PackageKit-0.3.8/configure.ac +=================================================================== +--- PackageKit-0.3.8.orig/configure.ac 2008-11-04 21:37:17.000000000 +0000 ++++ PackageKit-0.3.8/configure.ac 2008-11-04 21:37:57.000000000 +0000 +@@ -451,11 +451,11 @@ + polkit-grant >= $POLKIT_GRANT_REQUIRED) + AC_SUBST(POLKIT_CFLAGS) + AC_SUBST(POLKIT_LIBS) +- AC_CHECK_PROG([POLKIT_POLICY_FILE_VALIDATE], +- [polkit-policy-file-validate], [polkit-policy-file-validate]) +- if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then +- AC_MSG_ERROR([polkit-policy-file-validate not found]) +- fi ++ #AC_CHECK_PROG([POLKIT_POLICY_FILE_VALIDATE], ++ # [polkit-policy-file-validate], [polkit-policy-file-validate]) ++ #if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then ++ # AC_MSG_ERROR([polkit-policy-file-validate not found]) ++ #fi + AC_DEFINE(USE_SECURITY_POLKIT, 1, [if we should use PolicyKit]) + elif test x$with_security_framework = xdummy; then + AC_DEFINE(USE_SECURITY_DUMMY, 1, [if we should use a dummy security framework]) diff --git a/meta/packages/packkagekit/packagekit_0.3.8.bb b/meta/packages/packkagekit/packagekit_0.3.8.bb index ccac51c01f..7d25d9db10 100644 --- a/meta/packages/packkagekit/packagekit_0.3.8.bb +++ b/meta/packages/packkagekit/packagekit_0.3.8.bb @@ -1,10 +1,11 @@ HOMEPAGE = "http://www.packagekit.org/" -PR = "r4" +PR = "r5" -SRC_URI = "http://www.packagekit.org/releases/PackageKit-0.3.8.tar.gz" +SRC_URI = "http://www.packagekit.org/releases/PackageKit-0.3.8.tar.gz \ + file://no_validate.patch;patch=1 " -DEPENDS = "python polkit pam opkg-sdk" -EXTRA_OECONF = "--disable-qt --disable-tests --enable-yum --with-default-backend=yum --disable-local" +DEPENDS = "python polkit pam" +EXTRA_OECONF = "--disable-qt --disable-tests --enable-yum --with-default-backend=yum --disable-local --with-security-framework=polkit" S = "${WORKDIR}/PackageKit-${PV}" 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 <kukuk@suse.de> + # + +-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 |