Skip to contentSkip to conversation

Patches, QA & Bug Fixes

GIT PULL Saul Wold 2 participants 22 messages Oct 27, 2011 – Oct 31, 2011

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

Richard,

This includes some patches that have been pending, along with some QA packaging fixes that I worked up. This also includes the fix for creating a the xuser and avahi user.

Thanks
Sau!

The following changes since commit ddc9a58b8553599d2328ac1c4449b41681ae45d1:

Add readline as dependecy for gdb-cross-canadian (2011-10-27 08:37:53 +0100)

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

Khem Raj (1):
libtool: Upgrade from 2.4 -> 2.4.2

Paul Eggleton (3):
dbus: remove unused initscript
util-linux: split out mkfs into its own package
e2fsprogs: move mke2fs.conf to e2fsprogs-mke2fs package

Saul Wold (12):
wget: Add recipe from OE
dbus-glib: fix QA Packaging issues
libgcc: fix QA Packaging issues
at: fix QA Packaging issues
man: fix QA Packaging issues
mdadm: fix QA Packaging issues
libatomics-ops: fix QA Packaging issues
libproxy: fix QA Packaging issues
abiword: convert to svn
avahi: use useradd to create user
connman: create xuser
xserver-nodm-init: use useradd to create xuser

Scott Garman (1):
documentation-audit.sh: script for auditing documentation build
status

Wenzong Fan (1):
distro_tracking_fields: update packages tracking fields

 meta-demoapps/recipes-gnome/abiword/abiword.inc    |    4 +-
 meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb |   10 -
 meta-demoapps/recipes-gnome/abiword/abiword_svn.bb |   10 +
 .../conf/distro/include/distro_tracking_fields.inc |   12 +
 meta/recipes-connectivity/avahi/avahi.inc          |   22 +--
 meta/recipes-connectivity/connman/connman.inc      |    6 +-
 meta/recipes-connectivity/connman/connman_0.75.bb  |    2 +-
 meta/recipes-core/dbus/dbus-glib.inc               |    4 +-
 meta/recipes-core/dbus/dbus-glib_0.92.bb           |    2 +-
 meta/recipes-core/dbus/dbus.inc                    |    3 +
 meta/recipes-core/dbus/dbus_1.4.12.bb              |    3 +
 meta/recipes-core/util-linux/util-linux.inc        |    5 +-
 .../e2fsprogs/e2fsprogs_1.41.14.bb                 |    4 +-
 meta/recipes-devtools/gcc/libgcc_4.6.bb            |    2 +
 .../libtool/{libtool.inc => libtool-2.4.2.inc}     |   26 ++-
 meta/recipes-devtools/libtool/libtool-2.4.inc      |   13 -
 ...libtool-cross_2.4.bb => libtool-cross_2.4.2.bb} |    2 +-
 ...btool-native_2.4.bb => libtool-native_2.4.2.bb} |    2 +-
 ...nativesdk_2.4.bb => libtool-nativesdk_2.4.2.bb} |    2 +-
 meta/recipes-devtools/libtool/libtool/prefix.patch |   46 ++--
 .../libtool/libtool/resolve-sysroot.patch          |   42 ---
 .../libtool/{libtool_2.4.bb => libtool_2.4.2.bb}   |    2 +-
 meta/recipes-extended/at/at_3.1.12.bb              |    4 +-
 meta/recipes-extended/man/man_1.6f.bb              |    4 +-
 meta/recipes-extended/mdadm/mdadm_3.2.2.bb         |    3 +-
 .../wget/wget-1.12/fix_makefile.patch              |   59 +++++
 .../wget/wget-1.12/gnutls.bzr.patch                |  266 ++++++++++++++++++++
 meta/recipes-extended/wget/wget.inc                |   24 ++
 meta/recipes-extended/wget/wget_1.12.bb            |   11 +
 .../x11-common/xserver-nodm-init.bb                |   26 +--
 .../pulseaudio/libatomics-ops_1.2.bb               |    6 +-
 meta/recipes-support/libproxy/libproxy_0.4.7.bb    |    4 +-
 scripts/contrib/documentation-audit.sh             |   92 +++++++
 33 files changed, 571 insertions(+), 152 deletions(-)
 delete mode 100644 meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb
 create mode 100644 meta-demoapps/recipes-gnome/abiword/abiword_svn.bb
 rename meta/recipes-devtools/libtool/{libtool.inc => libtool-2.4.2.inc} (57%)
 delete mode 100644 meta/recipes-devtools/libtool/libtool-2.4.inc
 rename meta/recipes-devtools/libtool/{libtool-cross_2.4.bb => libtool-cross_2.4.2.bb} (98%)
 rename meta/recipes-devtools/libtool/{libtool-native_2.4.bb => libtool-native_2.4.2.bb} (96%)
 rename meta/recipes-devtools/libtool/{libtool-nativesdk_2.4.bb => libtool-nativesdk_2.4.2.bb} (97%)
 delete mode 100644 meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch
 rename meta/recipes-devtools/libtool/{libtool_2.4.bb => libtool_2.4.2.bb} (94%)
 create mode 100644 meta/recipes-extended/wget/wget-1.12/fix_makefile.patch
 create mode 100644 meta/recipes-extended/wget/wget-1.12/gnutls.bzr.patch
 create mode 100644 meta/recipes-extended/wget/wget.inc
 create mode 100644 meta/recipes-extended/wget/wget_1.12.bb
 create mode 100755 scripts/contrib/documentation-audit.sh
Signature · 1 line
1.7.6.4
author
#1 lore raw

[CONSOLIDATED PULL 01/18] libtool: Upgrade from 2.4 -> 2.4.2

From: Khem Raj <[email protected]>

Adjust prefix.patch and delete resolve-sysroot.patch since its already applied upstream

---
 .../libtool/{libtool.inc => libtool-2.4.2.inc}     |   26 +++++++++---
 meta/recipes-devtools/libtool/libtool-2.4.inc      |   13 ------
 ...libtool-cross_2.4.bb => libtool-cross_2.4.2.bb} |    2 +-
 ...btool-native_2.4.bb => libtool-native_2.4.2.bb} |    2 +-
 ...nativesdk_2.4.bb => libtool-nativesdk_2.4.2.bb} |    2 +-
 meta/recipes-devtools/libtool/libtool/prefix.patch |   46 ++++++++++----------
 .../libtool/libtool/resolve-sysroot.patch          |   42 ------------------
 .../libtool/{libtool_2.4.bb => libtool_2.4.2.bb}   |    2 +-
 8 files changed, 47 insertions(+), 88 deletions(-)
 rename meta/recipes-devtools/libtool/{libtool.inc => libtool-2.4.2.inc} (57%)
 delete mode 100644 meta/recipes-devtools/libtool/libtool-2.4.inc
 rename meta/recipes-devtools/libtool/{libtool-cross_2.4.bb => libtool-cross_2.4.2.bb} (98%)
 rename meta/recipes-devtools/libtool/{libtool-native_2.4.bb => libtool-native_2.4.2.bb} (96%)
 rename meta/recipes-devtools/libtool/{libtool-nativesdk_2.4.bb => libtool-nativesdk_2.4.2.bb} (97%)
 delete mode 100644 meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch
 rename meta/recipes-devtools/libtool/{libtool_2.4.bb => libtool_2.4.2.bb} (94%)
meta/recipes-devtools/libtool/libtool-2.4.2.inc renamed from meta/recipes-devtools/libtool/libtool.inc +20 -6
similarity index 57%
rename from meta/recipes-devtools/libtool/libtool.inc
rename to meta/recipes-devtools/libtool/libtool-2.4.2.inc
index ef9095b..1f652ef 100644
@@ -1,4 +1,3 @@
-SUMMARY = "Generic library support script"
 DESCRIPTION = "This is GNU libtool, a generic library support script. \
 Libtool hides the complexity of generating special library types \
 (such as shared libraries) behind a consistent interface."
@@ -8,21 +7,36 @@ LICENSE = "GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
     file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
 
+INC_PR = "r0"
+
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
            file://trailingslash.patch \
            file://prefix-manpage-fix.patch \
            file://rename-with-sysroot.patch \
-           file://resolve-sysroot.patch \
            file://use-sysroot-in-libpath.patch \
            file://fix-final-rpath.patch \
            file://avoid_absolute_paths_for_general_utils.patch \
-           file://fix-rpath.patch "
+           file://fix-rpath.patch \
+          "
+
+SRC_URI[md5sum] = "d2f3b7d4627e69e13514a40e72a24d50"
+SRC_URI[sha256sum] = "b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918"
 
 do_compile_prepend () {
-	# Sometimes this file doesn't get rebuilt, force the issue
-	rm -f ${S}/libltdl/config/ltmain.sh
-	make libltdl/config/ltmain.sh
+        # Sometimes this file doesn't get rebuilt, force the issue
+        rm -f ${S}/libltdl/config/ltmain.sh
+        make libltdl/config/ltmain.sh
 }
 
 inherit autotools
 EXTRA_AUTORECONF = "--exclude=libtoolize"
+
+DEPENDS = "libtool-native"
+
+PACKAGES =+ "libltdl libltdl-dev libltdl-dbg"
+FILES_${PN} += "${datadir}/aclocal*"
+FILES_libltdl = "${libdir}/libltdl.so.*"
+FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h"
+FILES_libltdl-dbg = "${libdir}/.debug/"
+
+EXTRA_OECONF = "--with-sysroot"
meta/recipes-devtools/libtool/libtool-2.4.inc deleted +0 -13
deleted file mode 100644
index e3d17b7..0000000
@@ -1,13 +0,0 @@
-require libtool.inc
-DEPENDS = "libtool-native"
-
-PACKAGES =+ "libltdl libltdl-dev libltdl-dbg"
-FILES_${PN} += "${datadir}/aclocal*"
-FILES_libltdl = "${libdir}/libltdl.so.*"
-FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h"
-FILES_libltdl-dbg = "${libdir}/.debug/"
-
-SRC_URI[md5sum] = "b32b04148ecdd7344abc6fe8bd1bb021"
-SRC_URI[sha256sum] = "13df57ab63a94e196c5d6e95d64e53262834fe780d5e82c28f177f9f71ddf62e"
-
-EXTRA_OECONF = "--with-sysroot"
\ No newline at end of file
meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb renamed from meta/recipes-devtools/libtool/libtool-cross_2.4.bb +1 -1
similarity index 98%
rename from meta/recipes-devtools/libtool/libtool-cross_2.4.bb
rename to meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb
index 6d512b1..b7fe851 100644
@@ -1,6 +1,6 @@
 require libtool-${PV}.inc
 
-PR = "r4"
+PR = "${INC_PR}.0"
 PACKAGES = ""
 SRC_URI += "file://prefix.patch"
 
meta/recipes-devtools/libtool/libtool-native_2.4.2.bb renamed from meta/recipes-devtools/libtool/libtool-native_2.4.bb +1 -1
similarity index 96%
rename from meta/recipes-devtools/libtool/libtool-native_2.4.bb
rename to meta/recipes-devtools/libtool/libtool-native_2.4.2.bb
index 3d0998e..f12e6a1 100644
@@ -2,7 +2,7 @@ require libtool-${PV}.inc
 
 DEPENDS = ""
 
-PR = "r4"
+PR = "${INC_PR}.0"
 SRC_URI += "file://prefix.patch"
 
 inherit native
meta/recipes-devtools/libtool/libtool-nativesdk_2.4.2.bb renamed from meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb +1 -1
similarity index 97%
rename from meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
rename to meta/recipes-devtools/libtool/libtool-nativesdk_2.4.2.bb
index a96d1d1..bd45dfe 100644
@@ -1,6 +1,6 @@
 require libtool-${PV}.inc
 
-PR = "r4"
+PR = "${INC_PR}.0"
 SRC_URI += "file://prefix.patch"
 
 inherit nativesdk
meta/recipes-devtools/libtool/libtool/prefix.patch +23 -23

90 lines not on this page · raw message

meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch deleted +0 -42

42 lines not on this page · raw message

meta/recipes-devtools/libtool/libtool_2.4.2.bb renamed from meta/recipes-devtools/libtool/libtool_2.4.bb +1 -1
similarity index 94%
rename from meta/recipes-devtools/libtool/libtool_2.4.bb
rename to meta/recipes-devtools/libtool/libtool_2.4.2.bb
index 3002215..a2eb4ea 100644
@@ -1,6 +1,6 @@
 require libtool-${PV}.inc
 
-PR = "r4"
+PR = "${INC_PR}.0"
 
 #
 # We want the results of libtool-cross preserved - don't stage anything ourselves.
Signature · 1 line
1.7.6.4
author
#2 lore raw

[CONSOLIDATED PULL 02/18] wget: Add recipe from OE

In reply to Saul Wold

Needed to support building oe-core with oe-core

---
 .../wget/wget-1.12/fix_makefile.patch              |   59 +++++
 .../wget/wget-1.12/gnutls.bzr.patch                |  266 ++++++++++++++++++++
 meta/recipes-extended/wget/wget.inc                |   24 ++
 meta/recipes-extended/wget/wget_1.12.bb            |   11 +
 4 files changed, 360 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-extended/wget/wget-1.12/fix_makefile.patch
 create mode 100644 meta/recipes-extended/wget/wget-1.12/gnutls.bzr.patch
 create mode 100644 meta/recipes-extended/wget/wget.inc
 create mode 100644 meta/recipes-extended/wget/wget_1.12.bb
meta/recipes-extended/wget/wget-1.12/fix_makefile.patch new file +59 -0
new file mode 100644
index 0000000..3f34c76
@@ -0,0 +1,59 @@
+
+Upstream-Status: Pending
+
+Signed-off-by: Saul Wold <[email protected]>
+
+Index: wget-1.12/po/Makefile.in.in
+===================================================================
+--- wget-1.12.orig/po/Makefile.in.in	2009-09-04 09:31:54.000000000 -0700
++++ wget-1.12/po/Makefile.in.in	2011-10-19 20:32:53.714812160 -0700
+@@ -8,8 +8,8 @@
+ # Please note that the actual code of GNU gettext is covered by the GNU
+ # General Public License and is *not* in the public domain.
+ #
+-# Origin: gettext-0.17
+-GETTEXT_MACRO_VERSION = 0.17
++# Origin: gettext-0.18
++GETTEXT_MACRO_VERSION = 0.18
+ 
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+Index: wget-1.12/configure.ac
+===================================================================
+--- wget-1.12.orig/configure.ac	2009-09-22 09:39:49.000000000 -0700
++++ wget-1.12/configure.ac	2011-10-19 20:32:53.714812160 -0700
+@@ -110,7 +110,7 @@
+ dnl Gettext
+ dnl
+ AM_GNU_GETTEXT([external],[need-ngettext])
+-AM_GNU_GETTEXT_VERSION([0.17])
++AM_GNU_GETTEXT_VERSION([0.18])
+ 
+ AC_PROG_RANLIB
+ 
+Index: wget-1.12/configure
+===================================================================
+--- wget-1.12.orig/configure	2009-09-22 09:40:13.000000000 -0700
++++ wget-1.12/configure	2011-10-19 20:33:46.578812174 -0700
+@@ -5297,7 +5297,7 @@
+ 
+ 
+ 
+-      GETTEXT_MACRO_VERSION=0.17
++      GETTEXT_MACRO_VERSION=0.18
+ 
+ 
+ 
+Index: wget-1.12/m4/po.m4
+===================================================================
+--- wget-1.12.orig/m4/po.m4	2009-09-04 09:31:54.000000000 -0700
++++ wget-1.12/m4/po.m4	2011-10-19 20:33:53.426812176 -0700
+@@ -30,7 +30,7 @@
+ 
+   dnl Release version of the gettext macros. This is used to ensure that
+   dnl the gettext macros and po/Makefile.in.in are in sync.
+-  AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
++  AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
+ 
+   dnl Perform the following tests also if --disable-nls has been given,
+   dnl because they are needed for "make dist" to work.
meta/recipes-extended/wget/wget-1.12/gnutls.bzr.patch new file +266 -0

266 lines not on this page · raw message

meta/recipes-extended/wget/wget.inc new file +24 -0
new file mode 100644
index 0000000..589d727
@@ -0,0 +1,24 @@
+DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more."
+SECTION = "console/network"
+LICENSE = "GPL"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+DEPENDS = ""
+
+INC_PR = "r10"
+
+S = "${WORKDIR}/wget-${PV}"
+
+inherit autotools gettext update-alternatives
+
+# Disable checking for SSL since that searches the system paths
+EXTRA_OECONF = "--with-libc --enable-ipv6 --without-ssl"
+
+do_install_append () {
+	mv ${D}${bindir}/wget ${D}${bindir}/wget.${PN}
+}
+
+ALTERNATIVE_NAME = "wget"
+ALTERNATIVE_LINK = "${base_bindir}/wget"
+ALTERNATIVE_PATH = "${base_bindir}/wget.${PN}"
+ALTERNATIVE_PRIORITY = "100"
meta/recipes-extended/wget/wget_1.12.bb new file +11 -0
new file mode 100644
index 0000000..cab27e9
@@ -0,0 +1,11 @@
+PR = "${INC_PR}.1"
+
+SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
+           file://gnutls.bzr.patch \
+           file://fix_makefile.patch \
+          "
+
+SRC_URI[md5sum] = "141461b9c04e454dc8933c9d1f2abf83"
+SRC_URI[sha256sum] = "7578ed0974e12caa71120581fa3962ee5a69f7175ddc3d6a6db0ecdcba65b572"
+
+require wget.inc
Signature · 1 line
1.7.6.4
author
#3 lore raw

[CONSOLIDATED PULL 03/18] dbus-glib: fix QA Packaging issues

In reply to Saul Wold
---
 meta/recipes-core/dbus/dbus-glib.inc     |    4 +++-
 meta/recipes-core/dbus/dbus-glib_0.92.bb |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-core/dbus/dbus-glib.inc +3 -1
index 704dc04..80f68c8 100644
@@ -19,7 +19,9 @@ EXTRA_OECONF = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-in
                 --with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool"
 EXTRA_OECONF_virtclass-native = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml"
 
-FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN} = "${libdir}/lib*${SOLIBS}"
+FILES_${PN}-bash_completion = "${sysconfdir}/bash_completion.d/dbus-bash-completion.sh \
+   ${libexecdir}/dbus-bash-completion-helper"
 FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
 FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
 
meta/recipes-core/dbus/dbus-glib_0.92.bb +1 -1
index 72bea89..c7266d4 100644
@@ -1,6 +1,6 @@
 require dbus-glib.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI[md5sum] = "b595b36890c4f9f8f5d5dec131c495f8"
 SRC_URI[sha256sum] = "5a7fd4cf937cdcb7f2eed61341b70ee0f2607450a50db381618598adf60dd40e"
Signature · 1 line
1.7.6.4
author
#4 lore raw

[CONSOLIDATED PULL 05/18] at: fix QA Packaging issues

In reply to Saul Wold
---
 meta/recipes-extended/at/at_3.1.12.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
meta/recipes-extended/at/at_3.1.12.bb +3 -1
index 30fdb68..f2017b7 100644
@@ -11,7 +11,7 @@ PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits"
 
 RCONFLICTS_${PN} = "atd"
 RREPLACES_${PN} = "atd"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
     file://configure.patch \
@@ -50,6 +50,8 @@ do_install () {
 	install -d ${D}${sysconfdir}/rcS.d
 	install -m 0755    ${WORKDIR}/S99at		${D}${sysconfdir}/init.d/atd
 	ln -sf		../init.d/atd		${D}${sysconfdir}/rcS.d/S99at
+	cp -r ${D}/usr/doc/at ${D}${docdir}/
+	rm -rf ${D}/usr/doc
 
 	for feature in ${DISTRO_FEATURES}; do
 		if [ "$feature" = "pam" ]; then
Signature · 1 line
1.7.6.4
author
#5 lore raw

[CONSOLIDATED PULL 04/18] libgcc: fix QA Packaging issues

In reply to Saul Wold
---
 meta/recipes-devtools/gcc/libgcc_4.6.bb |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
meta/recipes-devtools/gcc/libgcc_4.6.bb +2 -0
index 6ba0339..401d9dc 100644
@@ -6,6 +6,7 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 PACKAGES = "\
   ${PN} \
   ${PN}-dev \
+  ${PN}-dbg \
   "
 
 FILES_${PN} = "${base_libdir}/libgcc*.so.*"
@@ -14,6 +15,7 @@ FILES_${PN}-dev = " \
   ${libdir}/${TARGET_SYS}/${BINV}/crt* \
   ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \
   ${libdir}/${TARGET_SYS}/${BINV}/libgcc*"
+FILES_${PN}-dbg = "${base_libdir}/.debug"
 
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
Signature · 1 line
1.7.6.4
#6 lore raw

Re: [CONSOLIDATED PULL 04/18] libgcc: fix QA Packaging issues

Quoted 18 lines · Saul Wold
---
 meta/recipes-devtools/gcc/libgcc_4.6.bb |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
meta/recipes-devtools/gcc/libgcc_4.6.bb +1 -0
index 6ba0339..401d9dc 100644
@@ -6,6 +6,7 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 PACKAGES = "\
   ${PN} \
   ${PN}-dev \
+  ${PN}-dbg \
   "
 
 FILES_${PN} = "${base_libdir}/libgcc*.so.*"

meta/recipes-devtools/gcc/libgcc_4.6.bb FILES_${PN}-dev = " \ · line 18

Quoted 4 lines
meta/recipes-devtools/gcc/libgcc_4.6.bb +1 -0
@@ -14,6 +15,7 @@ FILES_${PN}-dev = " \
   ${libdir}/${TARGET_SYS}/${BINV}/crt* \
   ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \
   ${libdir}/${TARGET_SYS}/${BINV}/libgcc*"
+FILES_${PN}-dbg = "${base_libdir}/.debug"

Isn't this second piece defined by default in bitbake.conf? I think we can remove this second piece...

Cheers,

Richard

author
#7 lore raw

[CONSOLIDATED PULL 06/18] man: fix QA Packaging issues

In reply to Saul Wold
---
 meta/recipes-extended/man/man_1.6f.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-extended/man/man_1.6f.bb +2 -2
index d38612b..c98c920 100644
@@ -3,7 +3,7 @@ DESCRIPTION = "A set of documentation tools: man, apropos and whatis"
 SECTION = "console/utils"
 HOMEPAGE = "http://primates.ximian.com/~flucifredi/man"
 LICENSE = "GPLv2"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "groff less"
 
@@ -61,4 +61,4 @@ do_install_append(){
 }
 
 
-FILES_${PN} += "${datadir}/locale"
+FILES_${PN} += "${datadir}/locale ${sysconfdir}/man.conf"
Signature · 1 line
1.7.6.4
author
#8 lore raw

[CONSOLIDATED PULL 07/18] mdadm: fix QA Packaging issues

In reply to Saul Wold
---
 meta/recipes-extended/mdadm/mdadm_3.2.2.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
meta/recipes-extended/mdadm/mdadm_3.2.2.bb +2 -1
index 492cc8e..97878ed 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
                     file://mdmon.c;beginline=4;endline=18;md5=af7d8444d9c4d3e5c7caac0d9d34039d \
                     file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2 \
 	    file://0001-mdadm-fix-build-failures-ppc64.patch \
@@ -31,3 +31,4 @@ do_install() {
 	autotools_do_install
 }
 
+FILES_${PN} += "${base_libdir}/udev/rules.d/*.rules"
Signature · 1 line
1.7.6.4
author
#9 lore raw

[CONSOLIDATED PULL 09/18] libproxy: fix QA Packaging issues

In reply to Saul Wold
---
 meta/recipes-support/libproxy/libproxy_0.4.7.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
meta/recipes-support/libproxy/libproxy_0.4.7.bb +3 -1
index 2793b41..f31b701 100644
@@ -6,9 +6,10 @@ LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7d7044444a7b1b116e8783edcdb44ff4 \
                     file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0"
 
-
 DEPENDS = "gconf"
 
+PR = "r1"
+
 SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz"
 
 SRC_URI[md5sum] = "509e03a488a61cd62bfbaf3ab6a2a7a5"
@@ -19,6 +20,7 @@ inherit cmake pkgconfig
 EXTRA_OECMAKE = "-DWITH_WEBKIT=no -DWITH_GNOME=yes -DWITH_KDE4=no \
 	      -DWITH_PYTHON=no -DWITH_PERL=no -DWITH_MOZJS=no -DWITH_NM=no -DLIB_INSTALL_DIR=${libdir}"
 
+FILES_${PN}-dev += "${datadir}/cmake"
 FILES_${PN}-dbg += "${libdir}/libproxy/${PV}/plugins/.debug/ ${libdir}/libproxy/${PV}/modules/.debug/"
 
 do_configure_prepend() {
Signature · 1 line
1.7.6.4
author
#10 lore raw

[CONSOLIDATED PULL 10/18] abiword: convert to svn

In reply to Saul Wold
---
 meta-demoapps/recipes-gnome/abiword/abiword.inc    |    4 ++--
 meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb |   10 ----------
 meta-demoapps/recipes-gnome/abiword/abiword_svn.bb |   10 ++++++++++
 3 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb
 create mode 100644 meta-demoapps/recipes-gnome/abiword/abiword_svn.bb
meta-demoapps/recipes-gnome/abiword/abiword.inc +2 -2
index b1b0f67..4ec0ba9 100644
@@ -13,8 +13,8 @@ RRECOMMENDS_${PN}    = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
 RELURI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
 RELSRC = "${WORKDIR}/abiword-${PV}/abi"
 
-CVSURI = "cvs://anoncvs:[email protected]/cvsroot;module=abi"
-CVSSRC = "${WORKDIR}/abi"
+SVNURI = "svn://svn.abisource.com/abiword/trunk;module=abiword;proto=http"
+SVNSRC = "${WORKDIR}/abi"
 
 #want 2.x from 2.x.y for the installation directory
 SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb deleted +0 -10
deleted file mode 100644
index 163029e..0000000
@@ -1,10 +0,0 @@
-require abiword.inc
-
-SRCDATE = "20070130"
-PV="2.5.0+cvs${SRCDATE}"
-PR = "r4"
-
-SRC_URI = "${CVSURI}"
-
-S = "${CVSSRC}"
-
meta-demoapps/recipes-gnome/abiword/abiword_svn.bb new file +10 -0
new file mode 100644
index 0000000..a8946a8
@@ -0,0 +1,10 @@
+require abiword.inc
+
+SRCREV = "21818"
+PV="2.5.2+svnr${SRCPV}"
+PR = "r0"
+
+SRC_URI = "${SVNURI}"
+
+S = "${SVNSRC}"
+
Signature · 1 line
1.7.6.4
author
#11 lore raw

[CONSOLIDATED PULL 08/18] libatomics-ops: fix QA Packaging issues

In reply to Saul Wold
---
 .../pulseaudio/libatomics-ops_1.2.bb               |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb +5 -1
index 05b22e8..ab7ccbe 100644
@@ -6,7 +6,7 @@ LICENSE = "GPLv2 & MIT"
 LIC_FILES_CHKSUM = "file://doc/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://doc/LICENSING.txt;md5=607073e04548eac7d1f763e480477bab \
 		   "
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-${PV}.tar.gz \
            file://fedora/libatomic_ops-1.2-ppclwzfix.patch \
@@ -21,3 +21,7 @@ S = "${WORKDIR}/libatomic_ops-${PV}"
 ALLOW_EMPTY_${PN} = "1"
 
 inherit autotools pkgconfig
+
+do_install_append() {
+	mv ${D}${datadir}/libatomic_ops ${D}${datadir}/libatomic-ops || true
+}
Signature · 1 line
1.7.6.4
author
#12 lore raw

[CONSOLIDATED PULL 11/18] dbus: remove unused initscript

In reply to Saul Wold

From: Paul Eggleton <[email protected]>

We already install an appropriate init script to /etc/init.d, we do not need an additional one in /etc/init.d/rc.d as well.

---
 meta/recipes-core/dbus/dbus.inc       |    3 +++
 meta/recipes-core/dbus/dbus_1.4.12.bb |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)
meta/recipes-core/dbus/dbus.inc +3 -0
index 2a97c02..4c7d87a 100644
@@ -86,6 +86,9 @@ do_install() {
 	chown root:messagebus ${D}${libexecdir}/dbus-daemon-launch-helper
 	chmod 4754 ${D}${libexecdir}/dbus-daemon-launch-helper
 
+	# Remove Red Hat initscript
+	rm -rf ${D}${sysconfdir}/rc.d
+
 	# disable dbus-1 sysv script on systemd installs
 	# nearly all distros call the initscript plain 'dbus', but OE-core is different
 	ln -sf /dev/null ${D}/${base_libdir}/systemd/system/dbus-1.service
meta/recipes-core/dbus/dbus_1.4.12.bb +3 -0
index ada53c9..9324af7 100644
@@ -1,4 +1,7 @@
 include dbus.inc
+
+PR = "r1"
+
 SRC_URI[md5sum] = "104f2ea94c10a896dfb1edecb5714cb1"
 SRC_URI[sha256sum] = "da3c97fd546610558d588799e27c4fa81101e754acbcd34747a42c131f30dbe7"
 
Signature · 1 line
1.7.6.4
author
#13 lore raw

[CONSOLIDATED PULL 12/18] util-linux: split out mkfs into its own package

In reply to Saul Wold

From: Paul Eggleton <[email protected]>

For those external tools such as Webmin that call mkfs to do formatting operations, it is useful to have it in its own package to avoid dragging in the rest of util-linux.

[Merged with head]

---
 meta/recipes-core/util-linux/util-linux.inc |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
meta/recipes-core/util-linux/util-linux.inc +3 -2
index eeba67c..4db577c 100644
@@ -30,7 +30,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
              util-linux-mount util-linux-readprofile util-linux-libblkid \
              util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
              util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
-	     util-linux-chkdupexe"
+	     util-linux-chkdupexe util-linux-mkfs"
 
 EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown --enable-elvtune --enable-init --enable-kill --enable-last \
  --enable-mesg --enable-partx --enable-raw --enable-rdev --enable-reset \
@@ -57,15 +57,16 @@ FILES_util-linux-lscpu = "${bindir}/lscpu"
 
 FILES_util-linux-fsck = "${base_sbindir}/fsck*"
 FILES_util-linux-chkdupexe = "${bindir}/chkdupexe"
+FILES_util-linux-mkfs = "${sbindir}/mkfs"
 
 # Util-linux' blkid replaces the e2fsprogs one
 FILES_util-linux-blkid = "${base_sbindir}/blkid*"
 RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid"
 RREPLACES_util-linux-blkid = "e2fsprogs-blkid"
 
-RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile "
 RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup"
 RDEPENDS_${PN}-chkdupexe = "perl"
+RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs "
 
 RRECOMMENDS_${PN}_virtclass-native = ""
 RDEPENDS_${PN}_virtclass-native = ""
Signature · 1 line
1.7.6.4
author
#14 lore raw

[CONSOLIDATED PULL 14/18] distro_tracking_fields: update packages tracking fields

In reply to Saul Wold

From: Wenzong Fan <[email protected]>

Update packages tracking fields including ccache, chkconfig.

---
 .../conf/distro/include/distro_tracking_fields.inc |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +12 -0
index 1f3540e..f053f87 100644
@@ -5976,6 +5976,18 @@ RECIPE_MANUAL_CHECK_DATE_pn-libsdl = "Jul 28, 2011"
 RECIPE_MAINTAINER_pn-libsdl = "Kai Kang <[email protected]>"
 DISTRO_PN_ALIAS_pn-libsdl = "Fedora=SDL Opensuse=SDL"
 
+RECIPE_STATUS_pn-ccache = "green"
+RECIPE_MAINTAINER_pn-ccache = "Wenzong Fan <[email protected]>"
+RECIPE_LATEST_VERSION_pn-ccache = "3.1.6"
+RECIPE_LAST_UPDATE_pn-ccache = "October 19, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-ccache = "October 25, 2011"
+
+RECIPE_STATUS_pn-chkconfig = "green"
+RECIPE_MAINTAINER_pn-chkconfig = "Wenzong Fan <[email protected]>"
+RECIPE_LATEST_VERSION_pn-chkconfig = "1.3.55"
+RECIPE_LAST_UPDATE_pn-chkconfig = "October 19, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-chkconfig = "October 25, 2011"
+
 DISTRO_PN_ALIAS_pn-lame = "Debian=lame Ubuntu=lame"
 DISTRO_PN_ALIAS_pn-libiconv = "Fedora=mingw-libiconv Opensuse=cross-mingw-libiconv"
 DISTRO_PN_ALIAS_pn-qt4-native = "Fedora=qt4 Debian=qt4-dev-tools"
Signature · 1 line
1.7.6.4
author
#15 lore raw

[CONSOLIDATED PULL 15/18] documentation-audit.sh: script for auditing documentation build status

In reply to Saul Wold

From: Scott Garman <[email protected]>

This script is used to enumerate which recipes are building documentation. It does this by checking that a -doc package gets generated and contains files.

The script works by building each recipe using the output from bitbake -s.

It will generate several report files, listing which recipes include documentation, which are missing documentation, and which did not successfully build at all.

---
 scripts/contrib/documentation-audit.sh |   92 ++++++++++++++++++++++++++++++++
 1 files changed, 92 insertions(+), 0 deletions(-)
 create mode 100755 scripts/contrib/documentation-audit.sh
scripts/contrib/documentation-audit.sh new file +92 -0
new file mode 100755
index 0000000..5070fee
@@ -0,0 +1,92 @@
+#!/bin/bash
+#
+# Perform an audit of which packages provide documentation and which
+# are missing -doc packages.
+#
+# Setup requirements: be sure to be building for MACHINE=qemux86. Run
+# this script after source'ing the build environment script, so you're
+# running it from build/ directory.
+#
+# Maintainer: Scott Garman <[email protected]>
+
+REPORT_DOC_SIMPLE="documentation_exists.txt"
+REPORT_DOC_DETAIL="documentation_exists_detail.txt"
+REPORT_MISSING_SIMPLE="documentation_missing.txt"
+REPORT_MISSING_DETAIL="documentation_missing_detail.txt"
+REPORT_BUILD_ERRORS="build_errors.txt"
+
+rm -rf $REPORT_DOC_SIMPLE $REPORT_DOC_DETAIL $REPORT_MISSING_SIMPLE $REPORT_MISSING_DETAIL
+
+BITBAKE=`which bitbake`
+if [ -z "$BITBAKE" ]; then
+	echo "Error: bitbake command not found."
+	echo "Did you forget to source the build environment script?"
+	exit 1
+fi
+
+echo "REMINDER: you need to build for MACHINE=qemux86 or you won't get useful results"
+echo "REMINDER: you need to have COMMERCIAL_LICENSE = \"\" in local.conf or you'll get false positives"
+
+for pkg in `bitbake -s | awk '{ print \$1 }'`; do
+	if [[ "$pkg" == "Loading" || "$pkg" == "Loaded" ||
+          "$pkg" == "Parsing" || "$pkg" == "Package" ||
+          "$pkg" == "NOTE:"   || "$pkg" == "WARNING:" ||
+          "$pkg" == "done."   || "$pkg" == "============" ]]
+	then
+		# Skip initial bitbake output
+		continue
+	fi
+	if [[ "$pkg" =~ -native$ || "$pkg" =~ -nativesdk$ ||
+          "$pkg" =~ -cross-canadian ]]; then
+		# Skip native/nativesdk/cross-canadian recipes
+		continue
+	fi
+	if [[ "$pkg" =~ ^meta- || "$pkg" =~ ^task- || "$pkg" =~ -image ]]; then
+		# Skip meta, task and image recipes
+		continue
+	fi
+	if [[ "$pkg" =~ ^glibc- || "$pkg" =~ ^libiconv$ ||
+          "$pkg" =~ -toolchain$ || "$pkg" =~ ^package-index$ ||
+          "$pkg" =~ ^linux- || "$pkg" =~ ^adt-installer$ ||
+          "$pkg" =~ ^eds-tools$ || "$pkg" =~ ^external-python-tarball$ ||
+          "$pkg" =~ ^qt4-embedded$ || "$pkg" =~ ^qt-mobility ]]; then
+		# Skip glibc, libiconv, -toolchain, and other recipes known
+		# to cause build conflicts or trigger false positives.
+		continue
+	fi	
+
+	echo "Building package $pkg..."
+	bitbake $pkg > /dev/null
+	if [ $? -ne 0 ]; then
+		echo "There was an error building package $pkg" >> "$REPORT_MISSING_DETAIL"
+		echo "$pkg" >> $REPORT_BUILD_ERRORS
+
+		# Do not skip the remaining tests, as sometimes the
+		# exit status is 1 due to QA errors, and we can still
+		# perform the -doc checks.
+	fi
+
+	echo "$pkg built successfully, checking for a documentation package..."
+	WORKDIR=`bitbake -e $pkg | grep ^WORKDIR | awk -F '=' '{ print \$2 }' | awk -F '"' '{ print \$2 }'`
+	FIND_DOC_PKG=`find $WORKDIR/packages-split/*-doc -maxdepth 0 -type d`
+	if [ -z "$FIND_DOC_PKG" ]; then
+		# No -doc package was generated:
+		echo "No -doc package: $pkg" >> "$REPORT_MISSING_DETAIL"
+		echo "$pkg" >> $REPORT_MISSING_SIMPLE
+		continue
+	fi
+
+	FIND_DOC_FILES=`find $FIND_DOC_PKG -type f`
+	if [ -z "$FIND_DOC_FILES" ]; then
+		# No files shipped with the -doc package:
+		echo "No files shipped with the -doc package: $pkg" >> "$REPORT_MISSING_DETAIL"
+		echo "$pkg" >> $REPORT_MISSING_SIMPLE
+		continue
+	fi
+
+	echo "Documentation shipped with $pkg:" >> "$REPORT_DOC_DETAIL"
+	echo "$FIND_DOC_FILES" >> "$REPORT_DOC_DETAIL"
+	echo ""	>> "$REPORT_DOC_DETAIL"
+
+	echo "$pkg" >> "$REPORT_DOC_SIMPLE"
+done
Signature · 1 line
1.7.6.4
author
#16 lore raw

[CONSOLIDATED PULL 13/18] e2fsprogs: move mke2fs.conf to e2fsprogs-mke2fs package

In reply to Saul Wold

From: Paul Eggleton <[email protected]>

mke2fs.conf, which contains defaults for filesystem formatting options, ought to be shipped along with mke2fs itself.

---
 .../e2fsprogs/e2fsprogs_1.41.14.bb                 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb +2 -2
index 1fca7b9..c6c1f0d 100644
@@ -1,6 +1,6 @@
 require e2fsprogs.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://quotefix.patch \
             file://acinclude.m4"
@@ -44,7 +44,7 @@ PACKAGES =+ "libcomerr libss libe2p libext2fs"
 FILES_e2fsprogs-blkid = "${base_sbindir}/blkid"
 FILES_e2fsprogs-fsck = "${base_sbindir}/fsck"
 FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
-FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*"
+FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf"
 FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
 FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
 FILES_libcomerr = "${libdir}/libcom_err.so.*"
Signature · 1 line
1.7.6.4
author
#17 lore raw

[CONSOLIDATED PULL 16/18] avahi: use useradd to create user

In reply to Saul Wold
---
 meta/recipes-connectivity/avahi/avahi.inc |   22 ++++------------------
 1 files changed, 4 insertions(+), 18 deletions(-)
meta/recipes-connectivity/avahi/avahi.inc +4 -18
index 5ad9db0..4abe0e8 100644
@@ -23,7 +23,10 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
           file://99avahi-autoipd \
           file://initscript.patch"
 
-inherit autotools pkgconfig update-rc.d gettext
+USERADD_PACKAGES = "${PN}-daemon"
+USERADD_PARAM_${PN}-daemon = "--disabled-password --system --home /var/run/avahi-daemon --no-create-home -user-group avahi"
+
+inherit autotools pkgconfig update-rc.d gettext useradd
 
 EXTRA_OECONF = "--with-distro=debian \
              --disable-introspection \
@@ -116,23 +119,6 @@ do_install_avahi-autoipd() {
 	install ${WORKDIR}/99avahi-autoipd ${D}${sysconfdir}/udhcpc.d
 }
 
-# At the time the postinst runs, dbus might not be setup so only restart if running
-
-pkg_postinst_avahi-daemon () {
-	# can't do this offline
-	if [ "x$D" != "x" ]; then
-		exit 1
-	fi
-	grep "^avahi:" /etc/group > /dev/null || addgroup avahi
-	grep "^avahi:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
-
-	DBUSPID=`pidof dbus-daemon`
-
-	if [ "x$DBUSPID" != "x" ]; then
-		/etc/init.d/dbus-1 force-reload
-	fi
-}
-
 pkg_postinst_avahi-autoipd () {
 	# can't do this offline
 	if [ "x$D" != "x" ]; then
Signature · 1 line
1.7.6.4
author
#18 lore raw

[CONSOLIDATED PULL 18/18] xserver-nodm-init: use useradd to create xuser

In reply to Saul Wold
---
 .../x11-common/xserver-nodm-init.bb                |   26 ++++---------------
 1 files changed, 6 insertions(+), 20 deletions(-)
meta/recipes-graphics/x11-common/xserver-nodm-init.bb +6 -20
index ea4222d..33252cb 100644
@@ -2,11 +2,10 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SECTION = "x11"
-PR = "r26"
+PR = "r27"
 RDEPENDS_${PN} = "sudo"
 
 SRC_URI = "file://xserver-nodm \
-           file://Xusername \
            file://gplv2-license.patch"
 
 S = ${WORKDIR}
@@ -19,27 +18,14 @@ do_install() {
     install xserver-nodm ${D}/etc/init.d
     if [ "${ROOTLESS_X}" = "1" ] ; then
         install -d ${D}/etc/X11
-        install Xusername ${D}/etc/X11
     fi
 }
 
-pkg_postinst_${PN} () {
-    if [ "x$D" != "x" ] ; then
-        exit 1
-    fi
-
-    if [ -f /etc/X11/Xusername ]; then
-        # create the rootless X user, and add user to group tty, video, audio
-        username=`cat /etc/X11/Xusername`
-        adduser --disabled-password $username
-        # FIXME: use addgroup if busybox addgroup is ready
-        sed -i -e "s/^video:.*/&${username}/g" /etc/group
-        sed -i -e "s/^tty:.*/&${username}/g" /etc/group
-        sed -i -e "s/^audio:.*/&${username}/g" /etc/group
-    fi
-}
-
-inherit update-rc.d
+inherit update-rc.d useradd
 
 INITSCRIPT_NAME = "xserver-nodm"
 INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
+
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /etc/X11 --shell /bin/false --groups video,tty,audio --user-group xuser"
+
Signature · 1 line
1.7.6.4
#19 lore raw

Re: [CONSOLIDATED PULL 18/18] xserver-nodm-init: use useradd to create xuser

Quoted 44 lines · Saul Wold
---
 .../x11-common/xserver-nodm-init.bb                |   26 ++++---------------
 1 files changed, 6 insertions(+), 20 deletions(-)
meta/recipes-graphics/x11-common/xserver-nodm-init.bb +1 -17
index ea4222d..33252cb 100644
@@ -2,11 +2,10 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SECTION = "x11"
-PR = "r26"
+PR = "r27"
 RDEPENDS_${PN} = "sudo"
 
 SRC_URI = "file://xserver-nodm \
-           file://Xusername \
            file://gplv2-license.patch"
 
 S = ${WORKDIR}
@@ -19,27 +18,14 @@ do_install() {
     install xserver-nodm ${D}/etc/init.d
     if [ "${ROOTLESS_X}" = "1" ] ; then
         install -d ${D}/etc/X11
-        install Xusername ${D}/etc/X11
     fi
 }
 
-pkg_postinst_${PN} () {
-    if [ "x$D" != "x" ] ; then
-        exit 1
-    fi
-
-    if [ -f /etc/X11/Xusername ]; then
-        # create the rootless X user, and add user to group tty, video, audio
-        username=`cat /etc/X11/Xusername`
-        adduser --disabled-password $username
-        # FIXME: use addgroup if busybox addgroup is ready
-        sed -i -e "s/^video:.*/&${username}/g" /etc/group
-        sed -i -e "s/^tty:.*/&${username}/g" /etc/group
-        sed -i -e "s/^audio:.*/&${username}/g" /etc/group
-    fi

meta/recipes-graphics/x11-common/xserver-nodm-init.bb do_install() { · line 30

Quoted 10 lines
meta/recipes-graphics/x11-common/xserver-nodm-init.bb +4 -3
-}
-
-inherit update-rc.d
+inherit update-rc.d useradd
 
 INITSCRIPT_NAME = "xserver-nodm"
 INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
+
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /etc/X11 --shell /bin/false --groups video,tty,audio --user-group xuser"

You've removed the Xusername file which is used by other parts of the system. Its only enabled on x86 at this point iirc and will break things :(. This patch therefore needs more work since the useradd need to be conditional.

Cheers,

Richard

author
#20 lore raw

[CONSOLIDATED PULL 17/18] connman: create xuser

In reply to Saul Wold

We create xuser here as a backup incase that xerver-nodm-init is not on the system.

---
 meta/recipes-connectivity/connman/connman.inc     |    6 +++++-
 meta/recipes-connectivity/connman/connman_0.75.bb |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
meta/recipes-connectivity/connman/connman.inc +5 -1
index ae1b725..b337e0d 100644
@@ -18,9 +18,13 @@ DEPENDS  = "libgdbus dbus glib-2.0 iptables"
 INITSCRIPT_NAME = "connman"
 INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
 
-inherit autotools pkgconfig update-rc.d
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /etc/X11 --shell /bin/false --groups video,tty,audio --user-group xuser"
+
+inherit autotools pkgconfig update-rc.d useradd
 
 do_install_append() {
+    install -d ${D}/etc/X11
     install -d ${D}${sysconfdir}/init.d/
     install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman
 }
meta/recipes-connectivity/connman/connman_0.75.bb +1 -1
index 4c25fcc..fbfb40e 100644
@@ -1,5 +1,5 @@
 require connman.inc
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF += "\
   ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \
Signature · 1 line
1.7.6.4
#21 lore raw
In reply to Saul Wold
Quoted 2 lines · Saul Wold

Khem Raj (1):
libtool: Upgrade from 2.4 -> 2.4.2

This didn't go in since it doesn't have the whitespace and SUMMARY issues I previously mentioned fixed.

Quoted 8 lines

Paul Eggleton (3):
dbus: remove unused initscript
util-linux: split out mkfs into its own package
e2fsprogs: move mke2fs.conf to e2fsprogs-mke2fs package

Saul Wold (12):
wget: Add recipe from OE

I've pushed a subsequent commit cleaning up a couple of things I noticed later on this one.

Quoted 2 lines

dbus-glib: fix QA Packaging issues
libgcc: fix QA Packaging issues

The above patch has feedback directly.

Quoted 9 lines

at: fix QA Packaging issues
man: fix QA Packaging issues
mdadm: fix QA Packaging issues
libatomics-ops: fix QA Packaging issues
libproxy: fix QA Packaging issues
abiword: convert to svn
avahi: use useradd to create user
connman: create xuser
xserver-nodm-init: use useradd to create xuser

I didn't take these last three since the avahi dbus restart needs to remain (but can be ignored at rootfs time with an exit 0), I think you're going to change the xuser homedir and the xserver-nodm-init needs to preserve the Xusername file since other scripts use it.

Quoted 7 lines

Scott Garman (1):
documentation-audit.sh: script for auditing documentation build
status

Wenzong Fan (1):
distro_tracking_fields: update packages tracking fields

I merged everything else.

Cheers,

Richard