* [CONSOLIDATED PULL 01/28] bash: Ensure we fully reautoconf the recipes so site data is used
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 02/28] patch: Convert to use oe_terminal Saul Wold
` (27 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
This ensures bug 487 (missing job control functionality) really gets fixed.
[YOCTO #487]
(From OE-Core rev: 08b78066bd5a9ff2819a42eb4263ee0a78cddb97)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-extended/bash/bash.inc | 9 ++++++---
meta/recipes-extended/bash/bash_3.2.48.bb | 11 +++++++----
meta/recipes-extended/bash/bash_4.2.bb | 2 +-
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index d55e517..876be1e 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -22,9 +22,12 @@ ALTERNATIVE_PATH = "${base_bindir}/bash"
ALTERNATIVE_LINK = "${base_bindir}/sh"
ALTERNATIVE_PRIORITY = "100"
-do_configure () {
- gnu-configize
- oe_runconf
+export AUTOHEADER = "true"
+
+do_configure_prepend () {
+ if [ ! -e acinclude.m4 ]; then
+ cat aclocal.m4 > acinclude.m4
+ fi
}
pkg_postinst_${PN} () {
diff --git a/meta/recipes-extended/bash/bash_3.2.48.bb b/meta/recipes-extended/bash/bash_3.2.48.bb
index 1520c4e..f2ba572 100644
--- a/meta/recipes-extended/bash/bash_3.2.48.bb
+++ b/meta/recipes-extended/bash/bash_3.2.48.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=fd5d9bcabd8ed5a54a01ce8d183d592a"
DEPENDS = "ncurses"
-PR = "r7"
+PR = "r8"
SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
${GNU_MIRROR}/bash/bash-3.2-patches/bash32-049;apply=yes;striplevel=0 \
@@ -23,9 +23,12 @@ sbindir = "/sbin"
EXTRA_OECONF = "--with-ncurses"
export CC_FOR_BUILD = "${BUILD_CC}"
-do_configure () {
- gnu-configize
- oe_runconf
+export AUTOHEADER = "true"
+
+do_configure_prepend () {
+ if [ ! -e acinclude.m4 ]; then
+ cat aclocal.m4 > acinclude.m4
+ fi
}
pkg_postinst_${PN} () {
diff --git a/meta/recipes-extended/bash/bash_4.2.bb b/meta/recipes-extended/bash/bash_4.2.bb
index a0f5e4e..8070918 100644
--- a/meta/recipes-extended/bash/bash_4.2.bb
+++ b/meta/recipes-extended/bash/bash_4.2.bb
@@ -1,6 +1,6 @@
require bash.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "${GNU_MIRROR}/bash/${BPN}-${PV}.tar.gz;name=tarball \
${GNU_MIRROR}/bash/bash-4.2-patches/bash42-001;apply=yes;striplevel=0;name=patch001 \
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [CONSOLIDATED PULL 02/28] patch: Convert to use oe_terminal
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 01/28] bash: Ensure we fully reautoconf the recipes so site data is used Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 03/28] bitbake.conf: Drop remaining TERMCMD pieces and document OE_TERMINAL usage instead Saul Wold
` (26 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Unfortunately we can't access oe_terminal directly from patch.py
so we have to pass in the correct terminal function pointer.
[YOCTO #1587]
(From OE-Core rev: 9e0a21dda24f285a1c4878488e887485a749f3f2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/classes/patch.bbclass | 4 +++-
meta/lib/oe/patch.py | 17 ++++++-----------
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass
index 7622163..86046e1 100644
--- a/meta/classes/patch.bbclass
+++ b/meta/classes/patch.bbclass
@@ -5,6 +5,8 @@ QUILTRCFILE ?= "${STAGING_BINDIR_NATIVE}/quiltrc"
PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_sysroot"
+inherit terminal
+
python patch_do_patch() {
import oe.patch
@@ -124,7 +126,7 @@ python patch_do_patch() {
if not patchdir in classes:
patchset = cls(patchdir, d)
- resolver = rcls(patchset)
+ resolver = rcls(patchset, oe_terminal)
classes[patchdir] = (patchset, resolver)
patchset.Clean()
else:
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index 9768be0..75fb91e 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -311,7 +311,7 @@ class QuiltTree(PatchSet):
self._runcmd(args)
class Resolver(object):
- def __init__(self, patchset):
+ def __init__(self, patchset, terminal):
raise NotImplementedError()
def Resolve(self):
@@ -324,8 +324,9 @@ class Resolver(object):
raise NotImplementedError()
class NOOPResolver(Resolver):
- def __init__(self, patchset):
+ def __init__(self, patchset, terminal):
self.patchset = patchset
+ self.terminal = terminal
def Resolve(self):
olddir = os.path.abspath(os.curdir)
@@ -341,13 +342,13 @@ class NOOPResolver(Resolver):
# resolution, with the exception of refreshing the remote copy of the patch
# files (the urls).
class UserResolver(Resolver):
- def __init__(self, patchset):
+ def __init__(self, patchset, terminal):
self.patchset = patchset
+ self.terminal = terminal
# Force a push in the patchset, then drop to a shell for the user to
# resolve any rejected hunks
def Resolve(self):
-
olddir = os.path.abspath(os.curdir)
os.chdir(self.patchset.dir)
try:
@@ -368,16 +369,10 @@ class UserResolver(Resolver):
f.write("echo 'Run \"quilt refresh\" when patch is corrected, press CTRL+D to exit.'\n")
f.write("echo ''\n")
f.write(" ".join(patchcmd) + "\n")
- f.write("#" + bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
f.close()
os.chmod(rcfile, 0775)
- os.environ['TERMWINDOWTITLE'] = "Bitbake: Please fix patch rejects manually"
- os.environ['SHELLCMDS'] = "bash --rcfile " + rcfile
- rc = os.system(bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
- if os.WIFEXITED(rc) and os.WEXITSTATUS(rc) != 0:
- bb.msg.fatal("Build", ("Cannot proceed with manual patch resolution - '%s' not found. " \
- + "Check TERMCMDRUN variable.") % bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
+ self.terminal("bash --rcfile " + rcfile, 'Patch Rejects: Please fix patch rejects manually', self.patchset.d)
# Construct a new PatchSet after the user's changes, compare the
# sets, checking patches for modifications, and doing a remote
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [CONSOLIDATED PULL 03/28] bitbake.conf: Drop remaining TERMCMD pieces and document OE_TERMINAL usage instead
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 01/28] bash: Ensure we fully reautoconf the recipes so site data is used Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 02/28] patch: Convert to use oe_terminal Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 04/28] cogl: COPYING file Updated FSF Address Saul Wold
` (25 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
(From OE-Core rev: ddb825c87dd3e59d50841a993080a00d1459b1e7)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[Yes, this one is against meta-yocto, I'll fix it to apply the same
change to OE-Core's local.conf.sample in the final version]
---
meta/classes/sanity.bbclass | 13 -------------
meta/conf/bitbake.conf | 20 --------------------
meta/conf/local.conf.sample | 12 ++++--------
3 files changed, 4 insertions(+), 41 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 4067408..3f42b4f 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -331,19 +331,6 @@ def check_sanity(e):
if not data.getVar( 'DISPLAY', e.data, True ) and data.getVar( 'IMAGETEST', e.data, True ) == 'qemu':
messages = messages + 'qemuimagetest needs a X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n'
- if data.getVar('PATCHRESOLVE', e.data, True) != 'noop':
- # Ensure we have the binary for TERMCMD, as when patch application fails the error is fairly intimidating
- termcmd = data.getVar("TERMCMD", e.data, True)
- term = termcmd.split()[0]
- if not check_app_exists(term, e.data):
- messages = messages + "The console for use in patch error resolution is not available, please install %s or set TERMCMD and TERMCMDRUN (as documented in local.conf).\n" % term
- elif "konsole" in term:
- import oe.terminal
- vernum = oe.terminal.check_konsole_version(term)
- if vernum:
- if vernum.split('.')[0] == '2':
- messages = messages + 'Konsole from KDE 4.x will not work as TERMCMD/TERMCMDRUN, please specify a different terminal or set PATCHRESOLVE = "noop" to disable interactive patch resolution.\n'
-
if os.path.basename(os.readlink('/bin/sh')) == 'dash':
messages = messages + "Using dash as /bin/sh causes various subtle build problems, please use bash instead (e.g. 'dpkg-reconfigure dash' on an Ubuntu system.\n"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 9938a67..d405b6a 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -589,26 +589,6 @@ FAKEROOTENV = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALS
FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}"
PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native"
-
-##################################################################
-# UI/Interaction Configuration
-##################################################################
-
-export SHELLCMDS = "bash"
-# Some common terminal programs to choose from
-GNOME_TERMCMD = 'gnome-terminal --disable-factory -t "$TERMWINDOWTITLE"'
-GNOME_TERMCMDRUN = '${GNOME_TERMCMD} -x $SHELLCMDS'
-SCREEN_TERMCMD = 'screen -D -m -t "$TERMWINDOWTITLE"'
-SCREEN_TERMCMDRUN = '${SCREEN_TERMCMD} $SHELLCMDS'
-XTERM_TERMCMD = 'xterm -T "$TERMWINDOWTITLE"'
-XTERM_TERMCMDRUN = '${XTERM_TERMCMD} -e $SHELLCMDS'
-KONSOLE_TERMCMD = 'konsole -T "$TERMWINDOWTITLE"'
-KONSOLE_TERMCMDRUN = '${KONSOLE_TERMCMD} -e $SHELLCMDS'
-
-# Set a default
-TERMCMD ?= "${XTERM_TERMCMD}"
-TERMCMDRUN ?= "${XTERM_TERMCMDRUN}"
-
##################################################################
# Miscellaneous utilities.
##################################################################
diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index 84ed964..73ab9f8 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -168,20 +168,16 @@ USER_CLASSES ?= "image-mklibs image-prelink"
# Under certain circumstances the system may need input from you and to do this it
# can launch an interactive shell. It needs to do this since the build is
# multithreaded and needs to be able to handle the case where more than one parallel
-# process may require the user's attention. The default is to use xterm.
+# process may require the user's attention. The default is iterate over the available
+# terminal types to find one that works.
#
# Examples of the occasions this may happen are when resolving patches which cannot
# be applied, to use the devshell or the kernel menuconfig
#
-# If you do not use (or have installed) xterm you will need to
-# uncomment these variables and set them to the terminal you wish to use
-#
-# Supported shell prefixes for *_TERMCMD and *_TERMCMDRUN are:
-# GNOME, SCREEN, XTERM and KONSOLE
+# Supported values are auto, gnome, xfce, rxvt, xcreen, konsole (3.x only), none
# Note: currently, Konsole support only works for KDE 3.x due to the way
# newer Konsole versions behave
-#TERMCMD = "${XTERM_TERMCMD}"
-#TERMCMDRUN = "${XTERM_TERMCMDRUN}"
+#OE_TERMINAL = "auto"
# By default disable interactive patch resolution (tasks will just fail instead):
PATCHRESOLVE = "noop"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [CONSOLIDATED PULL 04/28] cogl: COPYING file Updated FSF Address
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (2 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 03/28] bitbake.conf: Drop remaining TERMCMD pieces and document OE_TERMINAL usage instead Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 05/28] dtc: update to latest git version Saul Wold
` (24 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-graphics/clutter/cogl_git.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/clutter/cogl_git.bb b/meta/recipes-graphics/clutter/cogl_git.bb
index 890c654..0702302 100644
--- a/meta/recipes-graphics/clutter/cogl_git.bb
+++ b/meta/recipes-graphics/clutter/cogl_git.bb
@@ -1,6 +1,6 @@
require cogl.inc
-LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
SRCREV = "0a70a159c65357809740971570b2e301451161b5"
PV = "1.8.0+git${SRCPV}"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [CONSOLIDATED PULL 05/28] dtc: update to latest git version
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (3 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 04/28] cogl: COPYING file Updated FSF Address Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 06/28] qmmp: update to 0.5.2 Saul Wold
` (23 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
From: Matthew McClintock <msm@freescale.com>
Also remove patches that are no longer needed, as well as use the
installation that is provided by the Makefile. Put all the extra
stuff in a new dtc-misc package
Signed-off-by: Matthew McClintock <msm@freescale.com>
---
meta/recipes-kernel/dtc/dtc.inc | 12 ++--
.../dtc/fix_for_compilation_with_gcc_4.6.0.patch | 51 --------------------
meta/recipes-kernel/dtc/dtc/remove_space_opt.patch | 18 -------
meta/recipes-kernel/dtc/dtc_git.bb | 10 +---
4 files changed, 9 insertions(+), 82 deletions(-)
delete mode 100644 meta/recipes-kernel/dtc/dtc/fix_for_compilation_with_gcc_4.6.0.patch
delete mode 100644 meta/recipes-kernel/dtc/dtc/remove_space_opt.patch
diff --git a/meta/recipes-kernel/dtc/dtc.inc b/meta/recipes-kernel/dtc/dtc.inc
index eae46ac..0f45d5f 100644
--- a/meta/recipes-kernel/dtc/dtc.inc
+++ b/meta/recipes-kernel/dtc/dtc.inc
@@ -6,13 +6,13 @@ DEPENDS = "flex-native bison-native"
inherit autotools
-do_install() {
- install -m 0755 -d ${D}${bindir}
- install -m 755 dtc ${D}${bindir}/dtc
-}
SRC_URI = "git://www.jdl.com/software/dtc.git;protocol=git \
- file://fix_for_compilation_with_gcc_4.6.0.patch"
+ "
-INC_PR = "r0"
+EXTRA_OEMAKE='PREFIX="${prefix}"'
+INC_PR = "r1"
S = "${WORKDIR}/git"
+
+PACKAGES =+ "${PN}-misc"
+FILES_${PN}-misc = "${bindir}/convert-dtsv0 ${bindir}/ftdump ${bindir}/dtdiff"
diff --git a/meta/recipes-kernel/dtc/dtc/fix_for_compilation_with_gcc_4.6.0.patch b/meta/recipes-kernel/dtc/dtc/fix_for_compilation_with_gcc_4.6.0.patch
deleted file mode 100644
index b34894d..0000000
--- a/meta/recipes-kernel/dtc/dtc/fix_for_compilation_with_gcc_4.6.0.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Upstream-Status: Pending
-
-Fix following compilation errors with gcc 4.6.0
-| dtc.c: In function 'main':
-| dtc.c:100:17: error: variable 'check' set but not used [-Werror=unused-but-set-variable]
-| cc1: all warnings being treated as errors
-|
-| make: *** [dtc.o] Error 1
-| make: *** Waiting for unfinished jobs....
-| flattree.c: In function 'flat_read_mem_reserve':
-| flattree.c:700:14: error: variable 'p' set but not used [-Werror=unused-but-set-variable]
-| cc1: all warnings being treated as errors
-|
-| make: *** [flattree.o] Error 1
-| ERROR: oe_runmake failed
-
-Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/10
-
-Index: git/dtc.c
-===================================================================
---- git.orig/dtc.c
-+++ git/dtc.c
-@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
- const char *inform = "dts";
- const char *outform = "dts";
- const char *outname = "-";
-- int force = 0, check = 0;
-+ int force = 0, __attribute__((__unused__)) check = 0;
- const char *arg;
- int opt;
- FILE *outf = NULL;
-Index: git/flattree.c
-===================================================================
---- git.orig/flattree.c
-+++ git/flattree.c
-@@ -697,7 +697,6 @@ static struct reserve_info *flat_read_me
- {
- struct reserve_info *reservelist = NULL;
- struct reserve_info *new;
-- const char *p;
- struct fdt_reserve_entry re;
-
- /*
-@@ -706,7 +705,6 @@ static struct reserve_info *flat_read_me
- *
- * First pass, count entries.
- */
-- p = inb->ptr;
- while (1) {
- flat_read_chunk(inb, &re, sizeof(re));
- re.address = fdt64_to_cpu(re.address);
diff --git a/meta/recipes-kernel/dtc/dtc/remove_space_opt.patch b/meta/recipes-kernel/dtc/dtc/remove_space_opt.patch
deleted file mode 100644
index 8c26dec..0000000
--- a/meta/recipes-kernel/dtc/dtc/remove_space_opt.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Remove the -Os flag
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-Index: git/Makefile
-===================================================================
---- git.orig/Makefile
-+++ git/Makefile
-@@ -18,7 +18,7 @@ CONFIG_LOCALVERSION =
- CPPFLAGS = -I libfdt
- WARNINGS = -Werror -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \
- -Wstrict-prototypes -Wmissing-prototypes
--CFLAGS = -g -Os -fPIC -Werror $(WARNINGS)
-+CFLAGS = -g -fPIC -Werror $(WARNINGS)
-
- BISON = bison
- LEX = flex
diff --git a/meta/recipes-kernel/dtc/dtc_git.bb b/meta/recipes-kernel/dtc/dtc_git.bb
index e010488..c205de7 100644
--- a/meta/recipes-kernel/dtc/dtc_git.bb
+++ b/meta/recipes-kernel/dtc/dtc_git.bb
@@ -3,14 +3,10 @@ require dtc.inc
LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c"
-SRCREV = "73dca9ae0b9abe6924ba640164ecce9f8df69c5a"
+SRCREV = "033089f29099bdfd5c2d6986cdb9fd07b16cfde0"
PV = "1.3.0+git${SRCPV}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
S = "${WORKDIR}/git"
-SRC_URI_PATCH = " file://remove_space_opt.patch"
-SRC_URI_PATCH_virtclass-native = ""
-SRC_URI += "${SRC_URI_PATCH}"
-
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [CONSOLIDATED PULL 06/28] qmmp: update to 0.5.2
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (4 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 05/28] dtc: update to latest git version Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:50 ` Koen Kooi
2011-11-05 17:22 ` [CONSOLIDATED PULL 07/28] dtc: Add patch to correctly install shared libraries and links Saul Wold
` (22 subsequent siblings)
28 siblings, 1 reply; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Remove recipe qmmp_0.5.1 and add qmmp_0.5.2
Use do_split_package for each grouping and name them correctly besides updating package.
The format to name plugins of qmmp:
qmmp-plugin-<group>-<library> with the Description: Qmmp<Group> plugin for %s"
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 9 +++-
.../qt-apps/{qmmp_0.5.1.bb => qmmp_0.5.2.bb} | 52 ++++++++++++--------
2 files changed, 38 insertions(+), 23 deletions(-)
rename meta/recipes-qt/qt-apps/{qmmp_0.5.1.bb => qmmp_0.5.2.bb} (48%)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 998eabf..7d7295c 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -5726,11 +5726,16 @@ RECIPE_LAST_UPDATE_pn-libgdata = "Dec 29, 2010"
RECIPE_MAINTAINER_pn-libgdata = "Zhai Edwin <edwin.zhai@intel.com>"
RECIPE_LATEST_VERSION_pn-man-pages = "3.32"
-RECIPE_LATEST_VERSION_pn-qmmp = "0.4.3"
-RECIPE_MAINTAINER_pn-qmmp = "Xiaofeng Yan <xiaofeng.yan@windriver.com>"
RECIPE_LATEST_VERSION_pn-sysprof = "6b5b8432711ef5c747f8375073cd9af88922d3c6"
RECIPE_LATEST_VERSION_pn-table = "d42a44938699ee30a998fc42bc149aebf69389db"
+RECIPE_STATUS_pn-qmmp = "green"
+RECIPE_LATEST_VERSION_pn-qmmp = "0.5.2"
+RECIPE_LATEST_RELEASE_DATE_pn-qmmp = "Sep 02, 2011"
+RECIPE_LAST_UPDATE_pn-qmmp = "Oct 27, 2011"
+RECIPE_MAINTAINER_pn-qmmp = "Xiaofeng Yan <xiaofeng.yan@windriver.com>"
+
+
RECIPE_LATEST_VERSION_pn-texinfo = "4.13a"
RECIPE_LATEST_RELEASE_DATE_pn-texinfo = "Sep 22, 2008"
RECIPE_LAST_UPDATE_pn-texinfo = "Sep 16, 2011"
diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
similarity index 48%
rename from meta/recipes-qt/qt-apps/qmmp_0.5.1.bb
rename to meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
index 948c32a..98ee907 100644
--- a/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb
+++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
@@ -1,23 +1,24 @@
-DESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an audio-player, written with help of Qt library"
+dESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an audio-player, written with help of Qt library"
HOMEPAGE = "http://qmmp.ylsoftware.com"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
SECTION = "multimedia"
-PR = "r0"
+PR = "r4"
+PROVIDES = "qmmp"
DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib"
-RDEPENDS_${PN} += "taglib alsa-lib curl"
+RDEPENDS_${PN} += "taglib alsa-lib libmad curl"
SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2"
-SRC_URI[md5sum] = "7934c069256bf2fc4ab762ad2683db2f"
-SRC_URI[sha256sum] = "16ab0334f368a5ef14d631a1d43d7cae876ee06b7185643377b5e9cfd6143099"
+SRC_URI[md5sum] = "20852f3cce3471bfc5affa9b2e947dc6"
+SRC_URI[sha256sum] = "6391dec020d2a381d7f4b7890fae6c49eadf88b3c9aef571fe3c5e96140822ec"
PARALLEL_MAKE = ""
-inherit qmake2 cmake
+inherit qmake2 cmake package
export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
-DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \
@@ -28,20 +29,29 @@ export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
-DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \
-DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \
"
-
-FILES_${PN} = "${bindir}/qmmp ${libdir}/*.so* \
- ${libdir}/qmmp/PlaylistFormats/*.so \
- ${libdir}/qmmp/Output/libalsa.so \
- ${libdir}/qmmp/Transports/libhttp.so \
- ${libdir}/qmmp/Visual/libanalyzer.so \
- ${datadir}/icons/* \
- ${datadir}/qmmp/images/* \
- ${datadir}/applications/qmmp.desktop \
+PACKAGES_DYNAMIC = "qmmp-plugin-* "
+
+
+python populate_packages_prepend () {
+ import os
+ qmmp_libdir = bb.data.expand('${libdir}/qmmp', d)
+ gd = bb.data.expand('${D}/${libdir}/qmmp', d)
+ plug_dirs = os.listdir(gd)
+
+ for plug_dir in plug_dirs:
+ g_plug_dir = os.path.join(qmmp_libdir,plug_dir)
+ do_split_packages(d, g_plug_dir, '^lib(.*)\.so$', 'qmmp-plugin-' + plug_dir + '-%s', 'Qmmp' + plug_dir + 'plugin for %s')
+}
+
+FILES_${PN} = "\
+ ${bindir}/qmmp \
+ ${libdir}/lib*${SOLIBS} \
+ ${datadir}/icons/* \
+ ${datadir}/qmmp/images/* \
+ ${datadir}/applications/* \
+ "
+
+FILES_${PN}-dbg += "\
+ ${libdir}/qmmp/*/.debug/* \
"
-PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis"
-
-FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so"
-RDEPENDS_${PN}-plugin-input-mad = "libmad"
-FILES_${PN}-plugin-input-vorbis = "${libdir}/qmmp/Input/libvorbis.so"
-RDEPENDS_${PN}-plugin-input-vorbis = "libvorbis libogg"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* Re: [CONSOLIDATED PULL 06/28] qmmp: update to 0.5.2
2011-11-05 17:22 ` [CONSOLIDATED PULL 06/28] qmmp: update to 0.5.2 Saul Wold
@ 2011-11-05 17:50 ` Koen Kooi
0 siblings, 0 replies; 33+ messages in thread
From: Koen Kooi @ 2011-11-05 17:50 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 2181 bytes --]
Op 5 nov. 2011, om 18:22 heeft Saul Wold het volgende geschreven:
> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
>
> Remove recipe qmmp_0.5.1 and add qmmp_0.5.2
That isn't formatted according to the commit policy
>
> Use do_split_package for each grouping and name them correctly besides updating package.
> The format to name plugins of qmmp:
> qmmp-plugin-<group>-<library> with the Description: Qmmp<Group> plugin for %s"
>
> Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> ---
> .../conf/distro/include/distro_tracking_fields.inc | 9 +++-
> .../qt-apps/{qmmp_0.5.1.bb => qmmp_0.5.2.bb} | 52 ++++++++++++--------
This should be in a seperate commit
>
> --- a/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb
> +++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
> @@ -1,23 +1,24 @@
> -DESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an audio-player, written with help of Qt library"
> +dESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an audio-player, written with help of Qt library"
> HOMEPAGE = "http://qmmp.ylsoftware.com"
> LICENSE = "GPLv2"
> LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
> SECTION = "multimedia"
>
> -PR = "r0"
> +PR = "r4"
When upgrading to a new PV you need to reset PR to r0, not increase it
> +PROVIDES = "qmmp"
${PN} is always in provides, no?
> DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib"
please use 'inherit qt4x11' for the qt depends.
> -RDEPENDS_${PN} += "taglib alsa-lib curl"
> +RDEPENDS_${PN} += "taglib alsa-lib libmad curl"
RDEPENDS go below do_install
>
> SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2"
>
> -SRC_URI[md5sum] = "7934c069256bf2fc4ab762ad2683db2f"
> -SRC_URI[sha256sum] = "16ab0334f368a5ef14d631a1d43d7cae876ee06b7185643377b5e9cfd6143099"
> +SRC_URI[md5sum] = "20852f3cce3471bfc5affa9b2e947dc6"
> +SRC_URI[sha256sum] = "6391dec020d2a381d7f4b7890fae6c49eadf88b3c9aef571fe3c5e96140822ec"
>
>
> PARALLEL_MAKE = ""
Is this still needed?
>
> -inherit qmake2 cmake
> +inherit qmake2 cmake package
Why do you inherit package.bbclass here ?!?!?!
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 169 bytes --]
^ permalink raw reply [flat|nested] 33+ messages in thread
* [CONSOLIDATED PULL 07/28] dtc: Add patch to correctly install shared libraries and links
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (5 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 06/28] qmmp: update to 0.5.2 Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 08/28] qmmp: Fix qmmp packaging, ensure lowercase package names Saul Wold
` (21 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-kernel/dtc/dtc.inc | 3 ++-
meta/recipes-kernel/dtc/dtc/make_install.patch | 15 +++++++++++++++
2 files changed, 17 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-kernel/dtc/dtc/make_install.patch
diff --git a/meta/recipes-kernel/dtc/dtc.inc b/meta/recipes-kernel/dtc/dtc.inc
index 0f45d5f..9b4b768 100644
--- a/meta/recipes-kernel/dtc/dtc.inc
+++ b/meta/recipes-kernel/dtc/dtc.inc
@@ -7,10 +7,11 @@ DEPENDS = "flex-native bison-native"
inherit autotools
SRC_URI = "git://www.jdl.com/software/dtc.git;protocol=git \
+ file://make_install.patch \
"
EXTRA_OEMAKE='PREFIX="${prefix}"'
-INC_PR = "r1"
+INC_PR = "r2"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-kernel/dtc/dtc/make_install.patch b/meta/recipes-kernel/dtc/dtc/make_install.patch
new file mode 100644
index 0000000..2f7d809
--- /dev/null
+++ b/meta/recipes-kernel/dtc/dtc/make_install.patch
@@ -0,0 +1,15 @@
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile 2011-11-02 14:52:17.243104779 -0700
++++ git/Makefile 2011-11-02 15:06:01.555104982 -0700
+@@ -161,8 +161,8 @@
+ $(INSTALL) -d $(DESTDIR)$(BINDIR)
+ $(INSTALL) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR)
+ $(INSTALL) -d $(DESTDIR)$(LIBDIR)
+- $(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR)
+- ln -sf $(notdir $(LIBFDT_lib)) $(DESTDIR)$(LIBDIR)/$(LIBFDT_soname)
++ $(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR)/$(LIBFDT_soname)
++ ln -sf $(LIBFDT_soname) $(DESTDIR)$(LIBDIR)/$(notdir $(LIBFDT_lib))
+ ln -sf $(LIBFDT_soname) $(DESTDIR)$(LIBDIR)/libfdt.$(SHAREDLIB_EXT)
+ $(INSTALL) -m 644 $(LIBFDT_archive) $(DESTDIR)$(LIBDIR)
+ $(INSTALL) -d $(DESTDIR)$(INCLUDEDIR)
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [CONSOLIDATED PULL 08/28] qmmp: Fix qmmp packaging, ensure lowercase package names
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (6 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 07/28] dtc: Add patch to correctly install shared libraries and links Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 09/28] buildstats: Fix for buildstats on tmpfs Saul Wold
` (20 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-qt/qt-apps/qmmp_0.5.2.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
index 98ee907..3823234 100644
--- a/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
+++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
SECTION = "multimedia"
-PR = "r4"
+PR = "r2"
PROVIDES = "qmmp"
DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib"
@@ -40,7 +40,7 @@ python populate_packages_prepend () {
for plug_dir in plug_dirs:
g_plug_dir = os.path.join(qmmp_libdir,plug_dir)
- do_split_packages(d, g_plug_dir, '^lib(.*)\.so$', 'qmmp-plugin-' + plug_dir + '-%s', 'Qmmp' + plug_dir + 'plugin for %s')
+ do_split_packages(d, g_plug_dir, '^lib(.*)\.so$', 'qmmp-plugin-' + plug_dir.lower() + '-%s', 'Qmmp ' + plug_dir + ' plugin for %s')
}
FILES_${PN} = "\
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [CONSOLIDATED PULL 09/28] buildstats: Fix for buildstats on tmpfs
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (7 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 08/28] qmmp: Fix qmmp packaging, ensure lowercase package names Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 10/28] udev-164: Update init script to do an explicit add action Saul Wold
` (19 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
From: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
tmpfs/encryptfs/(and most likely, but not confirmed)ramfs TMPDIRs
cause diskstats to choke. No device entry ends up in /proc/diskstats
for these fs types, which ends up causing the failure.
The short term solution is to exclude these fs types from diskstat
collection. Longer term we will want to see if we can collect
meaningful diskio for each of these, and other, use cases, but for
this cleans up Bug 1700.
[YOCTO #1700]
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Corrected YOCTO bug location and format
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/buildstats.bbclass | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/meta/classes/buildstats.bbclass b/meta/classes/buildstats.bbclass
index 55cbb3c..96c98d4 100644
--- a/meta/classes/buildstats.bbclass
+++ b/meta/classes/buildstats.bbclass
@@ -48,13 +48,24 @@ def set_device(e):
# something like stick DL_DIR on a different partition and this would
# throw stats gathering off. The same goes with SSTATE_DIR. However, let's
# get the basics in here and work on the cornercases later.
+ # A note. /proc/diskstats does not contain info on encryptfs, tmpfs, etc.
+ # If we end up hitting one of these fs, we'll just skip diskstats collection.
############################################################################
device=os.stat(tmpdir)
majordev=os.major(device.st_dev)
minordev=os.minor(device.st_dev)
+ ############################################################################
+ # Bug 1700:
+ # Because tmpfs/encryptfs/ramfs etc inserts no entry in /proc/diskstats
+ # we set rdev to NoLogicalDevice and search for it later. If we find NLD
+ # we do not collect diskstats as the method to collect meaningful statistics
+ # for these fs types requires a bit more research.
+ ############################################################################
for line in open("/proc/diskstats", "r"):
if majordev == int(line.split()[0]) and minordev == int(line.split()[1]):
rdev=line.split()[2]
+ else:
+ rdev="NoLogicalDevice"
file = open(bb.data.getVar('DEVFILE', e.data, True), "w")
file.write(rdev)
file.close()
@@ -133,10 +144,11 @@ def write_task_data(status, logfile, dev, e):
# For the best information, running things with BB_TOTAL_THREADS = "1"
# would return accurate per task results.
############################################################################
- diskdata = get_diskdata("__diskdata_task", dev, e.data)
- if diskdata:
- for key in sorted(diskdata.iterkeys()):
- file.write(key + ": " + diskdata[key] + "\n")
+ if dev != "NoLogicalDevice":
+ diskdata = get_diskdata("__diskdata_task", dev, e.data)
+ if diskdata:
+ for key in sorted(diskdata.iterkeys()):
+ file.write(key + ": " + diskdata[key] + "\n")
if status is "passed":
file.write("Status: PASSED \n")
else:
@@ -169,7 +181,8 @@ python run_buildstats () {
bb.mkdirhier(bsdir)
except:
pass
- set_diskdata("__diskdata_build", device, e.data)
+ if device != "NoLogicalDevice":
+ set_diskdata("__diskdata_build", device, e.data)
set_timedata("__timedata_build", e.data)
build_time = os.path.join(bsdir, "build_stats")
# write start of build into build_time
@@ -185,7 +198,7 @@ python run_buildstats () {
elif isinstance(e, bb.event.BuildCompleted):
bn = get_bn(e)
- dev = get_device(e)
+ device = get_device(e)
bsdir = os.path.join(bb.data.getVar('BUILDSTATS_BASE', e.data, True), bn)
taskdir = os.path.join(bsdir, bb.data.expand("${PF}", e.data))
build_time = os.path.join(bsdir, "build_stats")
@@ -201,10 +214,11 @@ python run_buildstats () {
file.write("Elapsed time: %0.2f seconds \n" % (time))
if cpu:
file.write("CPU usage: %0.1f%% \n" % cpu)
- diskio = get_diskdata("__diskdata_build", dev, e.data)
- if diskio:
- for key in sorted(diskio.iterkeys()):
- file.write(key + ": " + diskio[key] + "\n")
+ if device != "NoLogicalDevice":
+ diskio = get_diskdata("__diskdata_build", device, e.data)
+ if diskio:
+ for key in sorted(diskio.iterkeys()):
+ file.write(key + ": " + diskio[key] + "\n")
file.close()
if isinstance(e, bb.build.TaskStarted):
@@ -212,7 +226,8 @@ python run_buildstats () {
device = get_device(e)
bsdir = os.path.join(bb.data.getVar('BUILDSTATS_BASE', e.data, True), bn)
taskdir = os.path.join(bsdir, bb.data.expand("${PF}", e.data))
- set_diskdata("__diskdata_task", device, e.data)
+ if device != "NoLogicalDevice":
+ set_diskdata("__diskdata_task", device, e.data)
set_timedata("__timedata_task", e.data)
try:
bb.mkdirhier(taskdir)
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [CONSOLIDATED PULL 10/28] udev-164: Update init script to do an explicit add action
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (8 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 09/28] buildstats: Fix for buildstats on tmpfs Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 11/28] tslib: fix the bug with loading libts-1.0.so Saul Wold
` (18 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
From: Kumar Gala <galak@kernel.crashing.org>
With udev 152 or greater the default action for 'udevadm trigger' was
modified to be 'change' instead of 'add.
To ensure initial coldplug events at boot are seen be scripts the are
expecting them as 'add' events we invoke udevadm with an explicit
'--action=add'.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
meta/recipes-core/udev/udev-164/init | 4 ++--
meta/recipes-core/udev/udev_164.bb | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/udev/udev-164/init b/meta/recipes-core/udev/udev-164/init
index 9ce95ee..073942f 100644
--- a/meta/recipes-core/udev/udev-164/init
+++ b/meta/recipes-core/udev/udev-164/init
@@ -48,10 +48,10 @@ kill_udevd > "/dev/null" 2>&1
/sbin/udevadm control --env=STARTUP=1
if [ "$not_first_boot" != "" ];then
- /sbin/udevadm trigger --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform
+ /sbin/udevadm trigger --action=add --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform
(/sbin/udevadm settle --timeout=3; /sbin/udevadm control --env=STARTUP=)&
else
- /sbin/udevadm trigger
+ /sbin/udevadm trigger --action=add
/sbin/udevadm settle
fi
diff --git a/meta/recipes-core/udev/udev_164.bb b/meta/recipes-core/udev/udev_164.bb
index 7cbe4d8..d487add 100644
--- a/meta/recipes-core/udev/udev_164.bb
+++ b/meta/recipes-core/udev/udev_164.bb
@@ -1,6 +1,6 @@
include udev-new.inc
-PR = "r6"
+PR = "r7"
SRC_URI += "file://udev-166-v4l1-1.patch"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [CONSOLIDATED PULL 11/28] tslib: fix the bug with loading libts-1.0.so
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (9 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 10/28] udev-164: Update init script to do an explicit add action Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 12/28] libcense.bbclass: fix OpenSSL mapping Saul Wold
` (17 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
From: Dmitry Cherukhin <dima_ch@emcraft.com>
Touchpad did not work in the qtdemoE if the library libts-1.0.so was not loaded
manually using the LD_PRELOAD variable. This problem was fixed in the tslib mainline
https://github.com/kergoth/tslib after the 1.0 release. We just import the patch.
Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
---
.../tslib/0001-Link-plugins-against-libts.patch | 57 ++++++++++++++++++++
meta/recipes-graphics/tslib/tslib_1.0.bb | 3 +-
2 files changed, 59 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-graphics/tslib/tslib/0001-Link-plugins-against-libts.patch
diff --git a/meta/recipes-graphics/tslib/tslib/0001-Link-plugins-against-libts.patch b/meta/recipes-graphics/tslib/tslib/0001-Link-plugins-against-libts.patch
new file mode 100644
index 0000000..c6b9f59
--- /dev/null
+++ b/meta/recipes-graphics/tslib/tslib/0001-Link-plugins-against-libts.patch
@@ -0,0 +1,57 @@
+From 9623bbedf4ff409e5036edfcfe52b2595932a6d7 Mon Sep 17 00:00:00 2001
+From: Chris Larson <clarson@kergoth.com>
+Date: Sat, 1 Nov 2008 20:46:07 +0000
+Subject: [PATCH] Link plugins against libts
+
+Some plugins use tslib functions. Link those plugins against libts.
+The problem is easy to see with LDFLAGS="-Wl,-no-undefined".
+Without this change DirectFB in unable to use tslib because symbols
+in the tslib plugins can't be resolved.
+
+Signed-off-by: Ville Syrjala <syrjala@sci.fi>
+Signed-off-by: Chris Larson <clarson@kergoth.com>
+
+The patch was imported from git server git://github.com/kergoth/tslib.git
+as of commit id 9623bbedf4ff409e5036edfcfe52b2595932a6d7.
+
+Upstream-Status: Accepted
+Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
+---
+ plugins/Makefile.am | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index 3b902c2..4c4ef8b 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -114,15 +114,19 @@ pluginexec_LTLIBRARIES = \
+
+ variance_la_SOURCES = variance.c
+ variance_la_LDFLAGS = -module $(LTVSN)
++variance_la_LIBADD = $(top_builddir)/src/libts.la
+
+ dejitter_la_SOURCES = dejitter.c
+ dejitter_la_LDFLAGS = -module $(LTVSN)
++dejitter_la_LIBADD = $(top_builddir)/src/libts.la
+
+ linear_la_SOURCES = linear.c
+ linear_la_LDFLAGS = -module $(LTVSN)
++linear_la_LIBADD = $(top_builddir)/src/libts.la
+
+ pthres_la_SOURCES = pthres.c
+ pthres_la_LDFLAGS = -module $(LTVSN)
++pthres_la_LIBADD = $(top_builddir)/src/libts.la
+
+ # hw access
+ corgi_la_SOURCES = corgi-raw.c
+@@ -148,6 +152,7 @@ tatung_la_LDFLAGS = -module $(LTVSN)
+
+ input_la_SOURCES = input-raw.c
+ input_la_LDFLAGS = -module $(LTVSN)
++input_la_LIBADD = $(top_builddir)/src/libts.la
+
+ linear_h2200_la_SOURCES = linear-h2200.c
+ linear_h2200_la_LDFLAGS = -module $(LTVSN)
+--
+1.7.6.4
+
diff --git a/meta/recipes-graphics/tslib/tslib_1.0.bb b/meta/recipes-graphics/tslib/tslib_1.0.bb
index 3704572..dbabce0 100644
--- a/meta/recipes-graphics/tslib/tslib_1.0.bb
+++ b/meta/recipes-graphics/tslib/tslib_1.0.bb
@@ -10,10 +10,11 @@ SECTION = "base"
LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a"
-PR = "r18"
+PR = "r19"
SRC_URI = "http://download.berlios.de/tslib/tslib-${PV}.tar.bz2 \
file://fix_version.patch \
+ file://0001-Link-plugins-against-libts.patch \
file://ts.conf \
file://tslib.sh"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [CONSOLIDATED PULL 12/28] libcense.bbclass: fix OpenSSL mapping
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (10 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 11/28] tslib: fix the bug with loading libts-1.0.so Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 13/28] image_types bbclass: use 4k bytes per inode so we don't run out of space immediately Saul Wold
` (16 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
From: Martin Jansa <martin.jansa@gmail.com>
[YOCTO #1712]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Fixed YOCTO bug format and location
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/license.bbclass | 2 +-
.../recipes-connectivity/openssl/openssl_0.9.8r.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 3f93bf5..baf35f0 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -44,7 +44,7 @@ SPDXLICENSEMAP[MPLv1.1] = "MPL-1"
SPDXLICENSEMAP[MIT-X] = "MIT"
#Openssl variations
-SPDXLICENSEMAP[openssl] = "Openssl"
+SPDXLICENSEMAP[openssl] = "OpenSSL"
#Other variations
SPDXLICENSEMAP[AFL2.1] = "AFL-2"
diff --git a/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb b/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb
index 5add70e..555bacf 100644
--- a/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb
+++ b/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb
@@ -1,6 +1,6 @@
require openssl.inc
-PR = "r6"
+PR = "r7"
SRC_URI += "file://debian/ca.patch \
file://debian/config-hurd.patch;apply=no \
file://debian/debian-targets.patch \
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [CONSOLIDATED PULL 13/28] image_types bbclass: use 4k bytes per inode so we don't run out of space immediately
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (11 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 12/28] libcense.bbclass: fix OpenSSL mapping Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 14/28] Add new IMAGE_CLASSES variable for classes for image generation Saul Wold
` (15 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
From: Koen Kooi <koen@dominion.thruhere.net>
genext2fs only creates the minimum number of inodes, after this patch it will scale with the rootfs size
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta/classes/image_types.bbclass | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 0d64705..9549a9e 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -38,36 +38,36 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLO
IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}"
-IMAGE_CMD_ext2 = "genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2"
+IMAGE_CMD_ext2 = "genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2"
IMAGE_CMD_ext2.gz () {
rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}
- genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2
+ genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2
gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2
mv ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz
rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}
}
IMAGE_CMD_ext2.bz2 () {
rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz
- genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
+ genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.bz2
rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz
}
IMAGE_CMD_ext2.lzma () {
rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz
- genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
+ genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
lzma -f -7 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.lzma ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.lzma
rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz
}
IMAGE_CMD_ext3 () {
- genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
+ genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
}
IMAGE_CMD_ext3.gz () {
rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}
- genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext3
+ genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext3
tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext3
gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext3
mv ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz
@@ -75,7 +75,7 @@ IMAGE_CMD_ext3.gz () {
}
oe_mkext4fs () {
- genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} $1
+ genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} $1
tune2fs -O extents,uninit_bg,dir_index,has_journal $1
e2fsck -yfDC0 $1 || chk=$?
case $chk in
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [CONSOLIDATED PULL 14/28] Add new IMAGE_CLASSES variable for classes for image generation
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (12 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 13/28] image_types bbclass: use 4k bytes per inode so we don't run out of space immediately Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-07 14:04 ` Richard Purdie
2011-11-05 17:22 ` [CONSOLIDATED PULL 15/28] distro_tracking_fields: updates for sudo, mtools, grep, and openssh Saul Wold
` (14 subsequent siblings)
28 siblings, 1 reply; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
From: Matthew McClintock <msm@freescale.com>
Allows us to import classes only for images and not to the global
namespace
Signed-off-by: Matthew McClintock <msm@freescale.com>
---
meta/classes/image.bbclass | 3 ++-
meta/conf/local.conf.sample | 6 ++++++
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 05f4331..a2770a4 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -111,7 +111,8 @@ def get_devtable_list(d):
str += " %s" % bb.which(bb.data.getVar('BBPATH', d, 1), devtable)
return str
-inherit image_types
+IMAGE_CLASSES ?= "image_types"
+inherit ${IMAGE_CLASSES}
IMAGE_POSTPROCESS_COMMAND ?= ""
MACHINE_POSTPROCESS_COMMAND ?= ""
diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index 73ab9f8..aa546c7 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -141,6 +141,12 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks"
# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
USER_CLASSES ?= "image-mklibs image-prelink"
+# Additional image generation features
+#
+# The following is a list of classes to import to use in the generation of images
+# currently an example class is image_types_uboot
+# IMAGE_CLASSES = " image_types_uboot"
+
#
# Runtime testing of images
#
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* Re: [CONSOLIDATED PULL 14/28] Add new IMAGE_CLASSES variable for classes for image generation
2011-11-05 17:22 ` [CONSOLIDATED PULL 14/28] Add new IMAGE_CLASSES variable for classes for image generation Saul Wold
@ 2011-11-07 14:04 ` Richard Purdie
2011-11-07 20:16 ` McClintock Matthew-B29882
0 siblings, 1 reply; 33+ messages in thread
From: Richard Purdie @ 2011-11-07 14:04 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Sat, 2011-11-05 at 10:22 -0700, Saul Wold wrote:
> From: Matthew McClintock <msm@freescale.com>
>
> Allows us to import classes only for images and not to the global
> namespace
>
> Signed-off-by: Matthew McClintock <msm@freescale.com>
> ---
> meta/classes/image.bbclass | 3 ++-
> meta/conf/local.conf.sample | 6 ++++++
> 2 files changed, 8 insertions(+), 1 deletions(-)
>
> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> index 05f4331..a2770a4 100644
> --- a/meta/classes/image.bbclass
> +++ b/meta/classes/image.bbclass
> @@ -111,7 +111,8 @@ def get_devtable_list(d):
> str += " %s" % bb.which(bb.data.getVar('BBPATH', d, 1), devtable)
> return str
>
> -inherit image_types
> +IMAGE_CLASSES ?= "image_types"
> +inherit ${IMAGE_CLASSES}
>
> IMAGE_POSTPROCESS_COMMAND ?= ""
> MACHINE_POSTPROCESS_COMMAND ?= ""
> diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
> index 73ab9f8..aa546c7 100644
> --- a/meta/conf/local.conf.sample
> +++ b/meta/conf/local.conf.sample
> @@ -141,6 +141,12 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks"
> # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
> USER_CLASSES ?= "image-mklibs image-prelink"
>
> +# Additional image generation features
> +#
> +# The following is a list of classes to import to use in the generation of images
> +# currently an example class is image_types_uboot
> +# IMAGE_CLASSES = " image_types_uboot"
> +
Most initial new users don't need to see this. Can we place this into
local.conf.sample.extended please?
Cheers,
Richard
^ permalink raw reply [flat|nested] 33+ messages in thread
* [CONSOLIDATED PULL 15/28] distro_tracking_fields: updates for sudo, mtools, grep, and openssh
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (13 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 14/28] Add new IMAGE_CLASSES variable for classes for image generation Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 16/28] python: improve packaging Saul Wold
` (13 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
From: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 32 ++++++++++----------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 7d7295c..ab34727 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -813,12 +813,12 @@ RECIPE_MAINTAINER_pn-pax-utils = "Scott Garman <scott.a.garman@intel.com>"
RECIPE_STATUS_pn-sudo = "green"
RECIPE_DEPENDENCY_CHECK_pn-sudo = "not done"
-RECIPE_LATEST_VERSION_pn-sudo = "1.8.1p2"
+RECIPE_LATEST_VERSION_pn-sudo = "1.8.3"
RECIPE_INTEL_SECTION_pn-sudo = "base utils"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-sudo = "1 month"
-RECIPE_LATEST_RELEASE_DATE_pn-sudo = "May 16, 2011"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-sudo = "2 months"
+RECIPE_LATEST_RELEASE_DATE_pn-sudo = "Oct 21, 2011"
RECIPE_COMMENTS_pn-sudo = ""
-RECIPE_LAST_UPDATE_pn-sudo = "Jun 14, 2011"
+RECIPE_LAST_UPDATE_pn-sudo = "Oct 25, 2011"
RECIPE_MAINTAINER_pn-sudo = "Scott Garman <scott.a.garman@intel.com>"
RECIPE_STATUS_pn-blktool = "green"
@@ -1290,12 +1290,12 @@ DISTRO_PN_ALIAS_pn-msynctool = "OpenSuse=msynctool Mandriva=msynctool"
RECIPE_STATUS_pn-mtools = "green"
RECIPE_DEPENDENCY_CHECK_pn-mtools = "not done"
-RECIPE_LATEST_VERSION_pn-mtools = "4.0.16"
+RECIPE_LATEST_VERSION_pn-mtools = "4.0.17"
RECIPE_INTEL_SECTION_pn-mtools = "optional"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-mtools = "6 months"
-RECIPE_LATEST_RELEASE_DATE_pn-mtools = "Apr 16, 2011"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-mtools = "2 months"
+RECIPE_LATEST_RELEASE_DATE_pn-mtools = "Jun 28, 2011"
RECIPE_COMMENTS_pn-mtools = ""
-RECIPE_LAST_UPDATE_pn-mtools = "Jun 15, 2011"
+RECIPE_LAST_UPDATE_pn-mtools = "Oct 25, 2011"
RECIPE_MAINTAINER_pn-mtools = "Scott Garman <scott.a.garman@intel.com>"
RECIPE_STATUS_pn-pm-utils = "green"
@@ -2016,22 +2016,22 @@ RECIPE_MAINTAINER_pn-cronie = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-grep = "green"
RECIPE_DEPENDENCY_CHECK_pn-grep = "not done"
-RECIPE_LATEST_VERSION_pn-grep = "2.8"
+RECIPE_LATEST_VERSION_pn-grep = "2.9"
RECIPE_INTEL_SECTION_pn-grep = "base"
RECIPE_NO_OF_PATCHES_pn-grep = "0"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-grep = "8 months"
-RECIPE_LATEST_RELEASE_DATE_pn-grep = "May 01, 2011"
-RECIPE_LAST_UPDATE_pn-grep = "Jun 5, 2011"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-grep = "1 month"
+RECIPE_LATEST_RELEASE_DATE_pn-grep = "Jun 01, 2011"
+RECIPE_LAST_UPDATE_pn-grep = "Oct 25, 2011"
RECIPE_MAINTAINER_pn-grep = "Scott Garman <scott.a.garman@intel.com>"
RECIPE_STATUS_pn-openssh = "green"
RECIPE_DEPENDENCY_CHECK_pn-openssh = "not done"
-RECIPE_LATEST_VERSION_pn-openssh = "5.8p2"
+RECIPE_LATEST_VERSION_pn-openssh = "5.9p1"
RECIPE_INTEL_SECTION_pn-openssh = "base"
RECIPE_NO_OF_PATCHES_pn-openssh = "1"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-openssh = "3 months"
-RECIPE_LATEST_RELEASE_DATE_pn-openssh = "May 01, 2011"
-RECIPE_LAST_UPDATE_pn-openssh = "Jun 5, 2011"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-openssh = "4 months"
+RECIPE_LATEST_RELEASE_DATE_pn-openssh = "Sep 01, 2011"
+RECIPE_LAST_UPDATE_pn-openssh = "Oct 25, 2011"
RECIPE_MAINTAINER_pn-openssh = "Scott Garman <scott.a.garman@intel.com>"
RECIPE_STATUS_pn-tar = "green"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [CONSOLIDATED PULL 16/28] python: improve packaging
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (14 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 15/28] distro_tracking_fields: updates for sudo, mtools, grep, and openssh Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 17/28] connman 0.75: bump PR for iptables library change Saul Wold
` (12 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
From: Martin Jansa <martin.jansa@gmail.com>
* move 2to3 to separate package and include lib2to3 (was in python-misc)
* fix pattern for python-unittest (was in python-misc because it's in subdirectory now)
* add pydoc_data to python-pydoc (was in python-misc)
* add more stuff to smtpd, audio, codecs, ctypes, html, io, json, mime,
pickle, stringold, xmlrpc
* move all FILES_ details from python recipe to manifest generator so it's in one place
* added manual line break in FILES_${PN}-core, because git send-email
doesn't like too long lines
$ git send-email -1 dfaae65839f0ab23e5b2ae2a68df0f370bca84d2
fatal: /tmp/k8zbDajUNP/0001-python-improve-packaging.patch: 64: patch contains a line longer than 998 characters
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../python/python-2.7-manifest.inc | 43 ++++++++++--------
meta/recipes-devtools/python/python_2.7.2.bb | 22 +---------
scripts/contrib/python/generate-manifest-2.7.py | 47 ++++++++++++-------
3 files changed, 55 insertions(+), 57 deletions(-)
diff --git a/meta/recipes-devtools/python/python-2.7-manifest.inc b/meta/recipes-devtools/python/python-2.7-manifest.inc
index 69cb3c7..e4017ba 100644
--- a/meta/recipes-devtools/python/python-2.7-manifest.inc
+++ b/meta/recipes-devtools/python/python-2.7-manifest.inc
@@ -1,17 +1,21 @@
# WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file.
-# Generator: 'scripts/contrib/python/generate-manifest-2.7.py' Version 20110222.1 (C) 2002-2010 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
+# Generator: 'scripts/contrib/python/generate-manifest-2.7.py' Version 20110222.2 (C) 2002-2010 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
# Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
-PROVIDES+="${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib "
+PROVIDES+="${PN}-2to3 ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib "
-PACKAGES="${PN}-dbg ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib ${PN}-modules"
+PACKAGES="${PN}-dbg ${PN}-2to3 ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib ${PN}-modules"
+
+DESCRIPTION_${PN}-2to3="Python Automated Python 2 to 3 code translation"
+RDEPENDS_${PN}-2to3="${PN}-core"
+FILES_${PN}-2to3="${bindir}/2to3 ${libdir}/python2.7/lib2to3 "
DESCRIPTION_${PN}-audio="Python Audio Handling"
RDEPENDS_${PN}-audio="${PN}-core"
-FILES_${PN}-audio="${libdir}/python2.7/wave.* ${libdir}/python2.7/chunk.* ${libdir}/python2.7/sndhdr.* ${libdir}/python2.7/lib-dynload/ossaudiodev.so ${libdir}/python2.7/lib-dynload/audioop.so "
+FILES_${PN}-audio="${libdir}/python2.7/wave.* ${libdir}/python2.7/chunk.* ${libdir}/python2.7/sndhdr.* ${libdir}/python2.7/lib-dynload/ossaudiodev.so ${libdir}/python2.7/lib-dynload/audioop.so ${libdir}/python2.7/audiodev.* ${libdir}/python2.7/sunaudio.* ${libdir}/python2.7/sunau.* ${libdir}/python2.7/toaiff.* "
DESCRIPTION_${PN}-bsddb="Python Berkeley Database Bindings"
RDEPENDS_${PN}-bsddb="${PN}-core"
@@ -19,7 +23,7 @@ FILES_${PN}-bsddb="${libdir}/python2.7/bsddb ${libdir}/python2.7/lib-dynload/_bs
DESCRIPTION_${PN}-codecs="Python Codecs, Encodings & i18n Support"
RDEPENDS_${PN}-codecs="${PN}-core ${PN}-lang"
-FILES_${PN}-codecs="${libdir}/python2.7/codecs.* ${libdir}/python2.7/encodings ${libdir}/python2.7/gettext.* ${libdir}/python2.7/locale.* ${libdir}/python2.7/lib-dynload/_locale.so ${libdir}/python2.7/lib-dynload/unicodedata.so ${libdir}/python2.7/stringprep.* ${libdir}/python2.7/xdrlib.* "
+FILES_${PN}-codecs="${libdir}/python2.7/codecs.* ${libdir}/python2.7/encodings ${libdir}/python2.7/gettext.* ${libdir}/python2.7/locale.* ${libdir}/python2.7/lib-dynload/_locale.so ${libdir}/python2.7/lib-dynload/_codecs* ${libdir}/python2.7/lib-dynload/_multibytecodec.so ${libdir}/python2.7/lib-dynload/unicodedata.so ${libdir}/python2.7/stringprep.* ${libdir}/python2.7/xdrlib.* "
DESCRIPTION_${PN}-compile="Python Bytecode Compilation Support"
RDEPENDS_${PN}-compile="${PN}-core"
@@ -35,7 +39,8 @@ FILES_${PN}-compression="${libdir}/python2.7/gzip.* ${libdir}/python2.7/zipfile.
DESCRIPTION_${PN}-core="Python Interpreter and core modules (needed!)"
RDEPENDS_${PN}-core=""
-FILES_${PN}-core="${libdir}/python2.7/__future__.* ${libdir}/python2.7/_abcoll.* ${libdir}/python2.7/abc.* ${libdir}/python2.7/copy.* ${libdir}/python2.7/copy_reg.* ${libdir}/python2.7/ConfigParser.* ${libdir}/python2.7/genericpath.* ${libdir}/python2.7/getopt.* ${libdir}/python2.7/linecache.* ${libdir}/python2.7/new.* ${libdir}/python2.7/os.* ${libdir}/python2.7/posixpath.* ${libdir}/python2.7/struct.* ${libdir}/python2.7/warnings.* ${libdir}/python2.7/site.* ${libdir}/python2.7/stat.* ${libdir}/python2.7/UserDict.* ${libdir}/python2.7/UserList.* ${libdir}/python2.7/UserString.* ${libdir}/python2.7/lib-dynload/binascii.so ${libdir}/python2.7/lib-dynload/_struct.so ${libdir}/python2.7/lib-dynload/time.so ${libdir}/python2.7/lib-dynload/xreadlines.so ${libdir}/python2.7/types.* ${libdir}/python2.7/platform.* ${bindir}/python* ${libdir}/python2.7/_weakrefset.* ${libdir}/python2.7/sysconfig.* ${libdir}/python2.7/config/Makefile ${includedir}/python${PYTHON_MAJMIN}/pyconfig.h "
+FILES_${PN}-core="${libdir}/python2.7/__future__.* ${libdir}/python2.7/_abcoll.* ${libdir}/python2.7/abc.* ${libdir}/python2.7/copy.* ${libdir}/python2.7/copy_reg.* ${libdir}/python2.7/ConfigParser.* ${libdir}/python2.7/genericpath.* ${libdir}/python2.7/getopt.* ${libdir}/python2.7/linecache.* ${libdir}/python2.7/new.* ${libdir}/python2.7/os.* ${libdir}/python2.7/posixpath.* ${libdir}/python2.7/struct.* ${libdir}/python2.7/warnings.* ${libdir}/python2.7/site.* ${libdir}/python2.7/stat.* ${libdir}/python2.7/UserDict.* ${libdir}/python2.7/UserList.* ${libdir}/python2.7/UserString.* ${libdir}/python2.7/lib-dynload/binascii.so ${libdir}/python2.7/lib-dynload/_struct.so ${libdir}/python2.7/lib-dynload/time.so ${libdir}/python2.7/lib-dynload/xreadlines.so \
+${libdir}/python2.7/types.* ${libdir}/python2.7/platform.* ${bindir}/python* ${libdir}/python2.7/_weakrefset.* ${libdir}/python2.7/sysconfig.* ${libdir}/python2.7/config/Makefile ${includedir}/python${PYTHON_MAJMIN}/pyconfig.h ${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py "
DESCRIPTION_${PN}-crypt="Python Basic Cryptographic and Hashing Support"
RDEPENDS_${PN}-crypt="${PN}-core"
@@ -43,7 +48,7 @@ FILES_${PN}-crypt="${libdir}/python2.7/hashlib.* ${libdir}/python2.7/md5.* ${lib
DESCRIPTION_${PN}-ctypes="Python C Types Support"
RDEPENDS_${PN}-ctypes="${PN}-core"
-FILES_${PN}-ctypes="${libdir}/python2.7/ctypes ${libdir}/python2.7/lib-dynload/_ctypes.so "
+FILES_${PN}-ctypes="${libdir}/python2.7/ctypes ${libdir}/python2.7/lib-dynload/_ctypes.so ${libdir}/python2.7/lib-dynload/_ctypes_test.so "
DESCRIPTION_${PN}-curses="Python Curses Support"
RDEPENDS_${PN}-curses="${PN}-core"
@@ -63,7 +68,7 @@ FILES_${PN}-debugger="${libdir}/python2.7/bdb.* ${libdir}/python2.7/pdb.* "
DESCRIPTION_${PN}-dev="Python Development Package"
RDEPENDS_${PN}-dev="${PN}-core"
-FILES_${PN}-dev="${includedir} ${libdir}/libpython2.6.so "
+FILES_${PN}-dev="${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal ${datadir}/pkgconfig "
DESCRIPTION_${PN}-difflib="Python helpers for computing deltas between objects."
RDEPENDS_${PN}-difflib="${PN}-lang ${PN}-re"
@@ -99,7 +104,7 @@ FILES_${PN}-hotshot="${libdir}/python2.7/hotshot ${libdir}/python2.7/lib-dynload
DESCRIPTION_${PN}-html="Python HTML Processing"
RDEPENDS_${PN}-html="${PN}-core"
-FILES_${PN}-html="${libdir}/python2.7/formatter.* ${libdir}/python2.7/htmlentitydefs.* ${libdir}/python2.7/htmllib.* ${libdir}/python2.7/markupbase.* ${libdir}/python2.7/sgmllib.* "
+FILES_${PN}-html="${libdir}/python2.7/formatter.* ${libdir}/python2.7/htmlentitydefs.* ${libdir}/python2.7/htmllib.* ${libdir}/python2.7/markupbase.* ${libdir}/python2.7/sgmllib.* ${libdir}/python2.7/HTMLParser.* "
DESCRIPTION_${PN}-idle="Python Integrated Development Environment"
RDEPENDS_${PN}-idle="${PN}-core ${PN}-tkinter"
@@ -111,11 +116,11 @@ FILES_${PN}-image="${libdir}/python2.7/colorsys.* ${libdir}/python2.7/imghdr.* $
DESCRIPTION_${PN}-io="Python Low-Level I/O"
RDEPENDS_${PN}-io="${PN}-core ${PN}-math"
-FILES_${PN}-io="${libdir}/python2.7/lib-dynload/_socket.so ${libdir}/python2.7/lib-dynload/_ssl.so ${libdir}/python2.7/lib-dynload/select.so ${libdir}/python2.7/lib-dynload/termios.so ${libdir}/python2.7/lib-dynload/cStringIO.so ${libdir}/python2.7/pipes.* ${libdir}/python2.7/socket.* ${libdir}/python2.7/ssl.* ${libdir}/python2.7/tempfile.* ${libdir}/python2.7/StringIO.* "
+FILES_${PN}-io="${libdir}/python2.7/lib-dynload/_socket.so ${libdir}/python2.7/lib-dynload/_io.so ${libdir}/python2.7/lib-dynload/_ssl.so ${libdir}/python2.7/lib-dynload/select.so ${libdir}/python2.7/lib-dynload/termios.so ${libdir}/python2.7/lib-dynload/cStringIO.so ${libdir}/python2.7/pipes.* ${libdir}/python2.7/socket.* ${libdir}/python2.7/ssl.* ${libdir}/python2.7/tempfile.* ${libdir}/python2.7/StringIO.* ${libdir}/python2.7/io.* ${libdir}/python2.7/_pyio.* "
DESCRIPTION_${PN}-json="Python JSON Support"
RDEPENDS_${PN}-json="${PN}-core ${PN}-math ${PN}-re"
-FILES_${PN}-json="${libdir}/python2.7/json "
+FILES_${PN}-json="${libdir}/python2.7/json ${libdir}/python2.7/lib-dynload/_json.so "
DESCRIPTION_${PN}-lang="Python Low-Level Language Support"
RDEPENDS_${PN}-lang="${PN}-core"
@@ -135,7 +140,7 @@ FILES_${PN}-math="${libdir}/python2.7/lib-dynload/cmath.so ${libdir}/python2.7/l
DESCRIPTION_${PN}-mime="Python MIME Handling APIs"
RDEPENDS_${PN}-mime="${PN}-core ${PN}-io"
-FILES_${PN}-mime="${libdir}/python2.7/mimetools.* ${libdir}/python2.7/uu.* ${libdir}/python2.7/quopri.* ${libdir}/python2.7/rfc822.* "
+FILES_${PN}-mime="${libdir}/python2.7/mimetools.* ${libdir}/python2.7/uu.* ${libdir}/python2.7/quopri.* ${libdir}/python2.7/rfc822.* ${libdir}/python2.7/MimeWriter.* "
DESCRIPTION_${PN}-mmap="Python Memory-Mapped-File Support"
RDEPENDS_${PN}-mmap="${PN}-core ${PN}-io"
@@ -159,7 +164,7 @@ FILES_${PN}-numbers="${libdir}/python2.7/decimal.* ${libdir}/python2.7/numbers.*
DESCRIPTION_${PN}-pickle="Python Persistence Support"
RDEPENDS_${PN}-pickle="${PN}-core ${PN}-codecs ${PN}-io ${PN}-re"
-FILES_${PN}-pickle="${libdir}/python2.7/pickle.* ${libdir}/python2.7/shelve.* ${libdir}/python2.7/lib-dynload/cPickle.so "
+FILES_${PN}-pickle="${libdir}/python2.7/pickle.* ${libdir}/python2.7/shelve.* ${libdir}/python2.7/lib-dynload/cPickle.so ${libdir}/python2.7/pickletools.* "
DESCRIPTION_${PN}-pkgutil="Python Package Extension Utility Support"
RDEPENDS_${PN}-pkgutil="${PN}-core"
@@ -175,7 +180,7 @@ FILES_${PN}-profile="${libdir}/python2.7/profile.* ${libdir}/python2.7/pstats.*
DESCRIPTION_${PN}-pydoc="Python Interactive Help Support"
RDEPENDS_${PN}-pydoc="${PN}-core ${PN}-lang ${PN}-stringold ${PN}-re"
-FILES_${PN}-pydoc="${bindir}/pydoc ${libdir}/python2.7/pydoc.* "
+FILES_${PN}-pydoc="${bindir}/pydoc ${libdir}/python2.7/pydoc.* ${libdir}/python2.7/pydoc_data "
DESCRIPTION_${PN}-re="Python Regular Expression APIs"
RDEPENDS_${PN}-re="${PN}-core"
@@ -199,7 +204,7 @@ FILES_${PN}-shell="${libdir}/python2.7/cmd.* ${libdir}/python2.7/commands.* ${li
DESCRIPTION_${PN}-smtpd="Python Simple Mail Transport Daemon"
RDEPENDS_${PN}-smtpd="${PN}-core ${PN}-netserver ${PN}-email ${PN}-mime"
-FILES_${PN}-smtpd="${bindir}/smtpd.* "
+FILES_${PN}-smtpd="${bindir}/smtpd.* ${libdir}/python2.7/smtpd.* "
DESCRIPTION_${PN}-sqlite3="Python Sqlite3 Database Support"
RDEPENDS_${PN}-sqlite3="${PN}-core ${PN}-datetime ${PN}-lang ${PN}-crypt ${PN}-io ${PN}-threading ${PN}-zlib"
@@ -211,7 +216,7 @@ FILES_${PN}-sqlite3-tests="${libdir}/python2.7/sqlite3/test "
DESCRIPTION_${PN}-stringold="Python String APIs [deprecated]"
RDEPENDS_${PN}-stringold="${PN}-core ${PN}-re"
-FILES_${PN}-stringold="${libdir}/python2.7/lib-dynload/strop.so ${libdir}/python2.7/string.* "
+FILES_${PN}-stringold="${libdir}/python2.7/lib-dynload/strop.so ${libdir}/python2.7/string.* ${libdir}/python2.7/stringold.* "
DESCRIPTION_${PN}-subprocess="Python Subprocess Support"
RDEPENDS_${PN}-subprocess="${PN}-core ${PN}-io ${PN}-re ${PN}-fcntl ${PN}-pickle"
@@ -243,7 +248,7 @@ FILES_${PN}-tkinter="${libdir}/python2.7/lib-dynload/_tkinter.so ${libdir}/pytho
DESCRIPTION_${PN}-unittest="Python Unit Testing Framework"
RDEPENDS_${PN}-unittest="${PN}-core ${PN}-stringold ${PN}-lang"
-FILES_${PN}-unittest="${libdir}/python2.7/unittest.* "
+FILES_${PN}-unittest="${libdir}/python2.7/unittest/ "
DESCRIPTION_${PN}-unixadmin="Python Unix Administration Support"
RDEPENDS_${PN}-unixadmin="${PN}-core"
@@ -255,14 +260,14 @@ FILES_${PN}-xml="${libdir}/python2.7/lib-dynload/pyexpat.so ${libdir}/python2.7/
DESCRIPTION_${PN}-xmlrpc="Python XMLRPC Support"
RDEPENDS_${PN}-xmlrpc="${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang"
-FILES_${PN}-xmlrpc="${libdir}/python2.7/xmlrpclib.* ${libdir}/python2.7/SimpleXMLRPCServer.* "
+FILES_${PN}-xmlrpc="${libdir}/python2.7/xmlrpclib.* ${libdir}/python2.7/SimpleXMLRPCServer.* ${libdir}/python2.7/DocXMLRPCServer.* "
DESCRIPTION_${PN}-zlib="Python zlib Support."
RDEPENDS_${PN}-zlib="${PN}-core"
FILES_${PN}-zlib="${libdir}/python2.7/lib-dynload/zlib.so "
DESCRIPTION_${PN}-modules="All Python modules"
-RDEPENDS_${PN}-modules="${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib "
+RDEPENDS_${PN}-modules="${PN}-2to3 ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib "
ALLOW_EMPTY_${PN}-modules = "1"
diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb
index 45d8350..bb088a4 100644
--- a/meta/recipes-devtools/python/python_2.7.2.bb
+++ b/meta/recipes-devtools/python/python_2.7.2.bb
@@ -1,7 +1,7 @@
require python.inc
DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib"
DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
DISTRO_SRC_URI ?= "file://sitecustomize.py"
DISTRO_SRC_URI_linuxstdbase = ""
@@ -107,30 +107,10 @@ RPROVIDES_${PN}-core = "${PN}"
RRECOMMENDS_${PN}-core = "${PN}-readline"
RRECOMMENDS_${PN}-crypt = "openssl"
-# add sitecustomize
-FILES_${PN}-core += "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py"
-# ship 2to3
-FILES_${PN}-core += "${bindir}/2to3"
-
# package libpython2
PACKAGES =+ "lib${BPN}2"
FILES_lib${BPN}2 = "${libdir}/libpython*.so.*"
-# additional stuff -dev
-
-FILES_${PN}-dev = "\
- ${includedir} \
- ${libdir}/lib*${SOLIBSDEV} \
- ${libdir}/*.la \
- ${libdir}/*.a \
- ${libdir}/*.o \
- ${libdir}/pkgconfig \
- ${base_libdir}/*.a \
- ${base_libdir}/*.o \
- ${datadir}/aclocal \
- ${datadir}/pkgconfig \
-"
-
# catch debug extensions (isn't that already in python-core-dbg?)
FILES_${PN}-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug"
diff --git a/scripts/contrib/python/generate-manifest-2.7.py b/scripts/contrib/python/generate-manifest-2.7.py
index b526df5..e0171f9 100755
--- a/scripts/contrib/python/generate-manifest-2.7.py
+++ b/scripts/contrib/python/generate-manifest-2.7.py
@@ -17,7 +17,7 @@ import time
VERSION = "2.7.2"
__author__ = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
-__version__ = "20110222.1"
+__version__ = "20110222.2"
class MakefileMaker:
@@ -166,28 +166,41 @@ if __name__ == "__main__":
"lib-dynload/binascii.so lib-dynload/_struct.so lib-dynload/time.so " +
"lib-dynload/xreadlines.so types.* platform.* ${bindir}/python* " +
"_weakrefset.* sysconfig.* config/Makefile " +
- "${includedir}/python${PYTHON_MAJMIN}/pyconfig.h " )
+ "${includedir}/python${PYTHON_MAJMIN}/pyconfig.h " +
+ "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py ")
m.addPackage( "${PN}-dev", "Python Development Package", "${PN}-core",
- "${includedir} ${libdir}/libpython2.6.so" ) # package
+ "${includedir} " +
+ "${libdir}/lib*${SOLIBSDEV} " +
+ "${libdir}/*.la " +
+ "${libdir}/*.a " +
+ "${libdir}/*.o " +
+ "${libdir}/pkgconfig " +
+ "${base_libdir}/*.a " +
+ "${base_libdir}/*.o " +
+ "${datadir}/aclocal " +
+ "${datadir}/pkgconfig " )
+
+ m.addPackage( "${PN}-2to3", "Python Automated Python 2 to 3 code translation", "${PN}-core",
+ "${bindir}/2to3 lib2to3" ) # package
m.addPackage( "${PN}-idle", "Python Integrated Development Environment", "${PN}-core ${PN}-tkinter",
"${bindir}/idle idlelib" ) # package
m.addPackage( "${PN}-pydoc", "Python Interactive Help Support", "${PN}-core ${PN}-lang ${PN}-stringold ${PN}-re",
- "${bindir}/pydoc pydoc.*" )
+ "${bindir}/pydoc pydoc.* pydoc_data" )
m.addPackage( "${PN}-smtpd", "Python Simple Mail Transport Daemon", "${PN}-core ${PN}-netserver ${PN}-email ${PN}-mime",
- "${bindir}/smtpd.*" )
+ "${bindir}/smtpd.* smtpd.*" )
m.addPackage( "${PN}-audio", "Python Audio Handling", "${PN}-core",
- "wave.* chunk.* sndhdr.* lib-dynload/ossaudiodev.so lib-dynload/audioop.so" )
+ "wave.* chunk.* sndhdr.* lib-dynload/ossaudiodev.so lib-dynload/audioop.so audiodev.* sunaudio.* sunau.* toaiff.*" )
m.addPackage( "${PN}-bsddb", "Python Berkeley Database Bindings", "${PN}-core",
"bsddb lib-dynload/_bsddb.so" ) # package
m.addPackage( "${PN}-codecs", "Python Codecs, Encodings & i18n Support", "${PN}-core ${PN}-lang",
- "codecs.* encodings gettext.* locale.* lib-dynload/_locale.so lib-dynload/unicodedata.so stringprep.* xdrlib.*" )
+ "codecs.* encodings gettext.* locale.* lib-dynload/_locale.so lib-dynload/_codecs* lib-dynload/_multibytecodec.so lib-dynload/unicodedata.so stringprep.* xdrlib.*" )
m.addPackage( "${PN}-compile", "Python Bytecode Compilation Support", "${PN}-core",
"py_compile.* compileall.*" )
@@ -208,7 +221,7 @@ if __name__ == "__main__":
"curses lib-dynload/_curses.so lib-dynload/_curses_panel.so" ) # directory + low level module
m.addPackage( "${PN}-ctypes", "Python C Types Support", "${PN}-core",
- "ctypes lib-dynload/_ctypes.so" ) # directory + low level module
+ "ctypes lib-dynload/_ctypes.so lib-dynload/_ctypes_test.so" ) # directory + low level module
m.addPackage( "${PN}-datetime", "Python Calendar and Time support", "${PN}-core ${PN}-codecs",
"_strptime.* calendar.* lib-dynload/datetime.so" )
@@ -242,7 +255,7 @@ if __name__ == "__main__":
"hotshot lib-dynload/_hotshot.so" )
m.addPackage( "${PN}-html", "Python HTML Processing", "${PN}-core",
- "formatter.* htmlentitydefs.* htmllib.* markupbase.* sgmllib.* " )
+ "formatter.* htmlentitydefs.* htmllib.* markupbase.* sgmllib.* HTMLParser.* " )
m.addPackage( "${PN}-gdbm", "Python GNU Database Support", "${PN}-core",
"lib-dynload/gdbm.so" )
@@ -251,11 +264,11 @@ if __name__ == "__main__":
"colorsys.* imghdr.* lib-dynload/imageop.so lib-dynload/rgbimg.so" )
m.addPackage( "${PN}-io", "Python Low-Level I/O", "${PN}-core ${PN}-math",
- "lib-dynload/_socket.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so " +
- "pipes.* socket.* ssl.* tempfile.* StringIO.* " )
+ "lib-dynload/_socket.so lib-dynload/_io.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so " +
+ "pipes.* socket.* ssl.* tempfile.* StringIO.* io.* _pyio.*" )
m.addPackage( "${PN}-json", "Python JSON Support", "${PN}-core ${PN}-math ${PN}-re",
- "json" ) # package
+ "json lib-dynload/_json.so" ) # package
m.addPackage( "${PN}-lang", "Python Low-Level Language Support", "${PN}-core",
"lib-dynload/_bisect.so lib-dynload/_collections.so lib-dynload/_heapq.so lib-dynload/_weakref.so lib-dynload/_functools.so " +
@@ -273,7 +286,7 @@ if __name__ == "__main__":
"lib-dynload/cmath.so lib-dynload/math.so lib-dynload/_random.so random.* sets.*" )
m.addPackage( "${PN}-mime", "Python MIME Handling APIs", "${PN}-core ${PN}-io",
- "mimetools.* uu.* quopri.* rfc822.*" )
+ "mimetools.* uu.* quopri.* rfc822.* MimeWriter.*" )
m.addPackage( "${PN}-mmap", "Python Memory-Mapped-File Support", "${PN}-core ${PN}-io",
"lib-dynload/mmap.so " )
@@ -292,7 +305,7 @@ if __name__ == "__main__":
"decimal.* numbers.*" )
m.addPackage( "${PN}-pickle", "Python Persistence Support", "${PN}-core ${PN}-codecs ${PN}-io ${PN}-re",
- "pickle.* shelve.* lib-dynload/cPickle.so" )
+ "pickle.* shelve.* lib-dynload/cPickle.so pickletools.*" )
m.addPackage( "${PN}-pkgutil", "Python Package Extension Utility Support", "${PN}-core",
"pkgutil.*")
@@ -328,7 +341,7 @@ if __name__ == "__main__":
"sqlite3/test" )
m.addPackage( "${PN}-stringold", "Python String APIs [deprecated]", "${PN}-core ${PN}-re",
- "lib-dynload/strop.so string.*" )
+ "lib-dynload/strop.so string.* stringold.*" )
m.addPackage( "${PN}-syslog", "Python Syslog Interface", "${PN}-core",
"lib-dynload/syslog.so" )
@@ -346,7 +359,7 @@ if __name__ == "__main__":
"lib-dynload/_tkinter.so lib-tk" ) # package
m.addPackage( "${PN}-unittest", "Python Unit Testing Framework", "${PN}-core ${PN}-stringold ${PN}-lang",
- "unittest.*" )
+ "unittest/" )
m.addPackage( "${PN}-unixadmin", "Python Unix Administration Support", "${PN}-core",
"lib-dynload/nis.so lib-dynload/grp.so lib-dynload/pwd.so getpass.*" )
@@ -355,7 +368,7 @@ if __name__ == "__main__":
"lib-dynload/pyexpat.so xml xmllib.*" ) # package
m.addPackage( "${PN}-xmlrpc", "Python XMLRPC Support", "${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang",
- "xmlrpclib.* SimpleXMLRPCServer.*" )
+ "xmlrpclib.* SimpleXMLRPCServer.* DocXMLRPCServer.*" )
m.addPackage( "${PN}-zlib", "Python zlib Support.", "${PN}-core",
"lib-dynload/zlib.so" )
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [CONSOLIDATED PULL 17/28] connman 0.75: bump PR for iptables library change
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (15 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 16/28] python: improve packaging Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 18/28] iproute2: update to 3.0.0 to fix build with updated iptables Saul Wold
` (11 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
From: Koen Kooi <koen@dominion.thruhere.net>
connmand[180]: /usr/sbin/connmand: error while loading shared libraries: libxtables.so.5: cannot open shared object file: No such file or directory
$ dpkg-deb -c ipk/armv7a/iptables_1.4.12.1-r0_armv7a.ipk | grep libxtables
-rwxr-xr-x root/root 35252 2011-11-01 20:16 ./usr/lib/libxtables.so.7.0.0
lrwxrwxrwx root/root 0 2011-11-01 20:16 ./usr/lib/libxtables.so.7 -> libxtables.so.7.0.0
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta/recipes-connectivity/connman/connman_0.75.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-connectivity/connman/connman_0.75.bb b/meta/recipes-connectivity/connman/connman_0.75.bb
index 78f2199..c6e911b 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 = "r3"
+PR = "r4"
EXTRA_OECONF += "\
ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [CONSOLIDATED PULL 18/28] iproute2: update to 3.0.0 to fix build with updated iptables
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (16 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 17/28] connman 0.75: bump PR for iptables library change Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 19/28] libnl-2.0: move fix-pktloc_syntax_h-race.patch to libnl-2.0 subdirectory and merge with fix-makefile.patch Saul Wold
` (10 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
From: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
.../configure-cross.patch | 57 +++++++++++++-------
meta/recipes-connectivity/iproute2/iproute2.inc | 7 ++-
.../iproute2/iproute2_2.6.38.bb | 9 ---
.../iproute2/iproute2_3.0.0.bb | 8 +++
4 files changed, 51 insertions(+), 30 deletions(-)
rename meta/recipes-connectivity/iproute2/{iproute2-2.6.38 => iproute2-3.0.0}/configure-cross.patch (50%)
delete mode 100644 meta/recipes-connectivity/iproute2/iproute2_2.6.38.bb
create mode 100644 meta/recipes-connectivity/iproute2/iproute2_3.0.0.bb
diff --git a/meta/recipes-connectivity/iproute2/iproute2-2.6.38/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2-3.0.0/configure-cross.patch
similarity index 50%
rename from meta/recipes-connectivity/iproute2/iproute2-2.6.38/configure-cross.patch
rename to meta/recipes-connectivity/iproute2/iproute2-3.0.0/configure-cross.patch
index e26e8ef..92c12be 100644
--- a/meta/recipes-connectivity/iproute2/iproute2-2.6.38/configure-cross.patch
+++ b/meta/recipes-connectivity/iproute2/iproute2-3.0.0/configure-cross.patch
@@ -1,31 +1,38 @@
+From 85b0589b4843c03e8e6fd9416d71ea449a73c5c0 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Thu, 3 Nov 2011 10:46:16 +0100
+Subject: [PATCH] make configure cross compile safe
+
+According to Kevin Tian:
Upstream-Status: Pending
-# borrow from OE, to handle cross compile mess
-#
-# ktian1, 06/28/2010
-Index: iproute2-2.6.34/configure
-===================================================================
---- iproute2-2.6.34.orig/configure
-+++ iproute2-2.6.34/configure
-@@ -4,7 +4,7 @@
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ configure | 13 +++++++------
+ 1 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/configure b/configure
+index f5c3d40..bcc1948 100755
+--- a/configure
++++ b/configure
+@@ -2,6 +2,7 @@
+ # This is not an autconf generated configure
+ #
INCLUDE=${1:-"$PWD/include"}
-
- TABLES=
--
+SYSROOT=$1
+
check_atm()
{
- cat >/tmp/atmtest.c <<EOF
-@@ -15,7 +15,7 @@ int main(int argc, char **argv) {
+@@ -13,7 +14,7 @@ int main(int argc, char **argv) {
return 0;
}
EOF
-gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1
-+$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1
++$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1
if [ $? -eq 0 ]
then
echo "TC_CONFIG_ATM:=y" >>Config
-@@ -49,7 +49,7 @@ int main(int argc, char **argv)
+@@ -47,7 +48,7 @@ int main(int argc, char **argv)
EOF
@@ -34,7 +41,7 @@ Index: iproute2-2.6.34/configure
then
echo "TC_CONFIG_XT:=y" >>Config
echo "using xtables"
-@@ -86,7 +86,7 @@ int main(int argc, char **argv) {
+@@ -84,7 +85,7 @@ int main(int argc, char **argv) {
}
EOF
@@ -43,7 +50,7 @@ Index: iproute2-2.6.34/configure
if [ $? -eq 0 ]
then
-@@ -126,7 +126,7 @@ int main(int argc, char **argv) {
+@@ -124,7 +125,7 @@ int main(int argc, char **argv) {
}
EOF
@@ -52,12 +59,24 @@ Index: iproute2-2.6.34/configure
if [ $? -eq 0 ]
then
-@@ -150,7 +150,7 @@ check_ipt()
+@@ -145,7 +146,7 @@ check_ipt()
check_ipt_lib_dir()
{
IPT_LIB_DIR=""
- for dir in /lib /usr/lib /usr/local/lib
+ for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib
do
- for file in $dir/$TABLES/lib*t_*so ; do
+ for file in $dir/{xtables,iptables}/lib*t_*so ; do
if [ -f $file ]; then
+@@ -168,7 +169,7 @@ int main(int argc, char **argv)
+ return 0;
+ }
+ EOF
+-gcc -I$INCLUDE -o /tmp/setnstest /tmp/setnstest.c >/dev/null 2>&1
++$CC -I$INCLUDE -o /tmp/setnstest /tmp/setnstest.c >/dev/null 2>&1
+ if [ $? -eq 0 ]
+ then
+ echo "IP_CONFIG_SETNS:=y" >>Config
+--
+1.7.2.5
+
diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc
index 0f27a01..6fc30a0 100644
--- a/meta/recipes-connectivity/iproute2/iproute2.inc
+++ b/meta/recipes-connectivity/iproute2/iproute2.inc
@@ -23,8 +23,11 @@ do_install () {
rm ${D}/share -rf || true
}
-FILES_${PN} += "/usr/lib/tc/*"
-FILES_${PN}-dbg += "/usr/lib/tc/.debug"
+# There are only .so files in iproute2
+INSANE_SKIP_${PN} = "dev-so"
+
+FILES_${PN} += "${base_libdir}/tc/*"
+FILES_${PN}-dbg += "${base_libdir}/tc/.debug"
ALTERNATIVE_NAME = "ip"
ALTERNATIVE_PATH = "${base_sbindir}/ip.iproute2"
diff --git a/meta/recipes-connectivity/iproute2/iproute2_2.6.38.bb b/meta/recipes-connectivity/iproute2/iproute2_2.6.38.bb
deleted file mode 100644
index 7abc41f..0000000
--- a/meta/recipes-connectivity/iproute2/iproute2_2.6.38.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require iproute2.inc
-
-PR = "r0"
-
-SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${BPN}-${PV}.tar.bz2 \
- file://configure-cross.patch"
-
-SRC_URI[md5sum] = "a243bfea837e71824b7ca26c3bb45fa8"
-SRC_URI[sha256sum] = "47629a4f547f21d94d8e823a87dd8e13042cadecefea2e2dc433e4134fa9aec4"
diff --git a/meta/recipes-connectivity/iproute2/iproute2_3.0.0.bb b/meta/recipes-connectivity/iproute2/iproute2_3.0.0.bb
new file mode 100644
index 0000000..8d1db85
--- /dev/null
+++ b/meta/recipes-connectivity/iproute2/iproute2_3.0.0.bb
@@ -0,0 +1,8 @@
+require iproute2.inc
+
+#v3.0.0 tag
+SRCREV = "ce691fb5ce78b2c75243c60a757a3990ae09681c"
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git \
+ file://configure-cross.patch"
+S = "${WORKDIR}/git"
+
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [CONSOLIDATED PULL 19/28] libnl-2.0: move fix-pktloc_syntax_h-race.patch to libnl-2.0 subdirectory and merge with fix-makefile.patch
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (17 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 18/28] iproute2: update to 3.0.0 to fix build with updated iptables Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 20/28] libnl-2.0: add patch from meta-openembedded to fix pkg-config file Saul Wold
` (9 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
From: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../libnl/libnl-2.0/fix-makefile.patch | 32 --------------------
.../{ => libnl-2.0}/fix-pktloc_syntax_h-race.patch | 5 ++-
meta/recipes-support/libnl/libnl_2.0.bb | 8 ++--
3 files changed, 8 insertions(+), 37 deletions(-)
delete mode 100644 meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch
rename meta/recipes-support/libnl/{ => libnl-2.0}/fix-pktloc_syntax_h-race.patch (86%)
diff --git a/meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch b/meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch
deleted file mode 100644
index 3e88fbd..0000000
--- a/meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Upstream-Status: Pending
-
-12/03/2010
-
-add explicit rules for header files generated by lex and yacc,
-otherwise the build of lib/route/pktloc.c may fail in a parallel
-environment.
-
-Signed-off-by: Qing He <qing.he@intel.com>
-
-12/06/2010
-
-the dependency rule should really read pktloc.lo instead of
-pktloc.$(OBJEXT), since it's in a libtool setup.
-
-Signed-off-by: Qing He <qing.he@intel.com>
-
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index 92a916e..e8b8ef3 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -35,6 +35,10 @@ route/pktloc_grammar.c: route/pktloc_grammar.l
- route/pktloc_syntax.c: route/pktloc_syntax.y
- $(YACC) -d $(YFLAGS) -o $@ $^
-
-+route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h
-+route/pktloc_syntax.h: route/pktloc_syntax.c
-+route/pktloc_grammar.h: route/pktloc_grammar.c
-+
- libnl_route_la_LDFLAGS = -version-info 2:0:0
- libnl_route_la_LIBADD = libnl.la
- libnl_route_la_SOURCES = \
diff --git a/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch b/meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch
similarity index 86%
rename from meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
rename to meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch
index 05d75db..ea32e82 100644
--- a/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
+++ b/meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch
@@ -4,11 +4,13 @@ libnl has progressed to 0.3.2 and there does not appear to be any
"make -j" issues with this build after my limited testing on that
newer version so we can assume this issue is fixed upstream
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+
Index: libnl-2.0/lib/Makefile.am
===================================================================
--- libnl-2.0.orig/lib/Makefile.am
+++ libnl-2.0/lib/Makefile.am
-@@ -27,11 +27,15 @@ CLEANFILES = \
+@@ -27,11 +27,16 @@ CLEANFILES = \
route/pktloc_grammar.c route/pktloc_grammar.h \
route/pktloc_syntax.c route/pktloc_syntax.h
@@ -16,6 +18,7 @@ Index: libnl-2.0/lib/Makefile.am
+
# Hack to avoid using ylwrap. It does not function correctly in combination
# with --header-file=
++route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h
+route/pktloc_grammar.h: route/pktloc_grammar.c
route/pktloc_grammar.c: route/pktloc_grammar.l
$(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
diff --git a/meta/recipes-support/libnl/libnl_2.0.bb b/meta/recipes-support/libnl/libnl_2.0.bb
index 5339846..f783867 100644
--- a/meta/recipes-support/libnl/libnl_2.0.bb
+++ b/meta/recipes-support/libnl/libnl_2.0.bb
@@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc"
DEPENDS = "flex-native bison-native"
PR = "r3"
-SRC_URI= "http://www.infradead.org/~tgr/libnl/files/${BPN}-${PV}.tar.gz \
- file://fix-makefile.patch \
- file://fix-pktloc_syntax_h-race.patch \
- "
+SRC_URI = "\
+ http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \
+ file://fix-pktloc_syntax_h-race.patch \
+"
SRC_URI[md5sum] = "6aaf1e9802a17a7d702bb0638044ffa7"
SRC_URI[sha256sum] = "5a40dc903d3ca1074da7424b908bec8ff16936484798c7e46e53e9db8bc87a9c"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [CONSOLIDATED PULL 20/28] libnl-2.0: add patch from meta-openembedded to fix pkg-config file
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (18 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 19/28] libnl-2.0: move fix-pktloc_syntax_h-race.patch to libnl-2.0 subdirectory and merge with fix-makefile.patch Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 21/28] libnl-2.0: split to more packages, as meta-openembedded does Saul Wold
` (8 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
From: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../libnl/libnl-2.0/fix-pc-file.patch | 17 +++++++++++++++++
meta/recipes-support/libnl/libnl_2.0.bb | 1 +
2 files changed, 18 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch
diff --git a/meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch b/meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch
new file mode 100644
index 0000000..85afe8f
--- /dev/null
+++ b/meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch
@@ -0,0 +1,17 @@
+Upstream-Status: Pending
+
+Some packages are asking only for libnl-2.0, but expects to get also
+libnl-genl, libnl-nf libnl-route, easiest way to fix them is here.
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+Index: libnl-2.0/libnl-2.0.pc.in
+===================================================================
+--- libnl-2.0.orig/libnl-2.0.pc.in
++++ libnl-2.0/libnl-2.0.pc.in
+@@ -6,5 +6,5 @@
+ Name: libnl
+ Description: Convenience library for netlink sockets
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lnl
++Libs: -L${libdir} -lnl -lnl-genl -lnl-nf -lnl-route
+ Cflags: -I${includedir}
diff --git a/meta/recipes-support/libnl/libnl_2.0.bb b/meta/recipes-support/libnl/libnl_2.0.bb
index f783867..32705b9 100644
--- a/meta/recipes-support/libnl/libnl_2.0.bb
+++ b/meta/recipes-support/libnl/libnl_2.0.bb
@@ -11,6 +11,7 @@ PR = "r3"
SRC_URI = "\
http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \
file://fix-pktloc_syntax_h-race.patch \
+ file://fix-pc-file.patch \
"
SRC_URI[md5sum] = "6aaf1e9802a17a7d702bb0638044ffa7"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [CONSOLIDATED PULL 21/28] libnl-2.0: split to more packages, as meta-openembedded does
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (19 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 20/28] libnl-2.0: add patch from meta-openembedded to fix pkg-config file Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 22/28] libnl-2.0: add PE/PR bump for upgradable patch for meta-openembedded users Saul Wold
` (7 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
From: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-support/libnl/libnl_2.0.bb | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-support/libnl/libnl_2.0.bb b/meta/recipes-support/libnl/libnl_2.0.bb
index 32705b9..f084537 100644
--- a/meta/recipes-support/libnl/libnl_2.0.bb
+++ b/meta/recipes-support/libnl/libnl_2.0.bb
@@ -19,4 +19,8 @@ SRC_URI[sha256sum] = "5a40dc903d3ca1074da7424b908bec8ff16936484798c7e46e53e9db8b
inherit autotools pkgconfig
-LEAD_SONAME = "libnl.so"
+PACKAGES =+ "${PN}-route ${PN}-nf ${PN}-genl ${PN}-cli"
+FILES_${PN}-route = "${libdir}/libnl-route.so.*"
+FILES_${PN}-nf = "${libdir}/libnl-nf.so.*"
+FILES_${PN}-genl = "${libdir}/libnl-genl.so.*"
+FILES_${PN}-cli = "${libdir}/libnl-cli.so.*"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [CONSOLIDATED PULL 22/28] libnl-2.0: add PE/PR bump for upgradable patch for meta-openembedded users
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (20 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 21/28] libnl-2.0: split to more packages, as meta-openembedded does Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 23/28] linux-yocto_3.0: update base to v3.0.8 + meta config changes Saul Wold
` (6 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
From: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-support/libnl/libnl_2.0.bb | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-support/libnl/libnl_2.0.bb b/meta/recipes-support/libnl/libnl_2.0.bb
index f084537..c96e7db 100644
--- a/meta/recipes-support/libnl/libnl_2.0.bb
+++ b/meta/recipes-support/libnl/libnl_2.0.bb
@@ -6,7 +6,8 @@ LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc"
DEPENDS = "flex-native bison-native"
-PR = "r3"
+PE = "1"
+PR = "r6"
SRC_URI = "\
http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [CONSOLIDATED PULL 23/28] linux-yocto_3.0: update base to v3.0.8 + meta config changes
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (21 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 22/28] libnl-2.0: add PE/PR bump for upgradable patch for meta-openembedded users Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 24/28] fotowall: disable videocapture since we do not have a webcam Saul Wold
` (5 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@windriver.com>
The board branches are updated to have v3.0.8 as their base kernel
revision, and the version in the recipe is updated to match.
This commit also updates the meta branch to pick up the following
4 commits:
4095bb5 meta/common-pc-64: remove igb
17565fa meta/crownbay: use power/intel feature
8948937 meta/sugarbay: use power/intel feature
fcbc8a9 meta: add power feature
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto_3.0.bb | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
index 72db7bf..615209b 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
SRCREV_machine ?= "0936e13cc65d816f1759e2322c5e3fc82a5037f3"
SRCREV_machine_qemuppc ?= "0936e13cc65d816f1759e2322c5e3fc82a5037f3"
-SRCREV_meta ?= "353d43d340e87996b4be4c5f6ddb4447e050b65c"
+SRCREV_meta ?= "4095bb597a7bcd647856aa35b5fb8637ed7ff975"
PR = "r1"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index 9da7cc1..688999f 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -10,15 +10,15 @@ KMACHINE_qemuarm = "yocto/standard/arm-versatile-926ejs"
KBRANCH = ${KMACHINE}
-LINUX_VERSION ?= "3.0.4"
-
-SRCREV_machine_qemuarm ?= "7908f38ac44359d58c40b166dbb45e48fc58295c"
-SRCREV_machine_qemumips ?= "7ea75f58d69293e6b1c2f904f8f5790521a7ccee"
-SRCREV_machine_qemuppc ?= "eccd57eaa4c2b580b9adbbc39e19ecbff56779ae"
-SRCREV_machine_qemux86 ?= "72671808fdbe69a9fe03fd8f094e7c59da04a28c"
-SRCREV_machine_qemux86-64 ?= "2b2d0954a6fd12b4bb7f02f019bc62633c8060a1"
-SRCREV_machine ?= "6b2c7d65b844e686eae7d5cccb9b638887afe28e"
-SRCREV_meta ?= "353d43d340e87996b4be4c5f6ddb4447e050b65c"
+LINUX_VERSION ?= "3.0.8"
+
+SRCREV_machine_qemuarm ?= "d2f4973505e9cebcf2fc0058434214927deed5e6"
+SRCREV_machine_qemumips ?= "42968ceaecd71ae57157676aa63542db409732cb"
+SRCREV_machine_qemuppc ?= "16eb6506148ff163cfc4f4516110275726831014"
+SRCREV_machine_qemux86 ?= "fea3842615c13a54180b6600783b222f499002ef"
+SRCREV_machine_qemux86-64 ?= "5f86f8f0a3102e1c7d0164abefcd50d825aa468f"
+SRCREV_machine ?= "a811486d28dd9b0e1af0672a65ad9fa97873b82a"
+SRCREV_meta ?= "4095bb597a7bcd647856aa35b5fb8637ed7ff975"
PR = "r2"
PV = "${LINUX_VERSION}+git${SRCPV}"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [CONSOLIDATED PULL 24/28] fotowall: disable videocapture since we do not have a webcam
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (22 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 23/28] linux-yocto_3.0: update base to v3.0.8 + meta config changes Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 25/28] allarch.bbclass: disable shlib and debug symbol processing Saul Wold
` (4 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-qt/qt-apps/fotowall_0.9.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-qt/qt-apps/fotowall_0.9.bb b/meta/recipes-qt/qt-apps/fotowall_0.9.bb
index c5c751d..52dd727 100644
--- a/meta/recipes-qt/qt-apps/fotowall_0.9.bb
+++ b/meta/recipes-qt/qt-apps/fotowall_0.9.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://GPL_V2;md5=79808397c3355f163c012616125c9e26 \
file://main.cpp;beginline=6;endline=11;md5=b569acc2bf8974a3082b58fc53b9d8dc"
SECTION = "x11/apps"
-PR = "r1"
+PR = "r2"
DEPENDS = "qt4-x11-free"
RRECOMMENDS_${PN} += "qt4-plugin-imageformat-gif qt4-plugin-imageformat-jpeg qt4-plugin-imageformat-tiff"
@@ -21,6 +21,8 @@ S = "${WORKDIR}/Fotowall-${PV}"
inherit qmake2 pkgconfig
+EXTRA_QMAKEVARS_PRE = "CONFIG+=no-webcam"
+
do_install() {
oe_runmake INSTALL_ROOT=${D} install
}
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [CONSOLIDATED PULL 25/28] allarch.bbclass: disable shlib and debug symbol processing
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (23 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 24/28] fotowall: disable videocapture since we do not have a webcam Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 26/28] core-image-minimal-initramfs: force IMAGE_FSTYPES Saul Wold
` (3 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
all-arch packages should not contain any binaries that need processing,
so disable the shared library dependency processing and debug symbol
splitting/stripping to save some time during packaging.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/allarch.bbclass | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/meta/classes/allarch.bbclass b/meta/classes/allarch.bbclass
index a2f8179..18c9ae2 100644
--- a/meta/classes/allarch.bbclass
+++ b/meta/classes/allarch.bbclass
@@ -15,3 +15,8 @@ TARGET_CC_ARCH = "none"
TARGET_LD_ARCH = "none"
TARGET_AS_ARCH = "none"
PACKAGE_EXTRA_ARCHS = ""
+
+# No need to do shared library processing or debug symbol handling
+EXCLUDE_FROM_SHLIBS = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INHIBIT_PACKAGE_STRIP = "1"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [CONSOLIDATED PULL 26/28] core-image-minimal-initramfs: force IMAGE_FSTYPES
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (24 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 25/28] allarch.bbclass: disable shlib and debug symbol processing Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 27/28] qemugl: switch to new git repo Saul Wold
` (2 subsequent siblings)
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
If the user has set their own value for IMAGE_FSTYPES, they may have
disabled the cpio.gz image type, preventing the initramfs from being
produced in the format that image-live.bbclass expects; so force
IMAGE_FSTYPES to cpio.gz within the initramfs image recipe.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Prepend cpio.gz instead
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../images/core-image-minimal-initramfs.bb | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb
index 0bac27a..d078c10 100644
--- a/meta/recipes-core/images/core-image-minimal-initramfs.bb
+++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb
@@ -13,3 +13,4 @@ LICENSE = "MIT"
inherit core-image
IMAGE_ROOTFS_SIZE = "8192"
+IMAGE_FSTYPES =+ "cpio.gz"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [CONSOLIDATED PULL 27/28] qemugl: switch to new git repo
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (25 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 26/28] core-image-minimal-initramfs: force IMAGE_FSTYPES Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-05 17:22 ` [CONSOLIDATED PULL 28/28] lighttpd 1.4.29: rename index.html to avoid clashes with DL_DIR Saul Wold
2011-11-07 14:07 ` [CONSOLIDATED PULL 00/28] Richard Purdie
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
The qemugl git repository is now on yoctoproject.org.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-graphics/mesa/qemugl_git.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/mesa/qemugl_git.bb b/meta/recipes-graphics/mesa/qemugl_git.bb
index 1658759..e3552ec 100644
--- a/meta/recipes-graphics/mesa/qemugl_git.bb
+++ b/meta/recipes-graphics/mesa/qemugl_git.bb
@@ -9,7 +9,7 @@ DEPENDS = "virtual/libx11 xproto glproto libxfixes"
COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)'
-SRC_URI = "git://git.o-hand.com/qemugl.git;protocol=git \
+SRC_URI = "git://git.yoctoproject.org/qemugl;protocol=git \
file://versionfix.patch \
file://remove-x11r6-lib-dir.patch \
file://call_opengl_fix.patch"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [CONSOLIDATED PULL 28/28] lighttpd 1.4.29: rename index.html to avoid clashes with DL_DIR
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (26 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 27/28] qemugl: switch to new git repo Saul Wold
@ 2011-11-05 17:22 ` Saul Wold
2011-11-07 14:07 ` [CONSOLIDATED PULL 00/28] Richard Purdie
28 siblings, 0 replies; 33+ messages in thread
From: Saul Wold @ 2011-11-05 17:22 UTC (permalink / raw)
To: openembedded-core
From: Koen Kooi <koen@dominion.thruhere.net>
As Martin Jansa pointed out before, bitbake will silently peek in DL_DIR before FILESPATH and use files from there if found.
The failure mode for lighttpd involves a 404 redirect placing index.html into DL_DIR, which will end up in the lighttpd packages. In my specific case iproute2 hit the linuxfoundation 404 redirect so lighttpd.ipk now serves the linuxfoundation frontpage :)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
.../files/{index.html => index.html.lighttpd} | 0
meta/recipes-extended/lighttpd/lighttpd_1.4.29.bb | 6 +++---
2 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-extended/lighttpd/files/{index.html => index.html.lighttpd} (100%)
diff --git a/meta/recipes-extended/lighttpd/files/index.html b/meta/recipes-extended/lighttpd/files/index.html.lighttpd
similarity index 100%
rename from meta/recipes-extended/lighttpd/files/index.html
rename to meta/recipes-extended/lighttpd/files/index.html.lighttpd
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.29.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.29.bb
index c1d5f81..9fdb5f6 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.29.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.29.bb
@@ -16,10 +16,10 @@ RDEPENDS_${PN} += " \
lighttpd-module-staticfile \
"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.bz2 \
- file://index.html \
+ file://index.html.lighttpd \
file://lighttpd.conf \
file://lighttpd \
"
@@ -48,7 +48,7 @@ do_install_append() {
install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav ${D}/www/var
install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
- install -m 0644 ${WORKDIR}/index.html ${D}/www/pages/
+ install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html
}
FILES_${PN} += "${sysconfdir} /www"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* Re: [CONSOLIDATED PULL 00/28]
2011-11-05 17:22 [CONSOLIDATED PULL 00/28] Saul Wold
` (27 preceding siblings ...)
2011-11-05 17:22 ` [CONSOLIDATED PULL 28/28] lighttpd 1.4.29: rename index.html to avoid clashes with DL_DIR Saul Wold
@ 2011-11-07 14:07 ` Richard Purdie
28 siblings, 0 replies; 33+ messages in thread
From: Richard Purdie @ 2011-11-07 14:07 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Sat, 2011-11-05 at 10:22 -0700, Saul Wold wrote:
> The following changes since commit e3c003282afb93ec52882496400b042620ab00ef:
>
> rt-tests: update to 0.83 (2011-11-04 15:43:19 +0000)
>
> 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
>
> Bruce Ashfield (1):
> linux-yocto_3.0: update base to v3.0.8 + meta config changes
>
> Dmitry Cherukhin (1):
> tslib: fix the bug with loading libts-1.0.so
>
> Elizabeth Flanagan (1):
> buildstats: Fix for buildstats on tmpfs
>
> Koen Kooi (4):
> image_types bbclass: use 4k bytes per inode so we don't run out of
> space immediately
> connman 0.75: bump PR for iptables library change
> iproute2: update to 3.0.0 to fix build with updated iptables
> lighttpd 1.4.29: rename index.html to avoid clashes with DL_DIR
>
> Kumar Gala (1):
> udev-164: Update init script to do an explicit add action
>
> Martin Jansa (6):
> libcense.bbclass: fix OpenSSL mapping
> python: improve packaging
> libnl-2.0: move fix-pktloc_syntax_h-race.patch to libnl-2.0
> subdirectory and merge with fix-makefile.patch
> libnl-2.0: add patch from meta-openembedded to fix pkg-config file
> libnl-2.0: split to more packages, as meta-openembedded does
> libnl-2.0: add PE/PR bump for upgradable patch for meta-openembedded
> users
>
> Matthew McClintock (2):
> dtc: update to latest git version
> Add new IMAGE_CLASSES variable for classes for image generation
>
> Paul Eggleton (3):
> allarch.bbclass: disable shlib and debug symbol processing
> core-image-minimal-initramfs: force IMAGE_FSTYPES
> qemugl: switch to new git repo
>
> Richard Purdie (3):
> bash: Ensure we fully reautoconf the recipes so site data is used
> patch: Convert to use oe_terminal
> bitbake.conf: Drop remaining TERMCMD pieces and document OE_TERMINAL
> usage instead
>
> Saul Wold (4):
> cogl: COPYING file Updated FSF Address
> dtc: Add patch to correctly install shared libraries and links
> qmmp: Fix qmmp packaging, ensure lowercase package names
> fotowall: disable videocapture since we do not have a webcam
>
> Scott Garman (1):
> distro_tracking_fields: updates for sudo, mtools, grep, and openssh
>
> Xiaofeng Yan (1):
> qmmp: update to 0.5.2
I've merged to master apart from where the patches had feedback.
Cheers,
Richard
^ permalink raw reply [flat|nested] 33+ messages in thread