[meta-oe][PATCH 0/2] Pull request #11

[meta-oe][PATCH 0/2] Pull request #11

[Martin Jansa]

The following changes since commit 7f9dbc16002bacf2ccc040a2de3ddc134e5fbbad:

  gcc-4.6: Update with patches from gcc-4_6-branch and linaro 2011.05 release (2011-05-28 09:36:14 +0200)

are available in the git repository at:
  git+ssh://git@git.openembedded.org/meta-openembedded-contrib jansa/meta-oe
  http://cgit.openembedded.org/cgit.cgi/git+ssh://git@git.openembedded.org/meta-openembedded-contrib/log/?h=jansa/meta-oe

Martin Jansa (2):
  gconf: depend on polkit not policykit
  policykit: drop recipes, oe-core has newer versions named right
    polkit

 meta-oe/recipes-gnome/gnome/gconf_2.28.0.bb        |    4 +-
 .../policykit/policykit-gnome_0.96.bb              |   25 -------
 meta-oe/recipes-gnome/policykit/policykit_0.96.bb  |   67 --------------------
 3 files changed, 2 insertions(+), 94 deletions(-)
 delete mode 100644 meta-oe/recipes-gnome/policykit/policykit-gnome_0.96.bb
 delete mode 100644 meta-oe/recipes-gnome/policykit/policykit_0.96.bb

-- 
1.7.5.rc3

[meta-oe][PATCH 1/2] gconf: depend on polkit not policykit

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-gnome/gnome/gconf_2.28.0.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-gnome/gnome/gconf_2.28.0.bb b/meta-oe/recipes-gnome/gnome/gconf_2.28.0.bb
index e167d8a..defb5fe 100644
--- a/meta-oe/recipes-gnome/gnome/gconf_2.28.0.bb
+++ b/meta-oe/recipes-gnome/gnome/gconf_2.28.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "GNOME configuration database system"
 SECTION = "x11/gnome"
-DEPENDS = "gtk+ orbit2 glib-2.0 libxml2 policykit"
+DEPENDS = "gtk+ orbit2 glib-2.0 libxml2 polkit"
 ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
 
 LICENSE = "LGPLv2+"
@@ -12,7 +12,7 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.28/GConf-${PV}.tar.bz2
 SRC_URI[archive.md5sum] = "ad2aeb9c7d906b274954c51a615caeac"
 SRC_URI[archive.sha256sum] = "d057dcfe2bfb2a80e592349c2a78d7dce12d19542aeced466c64fb701c806ac8"
 
-PR = "r2"
+PR = "r3"
 
 RDEPENDS_${PN} += "dbus-x11"
 
-- 
1.7.5.rc3

[meta-oe][PATCH 2/2] policykit: drop recipes, oe-core has newer versions named right polkit

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../policykit/policykit-gnome_0.96.bb              |   25 -------
 meta-oe/recipes-gnome/policykit/policykit_0.96.bb  |   67 --------------------
 2 files changed, 0 insertions(+), 92 deletions(-)
 delete mode 100644 meta-oe/recipes-gnome/policykit/policykit-gnome_0.96.bb
 delete mode 100644 meta-oe/recipes-gnome/policykit/policykit_0.96.bb

diff --git a/meta-oe/recipes-gnome/policykit/policykit-gnome_0.96.bb b/meta-oe/recipes-gnome/policykit/policykit-gnome_0.96.bb
deleted file mode 100644
index 8720ea9..0000000
--- a/meta-oe/recipes-gnome/policykit/policykit-gnome_0.96.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-HOMEPAGE = "http://www.packagekit.org/"
-DEPENDS = "policykit libgnome"
-LICENSE = "LGPLv2"
-
-PR = "r1"
-
-SRC_URI = "http://hal.freedesktop.org/releases/polkit-gnome-${PV}.tar.bz2;name=polkitgnome"
-SRC_URI[polkitgnome.md5sum] = "611cf39fba2945320fc7a9ec49087e69"
-SRC_URI[polkitgnome.sha256sum] = "0d96c8032d658a2e1eef8adfbeafff0f569ef0cf68b35915423acc00873c8a92"
-
-EXTRA_OECONF = " --disable-scrollkeeper \
-                 --disable-man-pages \
-                 --disable-examples \
-                 --disable-gtk-doc \
-                 --enable-introspection=no \
-"
-
-S = "${WORKDIR}/polkit-gnome-${PV}"
-
-inherit autotools pkgconfig
-
-FILES_${PN} += " ${datadir}/dbus-1 \
-                 ${datadir}/PolicyKit \
-               "
-
diff --git a/meta-oe/recipes-gnome/policykit/policykit_0.96.bb b/meta-oe/recipes-gnome/policykit/policykit_0.96.bb
deleted file mode 100644
index 98c0dd0..0000000
--- a/meta-oe/recipes-gnome/policykit/policykit_0.96.bb
+++ /dev/null
@@ -1,67 +0,0 @@
-HOMEPAGE = "http://www.packagekit.org/"
-DEPENDS = "eggdbus libpam expat dbus-glib intltool-native"
-LICENSE = "LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb"
-
-PR = "r2"
-
-SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz;name=polkit \
-          "
-
-SRC_URI[polkit.md5sum] = "e0a06da501b04ed3bab986a9df5b5aa2"
-SRC_URI[polkit.sha256sum] = "3426ca917210b2a5525732559368c18f983a4c39a6a55c5dddba26071bd8054a"
-
-EXTRA_OECONF = "--with-authfw=pam \
-                --with-os-type=${DISTRO} \
-                --disable-man-pages \
-                --disable-gtk-doc \
-                --enable-introspection=no \
-"
-
-S = "${WORKDIR}/polkit-${PV}"
-
-inherit autotools pkgconfig
-
-do_install_append () {
-	install -d ${D}${localstatedir}/run/PolicyKit
-	sed -i -e s:system:common:g ${D}${sysconfdir}/pam.d/*
-}
-
-FILES_${PN} += " ${datadir}/dbus-1 \
-                 ${datadir}/PolicyKit ${datadir}/polkit-1\
-                 ${localstatedir}/run/PolicyKit \
-                 ${libdir}/polkit-1/extensions/*.so \
-"
-
-FILES_${PN}-dev += " ${libdir}/polkit-1/extensions/*a"
-
-pkg_postinst_${PN} () {
-    # can't do this offline
-    if [ "x$D" != "x" ]; then
-        exit 1
-    fi
-    grep "^polkituser:" /etc/group > /dev/null || addgroup polkituser
-    grep "^polkituser:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/run/polkit polkituser --ingroup polkituser -g polkituser 
-
-	# Fix owners
-	for i in /etc/polkit-1/localauthority /var/lib/polkit-1 ; do
-		mkdir -p $i
-		chown root $i
-		chmod 700 $i
-	done
-
-	for i in /usr/libexec/polkit-agent-helper-1 /usr/bin/pkexec ; do
-		chown root $i
-		chmod 4755 $i
-	done
-
-	DBUSPID=`pidof dbus-daemon`
-    if [ "x$DBUSPID" != "x" ]; then
-        /etc/init.d/dbus-1 force-reload
-    fi
-}
-
-pkg_postrm_${PN} () {
-    deluser polkituser || true
-    delgroup polkituser || true
-}
-- 
1.7.5.rc3

Re: [meta-oe][PATCH 0/2] Pull request #11

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 28-05-11 16:08, Martin Jansa wrote:
> The following changes since commit 7f9dbc16002bacf2ccc040a2de3ddc134e5fbbad:
> 
>   gcc-4.6: Update with patches from gcc-4_6-branch and linaro 2011.05 release (2011-05-28 09:36:14 +0200)
> 
> are available in the git repository at:
>   git+ssh://git@git.openembedded.org/meta-openembedded-contrib jansa/meta-oe
>   http://cgit.openembedded.org/cgit.cgi/git+ssh://git@git.openembedded.org/meta-openembedded-contrib/log/?h=jansa/meta-oe
> 
> Martin Jansa (2):
>   gconf: depend on polkit not policykit
>   policykit: drop recipes, oe-core has newer versions named right
>     polkit

Thanks, I merged both, will push those out soon.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFN4QoTMkyGM64RGpERAtIdAJ4l/O7+XJilJ1zU64IPgK0fJ32MiACfQJqn
+3vZQuoHM4XXrQHL7Bt4AyU=
=B/1b
-----END PGP SIGNATURE-----