* [CONSOLIDATED PULL 01/18] libtool: Upgrade from 2.4 -> 2.4.2
2011-10-27 22:06 [CONSOLIDATED PULL 00/18] Patches, QA & Bug Fixes Saul Wold
@ 2011-10-27 22:06 ` Saul Wold
2011-10-27 22:06 ` [CONSOLIDATED PULL 02/18] wget: Add recipe from OE Saul Wold
` (17 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Adjust prefix.patch and delete resolve-sysroot.patch
since its already applied upstream
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../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%)
diff --git a/meta/recipes-devtools/libtool/libtool.inc b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
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
--- a/meta/recipes-devtools/libtool/libtool.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
@@ -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"
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.inc b/meta/recipes-devtools/libtool/libtool-2.4.inc
deleted file mode 100644
index e3d17b7..0000000
--- a/meta/recipes-devtools/libtool/libtool-2.4.inc
+++ /dev/null
@@ -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
diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb
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
--- a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb
@@ -1,6 +1,6 @@
require libtool-${PV}.inc
-PR = "r4"
+PR = "${INC_PR}.0"
PACKAGES = ""
SRC_URI += "file://prefix.patch"
diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.2.bb
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
--- a/meta/recipes-devtools/libtool/libtool-native_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool-native_2.4.2.bb
@@ -2,7 +2,7 @@ require libtool-${PV}.inc
DEPENDS = ""
-PR = "r4"
+PR = "${INC_PR}.0"
SRC_URI += "file://prefix.patch"
inherit native
diff --git a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.2.bb
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
--- a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.2.bb
@@ -1,6 +1,6 @@
require libtool-${PV}.inc
-PR = "r4"
+PR = "${INC_PR}.0"
SRC_URI += "file://prefix.patch"
inherit nativesdk
diff --git a/meta/recipes-devtools/libtool/libtool/prefix.patch b/meta/recipes-devtools/libtool/libtool/prefix.patch
index 1b20324..fabec7a 100644
--- a/meta/recipes-devtools/libtool/libtool/prefix.patch
+++ b/meta/recipes-devtools/libtool/libtool/prefix.patch
@@ -9,11 +9,11 @@ Updated: Date: 2010/06/28
Nitin A Kamble <nitin.a.kamble@intel.com>
-Index: libtool-2.4/libltdl/m4/libtool.m4
+Index: libtool-2.4.2/libltdl/m4/libtool.m4
===================================================================
---- libtool-2.4.orig/libltdl/m4/libtool.m4
-+++ libtool-2.4/libltdl/m4/libtool.m4
-@@ -94,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1])
+--- libtool-2.4.2.orig/libltdl/m4/libtool.m4 2011-10-19 21:22:53.000000000 -0700
++++ libtool-2.4.2/libltdl/m4/libtool.m4 2011-10-19 21:23:30.716036612 -0700
+@@ -94,7 +94,8 @@
LIBTOOL_DEPS="$ltmain"
# Always use our own libtool.
@@ -23,7 +23,7 @@ Index: libtool-2.4/libltdl/m4/libtool.m4
AC_SUBST(LIBTOOL)dnl
_LT_SETUP
-@@ -204,7 +205,7 @@ aix3*)
+@@ -206,7 +207,7 @@
esac
# Global variables:
@@ -32,11 +32,11 @@ Index: libtool-2.4/libltdl/m4/libtool.m4
can_build_shared=yes
# All known linkers require a `.a' archive for static linking (except MSVC,
-Index: libtool-2.4/Makefile.am
+Index: libtool-2.4.2/Makefile.am
===================================================================
---- libtool-2.4.orig/Makefile.am
-+++ libtool-2.4/Makefile.am
-@@ -31,7 +31,7 @@ AM_LDFLAGS =
+--- libtool-2.4.2.orig/Makefile.am 2011-10-19 21:22:53.000000000 -0700
++++ libtool-2.4.2/Makefile.am 2011-10-19 21:25:33.152638032 -0700
+@@ -31,7 +31,7 @@
DIST_SUBDIRS = .
EXTRA_DIST =
@@ -45,8 +45,17 @@ Index: libtool-2.4/Makefile.am
CLEANFILES =
MOSTLYCLEANFILES =
-@@ -65,7 +65,7 @@ rebuild = rebuild=:; $(timestamp); corre
- ## ---------------- ##
+@@ -72,7 +72,7 @@
+ ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \
+ ChangeLog.2005 ChangeLog.2006 ChangeLog.2007 \
+ ChangeLog.2008 ChangeLog.2009 ChangeLog.2010
+-CLEANFILES += libtool libtoolize libtoolize.tmp \
++CLEANFILES += $(host_alias)-libtool libtoolize libtoolize.tmp \
+ $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp
+
+ ## These are the replacements that need to be made at bootstrap time,
+@@ -231,7 +231,7 @@
+ -e 's,@SED\@,$(SED),g'
# The libtool distributor and the standalone libtool script.
-bin_SCRIPTS = libtoolize libtool
@@ -54,7 +63,7 @@ Index: libtool-2.4/Makefile.am
libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status
rm -f libtoolize.tmp libtoolize
-@@ -90,8 +90,8 @@ $(srcdir)/libtoolize.in: $(sh_files) lib
+@@ -244,8 +244,8 @@
# We used to do this with a 'stamp-vcl' file, but non-gmake builds
# would rerun configure on every invocation, so now we manually
# check the version numbers from the build rule when necessary.
@@ -65,7 +74,7 @@ Index: libtool-2.4/Makefile.am
if test -f "$$target"; then \
set dummy `./$$target --version | sed 1q`; actualver="$$5"; \
test "$$actualver" = "$$correctver" && rebuild=false; \
-@@ -100,8 +100,8 @@ libtool: $(top_builddir)/config.status $
+@@ -254,8 +254,8 @@
case $$prereq in *ChangeLog);; *) rebuild=:;; esac; \
done; \
if $$rebuild; then \
@@ -76,16 +85,7 @@ Index: libtool-2.4/Makefile.am
fi
.PHONY: configure-subdirs
-@@ -146,7 +146,7 @@ EXTRA_DIST += bootstrap $(srcdir)/li
- ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \
- ChangeLog.2005 ChangeLog.2006 ChangeLog.2007 \
- ChangeLog.2008 ChangeLog.2009
--CLEANFILES += libtool libtoolize libtoolize.tmp \
-+CLEANFILES += $(host_alias)-libtool libtoolize libtoolize.tmp \
- $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp
-
- ## We build ltversion.m4 here, instead of from config.status,
-@@ -526,12 +526,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$
+@@ -535,12 +535,12 @@
BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \
LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \
diff --git a/meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch b/meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch
deleted file mode 100644
index 0341987..0000000
--- a/meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Upstream-Status: Pending
-
-Sometimes .las have =/a/b/c.la in dependency_libs. This should be
-resolved to sysroot.
-
--Khem Raj <raj.khem@gmail.com>
-
-Index: libtool-2.4/libltdl/config/ltmain.m4sh
-===================================================================
---- libtool-2.4.orig/libltdl/config/ltmain.m4sh
-+++ libtool-2.4/libltdl/config/ltmain.m4sh
-@@ -8479,7 +8479,8 @@ EOF
- *.la)
- func_basename "$deplib"
- name="$func_basename_result"
-- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+ func_resolve_sysroot "$deplib"
-+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
- test -z "$libdir" && \
- func_fatal_error "\`$deplib' is not a valid libtool archive"
- func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
-@@ -8505,7 +8506,9 @@ EOF
- *.la)
- func_basename "$lib"
- name="$func_basename_result"
-- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-+ func_resolve_sysroot "$lib"
-+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
-+
- test -z "$libdir" && \
- func_fatal_error "\`$lib' is not a valid libtool archive"
- func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
-@@ -8524,7 +8527,8 @@ EOF
- # the library:
- func_basename "$lib"
- name="$func_basename_result"
-- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-+ func_resolve_sysroot "$lib"
-+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
- test -z "$libdir" && \
- func_fatal_error "\`$lib' is not a valid libtool archive"
- func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
diff --git a/meta/recipes-devtools/libtool/libtool_2.4.bb b/meta/recipes-devtools/libtool/libtool_2.4.2.bb
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
--- a/meta/recipes-devtools/libtool/libtool_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool_2.4.2.bb
@@ -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.
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [CONSOLIDATED PULL 02/18] wget: Add recipe from OE
2011-10-27 22:06 [CONSOLIDATED PULL 00/18] Patches, QA & Bug Fixes Saul Wold
2011-10-27 22:06 ` [CONSOLIDATED PULL 01/18] libtool: Upgrade from 2.4 -> 2.4.2 Saul Wold
@ 2011-10-27 22:06 ` Saul Wold
2011-10-27 22:06 ` [CONSOLIDATED PULL 03/18] dbus-glib: fix QA Packaging issues Saul Wold
` (16 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
Needed to support building oe-core with oe-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../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
diff --git a/meta/recipes-extended/wget/wget-1.12/fix_makefile.patch b/meta/recipes-extended/wget/wget-1.12/fix_makefile.patch
new file mode 100644
index 0000000..3f34c76
--- /dev/null
+++ b/meta/recipes-extended/wget/wget-1.12/fix_makefile.patch
@@ -0,0 +1,59 @@
+
+Upstream-Status: Pending
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+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.
diff --git a/meta/recipes-extended/wget/wget-1.12/gnutls.bzr.patch b/meta/recipes-extended/wget/wget-1.12/gnutls.bzr.patch
new file mode 100644
index 0000000..6f0c2eb
--- /dev/null
+++ b/meta/recipes-extended/wget/wget-1.12/gnutls.bzr.patch
@@ -0,0 +1,266 @@
+--- wget-1.12/src/gnutls.c 2009-09-22 04:59:33.000000000 +0200
++++ /OE/projects/wget/src/gnutls.c 2010-10-30 16:24:10.000000000 +0200
+@@ -1,6 +1,6 @@
+ /* SSL support via GnuTLS library.
+- Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+- Inc.
++ Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
++ Foundation, Inc.
+
+ This file is part of GNU Wget.
+
+@@ -37,6 +37,8 @@
+ #endif
+ #include <string.h>
+ #include <stdio.h>
++#include <dirent.h>
++#include <stdlib.h>
+
+ #include <gnutls/gnutls.h>
+ #include <gnutls/x509.h>
+@@ -46,6 +48,10 @@
+ #include "url.h"
+ #include "ssl.h"
+
++#ifdef WIN32
++# include "w32sock.h"
++#endif
++
+ /* Note: some of the functions private to this file have names that
+ begin with "wgnutls_" (e.g. wgnutls_read) so that they wouldn't be
+ confused with actual gnutls functions -- such as the gnutls_read
+@@ -56,15 +62,50 @@
+ bool
+ ssl_init ()
+ {
++ const char *ca_directory;
++ DIR *dir;
++
+ gnutls_global_init ();
+ gnutls_certificate_allocate_credentials (&credentials);
++
++ ca_directory = opt.ca_directory ? opt.ca_directory : "/etc/ssl/certs";
++
++ dir = opendir (ca_directory);
++ if (dir == NULL)
++ {
++ if (opt.ca_directory)
++ logprintf (LOG_NOTQUIET, _("ERROR: Cannot open directory %s.\n"),
++ opt.ca_directory);
++ }
++ else
++ {
++ struct dirent *dent;
++ while ((dent = readdir (dir)) != NULL)
++ {
++ struct stat st;
++ char *ca_file;
++ asprintf (&ca_file, "%s/%s", ca_directory, dent->d_name);
++
++ stat (ca_file, &st);
++
++ if (S_ISREG (st.st_mode))
++ gnutls_certificate_set_x509_trust_file (credentials, ca_file,
++ GNUTLS_X509_FMT_PEM);
++
++ free (ca_file);
++ }
++
++ closedir (dir);
++ }
++
+ if (opt.ca_cert)
+ gnutls_certificate_set_x509_trust_file (credentials, opt.ca_cert,
+ GNUTLS_X509_FMT_PEM);
+ return true;
+ }
+
+-struct wgnutls_transport_context {
++struct wgnutls_transport_context
++{
+ gnutls_session session; /* GnuTLS session handle */
+ int last_error; /* last error returned by read/write/... */
+
+@@ -73,7 +114,7 @@
+ is stored to PEEKBUF, and wgnutls_read checks that buffer before
+ actually reading. */
+ char peekbuf[512];
+- int peekstart, peeklen;
++ int peeklen;
+ };
+
+ #ifndef MIN
+@@ -83,19 +124,18 @@
+ static int
+ wgnutls_read (int fd, char *buf, int bufsize, void *arg)
+ {
+- int ret;
++ int ret = 0;
+ struct wgnutls_transport_context *ctx = arg;
+
+ if (ctx->peeklen)
+ {
+ /* If we have any peek data, simply return that. */
+ int copysize = MIN (bufsize, ctx->peeklen);
+- memcpy (buf, ctx->peekbuf + ctx->peekstart, copysize);
++ memcpy (buf, ctx->peekbuf, copysize);
+ ctx->peeklen -= copysize;
+ if (ctx->peeklen != 0)
+- ctx->peekstart += copysize;
+- else
+- ctx->peekstart = 0;
++ memmove (ctx->peekbuf, ctx->peekbuf + copysize, ctx->peeklen);
++
+ return copysize;
+ }
+
+@@ -105,6 +145,7 @@
+
+ if (ret < 0)
+ ctx->last_error = ret;
++
+ return ret;
+ }
+
+@@ -124,31 +165,49 @@
+ static int
+ wgnutls_poll (int fd, double timeout, int wait_for, void *arg)
+ {
+- return 1;
++ struct wgnutls_transport_context *ctx = arg;
++ return ctx->peeklen || gnutls_record_check_pending (ctx->session)
++ || select_fd (fd, timeout, wait_for);
+ }
+
+ static int
+ wgnutls_peek (int fd, char *buf, int bufsize, void *arg)
+ {
+- int ret;
++ int ret = 0;
+ struct wgnutls_transport_context *ctx = arg;
+-
+- /* We don't support peeks following peeks: the reader must drain all
+- peeked data before the next peek. */
+- assert (ctx->peeklen == 0);
++ int offset = MIN (bufsize, ctx->peeklen);
+ if (bufsize > sizeof ctx->peekbuf)
+ bufsize = sizeof ctx->peekbuf;
+
+- do
+- ret = gnutls_record_recv (ctx->session, buf, bufsize);
+- while (ret == GNUTLS_E_INTERRUPTED);
++ if (ctx->peeklen)
++ memcpy (buf, ctx->peekbuf, offset);
+
+- if (ret >= 0)
++ if (bufsize > offset)
+ {
+- memcpy (ctx->peekbuf, buf, ret);
+- ctx->peeklen = ret;
++ do
++ {
++ ret = gnutls_record_recv (ctx->session, buf + offset,
++ bufsize - offset);
++ }
++ while (ret == GNUTLS_E_INTERRUPTED);
++
++ if (ret < 0)
++ {
++ if (offset)
++ ret = 0;
++ else
++ return ret;
++ }
++
++ if (ret > 0)
++ {
++ memcpy (ctx->peekbuf + offset, buf + offset,
++ ret);
++ ctx->peeklen += ret;
++ }
+ }
+- return ret;
++
++ return offset + ret;
+ }
+
+ static const char *
+@@ -165,23 +224,20 @@
+ /*gnutls_bye (ctx->session, GNUTLS_SHUT_RDWR);*/
+ gnutls_deinit (ctx->session);
+ xfree (ctx);
+-#ifndef WINDOWS
+ close (fd);
+-#else
+- closesocket (fd);
+-#endif
+ }
+
+ /* gnutls_transport is the singleton that describes the SSL transport
+ methods provided by this file. */
+
+-static struct transport_implementation wgnutls_transport = {
++static struct transport_implementation wgnutls_transport =
++{
+ wgnutls_read, wgnutls_write, wgnutls_poll,
+ wgnutls_peek, wgnutls_errstr, wgnutls_close
+ };
+
+ bool
+-ssl_connect (int fd)
++ssl_connect_wget (int fd)
+ {
+ static const int cert_type_priority[] = {
+ GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0
+@@ -189,11 +245,42 @@
+ struct wgnutls_transport_context *ctx;
+ gnutls_session session;
+ int err;
++ int allowed_protocols[4] = {0, 0, 0, 0};
+ gnutls_init (&session, GNUTLS_CLIENT);
+ gnutls_set_default_priority (session);
+ gnutls_certificate_type_set_priority (session, cert_type_priority);
+ gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, credentials);
+- gnutls_transport_set_ptr (session, (gnutls_transport_ptr) fd);
++#ifndef FD_TO_SOCKET
++# define FD_TO_SOCKET(X) (X)
++#endif
++ gnutls_transport_set_ptr (session, (gnutls_transport_ptr) FD_TO_SOCKET (fd));
++
++ err = 0;
++ switch (opt.secure_protocol)
++ {
++ case secure_protocol_auto:
++ break;
++ case secure_protocol_sslv2:
++ case secure_protocol_sslv3:
++ allowed_protocols[0] = GNUTLS_SSL3;
++ err = gnutls_protocol_set_priority (session, allowed_protocols);
++ break;
++ case secure_protocol_tlsv1:
++ allowed_protocols[0] = GNUTLS_TLS1_0;
++ allowed_protocols[1] = GNUTLS_TLS1_1;
++ allowed_protocols[2] = GNUTLS_TLS1_2;
++ err = gnutls_protocol_set_priority (session, allowed_protocols);
++ break;
++ default:
++ abort ();
++ }
++ if (err < 0)
++ {
++ logprintf (LOG_NOTQUIET, "GnuTLS: %s\n", gnutls_strerror (err));
++ gnutls_deinit (session);
++ return false;
++ }
++
+ err = gnutls_handshake (session);
+ if (err < 0)
+ {
+@@ -201,6 +288,7 @@
+ gnutls_deinit (session);
+ return false;
+ }
++
+ ctx = xnew0 (struct wgnutls_transport_context);
+ ctx->session = session;
+ fd_register_transport (fd, &wgnutls_transport, ctx);
diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
new file mode 100644
index 0000000..589d727
--- /dev/null
+++ b/meta/recipes-extended/wget/wget.inc
@@ -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"
diff --git a/meta/recipes-extended/wget/wget_1.12.bb b/meta/recipes-extended/wget/wget_1.12.bb
new file mode 100644
index 0000000..cab27e9
--- /dev/null
+++ b/meta/recipes-extended/wget/wget_1.12.bb
@@ -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
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [CONSOLIDATED PULL 03/18] dbus-glib: fix QA Packaging issues
2011-10-27 22:06 [CONSOLIDATED PULL 00/18] Patches, QA & Bug Fixes Saul Wold
2011-10-27 22:06 ` [CONSOLIDATED PULL 01/18] libtool: Upgrade from 2.4 -> 2.4.2 Saul Wold
2011-10-27 22:06 ` [CONSOLIDATED PULL 02/18] wget: Add recipe from OE Saul Wold
@ 2011-10-27 22:06 ` Saul Wold
2011-10-27 22:06 ` [CONSOLIDATED PULL 04/18] libgcc: " Saul Wold
` (15 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
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(-)
diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc
index 704dc04..80f68c8 100644
--- a/meta/recipes-core/dbus/dbus-glib.inc
+++ b/meta/recipes-core/dbus/dbus-glib.inc
@@ -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"
diff --git a/meta/recipes-core/dbus/dbus-glib_0.92.bb b/meta/recipes-core/dbus/dbus-glib_0.92.bb
index 72bea89..c7266d4 100644
--- a/meta/recipes-core/dbus/dbus-glib_0.92.bb
+++ b/meta/recipes-core/dbus/dbus-glib_0.92.bb
@@ -1,6 +1,6 @@
require dbus-glib.inc
-PR = "r0"
+PR = "r1"
SRC_URI[md5sum] = "b595b36890c4f9f8f5d5dec131c495f8"
SRC_URI[sha256sum] = "5a7fd4cf937cdcb7f2eed61341b70ee0f2607450a50db381618598adf60dd40e"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [CONSOLIDATED PULL 04/18] libgcc: fix QA Packaging issues
2011-10-27 22:06 [CONSOLIDATED PULL 00/18] Patches, QA & Bug Fixes Saul Wold
` (2 preceding siblings ...)
2011-10-27 22:06 ` [CONSOLIDATED PULL 03/18] dbus-glib: fix QA Packaging issues Saul Wold
@ 2011-10-27 22:06 ` Saul Wold
2011-10-28 13:59 ` Richard Purdie
2011-10-27 22:06 ` [CONSOLIDATED PULL 05/18] at: " Saul Wold
` (14 subsequent siblings)
18 siblings, 1 reply; 22+ messages in thread
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/gcc/libgcc_4.6.bb | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-devtools/gcc/libgcc_4.6.bb b/meta/recipes-devtools/gcc/libgcc_4.6.bb
index 6ba0339..401d9dc 100644
--- a/meta/recipes-devtools/gcc/libgcc_4.6.bb
+++ b/meta/recipes-devtools/gcc/libgcc_4.6.bb
@@ -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"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [CONSOLIDATED PULL 04/18] libgcc: fix QA Packaging issues
2011-10-27 22:06 ` [CONSOLIDATED PULL 04/18] libgcc: " Saul Wold
@ 2011-10-28 13:59 ` Richard Purdie
0 siblings, 0 replies; 22+ messages in thread
From: Richard Purdie @ 2011-10-28 13:59 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2011-10-28 at 00:06 +0200, Saul Wold wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/recipes-devtools/gcc/libgcc_4.6.bb | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/meta/recipes-devtools/gcc/libgcc_4.6.bb b/meta/recipes-devtools/gcc/libgcc_4.6.bb
> index 6ba0339..401d9dc 100644
> --- a/meta/recipes-devtools/gcc/libgcc_4.6.bb
> +++ b/meta/recipes-devtools/gcc/libgcc_4.6.bb
> @@ -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"
Isn't this second piece defined by default in bitbake.conf? I think we
can remove this second piece...
Cheers,
Richard
^ permalink raw reply [flat|nested] 22+ messages in thread
* [CONSOLIDATED PULL 05/18] at: fix QA Packaging issues
2011-10-27 22:06 [CONSOLIDATED PULL 00/18] Patches, QA & Bug Fixes Saul Wold
` (3 preceding siblings ...)
2011-10-27 22:06 ` [CONSOLIDATED PULL 04/18] libgcc: " Saul Wold
@ 2011-10-27 22:06 ` Saul Wold
2011-10-27 22:06 ` [CONSOLIDATED PULL 06/18] man: " Saul Wold
` (13 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-extended/at/at_3.1.12.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/at/at_3.1.12.bb b/meta/recipes-extended/at/at_3.1.12.bb
index 30fdb68..f2017b7 100644
--- a/meta/recipes-extended/at/at_3.1.12.bb
+++ b/meta/recipes-extended/at/at_3.1.12.bb
@@ -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
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [CONSOLIDATED PULL 06/18] man: fix QA Packaging issues
2011-10-27 22:06 [CONSOLIDATED PULL 00/18] Patches, QA & Bug Fixes Saul Wold
` (4 preceding siblings ...)
2011-10-27 22:06 ` [CONSOLIDATED PULL 05/18] at: " Saul Wold
@ 2011-10-27 22:06 ` Saul Wold
2011-10-27 22:06 ` [CONSOLIDATED PULL 07/18] mdadm: " Saul Wold
` (12 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-extended/man/man_1.6f.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/man/man_1.6f.bb b/meta/recipes-extended/man/man_1.6f.bb
index d38612b..c98c920 100644
--- a/meta/recipes-extended/man/man_1.6f.bb
+++ b/meta/recipes-extended/man/man_1.6f.bb
@@ -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"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [CONSOLIDATED PULL 07/18] mdadm: fix QA Packaging issues
2011-10-27 22:06 [CONSOLIDATED PULL 00/18] Patches, QA & Bug Fixes Saul Wold
` (5 preceding siblings ...)
2011-10-27 22:06 ` [CONSOLIDATED PULL 06/18] man: " Saul Wold
@ 2011-10-27 22:06 ` Saul Wold
2011-10-27 22:06 ` [CONSOLIDATED PULL 08/18] libatomics-ops: " Saul Wold
` (11 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-extended/mdadm/mdadm_3.2.2.bb | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/mdadm/mdadm_3.2.2.bb b/meta/recipes-extended/mdadm/mdadm_3.2.2.bb
index 492cc8e..97878ed 100644
--- a/meta/recipes-extended/mdadm/mdadm_3.2.2.bb
+++ b/meta/recipes-extended/mdadm/mdadm_3.2.2.bb
@@ -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"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [CONSOLIDATED PULL 08/18] libatomics-ops: fix QA Packaging issues
2011-10-27 22:06 [CONSOLIDATED PULL 00/18] Patches, QA & Bug Fixes Saul Wold
` (6 preceding siblings ...)
2011-10-27 22:06 ` [CONSOLIDATED PULL 07/18] mdadm: " Saul Wold
@ 2011-10-27 22:06 ` Saul Wold
2011-10-27 22:06 ` [CONSOLIDATED PULL 09/18] libproxy: " Saul Wold
` (10 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../pulseaudio/libatomics-ops_1.2.bb | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb b/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb
index 05b22e8..ab7ccbe 100644
--- a/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb
+++ b/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb
@@ -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
+}
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [CONSOLIDATED PULL 09/18] libproxy: fix QA Packaging issues
2011-10-27 22:06 [CONSOLIDATED PULL 00/18] Patches, QA & Bug Fixes Saul Wold
` (7 preceding siblings ...)
2011-10-27 22:06 ` [CONSOLIDATED PULL 08/18] libatomics-ops: " Saul Wold
@ 2011-10-27 22:06 ` Saul Wold
2011-10-27 22:06 ` [CONSOLIDATED PULL 10/18] abiword: convert to svn Saul Wold
` (9 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-support/libproxy/libproxy_0.4.7.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-support/libproxy/libproxy_0.4.7.bb b/meta/recipes-support/libproxy/libproxy_0.4.7.bb
index 2793b41..f31b701 100644
--- a/meta/recipes-support/libproxy/libproxy_0.4.7.bb
+++ b/meta/recipes-support/libproxy/libproxy_0.4.7.bb
@@ -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() {
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [CONSOLIDATED PULL 10/18] abiword: convert to svn
2011-10-27 22:06 [CONSOLIDATED PULL 00/18] Patches, QA & Bug Fixes Saul Wold
` (8 preceding siblings ...)
2011-10-27 22:06 ` [CONSOLIDATED PULL 09/18] libproxy: " Saul Wold
@ 2011-10-27 22:06 ` Saul Wold
2011-10-27 22:06 ` [CONSOLIDATED PULL 11/18] dbus: remove unused initscript Saul Wold
` (8 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
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
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword.inc b/meta-demoapps/recipes-gnome/abiword/abiword.inc
index b1b0f67..4ec0ba9 100644
--- a/meta-demoapps/recipes-gnome/abiword/abiword.inc
+++ b/meta-demoapps/recipes-gnome/abiword/abiword.inc
@@ -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:anoncvs@anoncvs.abisource.com/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]}"
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb b/meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb
deleted file mode 100644
index 163029e..0000000
--- a/meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require abiword.inc
-
-SRCDATE = "20070130"
-PV="2.5.0+cvs${SRCDATE}"
-PR = "r4"
-
-SRC_URI = "${CVSURI}"
-
-S = "${CVSSRC}"
-
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword_svn.bb b/meta-demoapps/recipes-gnome/abiword/abiword_svn.bb
new file mode 100644
index 0000000..a8946a8
--- /dev/null
+++ b/meta-demoapps/recipes-gnome/abiword/abiword_svn.bb
@@ -0,0 +1,10 @@
+require abiword.inc
+
+SRCREV = "21818"
+PV="2.5.2+svnr${SRCPV}"
+PR = "r0"
+
+SRC_URI = "${SVNURI}"
+
+S = "${SVNSRC}"
+
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [CONSOLIDATED PULL 11/18] dbus: remove unused initscript
2011-10-27 22:06 [CONSOLIDATED PULL 00/18] Patches, QA & Bug Fixes Saul Wold
` (9 preceding siblings ...)
2011-10-27 22:06 ` [CONSOLIDATED PULL 10/18] abiword: convert to svn Saul Wold
@ 2011-10-27 22:06 ` Saul Wold
2011-10-27 22:06 ` [CONSOLIDATED PULL 12/18] util-linux: split out mkfs into its own package Saul Wold
` (7 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
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.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-core/dbus/dbus.inc | 3 +++
meta/recipes-core/dbus/dbus_1.4.12.bb | 3 +++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 2a97c02..4c7d87a 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -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
diff --git a/meta/recipes-core/dbus/dbus_1.4.12.bb b/meta/recipes-core/dbus/dbus_1.4.12.bb
index ada53c9..9324af7 100644
--- a/meta/recipes-core/dbus/dbus_1.4.12.bb
+++ b/meta/recipes-core/dbus/dbus_1.4.12.bb
@@ -1,4 +1,7 @@
include dbus.inc
+
+PR = "r1"
+
SRC_URI[md5sum] = "104f2ea94c10a896dfb1edecb5714cb1"
SRC_URI[sha256sum] = "da3c97fd546610558d588799e27c4fa81101e754acbcd34747a42c131f30dbe7"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [CONSOLIDATED PULL 12/18] util-linux: split out mkfs into its own package
2011-10-27 22:06 [CONSOLIDATED PULL 00/18] Patches, QA & Bug Fixes Saul Wold
` (10 preceding siblings ...)
2011-10-27 22:06 ` [CONSOLIDATED PULL 11/18] dbus: remove unused initscript Saul Wold
@ 2011-10-27 22:06 ` Saul Wold
2011-10-27 22:06 ` [CONSOLIDATED PULL 13/18] e2fsprogs: move mke2fs.conf to e2fsprogs-mke2fs package Saul Wold
` (6 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
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.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
[Merged with head]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/util-linux/util-linux.inc | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index eeba67c..4db577c 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -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 = ""
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [CONSOLIDATED PULL 13/18] e2fsprogs: move mke2fs.conf to e2fsprogs-mke2fs package
2011-10-27 22:06 [CONSOLIDATED PULL 00/18] Patches, QA & Bug Fixes Saul Wold
` (11 preceding siblings ...)
2011-10-27 22:06 ` [CONSOLIDATED PULL 12/18] util-linux: split out mkfs into its own package Saul Wold
@ 2011-10-27 22:06 ` Saul Wold
2011-10-27 22:06 ` [CONSOLIDATED PULL 14/18] distro_tracking_fields: update packages tracking fields Saul Wold
` (5 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
mke2fs.conf, which contains defaults for filesystem formatting options,
ought to be shipped along with mke2fs itself.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../e2fsprogs/e2fsprogs_1.41.14.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb
index 1fca7b9..c6c1f0d 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb
@@ -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.*"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [CONSOLIDATED PULL 14/18] distro_tracking_fields: update packages tracking fields
2011-10-27 22:06 [CONSOLIDATED PULL 00/18] Patches, QA & Bug Fixes Saul Wold
` (12 preceding siblings ...)
2011-10-27 22:06 ` [CONSOLIDATED PULL 13/18] e2fsprogs: move mke2fs.conf to e2fsprogs-mke2fs package Saul Wold
@ 2011-10-27 22:06 ` Saul Wold
2011-10-27 22:06 ` [CONSOLIDATED PULL 15/18] documentation-audit.sh: script for auditing documentation build status Saul Wold
` (4 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
From: Wenzong Fan <wenzong.fan@windriver.com>
Update packages tracking fields including ccache, chkconfig.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 1f3540e..f053f87 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -5976,6 +5976,18 @@ RECIPE_MANUAL_CHECK_DATE_pn-libsdl = "Jul 28, 2011"
RECIPE_MAINTAINER_pn-libsdl = "Kai Kang <kai.kang@windriver.com>"
DISTRO_PN_ALIAS_pn-libsdl = "Fedora=SDL Opensuse=SDL"
+RECIPE_STATUS_pn-ccache = "green"
+RECIPE_MAINTAINER_pn-ccache = "Wenzong Fan <wenzong.fan@windriver.com>"
+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 <wenzong.fan@windriver.com>"
+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"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [CONSOLIDATED PULL 15/18] documentation-audit.sh: script for auditing documentation build status
2011-10-27 22:06 [CONSOLIDATED PULL 00/18] Patches, QA & Bug Fixes Saul Wold
` (13 preceding siblings ...)
2011-10-27 22:06 ` [CONSOLIDATED PULL 14/18] distro_tracking_fields: update packages tracking fields Saul Wold
@ 2011-10-27 22:06 ` Saul Wold
2011-10-27 22:06 ` [CONSOLIDATED PULL 16/18] avahi: use useradd to create user Saul Wold
` (3 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
From: Scott Garman <scott.a.garman@intel.com>
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.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
scripts/contrib/documentation-audit.sh | 92 ++++++++++++++++++++++++++++++++
1 files changed, 92 insertions(+), 0 deletions(-)
create mode 100755 scripts/contrib/documentation-audit.sh
diff --git a/scripts/contrib/documentation-audit.sh b/scripts/contrib/documentation-audit.sh
new file mode 100755
index 0000000..5070fee
--- /dev/null
+++ b/scripts/contrib/documentation-audit.sh
@@ -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 <scott.a.garman@intel.com>
+
+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
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [CONSOLIDATED PULL 16/18] avahi: use useradd to create user
2011-10-27 22:06 [CONSOLIDATED PULL 00/18] Patches, QA & Bug Fixes Saul Wold
` (14 preceding siblings ...)
2011-10-27 22:06 ` [CONSOLIDATED PULL 15/18] documentation-audit.sh: script for auditing documentation build status Saul Wold
@ 2011-10-27 22:06 ` Saul Wold
2011-10-27 22:06 ` [CONSOLIDATED PULL 17/18] connman: create xuser Saul Wold
` (2 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-connectivity/avahi/avahi.inc | 22 ++++------------------
1 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 5ad9db0..4abe0e8 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -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
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [CONSOLIDATED PULL 17/18] connman: create xuser
2011-10-27 22:06 [CONSOLIDATED PULL 00/18] Patches, QA & Bug Fixes Saul Wold
` (15 preceding siblings ...)
2011-10-27 22:06 ` [CONSOLIDATED PULL 16/18] avahi: use useradd to create user Saul Wold
@ 2011-10-27 22:06 ` Saul Wold
2011-10-27 22:06 ` [CONSOLIDATED PULL 18/18] xserver-nodm-init: use useradd to " Saul Wold
2011-10-31 22:44 ` [CONSOLIDATED PULL 00/18] Patches, QA & Bug Fixes Richard Purdie
18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
We create xuser here as a backup incase that xerver-nodm-init
is not on the system.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-connectivity/connman/connman.inc | 6 +++++-
meta/recipes-connectivity/connman/connman_0.75.bb | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index ae1b725..b337e0d 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -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
}
diff --git a/meta/recipes-connectivity/connman/connman_0.75.bb b/meta/recipes-connectivity/connman/connman_0.75.bb
index 4c25fcc..fbfb40e 100644
--- a/meta/recipes-connectivity/connman/connman_0.75.bb
+++ b/meta/recipes-connectivity/connman/connman_0.75.bb
@@ -1,5 +1,5 @@
require connman.inc
-PR = "r1"
+PR = "r2"
EXTRA_OECONF += "\
ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [CONSOLIDATED PULL 18/18] xserver-nodm-init: use useradd to create xuser
2011-10-27 22:06 [CONSOLIDATED PULL 00/18] Patches, QA & Bug Fixes Saul Wold
` (16 preceding siblings ...)
2011-10-27 22:06 ` [CONSOLIDATED PULL 17/18] connman: create xuser Saul Wold
@ 2011-10-27 22:06 ` Saul Wold
2011-10-28 14:16 ` Richard Purdie
2011-10-31 22:44 ` [CONSOLIDATED PULL 00/18] Patches, QA & Bug Fixes Richard Purdie
18 siblings, 1 reply; 22+ messages in thread
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../x11-common/xserver-nodm-init.bb | 26 ++++---------------
1 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
index ea4222d..33252cb 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
@@ -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"
+
--
1.7.6.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [CONSOLIDATED PULL 18/18] xserver-nodm-init: use useradd to create xuser
2011-10-27 22:06 ` [CONSOLIDATED PULL 18/18] xserver-nodm-init: use useradd to " Saul Wold
@ 2011-10-28 14:16 ` Richard Purdie
0 siblings, 0 replies; 22+ messages in thread
From: Richard Purdie @ 2011-10-28 14:16 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2011-10-28 at 00:06 +0200, Saul Wold wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> .../x11-common/xserver-nodm-init.bb | 26 ++++---------------
> 1 files changed, 6 insertions(+), 20 deletions(-)
>
> diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
> index ea4222d..33252cb 100644
> --- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
> +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
> @@ -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"
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
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [CONSOLIDATED PULL 00/18] Patches, QA & Bug Fixes
2011-10-27 22:06 [CONSOLIDATED PULL 00/18] Patches, QA & Bug Fixes Saul Wold
` (17 preceding siblings ...)
2011-10-27 22:06 ` [CONSOLIDATED PULL 18/18] xserver-nodm-init: use useradd to " Saul Wold
@ 2011-10-31 22:44 ` Richard Purdie
18 siblings, 0 replies; 22+ messages in thread
From: Richard Purdie @ 2011-10-31 22:44 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2011-10-28 at 00:06 +0200, Saul Wold wrote:
> 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.
>
> 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.
> dbus-glib: fix QA Packaging issues
> libgcc: fix QA Packaging issues
The above patch has feedback directly.
> 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.
>
> 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
^ permalink raw reply [flat|nested] 22+ messages in thread