summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2008-11-04 21:46:02 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2008-11-04 21:46:02 +0000
commit4b0098b26111909ba8a6f5a1c1795bf275cc8346 (patch)
tree1e328e1210e453f7804e459c3a8e4adab4b4e205
parent76e51a83e1af6c95a8ba780d8d543ddda52e1597 (diff)
downloadpoky-4b0098b26111909ba8a6f5a1c1795bf275cc8346.tar.gz
packagekit: Fix DEPENDS and configure
-rw-r--r--meta/packages/packkagekit/files/no_validate.patch21
-rw-r--r--meta/packages/packkagekit/packagekit_0.3.8.bb9
-rw-r--r--meta/packages/pam/files/disable_crossbinary.patch34
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 @@
1Index: PackageKit-0.3.8/configure.ac
2===================================================================
3--- PackageKit-0.3.8.orig/configure.ac 2008-11-04 21:37:17.000000000 +0000
4+++ PackageKit-0.3.8/configure.ac 2008-11-04 21:37:57.000000000 +0000
5@@ -451,11 +451,11 @@
6 polkit-grant >= $POLKIT_GRANT_REQUIRED)
7 AC_SUBST(POLKIT_CFLAGS)
8 AC_SUBST(POLKIT_LIBS)
9- AC_CHECK_PROG([POLKIT_POLICY_FILE_VALIDATE],
10- [polkit-policy-file-validate], [polkit-policy-file-validate])
11- if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then
12- AC_MSG_ERROR([polkit-policy-file-validate not found])
13- fi
14+ #AC_CHECK_PROG([POLKIT_POLICY_FILE_VALIDATE],
15+ # [polkit-policy-file-validate], [polkit-policy-file-validate])
16+ #if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then
17+ # AC_MSG_ERROR([polkit-policy-file-validate not found])
18+ #fi
19 AC_DEFINE(USE_SECURITY_POLKIT, 1, [if we should use PolicyKit])
20 elif test x$with_security_framework = xdummy; then
21 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 @@
1HOMEPAGE = "http://www.packagekit.org/" 1HOMEPAGE = "http://www.packagekit.org/"
2PR = "r4" 2PR = "r5"
3 3
4SRC_URI = "http://www.packagekit.org/releases/PackageKit-0.3.8.tar.gz" 4SRC_URI = "http://www.packagekit.org/releases/PackageKit-0.3.8.tar.gz \
5 file://no_validate.patch;patch=1 "
5 6
6DEPENDS = "python polkit pam opkg-sdk" 7DEPENDS = "python polkit pam"
7EXTRA_OECONF = "--disable-qt --disable-tests --enable-yum --with-default-backend=yum --disable-local" 8EXTRA_OECONF = "--disable-qt --disable-tests --enable-yum --with-default-backend=yum --disable-local --with-security-framework=polkit"
8 9
9S = "${WORKDIR}/PackageKit-${PV}" 10S = "${WORKDIR}/PackageKit-${PV}"
10 11
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 @@
1padout should be compiled using the native compiler but isn't.
2Disable this piece of documentation for now.
3
4RP
5
6Index: Linux-PAM-1.0.2/doc/specs/Makefile.am
7===================================================================
8--- Linux-PAM-1.0.2.orig/doc/specs/Makefile.am 2008-11-04 21:06:23.000000000 +0000
9+++ Linux-PAM-1.0.2/doc/specs/Makefile.am 2008-11-04 21:07:06.000000000 +0000
10@@ -2,21 +2,8 @@
11 # Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de>
12 #
13
14-CLEANFILES = draft-morgan-pam-current.txt *~
15+CLEANFILES = *~
16
17-EXTRA_DIST = draft-morgan-pam.raw std-agent-id.raw rfc86.0.txt
18+EXTRA_DIST = std-agent-id.raw rfc86.0.txt
19
20-draft-morgan-pam-current.txt: padout draft-morgan-pam.raw
21- ./padout < $(srcdir)/draft-morgan-pam.raw > draft-morgan-pam-current.txt
22-
23-AM_YFLAGS = -d
24-
25-BUILT_SOURCES = parse_y.h
26-
27-noinst_PROGRAMS = padout
28-
29-padout_SOURCES = parse_l.l parse_y.y
30-
31-padout_LDADD = @LEXLIB@
32-
33-doc_DATA = draft-morgan-pam-current.txt rfc86.0.txt
34+doc_DATA = rfc86.0.txt