Small fixes

PATCH In review Martin Jansa 3 participants 17 messages Nov 29, 2011 – Nov 30, 2011

lore

Share & tools

lore

Martin Jansa

author

2011-11-29 07:01 UTC #0 lore raw

cover Small fixes

The following changes since commit 2864ff6a4b3c3f9b3bbb6d2597243cc5d3715939:

getVar/setVar cleanups (2011-11-26 22:42:00 +0000)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/pull2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull2

Denis 'GNUtoo' Carikli (1):
libical: add version 0.47

Martin Jansa (9):
tinylogin: use u-a for getty so we can provide /sbin/getty from
util-linux-agetty too
util-linux: use u-a to provide /sbin/getty from util-linux-agetty
mingetty: use u-a to provide /sbin/getty (also provided by
util-linux-agetty and tinylogin)
cronie: use useradd.bbclass instead of hardcoded groupadd calls
ppp-dialin: use useradd.bbclass instead of hardcoded adduser/deluser
calls
libical: drop older version 0.46
libid3tag: add gperf to DEPENDS
gst-plugins-ugly: bump PR to rebuild after libid3tag fix
gconf: add polkit to DEPENDS

 .../ppp-dialin/ppp-dialin_0.1.bb                   |   23 +++----------
 meta/recipes-core/tinylogin/tinylogin_1.4.bb       |   13 +++++++-
 meta/recipes-core/util-linux/util-linux.inc        |    8 +++++
 meta/recipes-core/util-linux/util-linux_2.19.1.bb  |    2 +-
 meta/recipes-extended/cronie/cronie_1.4.8.bb       |   33 +++++++++-----------
 meta/recipes-extended/mingetty/mingetty_1.08.bb    |    9 +++++-
 meta/recipes-gnome/gnome/gconf_3.2.3.bb            |    2 +-
 .../gstreamer/gst-plugins-ugly_0.10.17.bb          |    2 +-
 .../libid3tag/libid3tag_0.15.1b.bb                 |    4 +-
 .../libical/{libical_0.46.bb => libical_0.47.bb}   |   11 +++---
 10 files changed, 59 insertions(+), 48 deletions(-)
 rename meta/recipes-sato/libical/{libical_0.46.bb => libical_0.47.bb} (41%)

Signature · 1 line

1.7.8.rc3

Martin Jansa

author

2011-11-29 07:07 UTC #1 lore raw

PATCH 1/10 tinylogin: use u-a for getty so we can provide /sbin/getty from util-linux-agetty too

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-core/tinylogin/tinylogin_1.4.bb |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

meta/recipes-core/tinylogin/tinylogin_1.4.bb +12 -1

index bad918c..478f69b 100644
@@ -7,7 +7,9 @@ and groups on an embedded system."
 HOMEPAGE = "http://tinylogin.busybox.net/"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM="file://LICENSE;md5=f1060fa3a366f098b5b1d8c2077ba269"
-PR = "r7"
+PR = "r8"
+
+inherit update-alternatives
 
 SRC_URI = "http://www.angstrom-distribution.org/unstable/sources/tinylogin-${PV}.tar.bz2 \
 	file://cvs-20040608.patch \

@@ -35,3 +37,12 @@ do_install () {
 		ln -sf /bin/tinylogin ${D}$i
 	done
 }
+
+do_install_append () {
+        mv ${D}${base_sbindir}/getty ${D}${base_sbindir}/getty.${PN}
+}
+
+ALTERNATIVE_NAME = "getty"
+ALTERNATIVE_LINK = "${base_sbindir}/getty"
+ALTERNATIVE_PATH = "${base_sbindir}/getty.${PN}"
+ALTERNATIVE_PRIORITY = "80"

Signature · 1 line

1.7.8.rc3

Martin Jansa

author

2011-11-29 07:07 UTC #2 lore raw

PATCH 2/10 util-linux: use u-a to provide /sbin/getty from util-linux-agetty

* inittab and systemd-serialgetty expects /sbin/getty not agetty

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-core/util-linux/util-linux.inc       |    8 ++++++++
 meta/recipes-core/util-linux/util-linux_2.19.1.bb |    2 +-
 2 files changed, 9 insertions(+), 1 deletions(-)

meta/recipes-core/util-linux/util-linux.inc +8 -0

index 855a545..acc4a39 100644
@@ -236,6 +236,14 @@ pkg_prerm_util-linux-fdisk () {
 	update-alternatives --remove fdisk fdisk.${PN}
 }
 
+pkg_postinst_util-linux-agetty () {
+	update-alternatives --install ${base_sbindir}/getty getty agetty 100
+}
+
+pkg_prerm_util-linux-agetty () {
+	update-alternatives --remove getty agetty
+}
+
 pkg_postinst_util-linux-mount () {
 	update-alternatives --install ${base_bindir}/mount mount mount.${PN} 100
 }

meta/recipes-core/util-linux/util-linux_2.19.1.bb +1 -1

index b65e761..82040ef 100644
@@ -1,5 +1,5 @@
 MAJOR_VERSION = "2.19"
-PR = "r11"
+PR = "r12"
 require util-linux.inc
 
 # note that `lscpu' is under GPLv3+

Signature · 1 line

1.7.8.rc3

Martin Jansa

author

2011-11-29 07:08 UTC #3 lore raw

PATCH 3/10 mingetty: use u-a to provide /sbin/getty (also provided by util-linux-agetty and tinylogin)

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-extended/mingetty/mingetty_1.08.bb |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

meta/recipes-extended/mingetty/mingetty_1.08.bb +8 -1

index ce4b3d4..fed5dfd 100644
@@ -2,7 +2,7 @@ DESCRIPTION = " A compact getty program for virtual consoles only"
 SECTION = "console/utils"
 HOMEPAGE = "http://sourceforge.net/projects/mingetty/"
 LICENSE = "GPLv2"
-PR = "r0"
+PR = "r1"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e"
 SRC_URI = "http://cdnetworks-kr-1.dl.sourceforge.net/project/mingetty/mingetty/${PV}/mingetty-${PV}.tar.gz"

@@ -17,3 +17,10 @@ do_install(){
     mkdir -p ${D}/sbin
     oe_runmake install DESTDIR=${D}
 }
+
+inherit update-alternatives
+
+ALTERNATIVE_NAME = "getty"
+ALTERNATIVE_LINK = "${base_sbindir}/getty"
+ALTERNATIVE_PATH = "${base_sbindir}/mingetty"
+ALTERNATIVE_PRIORITY = "50"

Signature · 1 line

1.7.8.rc3

Martin Jansa

author

2011-11-29 07:08 UTC #4 lore raw

PATCH 4/10 cronie: use useradd.bbclass instead of hardcoded groupadd calls

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-extended/cronie/cronie_1.4.8.bb |   33 +++++++++++--------------
 1 files changed, 15 insertions(+), 18 deletions(-)

meta/recipes-extended/cronie/cronie_1.4.8.bb +15 ~~-18~~

index 064347e..2d25627 100644
@@ -18,7 +18,7 @@ DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)}"
 PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \
            file://crond.init \

@@ -31,7 +31,7 @@ PAM_SRC_URI = "file://crond_pam_config.patch"
 SRC_URI[md5sum] = "9b1d2ce6db8d1883e06635f437170657"
 SRC_URI[sha256sum] = "a3b910876f255712f1a5c364b74f34b0ceac9f6f3bbc45e854c5722785f513b3"
 
-inherit autotools update-rc.d
+inherit autotools update-rc.d useradd
 
 EXTRA_OECONF += "\
                 ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)}"

@@ -39,6 +39,9 @@ EXTRA_OECONF += "\
 INITSCRIPT_NAME = "crond"
 INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ."
 
+USERADD_PACKAGES = "${PN}"
+GROUPADD_PARAM_${PN} = "crontab"
+
 do_install_append () {
 	install -d ${D}${sysconfdir}/sysconfig/
 	install -d ${D}${sysconfdir}/init.d/

@@ -54,25 +57,19 @@ do_install_append () {
 	mkdir -p ${D}${sysconfdir}/cron.weekly
 	mkdir -p ${D}${sysconfdir}/cron.monthly
 	touch ${D}${sysconfdir}/cron.deny
-}
-
-FILES_${PN} += "${sysconfdir}/cron*"
-
-pkg_postinst_${PN} () {
-	if [ "x$D" != "x" ] ; then
-		exit 1
-	fi
-
+	
 	# below setting is necessary to allow normal user using crontab
 
-	# add 'crontab' group and setgid for crontab binary
-	grep crontab /etc/group || addgroup crontab
-	chown root:crontab /usr/bin/crontab
-	chmod 2755 /usr/bin/crontab
+	# setgid for crontab binary
+	chown root:crontab ${D}/usr/bin/crontab
+	chmod 2755 ${D}/usr/bin/crontab
 
 	# allow 'crontab' group write to /var/spool/cron
-	chown root:crontab /var/spool/cron
-	chmod 770 /var/spool/cron
+	chown root:crontab ${D}/var/spool/cron
+	chmod 770 ${D}/var/spool/cron
 
-	chmod 600 /etc/crontab
+	chmod 600 ${D}/etc/crontab
 }
+
+FILES_${PN} += "${sysconfdir}/cron*"
+

Signature · 1 line

1.7.8.rc3

Martin Jansa

author

2011-11-29 07:08 UTC #5 lore raw

PATCH 5/10 ppp-dialin: use useradd.bbclass instead of hardcoded adduser/deluser calls

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 .../ppp-dialin/ppp-dialin_0.1.bb                   |   23 +++++--------------
 1 files changed, 6 insertions(+), 17 deletions(-)

meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb +6 ~~-17~~

index d4ac77e..d239c20 100644
@@ -2,7 +2,7 @@ SECTION = "console/network"
 DESCRIPTION = "Enables PPP dial-in through a serial connection"
 DEPENDS = "ppp"
 RDEPENDS_${PN} = "ppp"
-PR = "r7"
+PR = "r8"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"

@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 SRC_URI = "file://host-peer \
            file://ppp-dialin"
 
-inherit allarch
+inherit allarch useradd
 
 do_install() {
 	install -d ${D}${sysconfdir}/ppp/peers

@@ -20,18 +20,7 @@ do_install() {
 	install -m 0755 ${WORKDIR}/ppp-dialin ${D}${sbindir}
 }
 
-pkg_postinst_${PN} () {
-if test "x$D" != "x"; then
-	exit 1
-else
-	adduser --system --home /dev/null --no-create-home --empty-password --ingroup nogroup -s ${sbindir}/ppp-dialin ppp
-fi
-}
-
-pkg_postrm_${PN} () {
-if test "x$D" != "x"; then
-	exit 1
-else
-	deluser ppp
-fi
-}
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system --home /dev/null \
+                       --no-create-home --shell ${sbindir}/ppp-dialin \
+                       --no-user-group --gid nogroup ppp"

Signature · 1 line

1.7.8.rc3

Martin Jansa

author

2011-11-29 07:08 UTC #6 lore raw

PATCH 6/10 libical: add version 0.47

In reply to Martin Jansa

From: Denis 'GNUtoo' Carikli <[email protected]>

Signed-off-by Denis 'GNUtoo' Carikli <[email protected]>

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-sato/libical/libical_0.47.bb |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-sato/libical/libical_0.47.bb

meta/recipes-sato/libical/libical_0.47.bb new file +14 -0

new file mode 100644
index 0000000..d711d5f
@@ -0,0 +1,14 @@
+DESCRIPTION = "iCal and scheduling (RFC 2445, 2446, 2447) library"
+HOMEPAGE = "http://sourceforge.net/projects/freeassociation/"
+BUGTRACKER = "http://sourceforge.net/tracker/?group_id=16077&atid=116077"
+LICENSE = "LGPLv2.1 | MPL-1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d4fc58309d8ed46587ac63bb449d82f8 \
+                    file://LICENSE;md5=d1a0891cd3e582b3e2ec8fe63badbbb6"
+SECTION = "libs"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/freeassociation/${BPN}/${P}/${BPN}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "21f7f8a21e3d857c9476be732e52dc32"
+SRC_URI[sha256sum] = "af4cbb4bb13d9ed3f2262181da9199823feba70802b15cc3e89b263d95da2888"
+
+inherit autotools

Signature · 1 line

1.7.8.rc3

Martin Jansa

author

2011-11-29 14:16 UTC #7 lore raw

PATCH 7/10 libical: drop older version 0.46

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-sato/libical/libical_0.46.bb |   15 ---------------
 1 files changed, 0 insertions(+), 15 deletions(-)
 delete mode 100644 meta/recipes-sato/libical/libical_0.46.bb

meta/recipes-sato/libical/libical_0.46.bb deleted +0 ~~-15~~

deleted file mode 100644
index e0e88ba..0000000
@@ -1,15 +0,0 @@
-DESCRIPTION = "iCal and scheduling (RFC 2445, 2446, 2447) library"
-HOMEPAGE = "http://sourceforge.net/projects/freeassociation/"
-BUGTRACKER = "http://sourceforge.net/tracker/?group_id=16077&atid=116077"
-LICENSE = "LGPLv2.1 | MPL-1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=35da21efce2b9f0ca07524c9f844e6ed \
-			file://LICENSE;md5=35da21efce2b9f0ca07524c9f844e6ed"
-SECTION = "libs"
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/freeassociation/${BPN}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "9c08f88945bfd5d0791d102e4aa4125c"
-SRC_URI[sha256sum] = "000762efb81501421d94ec56343648a62b3bd2884e7cdf6f638e2c207dd8f6a1"
-
-inherit autotools

Signature · 1 line

1.7.8.rc3

Martin Jansa

author

2011-11-29 14:16 UTC #8 lore raw

PATCH 8/10 libid3tag: add gperf to DEPENDS

In reply to Martin Jansa

* see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=270449

Signed-off-by Martin Jansa <[email protected]>

---
 .../libid3tag/libid3tag_0.15.1b.bb                 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb +2 -2

index 4faa981..05e566e 100644
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 			file://COPYRIGHT;md5=5e6279efb87c26c6e5e7a68317a6a87a \
 			file://version.h;beginline=1;endline=8;md5=86ac68b67f054b7afde9e149bbc3fe63"
 SECTION = "libs"
-DEPENDS = "zlib"
-PR = "r3"
+DEPENDS = "zlib gperf-native"
+PR = "r4"
 
 SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libid3tag-${PV}.tar.gz \
            file://addpkgconfig.patch"

Signature · 1 line

1.7.8.rc3

Martin Jansa

author

2011-11-29 14:16 UTC #9 lore raw

PATCH 9/10 gst-plugins-ugly: bump PR to rebuild after libid3tag fix

Signed-off-by Martin Jansa <[email protected]>

---
 .../gstreamer/gst-plugins-ugly_0.10.17.bb          |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.17.bb +1 -1

index 2a79c2a..26bc0ba 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                     file://gst/mpegstream/gstmpegparse.h;beginline=1;endline=18;md5=ff65467b0c53cdfa98d0684c1bc240a9"
 
 DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame"
-PR = "r1"
+PR = "r2"
 
 inherit gettext

Signature · 1 line

1.7.8.rc3

Martin Jansa

author

2011-11-29 14:16 UTC #10 lore raw

PATCH 10/10 gconf: add polkit to DEPENDS

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-gnome/gnome/gconf_3.2.3.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta/recipes-gnome/gnome/gconf_3.2.3.bb +1 -1

index aa9da78..907f0ba 100644
@@ -3,7 +3,7 @@ SECTION = "x11/gnome"
 LICENSE = "LGPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
 
-DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native"
+DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native polkit"
 
 PR = "r1"

Signature · 1 line

1.7.8.rc3

Saul Wold

2011-11-29 20:32 UTC #11 lore raw

Re: [oe-core 10/10] gconf: add polkit to DEPENDS

Quoted 10 lines · Martin Jansa

Signed-off-by Martin Jansa<[email protected]>
---
  meta/recipes-gnome/gnome/gconf_3.2.3.bb |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-gnome/gnome/gconf_3.2.3.bb +0 -0
index aa9da78..907f0ba 100644

meta/recipes-gnome/gnome/gconf_3.2.3.bb SECTION = "x11/gnome" · line 9

Quoted 8 lines

meta/recipes-gnome/gnome/gconf_3.2.3.bb +1 -1

@@ -3,7 +3,7 @@ SECTION = "x11/gnome"
  LICENSE = "LGPLv2+"
  LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
 
-DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native"
+DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native polkit"
 
  PR = "r1"

What is this solving? This also would require polkit to have a BBCLASSEXTEND with native.

Sau!

Martin Jansa

author

2011-11-29 20:50 UTC #12 lore raw

Re: [oe-core 10/10] gconf: add polkit to DEPENDS

Quoted 14 lines · Saul Wold

Quoted 13 lines · Martin Jansa

Signed-off-by Martin Jansa<[email protected]>

---
  meta/recipes-gnome/gnome/gconf_3.2.3.bb |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)

meta/recipes-gnome/gnome/gconf_3.2.3.bb +0 -0

index aa9da78..907f0ba 100644
@@ -3,7 +3,7 @@ SECTION = "x11/gnome"
  LICENSE = "LGPLv2+"
  LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"

Quoted 8 lines

meta/recipes-gnome/gnome/gconf_3.2.3.bb SECTION = "x11/gnome" · line 9
Quoted 5 lines
meta/recipes-gnome/gnome/gconf_3.2.3.bb +1 -1
-DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native"
+DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native polkit"
 
  PR = "r1"
 
What is this solving? This also would require polkit to have a BBCLASSEXTEND with native.

gconf-defaults.c:40:27: fatal error: polkit/polkit.h: No such file or directory

most people have polkit build in sysroot and then if you upgrade gconf and polkit at the same time you can get it autodetected in gconf's do_configure and later removed from sysroot while polkit itself is being upgraded.

And we probably don't want to disable defaults_service for gconf to force polkit dependency off.

HAVE_POLKIT=no
AC_ARG_ENABLE(defaults_service,
AS_HELP_STRING([--enable-defaults-service],
[build the defaults DBus service @<:@default=auto@:>@]),
, enable_defaults_service=auto)

if test "x$enable_defaults_service" != "xno" ; then
PKG_CHECK_MODULES(DEFAULTS, glib-2.0 gthread-2.0 gobject-2.0 dbus-1 dbus-glib-1 polkit-gobject-1, HAVE_POLKIT=yes, HAVE_POLKIT=no) if test "x$HAVE_POLKIT" = "xno"; then
if test "x$enable_defaults_service" = "xyes" ; then
AC_MSG_ERROR([[
*** Could not find PolicyKit.]])
else
enable_defaults_service=no
fi
else
enable_defaults_service=yes
fi
fi

Weird it didn't fail for me without polkit-native (there isn't .bbappend in any of my layers and I've even tested it in distro less oe-core), but you're right, we should provide polkit-native or disable defaults_service for native gconf.

Cheers,

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Saul Wold

2011-11-29 20:55 UTC #13 lore raw

Re: [oe-core 10/10] gconf: add polkit to DEPENDS

Quoted 54 lines · Martin Jansa

Quoted 14 lines · Saul Wold
Quoted 13 lines · Martin Jansa
Signed-off-by Martin Jansa<[email protected]>
---
   meta/recipes-gnome/gnome/gconf_3.2.3.bb |    2 +-
   1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-gnome/gnome/gconf_3.2.3.bb +0 -0
index aa9da78..907f0ba 100644
@@ -3,7 +3,7 @@ SECTION = "x11/gnome"
   LICENSE = "LGPLv2+"
   LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
 
Quoted 8 lines
meta/recipes-gnome/gnome/gconf_3.2.3.bb SECTION = "x11/gnome" · line 9
Quoted 5 lines
meta/recipes-gnome/gnome/gconf_3.2.3.bb +1 -1
-DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native"
+DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native polkit"
 
   PR = "r1"
 
What is this solving? This also would require polkit to have a BBCLASSEXTEND with native.
gconf-defaults.c:40:27: fatal error: polkit/polkit.h: No such file or directory
most people have polkit build in sysroot and then if you upgrade gconf and polkit at the same time you can get it autodetected in gconf's do_configure and later removed from sysroot while polkit itself is being upgraded.
And we probably don't want to disable defaults_service for gconf to force polkit dependency off.
HAVE_POLKIT=no
AC_ARG_ENABLE(defaults_service,
AS_HELP_STRING([--enable-defaults-service],
[build the defaults DBus service @<:@default=auto@:>@]),
, enable_defaults_service=auto)
if test "x$enable_defaults_service" != "xno" ; then
PKG_CHECK_MODULES(DEFAULTS, glib-2.0 gthread-2.0 gobject-2.0 dbus-1 dbus-glib-1 polkit-gobject-1, HAVE_POLKIT=yes, HAVE_POLKIT=no) if test "x$HAVE_POLKIT" = "xno"; then
if test "x$enable_defaults_service" = "xyes" ; then
AC_MSG_ERROR([[
*** Could not find PolicyKit.]])
else
enable_defaults_service=no
fi
else
enable_defaults_service=yes
fi
fi

Quoted 4 lines

Weird it didn't fail for me without polkit-native (there isn't .bbappend in any of my layers and I've even tested it in distro less oe-core), but you're right, we should provide polkit-native or disable defaults_service for native gconf.

I think it would be best to disable the default_services for native gconf, a patch for that would be great, thanks

Sau!

Quoted 1 line

Cheers,

Martin Jansa

author

2011-11-29 21:36 UTC #14 lore raw

Re: [oe-core 10/10] gconf: add polkit to DEPENDS

Quoted 55 lines · Saul Wold

Quoted 54 lines · Martin Jansa
Quoted 14 lines · Saul Wold
Quoted 13 lines · Martin Jansa
Signed-off-by Martin Jansa<[email protected]>
---
   meta/recipes-gnome/gnome/gconf_3.2.3.bb |    2 +-
   1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-gnome/gnome/gconf_3.2.3.bb +0 -0
index aa9da78..907f0ba 100644
@@ -3,7 +3,7 @@ SECTION = "x11/gnome"
   LICENSE = "LGPLv2+"
   LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
 
Quoted 8 lines
meta/recipes-gnome/gnome/gconf_3.2.3.bb SECTION = "x11/gnome" · line 9
Quoted 5 lines
meta/recipes-gnome/gnome/gconf_3.2.3.bb +1 -1
-DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native"
+DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native polkit"
 
   PR = "r1"
 
What is this solving? This also would require polkit to have a BBCLASSEXTEND with native.
gconf-defaults.c:40:27: fatal error: polkit/polkit.h: No such file or directory
most people have polkit build in sysroot and then if you upgrade gconf and polkit at the same time you can get it autodetected in gconf's do_configure and later removed from sysroot while polkit itself is being upgraded.
And we probably don't want to disable defaults_service for gconf to force polkit dependency off.
HAVE_POLKIT=no
AC_ARG_ENABLE(defaults_service,
AS_HELP_STRING([--enable-defaults-service],
[build the defaults DBus service @<:@default=auto@:>@]),
, enable_defaults_service=auto)
if test "x$enable_defaults_service" != "xno" ; then
PKG_CHECK_MODULES(DEFAULTS, glib-2.0 gthread-2.0 gobject-2.0 dbus-1 dbus-glib-1 polkit-gobject-1, HAVE_POLKIT=yes, HAVE_POLKIT=no) if test "x$HAVE_POLKIT" = "xno"; then
if test "x$enable_defaults_service" = "xyes" ; then
AC_MSG_ERROR([[
*** Could not find PolicyKit.]])
else
enable_defaults_service=no
fi
else
enable_defaults_service=yes
fi
fi

Quoted 6 lines

Quoted 4 lines
Weird it didn't fail for me without polkit-native (there isn't .bbappend in any of my layers and I've even tested it in distro less oe-core), but you're right, we should provide polkit-native or disable defaults_service for native gconf.
I think it would be best to disable the default_services for native gconf, a patch for that would be great, thanks

Ah, now I know why I haven't seen that in normal builds /OE/shr-core/meta-openembedded/meta-gnome/recipes-gnome/gconf/gconf-native_2.6.1.bb

and nothing in my oe-core-only builds was depending on gconf-native

I'll send updated patch after few more tests..

Cheers,

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Martin Jansa

author

2011-11-29 22:30 UTC #15 lore raw

PATCH 1/1 gconf: add polkit to DEPENDS only for target recipe and disable default-service for native

In reply to Martin Jansa

* gnome-common-native is needed because gnomebase.bbclass does only DEPENDS += "gnome-common"

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-gnome/gnome/gconf_3.2.3.bb |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

meta/recipes-gnome/gnome/gconf_3.2.3.bb +7 -3

index aa9da78..cdc7a35 100644
@@ -3,9 +3,10 @@ SECTION = "x11/gnome"
 LICENSE = "LGPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
 
-DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native"
+DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native polkit"
+DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native"
 
-PR = "r1"
+PR = "r2"
 
 inherit gnomebase

@@ -18,7 +19,10 @@ SRC_URI[archive.sha256sum] = "52008a82a847527877d9e1e549a351c86cc53cada4733b8a70
 
 S = "${WORKDIR}/GConf-${PV}"
 
-EXTRA_OECONF = "--disable-gtk-doc --disable-gtk --enable-shared --disable-static --enable-debug=yes --disable-introspection --disable-orbit --with-openldap=no"
+POLKIT_OECONF = "--enable-defaults-service"
+POLKIT_OECONF_virtclass-native = "--disable-defaults-service"
+EXTRA_OECONF = "--disable-gtk-doc --disable-gtk --enable-shared --disable-static --enable-debug=yes \
+                --disable-introspection --disable-orbit --with-openldap=no ${POLKIT_OECONF}"
 
 do_configure_prepend () {
 	touch gtk-doc.make

Signature · 1 line

1.7.8.rc4

Richard Purdie

2011-11-30 15:45 UTC #16 lore raw

In reply to Martin Jansa

Quoted 11 lines · Martin Jansa

The following changes since commit 2864ff6a4b3c3f9b3bbb6d2597243cc5d3715939:
getVar/setVar cleanups (2011-11-26 22:42:00 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/pull2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull2
Denis 'GNUtoo' Carikli (1):
libical: add version 0.47

Quoted 13 lines

Martin Jansa (9):
tinylogin: use u-a for getty so we can provide /sbin/getty from
util-linux-agetty too
util-linux: use u-a to provide /sbin/getty from util-linux-agetty
mingetty: use u-a to provide /sbin/getty (also provided by
util-linux-agetty and tinylogin)
cronie: use useradd.bbclass instead of hardcoded groupadd calls
ppp-dialin: use useradd.bbclass instead of hardcoded adduser/deluser
calls
libical: drop older version 0.46
libid3tag: add gperf to DEPENDS
gst-plugins-ugly: bump PR to rebuild after libid3tag fix
gconf: add polkit to DEPENDS

I took these with the exception of the gconf change which I know there is an updated patch for.

Cheers,

Richard