* [CONSOLIDATED PULL 01/32] image.bbclass, kernel.bbclass: create warning file about deleting deploydir files
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 02/32] sanity.bbclass: add optional untested host distro warning Saul Wold
` (31 subsequent siblings)
32 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
New users sometimes delete files in tmp/deploy/images assuming they will
be re-created just by re-running the build, and then are confused when
this doesn't work. To discourage people from doing this, create a file
called README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt in
tmp/deploy/images containing an explanation of what needs to be done to
re-create files there.
Fixes [YOCTO #1315] and [YOCTO #1346].
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/image.bbclass | 2 ++
meta/classes/kernel.bbclass | 2 ++
meta/files/deploydir_readme.txt | 8 ++++++++
3 files changed, 12 insertions(+), 0 deletions(-)
create mode 100644 meta/files/deploydir_readme.txt
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 54eb78b..286ae01 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -138,6 +138,8 @@ fakeroot do_rootfs () {
mkdir -p ${IMAGE_ROOTFS}
mkdir -p ${DEPLOY_DIR_IMAGE}
+ cp -n ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOY_DIR_IMAGE}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt
+
if [ "${USE_DEVFS}" != "1" ]; then
for devtable in ${@get_devtable_list(d)}; do
makedevs -r ${IMAGE_ROOTFS} -D $devtable
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 386b05e..a2b10f2 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -500,6 +500,8 @@ kernel_do_deploy() {
cd ${DEPLOYDIR}
rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin
+
+ cp -n ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt
}
do_deploy[dirs] = "${DEPLOYDIR} ${B}"
diff --git a/meta/files/deploydir_readme.txt b/meta/files/deploydir_readme.txt
new file mode 100644
index 0000000..97ec185
--- /dev/null
+++ b/meta/files/deploydir_readme.txt
@@ -0,0 +1,8 @@
+Files in the deploy directory will not be re-created automatically if you
+delete them. If you do delete a file, you will need to run:
+
+ bitbake -c clean TARGET
+ bitbake TARGET
+
+where TARGET is the name of the appropriate package or target e.g.
+"virtual/kernel" for the kernel, an image, etc.
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* [CONSOLIDATED PULL 02/32] sanity.bbclass: add optional untested host distro warning
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 01/32] image.bbclass, kernel.bbclass: create warning file about deleting deploydir files Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 03/32] qt4: allow a reduction in build time Saul Wold
` (30 subsequent siblings)
32 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
SANITY_TESTED_DISTROS, if specified, is expected to be a
newline-delimited list of distro identifier strings, e.g.
SANITY_TESTED_DISTROS = " \
Ubuntu 11.04 \
Fedora release 14 (Laughlin) \
"
(spaces, tabs etc. are trimmed)
If SANITY_TESTED_DISTROS is defined, we will attempt to detect the host
distribution. If the distribution is not in SANITY_TESTED_DISTROS or we
could not detect the distribution then we show a warning during sanity
checking.
Provides the mechanism for fixing [YOCTO #1096].
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/sanity.bbclass | 48 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index d50c843..16af029 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -118,6 +118,52 @@ def check_connectivity(d):
return retval
+def check_supported_distro(e):
+ tested_distros = e.data.getVar('SANITY_TESTED_DISTROS', True)
+ if not tested_distros:
+ return
+
+ if os.path.exists("/etc/redhat-release"):
+ f = open("/etc/redhat-release", "r")
+ try:
+ distro = f.readline()
+ finally:
+ f.close()
+ elif os.path.exists("/etc/SuSE-release"):
+ f = open("/etc/SuSE-release", "r")
+ try:
+ distro = f.readline()
+ # Remove the architecture suffix e.g. (i586)
+ distro = re.sub(r' \([a-zA-Z0-9\-_]*\)$', '', distro).strip()
+ finally:
+ f.close()
+ else:
+ # Use LSB method
+ import subprocess as sub
+ try:
+ p = sub.Popen(['lsb_release','-d','-s'],stdout=sub.PIPE,stderr=sub.PIPE)
+ out, err = p.communicate()
+ distro = out.rstrip()
+ except Exception:
+ distro = None
+
+ if not distro:
+ if os.path.exists("/etc/lsb-release"):
+ f = open("/etc/lsb-release", "r")
+ try:
+ for line in f:
+ lns = line.split('=')
+ if lns[0] == "DISTRIB_DESCRIPTION":
+ distro = lns[1].strip('"\n')
+ break
+ finally:
+ f.close()
+ if distro:
+ if distro not in [x.strip() for x in tested_distros.split('\n')]:
+ bb.warn('Host distribution "%s" has not been validated with this version of the build system; you may possibly experience unexpected failures. It is recommended that you use a tested distribution.' % distro)
+ else:
+ bb.warn('Host distribution could not be determined; you may possibly experience unexpected failures. It is recommended that you use a tested distribution.')
+
def check_sanity(e):
from bb import note, error, data, __version__
@@ -249,6 +295,8 @@ def check_sanity(e):
if pseudo_msg != "":
messages = messages + pseudo_msg + '\n'
+ check_supported_distro(e)
+
# Check if DISPLAY is set if IMAGETEST is set
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'
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* [CONSOLIDATED PULL 03/32] qt4: allow a reduction in build time
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 01/32] image.bbclass, kernel.bbclass: create warning file about deleting deploydir files Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 02/32] sanity.bbclass: add optional untested host distro warning Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-19 14:34 ` Richard Purdie
2011-08-18 20:55 ` [CONSOLIDATED PULL 04/32] glib-2.0: explicitly disable dtrace and systemtap for native varaint Saul Wold
` (29 subsequent siblings)
32 siblings, 1 reply; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Anders Darander <anders@chargestorm.se>
When reducing build time by adding QT_DISTRO_FLAGS from the set '-no-gui -nomake tools
-nomake examples -nomake demos -nomake docs', build failure can occur, due to not building
all tools.
* Make rm not error out when removing one of the, possibly, non-existing tools.
* Only try to rename qtdemo, if qtdemo exists.
* Check if the phrasebook path exists, and only then call do_split_packages()
Signed-off-by: Anders Darander <anders@chargestorm.se>
---
meta/recipes-qt/qt4/qt4.inc | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 0410a92..5545be7 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -227,10 +227,11 @@ python populate_packages_prepend() {
phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d)
phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d)
- do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
+ import os;
+ if os.path.exists(phrasebook_dir):
+ do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
# Package all the plugins and their -dbg version and create a meta package
- import os
def qtopia_split(path, name, glob):
"""
Split the package into a normal and -dbg package and then add the
@@ -278,11 +279,11 @@ do_install() {
# These are host binaries, we should only use them in staging
rm ${D}/${bindir}/qmake
- rm ${D}/${bindir}/uic
- rm ${D}/${bindir}/uic3
+ rm -f ${D}/${bindir}/uic
+ rm -f ${D}/${bindir}/uic3
rm ${D}/${bindir}/moc
rm ${D}/${bindir}/rcc
- rm ${D}/${bindir}/lrelease
+ rm -f ${D}/${bindir}/lrelease
# fix pkgconfig, libtool and prl files
sed -i -e s#-L${S}/lib##g \
@@ -319,6 +320,6 @@ do_install() {
#Append an E to the qtdemo file
if [ -n "${QT_LIBINFIX}" ] ; then
- mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
+ [ -f ${D}${bindir}/qtdemo ] && mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
fi
}
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* Re: [CONSOLIDATED PULL 03/32] qt4: allow a reduction in build time
2011-08-18 20:55 ` [CONSOLIDATED PULL 03/32] qt4: allow a reduction in build time Saul Wold
@ 2011-08-19 14:34 ` Richard Purdie
0 siblings, 0 replies; 51+ messages in thread
From: Richard Purdie @ 2011-08-19 14:34 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, 2011-08-18 at 13:55 -0700, Saul Wold wrote:
> From: Anders Darander <anders@chargestorm.se>
>
> When reducing build time by adding QT_DISTRO_FLAGS from the set '-no-gui -nomake tools
> -nomake examples -nomake demos -nomake docs', build failure can occur, due to not building
> all tools.
>
> * Make rm not error out when removing one of the, possibly, non-existing tools.
> * Only try to rename qtdemo, if qtdemo exists.
> * Check if the phrasebook path exists, and only then call do_split_packages()
>
> Signed-off-by: Anders Darander <anders@chargestorm.se>
> ---
> meta/recipes-qt/qt4/qt4.inc | 13 +++++++------
> 1 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
> index 0410a92..5545be7 100644
> --- a/meta/recipes-qt/qt4/qt4.inc
> +++ b/meta/recipes-qt/qt4/qt4.inc
> @@ -227,10 +227,11 @@ python populate_packages_prepend() {
>
> phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d)
> phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d)
> - do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
> + import os;
> + if os.path.exists(phrasebook_dir):
> + do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
>
> # Package all the plugins and their -dbg version and create a meta package
> - import os
For reference, BitBake assumes that both os and bb are always imported
so we can likely drop all "import os" references. I'll take this patch
since its harmless but I did just grep the classes directory and it
looks like we can clean up those imports a little.
Cheers,
Richard
^ permalink raw reply [flat|nested] 51+ messages in thread
* [CONSOLIDATED PULL 04/32] glib-2.0: explicitly disable dtrace and systemtap for native varaint
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (2 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 03/32] qt4: allow a reduction in build time Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 05/32] tcl: fix networking breakage Saul Wold
` (28 subsequent siblings)
32 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Joshua Lock <josh@linux.intel.com>
This prevents systemtap and dtrace being picked up from the host as
reported on the Yocto mailing list by Andre Haupt <andre@bitwigglers.org>
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
meta/recipes-core/glib-2.0/glib.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index e25db3d..fdbfa54 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -26,7 +26,7 @@ inherit autotools pkgconfig gettext
S = "${WORKDIR}/glib-${PV}"
EXTRA_OECONF = "--disable-debug --enable-included-printf=no"
-EXTRA_OECONF_virtclass-native = ""
+EXTRA_OECONF_virtclass-native = "--disable-dtrace --disable-systemtap"
EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no"
FILES_${PN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}/bash_completion.d ${datadir}/glib-2.0/schemas"
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* [CONSOLIDATED PULL 05/32] tcl: fix networking breakage
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (3 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 04/32] glib-2.0: explicitly disable dtrace and systemtap for native varaint Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-19 14:31 ` Richard Purdie
2011-08-18 20:55 ` [CONSOLIDATED PULL 06/32] perl-native: Update find_perl to find the perl wrapper Saul Wold
` (27 subsequent siblings)
32 siblings, 1 reply; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Koen Kooi <koen@dominion.thruhere.net>
Without providing these site entries tcl networking doesn't work on the target.
Original OE commit:
commit 0c340037644f87054462f62b50cd397c162615b7
Author: Koen Kooi <koen@openembedded.org>
Date: Wed May 26 13:04:18 2010 +0200
tcl: add 2 entries to arm-linux site file (possibly only glibc specific, need to check)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta/recipes-devtools/tcltk/tcl_8.5.9.bb | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.9.bb b/meta/recipes-devtools/tcltk/tcl_8.5.9.bb
index 2eabb4d..1b4ae83 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.5.9.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.5.9.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://../license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11
file://../win/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \
"
-PR = "r1"
+PR = "r2"
BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
file://tcl-add-soname.patch"
@@ -30,7 +30,9 @@ inherit autotools
DEPENDS_virtclass-native = ""
-EXTRA_OECONF = "--enable-threads"
+EXTRA_OECONF = "--enable-threads \
+ tcl_cv_api_getaddrinfo=yes \
+ "
do_configure() {
gnu-configize
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* Re: [CONSOLIDATED PULL 05/32] tcl: fix networking breakage
2011-08-18 20:55 ` [CONSOLIDATED PULL 05/32] tcl: fix networking breakage Saul Wold
@ 2011-08-19 14:31 ` Richard Purdie
0 siblings, 0 replies; 51+ messages in thread
From: Richard Purdie @ 2011-08-19 14:31 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, 2011-08-18 at 13:55 -0700, Saul Wold wrote:
> From: Koen Kooi <koen@dominion.thruhere.net>
>
> Without providing these site entries tcl networking doesn't work on the target.
>
> Original OE commit:
>
> commit 0c340037644f87054462f62b50cd397c162615b7
> Author: Koen Kooi <koen@openembedded.org>
> Date: Wed May 26 13:04:18 2010 +0200
>
> tcl: add 2 entries to arm-linux site file (possibly only glibc specific, need to check)
>
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
> meta/recipes-devtools/tcltk/tcl_8.5.9.bb | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.9.bb b/meta/recipes-devtools/tcltk/tcl_8.5.9.bb
> index 2eabb4d..1b4ae83 100644
> --- a/meta/recipes-devtools/tcltk/tcl_8.5.9.bb
> +++ b/meta/recipes-devtools/tcltk/tcl_8.5.9.bb
> @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://../license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11
> file://../win/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \
> "
>
> -PR = "r1"
> +PR = "r2"
>
> BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
> file://tcl-add-soname.patch"
> @@ -30,7 +30,9 @@ inherit autotools
>
> DEPENDS_virtclass-native = ""
>
> -EXTRA_OECONF = "--enable-threads"
> +EXTRA_OECONF = "--enable-threads \
> + tcl_cv_api_getaddrinfo=yes \
> + "
>
Why are we adding these in the recipe rather than the site files? I can
see the reasons why we might but it does seem to be a change in
behaviour/policy?
Cheers,
Richard
^ permalink raw reply [flat|nested] 51+ messages in thread
* [CONSOLIDATED PULL 06/32] perl-native: Update find_perl to find the perl wrapper
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (4 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 05/32] tcl: fix networking breakage Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 07/32] busybox: Change ${PN} to ${BPN} in file names Saul Wold
` (26 subsequent siblings)
32 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Wenzong Fan <wenzong.fan@windriver.com>
[YOCTO #1157] [YOCTO #829]
This is a common issue to the packages which using 'MakeMaker.pm' to
generate their Makefiles. The function 'find_perl()' in 'MM_Unix.pm'
will be used to figure out the path/link of 'PERL/FULLPERL', but it
always find the 'perl.real' instead of perl wrapper.
Just update it to find the perl wrapper correctly.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
.../perl/perl-5.12.3/MM_Unix.pm.patch | 22 ++++++++++++++++++++
meta/recipes-devtools/perl/perl-native_5.12.3.bb | 5 ++-
2 files changed, 25 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-devtools/perl/perl-5.12.3/MM_Unix.pm.patch
diff --git a/meta/recipes-devtools/perl/perl-5.12.3/MM_Unix.pm.patch b/meta/recipes-devtools/perl/perl-5.12.3/MM_Unix.pm.patch
new file mode 100644
index 0000000..eb92ccb
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl-5.12.3/MM_Unix.pm.patch
@@ -0,0 +1,22 @@
+Upstream-Status:Pending
+
+The perl-native should be relocatable while re-use sstate-cache from
+another build, especially the original build was renamed/removed.
+
+To get the MakeMaker.pm works in this case, we need perl wrapper here
+instead of real perl binary.
+
+Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
+===================================================================
+--- perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.orig 2011-08-12 16:07:30.000000000 +0800
++++ perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 2011-08-12 16:08:56.000000000 +0800
+@@ -1019,6 +1019,9 @@
+ }
+
+ foreach my $name (@$names){
++ # Getting MakeMaker.pm use perl wrapper instead of 'perl.real' directly
++ $name =~ s/perl\.real/perl/ if ($name =~ /perl\.real/);
++
+ foreach my $dir (@$dirs){
+ next unless defined $dir; # $self->{PERL_SRC} may be undefined
+ my ($abs, $val);
diff --git a/meta/recipes-devtools/perl/perl-native_5.12.3.bb b/meta/recipes-devtools/perl/perl-native_5.12.3.bb
index 945ebd4..a8e2346 100644
--- a/meta/recipes-devtools/perl/perl-native_5.12.3.bb
+++ b/meta/recipes-devtools/perl/perl-native_5.12.3.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
LICENSE = "Artistic|GPL"
LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
-PR = "r4"
+PR = "r5"
LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
@@ -19,7 +19,8 @@ SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
file://parallel_build_fix_5.patch \
file://parallel_build_fix_6.patch \
file://native-nopacklist.patch \
- file://native-perlinc.patch"
+ file://native-perlinc.patch \
+ file://MM_Unix.pm.patch"
SRC_URI[md5sum] = "29975a69dce54e47fcd6331c085c6c99"
SRC_URI[sha256sum] = "5678bfd5c2cd59253a26171bf3e681235433b00c730eea8a8046e1b225c11d2f"
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* [CONSOLIDATED PULL 07/32] busybox: Change ${PN} to ${BPN} in file names
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (5 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 06/32] perl-native: Update find_perl to find the perl wrapper Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 08/32] sysvinit: " Saul Wold
` (25 subsequent siblings)
32 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Dongxiao Xu <dongxiao.xu@intel.com>
Some files in busybox are named with ${PN}. In multilib case, ${PN}
will be prefixed with "lib32-" or "lib64-". Use ${BPN} instead.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
meta/recipes-core/busybox/busybox.inc | 30 +++++++++++++-------------
meta/recipes-core/busybox/busybox_1.18.4.bb | 2 +-
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index d46c135..3f93358 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -29,7 +29,7 @@ INITSCRIPT_NAME_${PN}-mdev = "mdev"
INITSCRIPT_PARAMS_${PN}-mdev = "start 06 S ."
INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd"
INITSCRIPT_NAME_${PN}-udhcpc = "busybox-udhcpc"
-CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf.${PN}"
+CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf.${BPN}"
CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf"
RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc"
@@ -152,24 +152,24 @@ do_install () {
install -d ${D}${libdir} ${D}${bindir} ${D}${sbindir}
cat busybox.links | while read FILE; do
NAME=`basename "$FILE"`
- install -m 0755 "0_lib/$NAME" "${D}$FILE.${PN}"
+ install -m 0755 "0_lib/$NAME" "${D}$FILE.${BPN}"
done
# add suid bit where needed
for i in `grep -E "APPLET.*_BB_SUID_((MAYBE|REQUIRE))" include/applets.h | grep -v _BB_SUID_DROP | cut -f 3 -d '(' | cut -f 1 -d ','`; do
- find ${D} -name $i.${PN} -exec chmod a+s {} \;
+ find ${D} -name $i.${BPN} -exec chmod a+s {} \;
done
install -m 0755 0_lib/libbusybox.so.${PV} ${D}${libdir}/libbusybox.so.${PV}
- ln -sf sh.${PN} ${D}${base_bindir}/sh
- ln -sf ln.${PN} ${D}${base_bindir}/ln
- ln -sf test.${PN} ${D}${bindir}/test
- if [ -f ${D}/linuxrc.${PN} ]; then
- mv ${D}/linuxrc.${PN} ${D}/linuxrc
+ ln -sf sh.${BPN} ${D}${base_bindir}/sh
+ ln -sf ln.${BPN} ${D}${base_bindir}/ln
+ ln -sf test.${BPN} ${D}${bindir}/test
+ if [ -f ${D}/linuxrc.${BPN} ]; then
+ mv ${D}/linuxrc.${BPN} ${D}/linuxrc
fi
fi
if grep -q "CONFIG_SYSLOGD=y" ${WORKDIR}/defconfig; then
- install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${PN}
- install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf.${PN}
+ install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${BPN}
+ install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf.${BPN}
fi
if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
@@ -193,7 +193,7 @@ do_install () {
install -m 0755 ${WORKDIR}/busybox-udhcpc ${D}${sysconfdir}/init.d/
fi
if grep "CONFIG_INETD=y" ${WORKDIR}/defconfig; then
- install -m 0755 ${WORKDIR}/inetd ${D}${sysconfdir}/init.d/inetd.${PN}
+ install -m 0755 ${WORKDIR}/inetd ${D}${sysconfdir}/init.d/inetd.${BPN}
install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/
fi
if grep "CONFIG_MDEV=y" ${WORKDIR}/defconfig; then
@@ -217,8 +217,8 @@ pkg_postinst_${PN} () {
}
pkg_postinst_${PN}-syslog () {
- update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 50
- update-alternatives --install ${sysconfdir}/syslog.conf syslog-conf syslog.conf.${PN} 50
+ update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${BPN} 50
+ update-alternatives --install ${sysconfdir}/syslog.conf syslog-conf syslog.conf.${BPN} 50
}
pkg_prerm_${PN} () {
@@ -260,6 +260,6 @@ pkg_prerm_${PN}-syslog () {
fi
fi
- update-alternatives --remove syslog-init syslog.${PN}
- update-alternatives --remove syslog-conf syslog.conf.${PN}
+ update-alternatives --remove syslog-init syslog.${BPN}
+ update-alternatives --remove syslog-conf syslog.conf.${BPN}
}
diff --git a/meta/recipes-core/busybox/busybox_1.18.4.bb b/meta/recipes-core/busybox/busybox_1.18.4.bb
index b4681a4..b2053ee 100644
--- a/meta/recipes-core/busybox/busybox_1.18.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.18.4.bb
@@ -1,5 +1,5 @@
require busybox.inc
-PR = "r8"
+PR = "r9"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://udhcpscript.patch \
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* [CONSOLIDATED PULL 08/32] sysvinit: Change ${PN} to ${BPN} in file names
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (6 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 07/32] busybox: Change ${PN} to ${BPN} in file names Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 09/32] qemu: modify search paths for libgl Saul Wold
` (24 subsequent siblings)
32 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Dongxiao Xu <dongxiao.xu@intel.com>
Some files in sysvinit are named with ${PN}. In multilib case, ${PN}
will be prefixed with "lib32-" or "lib64-". Use ${BPN} instead.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 52 ++++++++++++------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
index bda8a51..663e298 100644
--- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
@@ -5,7 +5,7 @@ SECTION = "base"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4"
-PR = "r4"
+PR = "r5"
RDEPENDS_${PN} = "${PN}-inittab"
@@ -65,41 +65,41 @@ do_install () {
install -d ${D}${sysconfdir}/rc$level.d
ln -s ../init.d/stop-bootlogd ${D}${sysconfdir}/rc$level.d/S99stop-bootlogd
done
- mv ${D}${base_sbindir}/init ${D}${base_sbindir}/init.${PN}
- mv ${D}${base_bindir}/pidof ${D}${base_bindir}/pidof.${PN}
- mv ${D}${base_sbindir}/halt ${D}${base_sbindir}/halt.${PN}
- mv ${D}${base_sbindir}/reboot ${D}${base_sbindir}/reboot.${PN}
- mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN}
- mv ${D}${base_sbindir}/poweroff ${D}${base_sbindir}/poweroff.${PN}
- mv ${D}${bindir}/last ${D}${bindir}/last.${PN}
- mv ${D}${bindir}/mesg ${D}${bindir}/mesg.${PN}
- mv ${D}${bindir}/wall ${D}${bindir}/wall.${PN}
+ mv ${D}${base_sbindir}/init ${D}${base_sbindir}/init.${BPN}
+ mv ${D}${base_bindir}/pidof ${D}${base_bindir}/pidof.${BPN}
+ mv ${D}${base_sbindir}/halt ${D}${base_sbindir}/halt.${BPN}
+ mv ${D}${base_sbindir}/reboot ${D}${base_sbindir}/reboot.${BPN}
+ mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${BPN}
+ mv ${D}${base_sbindir}/poweroff ${D}${base_sbindir}/poweroff.${BPN}
+ mv ${D}${bindir}/last ${D}${bindir}/last.${BPN}
+ mv ${D}${bindir}/mesg ${D}${bindir}/mesg.${BPN}
+ mv ${D}${bindir}/wall ${D}${bindir}/wall.${BPN}
}
pkg_postinst_${PN} () {
- update-alternatives --install ${base_sbindir}/halt halt halt.${PN} 200
- update-alternatives --install ${base_sbindir}/reboot reboot reboot.${PN} 200
- update-alternatives --install ${base_sbindir}/shutdown shutdown shutdown.${PN} 200
- update-alternatives --install ${base_sbindir}/poweroff poweroff poweroff.${PN} 200
- update-alternatives --install ${bindir}/last last last.${PN} 200
- update-alternatives --install ${bindir}/mesg mesg mesg.${PN} 200
- update-alternatives --install ${bindir}/wall wall wall.${PN} 200
+ update-alternatives --install ${base_sbindir}/halt halt halt.${BPN} 200
+ update-alternatives --install ${base_sbindir}/reboot reboot reboot.${BPN} 200
+ update-alternatives --install ${base_sbindir}/shutdown shutdown shutdown.${BPN} 200
+ update-alternatives --install ${base_sbindir}/poweroff poweroff poweroff.${BPN} 200
+ update-alternatives --install ${bindir}/last last last.${BPN} 200
+ update-alternatives --install ${bindir}/mesg mesg mesg.${BPN} 200
+ update-alternatives --install ${bindir}/wall wall wall.${BPN} 200
}
pkg_prerm_${PN} () {
- update-alternatives --remove halt halt.${PN}
- update-alternatives --remove reboot reboot.${PN}
- update-alternatives --remove shutdown shutdown.${PN}
- update-alternatives --remove poweroff poweroff.${PN}
- update-alternatives --remove last last.${PN}
- update-alternatives --remove mesg mesg.${PN}
- update-alternatives --remove wall wall.${PN}
+ update-alternatives --remove halt halt.${BPN}
+ update-alternatives --remove reboot reboot.${BPN}
+ update-alternatives --remove shutdown shutdown.${BPN}
+ update-alternatives --remove poweroff poweroff.${BPN}
+ update-alternatives --remove last last.${BPN}
+ update-alternatives --remove mesg mesg.${BPN}
+ update-alternatives --remove wall wall.${BPN}
}
pkg_postinst_sysvinit-pidof () {
- update-alternatives --install ${base_bindir}/pidof pidof pidof.${PN} 200
+ update-alternatives --install ${base_bindir}/pidof pidof pidof.${BPN} 200
}
pkg_prerm_sysvinit-pidof () {
- update-alternatives --remove pidof pidof.${PN}
+ update-alternatives --remove pidof pidof.${BPN}
}
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* [CONSOLIDATED PULL 09/32] qemu: modify search paths for libgl
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (7 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 08/32] sysvinit: " Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 10/32] scripts/runqemu: " Saul Wold
` (23 subsequent siblings)
32 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Anders Darander <anders@chargestorm.se>
On e.g. Debian libql is found under /usr/lib/x86_64-linux-gnu/libGL.so.
Use a wildcard to match different locations, as uname -i only return unknown on Debian.
Signed-off-by: Anders Darander <anders@chargestorm.se>
---
meta/recipes-devtools/qemu/qemu.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index e5414ff..86c7d2c 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -26,7 +26,7 @@ do_configure_prepend_virtclass-native() {
test -e /usr/lib/libGL.so -a -e /usr/lib/libGLU.so && libgl='yes'
test -e /usr/lib64/libGL.so -a -e /usr/lib64/libGLU.so && libgl='yes'
- test -e /usr/lib/`uname -i`-linux-gnu/libGL.so -a -e /usr/lib/`uname -i`-linux-gnu/libGLU.so && libgl='yes'
+ test -e /usr/lib/*-linux-gnu/libGL.so -a -e /usr/lib/*-linux-gnu/libGLU.so && libgl='yes'
test -e /usr/lib/pkgconfig/sdl.pc -o -e /usr/lib64/pkgconfig/sdl.pc -o -e /usr/include/SDL/SDL.h && libsdl='yes'
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* [CONSOLIDATED PULL 10/32] scripts/runqemu: modify search paths for libgl
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (8 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 09/32] qemu: modify search paths for libgl Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 11/32] mtd-utils: Added recipe of newer version 1.4.4 Saul Wold
` (22 subsequent siblings)
32 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Anders Darander <anders@chargestorm.se>
On e.g. Debian libql is found under /usr/lib/x86_64-linux-gnu/libGL.so.
Use a wildcard to match different locations, as uname -i only return unknown on Debian.
Signed-off-by: Anders Darander <anders@chargestorm.se>
---
scripts/runqemu | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/runqemu b/scripts/runqemu
index 2b8e88a..ed8c05b 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -388,7 +388,7 @@ libgl='no'
test -e /usr/lib/libGL.so -a -e /usr/lib/libGLU.so && libgl='yes'
test -e /usr/lib64/libGL.so -a -e /usr/lib64/libGLU.so && libgl='yes'
-test -e /usr/lib/`uname -i`-linux-gnu/libGL.so -a -e /usr/lib/`uname -i`-linux-gnu/libGLU.so && libgl='yes'
+test -e /usr/lib/*-linux-gnu/libGL.so -a -e /usr/lib/*-linux-gnu/libGLU.so && libgl='yes'
if [ "$libgl" != 'yes' ]; then
echo "You need libGL.so and libGLU.so to exist in your library path to run the QEMU emulator.
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* [CONSOLIDATED PULL 11/32] mtd-utils: Added recipe of newer version 1.4.4.
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (9 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 10/32] scripts/runqemu: " Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-19 14:28 ` Richard Purdie
2011-08-18 20:55 ` [CONSOLIDATED PULL 12/32] libxkbcommon: new Saul Wold
` (21 subsequent siblings)
32 siblings, 1 reply; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Noor Ahsan <noor_ahsan@mentor.com>
* Added recipe of version 1.4.4 and removed 1.4.1 recipe and its patch files.
Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com>
---
.../add-exclusion-to-mkfs-jffs2-git-2.patch | 0
.../mtd/{mtd-utils_1.4.1.bb => mtd-utils_1.4.4.bb} | 11 ++++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
rename meta/recipes-devtools/mtd/{mtd-utils-1.4.1 => mtd-utils-1.4.4}/add-exclusion-to-mkfs-jffs2-git-2.patch (100%)
rename meta/recipes-devtools/mtd/{mtd-utils_1.4.1.bb => mtd-utils_1.4.4.bb} (76%)
diff --git a/meta/recipes-devtools/mtd/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch b/meta/recipes-devtools/mtd/mtd-utils-1.4.4/add-exclusion-to-mkfs-jffs2-git-2.patch
similarity index 100%
rename from meta/recipes-devtools/mtd/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch
rename to meta/recipes-devtools/mtd/mtd-utils-1.4.4/add-exclusion-to-mkfs-jffs2-git-2.patch
diff --git a/meta/recipes-devtools/mtd/mtd-utils_1.4.1.bb b/meta/recipes-devtools/mtd/mtd-utils_1.4.4.bb
similarity index 76%
rename from meta/recipes-devtools/mtd/mtd-utils_1.4.1.bb
rename to meta/recipes-devtools/mtd/mtd-utils_1.4.4.bb
index f2de74d..ac9316d 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_1.4.1.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_1.4.4.bb
@@ -6,12 +6,15 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c"
-SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=3c3674a6e1d3f59554b0ff68ca59be2fd4134e0c \
- file://add-exclusion-to-mkfs-jffs2-git-2.patch;patch=1"
+TAG = "v${PV}"
+
+SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=${TAG} \
+ file://add-exclusion-to-mkfs-jffs2-git-2.patch;patch=1"
+
S = "${WORKDIR}/git/"
-PR = "r1"
+PR = "r0"
EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'BUILDDIR=${S}'"
@@ -27,5 +30,3 @@ PARALLEL_MAKE = ""
BBCLASSEXTEND = "native"
-SRC_URI[md5sum] = "645519b753b364d52c4b941dcee3dd7e"
-SRC_URI[sha256sum] = "51d6a77c7e673219bb89c4b119f336d9f2f5a5e065a12ecf9636c5348d099a0e"
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* Re: [CONSOLIDATED PULL 11/32] mtd-utils: Added recipe of newer version 1.4.4.
2011-08-18 20:55 ` [CONSOLIDATED PULL 11/32] mtd-utils: Added recipe of newer version 1.4.4 Saul Wold
@ 2011-08-19 14:28 ` Richard Purdie
0 siblings, 0 replies; 51+ messages in thread
From: Richard Purdie @ 2011-08-19 14:28 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, 2011-08-18 at 13:55 -0700, Saul Wold wrote:
> From: Noor Ahsan <noor_ahsan@mentor.com>
>
> * Added recipe of version 1.4.4 and removed 1.4.1 recipe and its patch files.
>
> Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com>
> ---
> .../add-exclusion-to-mkfs-jffs2-git-2.patch | 0
> .../mtd/{mtd-utils_1.4.1.bb => mtd-utils_1.4.4.bb} | 11 ++++++-----
> 2 files changed, 6 insertions(+), 5 deletions(-)
> rename meta/recipes-devtools/mtd/{mtd-utils-1.4.1 => mtd-utils-1.4.4}/add-exclusion-to-mkfs-jffs2-git-2.patch (100%)
> rename meta/recipes-devtools/mtd/{mtd-utils_1.4.1.bb => mtd-utils_1.4.4.bb} (76%)
>
> diff --git a/meta/recipes-devtools/mtd/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch b/meta/recipes-devtools/mtd/mtd-utils-1.4.4/add-exclusion-to-mkfs-jffs2-git-2.patch
> similarity index 100%
> rename from meta/recipes-devtools/mtd/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch
> rename to meta/recipes-devtools/mtd/mtd-utils-1.4.4/add-exclusion-to-mkfs-jffs2-git-2.patch
> diff --git a/meta/recipes-devtools/mtd/mtd-utils_1.4.1.bb b/meta/recipes-devtools/mtd/mtd-utils_1.4.4.bb
> similarity index 76%
> rename from meta/recipes-devtools/mtd/mtd-utils_1.4.1.bb
> rename to meta/recipes-devtools/mtd/mtd-utils_1.4.4.bb
> index f2de74d..ac9316d 100644
> --- a/meta/recipes-devtools/mtd/mtd-utils_1.4.1.bb
> +++ b/meta/recipes-devtools/mtd/mtd-utils_1.4.4.bb
> @@ -6,12 +6,15 @@ LICENSE = "GPLv2+"
> LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
> file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c"
>
> -SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=3c3674a6e1d3f59554b0ff68ca59be2fd4134e0c \
> - file://add-exclusion-to-mkfs-jffs2-git-2.patch;patch=1"
> +TAG = "v${PV}"
> +
> +SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=${TAG} \
> + file://add-exclusion-to-mkfs-jffs2-git-2.patch;patch=1"
> +
This will force network lookups to resolve the tag into a revision. We
need to specify the revision here, a least in OE-Core.
Cheers,
Richard
^ permalink raw reply [flat|nested] 51+ messages in thread
* [CONSOLIDATED PULL 12/32] libxkbcommon: new
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (10 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 11/32] mtd-utils: Added recipe of newer version 1.4.4 Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-19 14:27 ` Richard Purdie
2011-08-18 20:55 ` [CONSOLIDATED PULL 13/32] libxslt: fix packaging of static libraries Saul Wold
` (20 subsequent siblings)
32 siblings, 1 reply; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Phil Blundell <philb@gnu.org>
This is needed by Clutter's egl backend.
Signed-off-by: Phil Blundell <philb@gnu.org>
---
.../xorg-lib/libxkbcommon/cross.patch | 43 ++++++++++++++++++++
meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb | 22 ++++++++++
2 files changed, 65 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon/cross.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon/cross.patch b/meta/recipes-graphics/xorg-lib/libxkbcommon/cross.patch
new file mode 100644
index 0000000..7fd35be
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxkbcommon/cross.patch
@@ -0,0 +1,43 @@
+Upstream-Status: Inappropriate
+Signed-off-by: Phil Blundell <philb@gnu.org>
+
+Use makekeys from -native package rather than trying to compile it here, and fix up
+configure logic to find keysymdef.h in the sysroot.
+
+diff --git a/Makefile.am b/Makefile.am
+index 2a4d448..214271f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,5 +1,5 @@
+ # Order: makekeys before src
+-SUBDIRS = include makekeys src test
++SUBDIRS = include src test
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = xkbcommon.pc
+diff --git a/configure.ac b/configure.ac
+index e6a8f15..7f2c387 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -74,7 +74,8 @@ PKG_CHECK_MODULES([X11], [xproto kbproto >= 1.0.4])
+
+ # Obtain the path to the X Window System Core Protocol
+ AC_MSG_CHECKING([for X11 includedir])
+-includex11dir="`$PKG_CONFIG --variable=includex11dir xproto`"
++m4_pattern_allow([PKG_CONFIG_SYSROOT_DIR])
++includex11dir="$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includex11dir xproto`"
+ AC_MSG_RESULT([$includex11dir])
+
+ # Obtain full path for keysymdef header file
+diff --git a/src/Makefile.am b/src/Makefile.am
+index b9a12b9..c625b4c 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -26,5 +26,5 @@ libxkbcommon_la_SOURCES = \
+ BUILT_SOURCES = ks_tables.h
+ CLEANFILES = $(BUILT_SOURCES)
+
+-ks_tables.h: $(top_builddir)/makekeys/makekeys$(EXEEXT) $(KEYSYMDEF_H) $(XF86KEYSYM_H)
+- $(AM_V_GEN)cat $(KEYSYMDEF_H) $(XF86KEYSYM_H) | $(top_builddir)/makekeys/makekeys$(EXEEXT) > $@
++ks_tables.h: $(KEYSYMDEF_H) $(XF86KEYSYM_H)
++ $(AM_V_GEN)cat $(KEYSYMDEF_H) $(XF86KEYSYM_H) | libxkbcommon-makekeys$(EXEEXT) > $@
diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb
new file mode 100644
index 0000000..1b63b0e
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb
@@ -0,0 +1,22 @@
+require xorg-lib-common.inc
+
+SUMMARY = "library interface to the XKB compiler"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=469a86f811ec5d6bba592811c3005a2a"
+PR = "r0"
+DEPENDS = "xproto kbproto ${@['', '${PN}-native'][oe.utils.inherits(d, 'virtclass-native')]}"
+
+S = "${WORKDIR}/git"
+
+patches = "file://cross.patch"
+patches_virtclass-native = ""
+
+SRC_URI = "git://anongit.freedesktop.org/xorg/lib/libxkbcommon \
+ ${patches}"
+SRCREV = "f91afe4f3ebcac3fb65a402c6c85cf1df5e2b52a"
+
+BBCLASSEXTEND = "native"
+
+do_install_append_virtclass-native() {
+ install -m 755 "makekeys/makekeys" "${STAGING_BINDIR}/libxkbcommon-makekeys"
+}
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* Re: [CONSOLIDATED PULL 12/32] libxkbcommon: new
2011-08-18 20:55 ` [CONSOLIDATED PULL 12/32] libxkbcommon: new Saul Wold
@ 2011-08-19 14:27 ` Richard Purdie
2011-08-19 14:33 ` Phil Blundell
0 siblings, 1 reply; 51+ messages in thread
From: Richard Purdie @ 2011-08-19 14:27 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, 2011-08-18 at 13:55 -0700, Saul Wold wrote:
> From: Phil Blundell <philb@gnu.org>
>
> This is needed by Clutter's egl backend.
>
> Signed-off-by: Phil Blundell <philb@gnu.org>
> ---
> .../xorg-lib/libxkbcommon/cross.patch | 43 ++++++++++++++++++++
> meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb | 22 ++++++++++
> 2 files changed, 65 insertions(+), 0 deletions(-)
> create mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon/cross.patch
> create mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb
>
> diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon/cross.patch b/meta/recipes-graphics/xorg-lib/libxkbcommon/cross.patch
> new file mode 100644
> index 0000000..7fd35be
> --- /dev/null
> +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon/cross.patch
> @@ -0,0 +1,43 @@
> +Upstream-Status: Inappropriate
> +Signed-off-by: Phil Blundell <philb@gnu.org>
> +
> +Use makekeys from -native package rather than trying to compile it here, and fix up
> +configure logic to find keysymdef.h in the sysroot.
> +
> +diff --git a/Makefile.am b/Makefile.am
> +index 2a4d448..214271f 100644
> +--- a/Makefile.am
> ++++ b/Makefile.am
> +@@ -1,5 +1,5 @@
> + # Order: makekeys before src
> +-SUBDIRS = include makekeys src test
> ++SUBDIRS = include src test
> +
> + pkgconfigdir = $(libdir)/pkgconfig
> + pkgconfig_DATA = xkbcommon.pc
> +diff --git a/configure.ac b/configure.ac
> +index e6a8f15..7f2c387 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -74,7 +74,8 @@ PKG_CHECK_MODULES([X11], [xproto kbproto >= 1.0.4])
> +
> + # Obtain the path to the X Window System Core Protocol
> + AC_MSG_CHECKING([for X11 includedir])
> +-includex11dir="`$PKG_CONFIG --variable=includex11dir xproto`"
> ++m4_pattern_allow([PKG_CONFIG_SYSROOT_DIR])
> ++includex11dir="$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includex11dir xproto`"
> + AC_MSG_RESULT([$includex11dir])
> +
> + # Obtain full path for keysymdef header file
> +diff --git a/src/Makefile.am b/src/Makefile.am
> +index b9a12b9..c625b4c 100644
> +--- a/src/Makefile.am
> ++++ b/src/Makefile.am
> +@@ -26,5 +26,5 @@ libxkbcommon_la_SOURCES = \
> + BUILT_SOURCES = ks_tables.h
> + CLEANFILES = $(BUILT_SOURCES)
> +
> +-ks_tables.h: $(top_builddir)/makekeys/makekeys$(EXEEXT) $(KEYSYMDEF_H) $(XF86KEYSYM_H)
> +- $(AM_V_GEN)cat $(KEYSYMDEF_H) $(XF86KEYSYM_H) | $(top_builddir)/makekeys/makekeys$(EXEEXT) > $@
> ++ks_tables.h: $(KEYSYMDEF_H) $(XF86KEYSYM_H)
> ++ $(AM_V_GEN)cat $(KEYSYMDEF_H) $(XF86KEYSYM_H) | libxkbcommon-makekeys$(EXEEXT) > $@
> diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb
> new file mode 100644
> index 0000000..1b63b0e
> --- /dev/null
> +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb
> @@ -0,0 +1,22 @@
> +require xorg-lib-common.inc
> +
> +SUMMARY = "library interface to the XKB compiler"
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=469a86f811ec5d6bba592811c3005a2a"
> +PR = "r0"
> +DEPENDS = "xproto kbproto ${@['', '${PN}-native'][oe.utils.inherits(d, 'virtclass-native')]}"
> +
> +S = "${WORKDIR}/git"
> +
> +patches = "file://cross.patch"
> +patches_virtclass-native = ""
> +
> +SRC_URI = "git://anongit.freedesktop.org/xorg/lib/libxkbcommon \
> + ${patches}"
> +SRCREV = "f91afe4f3ebcac3fb65a402c6c85cf1df5e2b52a"
> +
> +BBCLASSEXTEND = "native"
> +
> +do_install_append_virtclass-native() {
> + install -m 755 "makekeys/makekeys" "${STAGING_BINDIR}/libxkbcommon-makekeys"
> +}
What isthe version getting set to for this recipe?
Cheers,
Richard
^ permalink raw reply [flat|nested] 51+ messages in thread* Re: [CONSOLIDATED PULL 12/32] libxkbcommon: new
2011-08-19 14:27 ` Richard Purdie
@ 2011-08-19 14:33 ` Phil Blundell
2011-08-19 14:40 ` Martin Jansa
0 siblings, 1 reply; 51+ messages in thread
From: Phil Blundell @ 2011-08-19 14:33 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2011-08-19 at 09:27 -0500, Richard Purdie wrote:
> What isthe version getting set to for this recipe?
Just "git" at the moment, which I suppose is a bit suboptimal. What's
the recommended string for packages that don't have any upstream
release?
p.
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [CONSOLIDATED PULL 12/32] libxkbcommon: new
2011-08-19 14:33 ` Phil Blundell
@ 2011-08-19 14:40 ` Martin Jansa
2011-08-19 16:08 ` Richard Purdie
0 siblings, 1 reply; 51+ messages in thread
From: Martin Jansa @ 2011-08-19 14:40 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 751 bytes --]
On Fri, Aug 19, 2011 at 03:33:38PM +0100, Phil Blundell wrote:
> On Fri, 2011-08-19 at 09:27 -0500, Richard Purdie wrote:
> > What isthe version getting set to for this recipe?
>
> Just "git" at the moment, which I suppose is a bit suboptimal. What's
> the recommended string for packages that don't have any upstream
> release?
http://cgit.freedesktop.org/xorg/lib/libxkbcommon/tree/configure.ac
says:
AC_INIT([libxkbcommon], [0.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
In such cases I'm using
PV = "0.1.0+gitr${SRCPV}"
even when there isn't any 0.1.0 tarball yet
problem is when content of such repo is realease as 0.1.0 tarball
later..
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 51+ messages in thread* Re: [CONSOLIDATED PULL 12/32] libxkbcommon: new
2011-08-19 14:40 ` Martin Jansa
@ 2011-08-19 16:08 ` Richard Purdie
0 siblings, 0 replies; 51+ messages in thread
From: Richard Purdie @ 2011-08-19 16:08 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2011-08-19 at 16:40 +0200, Martin Jansa wrote:
> On Fri, Aug 19, 2011 at 03:33:38PM +0100, Phil Blundell wrote:
> > On Fri, 2011-08-19 at 09:27 -0500, Richard Purdie wrote:
> > > What isthe version getting set to for this recipe?
> >
> > Just "git" at the moment, which I suppose is a bit suboptimal. What's
> > the recommended string for packages that don't have any upstream
> > release?
>
> http://cgit.freedesktop.org/xorg/lib/libxkbcommon/tree/configure.ac
> says:
> AC_INIT([libxkbcommon], [0.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
>
> In such cases I'm using
> PV = "0.1.0+gitr${SRCPV}"
>
> even when there isn't any 0.1.0 tarball yet
>
> problem is when content of such repo is realease as 0.1.0 tarball
> later..
I'd just go for "0.0.0+gitr${SRCPV}" which would only then break is
upstream releases a 0.0.0.1 which is hopefully unlikely :)
Cheers,
Richard
^ permalink raw reply [flat|nested] 51+ messages in thread
* [CONSOLIDATED PULL 13/32] libxslt: fix packaging of static libraries
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (11 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 12/32] libxkbcommon: new Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 14/32] at: make at usable for common user Saul Wold
` (19 subsequent siblings)
32 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Phil Blundell <philb@gnu.org>
This prevents warnings about .a files being installed but not shipped.
Signed-off-by: Phil Blundell <philb@gnu.org>
---
meta/recipes-support/libxslt/libxslt_1.1.26.bb | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-support/libxslt/libxslt_1.1.26.bb b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
index b5f6962..cc64ba7 100644
--- a/meta/recipes-support/libxslt/libxslt_1.1.26.bb
+++ b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
@@ -6,8 +6,8 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=0cd9a07afbeb24026c9b03aecfeba458"
SECTION = "libs"
-DEPENDS = "libxml2 (>=2.6.27)"
-PR = "r1"
+DEPENDS = "libxml2"
+PR = "r2"
SRC_URI = "ftp://xmlsoft.org/libxslt//libxslt-${PV}.tar.gz \
file://pkgconfig_fix.patch;patch=1"
@@ -16,13 +16,14 @@ SRC_URI[md5sum] = "e61d0364a30146aaa3001296f853b2b9"
SRC_URI[sha256sum] = "55dd52b42861f8a02989d701ef716d6280bfa02971e967c285016f99c66e3db1"
S = "${WORKDIR}/libxslt-${PV}"
-inherit autotools pkgconfig binconfig
+inherit autotools pkgconfig binconfig lib_package
EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto"
+# older versions of this recipe had ${PN}-utils
+RPROVIDES_${PN}-bin += "${PN}-utils"
+RCONFLICTS_${PN}-bin += "${PN}-utils"
+RREPLACES_${PN}-bin += "${PN}-utils"
-PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
-
-FILES_${PN}-dev += "${bindir}/xslt-config"
-FILES_${PN}-utils += "${bindir}"
+FILES_${PN}-dev += "${bindir}/xsltConf.sh"
BBCLASSEXTEND = "native"
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* [CONSOLIDATED PULL 14/32] at: make at usable for common user
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (12 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 13/32] libxslt: fix packaging of static libraries Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 15/32] conf, recipes: Redefine LINKER_HASH_STYLE Saul Wold
` (18 subsequent siblings)
32 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Kang Kai <kai.kang@windriver.com>
Fixes [Yocto #1297]
The pkg_postinst was added to fix Yocto #675. But it seems not needed
any more. Remove it then unprivilege user could use at.
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
meta/recipes-extended/at/at_3.1.12.bb | 26 +++++---------------------
1 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/meta/recipes-extended/at/at_3.1.12.bb b/meta/recipes-extended/at/at_3.1.12.bb
index c76b50e..baf15df 100644
--- a/meta/recipes-extended/at/at_3.1.12.bb
+++ b/meta/recipes-extended/at/at_3.1.12.bb
@@ -4,11 +4,14 @@ the system load levels drop to a particular level."
SECTION = "base"
LICENSE="GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4"
-DEPENDS = "flex libpam initscripts \
+DEPENDS = "flex initscripts \
${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
+RDEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)}"
+PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits"
+
RCONFLICTS_${PN} = "atd"
RREPLACES_${PN} = "atd"
-PR = "r5"
+PR = "r6"
SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
file://configure.patch \
@@ -56,23 +59,4 @@ do_install () {
done
}
-pkg_postinst_${PN} () {
- if [ "x$D" != "x" ] ; then
- exit 1
- fi
-
- # below is necessary to allow at usable to normal users
- # now at is has its own /var/spool/at instead of under /var/spool/cron
- # this way is better to allow setgid on both sides
- grep "^daemon" /etc/group || groupadd daemon
- chown root:daemon /usr/bin/at
- chmod 2755 /usr/bin/at
-
- chown root:daemon -R /var/spool/at
- chmod 770 -R /var/spool/at
-
- chown root:daemon /etc/at.deny
- chmod 640 /etc/at.deny
-}
-
PARALLEL_MAKE = ""
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* [CONSOLIDATED PULL 15/32] conf, recipes: Redefine LINKER_HASH_STYLE
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (13 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 14/32] at: make at usable for common user Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-19 9:24 ` Phil Blundell
2011-08-18 20:55 ` [CONSOLIDATED PULL 16/32] gcc-4.6: Use --with-linker-hash-style configure option Saul Wold
` (17 subsequent siblings)
32 siblings, 1 reply; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
LINKER_HASH_STYLE is not set to either sysv or gnu
depending upon architecture e.g. mips does not support
gnu hash style among the supported architectures so
we make sure its set to 'sysv' form mips
Linker flags are munged to adhere to renamed variable
Third option is to set it to 'both' we do
not do that by default but user can still set it
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/conf/bitbake.conf | 4 ++--
meta/conf/distro/include/tcmode-default.inc | 6 +++++-
meta/recipes-core/uclibc/uclibc.inc | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index b309516..58a604a 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -475,9 +475,9 @@ BUILDSDK_LDFLAGS = "-L${STAGING_LIBDIR} \
-Wl,-rpath-link,${STAGING_DIR_HOST}${base_libdir} \
-Wl,-rpath,${base_libdir} -Wl,-O1"
-TARGET_LINK_HASH_STYLE ??= ""
+LINKER_HASH_STYLE ??= "gnu"
export LDFLAGS = "${TARGET_LDFLAGS}"
-export TARGET_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE}"
+export TARGET_LDFLAGS = "-Wl,-O1 -Wl,--hash-style=${LINKER_HASH_STYLE}"
#export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${libdir} \
# -Wl,-rpath-link,${STAGING_DIR_TARGET}${libdir} \
# -Wl,-O1"
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 0d0af38..60f99ac 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -63,5 +63,9 @@ PREFERRED_VERSION_gzip-native ?= "1.4"
# Setup suitable toolchain flags
require conf/distro/include/as-needed.inc
-TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH', d, True) in ['mips', 'mipsel', 'mips64', 'mips64el']]}"
+# mips does not support GNU hash style therefore we hard assign them
+LINKER_HASH_STYLE_mips = "sysv"
+LINKER_HASH_STYLE_mipsel = "sysv"
+LINKER_HASH_STYLE_mips64 = "sysv"
+LINKER_HASH_STYLE_mips64el = "sysv"
diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc
index 222c34f..ab10f1b 100644
--- a/meta/recipes-core/uclibc/uclibc.inc
+++ b/meta/recipes-core/uclibc/uclibc.inc
@@ -201,5 +201,5 @@ do_configure() {
do_install() {
oe_runmake PREFIX=${D} install
- oe_runmake PREFIX=${D} "SSP_ALL_CFLAGS=${TARGET_LINK_HASH_STYLE}" install_utils
+ oe_runmake PREFIX=${D} "SSP_ALL_CFLAGS=-Wl,--hash-style=${LINKER_HASH_STYLE}" install_utils
}
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* Re: [CONSOLIDATED PULL 15/32] conf, recipes: Redefine LINKER_HASH_STYLE
2011-08-18 20:55 ` [CONSOLIDATED PULL 15/32] conf, recipes: Redefine LINKER_HASH_STYLE Saul Wold
@ 2011-08-19 9:24 ` Phil Blundell
2011-08-19 14:26 ` Richard Purdie
0 siblings, 1 reply; 51+ messages in thread
From: Phil Blundell @ 2011-08-19 9:24 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, 2011-08-18 at 13:55 -0700, Saul Wold wrote:
> From: Khem Raj <raj.khem@gmail.com>
>
> LINKER_HASH_STYLE is not set to either sysv or gnu
> depending upon architecture e.g. mips does not support
> gnu hash style among the supported architectures so
> we make sure its set to 'sysv' form mips
>
> Linker flags are munged to adhere to renamed variable
>
> Third option is to set it to 'both' we do
> not do that by default but user can still set it
It wasn't totally obvious to me why this patch is a good thing. Can you
explain why this change is desirable?
Also, I found the first paragraph of the description above quite hard to
understand. Do you think you could try to reword it to be a bit
clearer?
p.
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [CONSOLIDATED PULL 15/32] conf, recipes: Redefine LINKER_HASH_STYLE
2011-08-19 9:24 ` Phil Blundell
@ 2011-08-19 14:26 ` Richard Purdie
2011-08-19 15:27 ` Khem Raj
0 siblings, 1 reply; 51+ messages in thread
From: Richard Purdie @ 2011-08-19 14:26 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2011-08-19 at 10:24 +0100, Phil Blundell wrote:
> On Thu, 2011-08-18 at 13:55 -0700, Saul Wold wrote:
> > From: Khem Raj <raj.khem@gmail.com>
> >
> > LINKER_HASH_STYLE is not set to either sysv or gnu
> > depending upon architecture e.g. mips does not support
> > gnu hash style among the supported architectures so
> > we make sure its set to 'sysv' form mips
> >
> > Linker flags are munged to adhere to renamed variable
> >
> > Third option is to set it to 'both' we do
> > not do that by default but user can still set it
>
> It wasn't totally obvious to me why this patch is a good thing. Can you
> explain why this change is desirable?
>
> Also, I found the first paragraph of the description above quite hard to
> understand. Do you think you could try to reword it to be a bit
> clearer?
Agreed, I'm also having trouble understanding this change. I guess its
related to the options passed into gcc but I suspect we can just improve
the gcc option handling instead.
What I don't like about this patch is forcing a string into LDFLAGS and
I much prefer the current approach where its either added or its not,
its not just adding a parameter through the variable.
Also, if mips doesn't support this, how is anything at all working at
the moment?
Cheers,
Richard
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [CONSOLIDATED PULL 15/32] conf, recipes: Redefine LINKER_HASH_STYLE
2011-08-19 14:26 ` Richard Purdie
@ 2011-08-19 15:27 ` Khem Raj
2011-08-19 16:13 ` Richard Purdie
0 siblings, 1 reply; 51+ messages in thread
From: Khem Raj @ 2011-08-19 15:27 UTC (permalink / raw)
To: openembedded-core
On 8/19/2011 7:26 AM, Richard Purdie wrote:
> On Fri, 2011-08-19 at 10:24 +0100, Phil Blundell wrote:
>> On Thu, 2011-08-18 at 13:55 -0700, Saul Wold wrote:
>>> From: Khem Raj<raj.khem@gmail.com>
>>>
>>> LINKER_HASH_STYLE is not set to either sysv or gnu
>>> depending upon architecture e.g. mips does not support
>>> gnu hash style among the supported architectures so
>>> we make sure its set to 'sysv' form mips
>>>
>>> Linker flags are munged to adhere to renamed variable
>>>
>>> Third option is to set it to 'both' we do
>>> not do that by default but user can still set it
>>
>> It wasn't totally obvious to me why this patch is a good thing. Can you
>> explain why this change is desirable?
when we build libraries within gcc e.g. libgcc or libstdc++ etc. then
it does not respect injection of LDFLAGS as we do so if we set hash
style to gnu then it does not get passed to build environment of those
runtime libraries. Now one may argue that its a bug in gcc but I would
rather like to use provisions gcc provides.
This patch makes ways for us to specify linker style options to gcc
configure.
but the bigger problem is that I forgot to attach the gcc patch that
adds this options to gcc configury:) that however does not impact this
patch so much but the next one where I enable the gcc options.
>>
>> Also, I found the first paragraph of the description above quite hard to
>> understand. Do you think you could try to reword it to be a bit
>> clearer?
Yes I had a typo in there
LINKER_HASH_STYLE is not set to either sysv or gnu
should have been
LINKER_HASH_STYLE is now set to either sysv or gnu
>
> Agreed, I'm also having trouble understanding this change. I guess its
> related to the options passed into gcc but I suspect we can just improve
> the gcc option handling instead.
>
> What I don't like about this patch is forcing a string into LDFLAGS and
> I much prefer the current approach where its either added or its not,
> its not just adding a parameter through the variable.
>
Yes default is sysv so if you do not specify anything then linker
assumes sysv but since barring mips we pass this option to all
architecture there should be not much impact on other architectures than
mips.
> Also, if mips doesn't support this, how is anything at all working at
> the moment?
see last line in distro/include/tcmode-default.inc
TARGET_LINK_HASH_STYLE ?=
"${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH', d, True)
in ['mips', 'mipsel', 'mips64', 'mips64el']]}"
>
> Cheers,
>
> Richard
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 51+ messages in thread* Re: [CONSOLIDATED PULL 15/32] conf, recipes: Redefine LINKER_HASH_STYLE
2011-08-19 15:27 ` Khem Raj
@ 2011-08-19 16:13 ` Richard Purdie
2011-08-19 16:35 ` Khem Raj
0 siblings, 1 reply; 51+ messages in thread
From: Richard Purdie @ 2011-08-19 16:13 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2011-08-19 at 08:27 -0700, Khem Raj wrote:
> > Also, if mips doesn't support this, how is anything at all working at
> > the moment?
>
> see last line in distro/include/tcmode-default.inc
>
> TARGET_LINK_HASH_STYLE ?=
> "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH', d, True)
> in ['mips', 'mipsel', 'mips64', 'mips64el']]}"
So given that, why can't we just add TARGET_LINK_HASH_STYLE to gcc's
EXTRA_OECONF?
Cheers,
Richard
^ permalink raw reply [flat|nested] 51+ messages in thread* Re: [CONSOLIDATED PULL 15/32] conf, recipes: Redefine LINKER_HASH_STYLE
2011-08-19 16:13 ` Richard Purdie
@ 2011-08-19 16:35 ` Khem Raj
0 siblings, 0 replies; 51+ messages in thread
From: Khem Raj @ 2011-08-19 16:35 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, Aug 19, 2011 at 9:13 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Fri, 2011-08-19 at 08:27 -0700, Khem Raj wrote:
>> > Also, if mips doesn't support this, how is anything at all working at
>> > the moment?
>>
>> see last line in distro/include/tcmode-default.inc
>>
>> TARGET_LINK_HASH_STYLE ?=
>> "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH', d, True)
>> in ['mips', 'mipsel', 'mips64', 'mips64el']]}"
>
> So given that, why can't we just add TARGET_LINK_HASH_STYLE to gcc's
> EXTRA_OECONF?
if you mean the configure option --with-linker-hash-style then
yes we can and certainly we can get rid of TARGET_LINK_HASH_STYLE
altogether then however
the patch I backported only for gcc 4.6 certainly can be done for 4.5
and I left it in there mainly for
prebuilt external toolchains. since we don't control how those
prebuilt toolchains are configured
>
> Cheers,
>
> Richard
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 51+ messages in thread
* [CONSOLIDATED PULL 16/32] gcc-4.6: Use --with-linker-hash-style configure option
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (14 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 15/32] conf, recipes: Redefine LINKER_HASH_STYLE Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-19 16:23 ` Phil Blundell
2011-08-18 20:55 ` [CONSOLIDATED PULL 17/32] task-core-tools: Use LTTNGUST variable instead of hardcoding lttng-ust Saul Wold
` (16 subsequent siblings)
32 siblings, 1 reply; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Depending upon what hash style is in use this uses
the right flag for setting the hash style type. This
fixes the QA errors about missing GNU hash style reported
in gcc-runtime build particularly libgcc
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-devtools/gcc/gcc-4.6.inc | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
index 0a148b4..fffb779 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = "r7"
+PR = "r8"
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.6.0
@@ -90,6 +90,7 @@ EXTRA_OECONF_BASE = " --enable-lto \
--disable-bootstrap \
--disable-libgomp \
--disable-libmudflap \
+ --with-linker-hash-style=${LINKER_HASH_STYLE} \
--enable-cheaders=c_global "
EXTRA_OECONF_INITIAL = "--disable-libmudflap \
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* Re: [CONSOLIDATED PULL 16/32] gcc-4.6: Use --with-linker-hash-style configure option
2011-08-18 20:55 ` [CONSOLIDATED PULL 16/32] gcc-4.6: Use --with-linker-hash-style configure option Saul Wold
@ 2011-08-19 16:23 ` Phil Blundell
2011-08-19 18:29 ` Khem Raj
0 siblings, 1 reply; 51+ messages in thread
From: Phil Blundell @ 2011-08-19 16:23 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, 2011-08-18 at 13:55 -0700, Saul Wold wrote:
> # Third digit in PV should be incremented after a minor release
> # happens from this branch on gcc e.g. currently its 4.6.0
> @@ -90,6 +90,7 @@ EXTRA_OECONF_BASE = " --enable-lto \
> --disable-bootstrap \
> --disable-libgomp \
> --disable-libmudflap \
> + --with-linker-hash-style=${LINKER_HASH_STYLE} \
> --enable-cheaders=c_global "
>
> EXTRA_OECONF_INITIAL = "--disable-libmudflap \
Which gcc did you test this against? As far as I can tell this patch
was only applied to the trunk (as of May this year) and not the 4.6
branch. The corresponding configury certainly doesn't seem to exist in
the oe-core build tree that I happen to have lying around in front of
me, so it isn't apparent that this patch will have any useful effect.
p.
^ permalink raw reply [flat|nested] 51+ messages in thread* Re: [CONSOLIDATED PULL 16/32] gcc-4.6: Use --with-linker-hash-style configure option
2011-08-19 16:23 ` Phil Blundell
@ 2011-08-19 18:29 ` Khem Raj
2011-08-19 18:55 ` Khem Raj
0 siblings, 1 reply; 51+ messages in thread
From: Khem Raj @ 2011-08-19 18:29 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, Aug 19, 2011 at 9:23 AM, Phil Blundell <philb@gnu.org> wrote:
> On Thu, 2011-08-18 at 13:55 -0700, Saul Wold wrote:
>> # Third digit in PV should be incremented after a minor release
>> # happens from this branch on gcc e.g. currently its 4.6.0
>> @@ -90,6 +90,7 @@ EXTRA_OECONF_BASE = " --enable-lto \
>> --disable-bootstrap \
>> --disable-libgomp \
>> --disable-libmudflap \
>> + --with-linker-hash-style=${LINKER_HASH_STYLE} \
>> --enable-cheaders=c_global "
>>
>> EXTRA_OECONF_INITIAL = "--disable-libmudflap \
>
> Which gcc did you test this against? As far as I can tell this patch
> was only applied to the trunk (as of May this year) and not the 4.6
> branch. The corresponding configury certainly doesn't seem to exist in
> the oe-core build tree that I happen to have lying around in front of
> me, so it isn't apparent that this patch will have any useful effect.
>
Yes that patch is missing
I noted it in mail to other thread. the patch was being applied
in meta-oe. I will redo these 2 patches and resend
> p.
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 51+ messages in thread* Re: [CONSOLIDATED PULL 16/32] gcc-4.6: Use --with-linker-hash-style configure option
2011-08-19 18:29 ` Khem Raj
@ 2011-08-19 18:55 ` Khem Raj
0 siblings, 0 replies; 51+ messages in thread
From: Khem Raj @ 2011-08-19 18:55 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, Aug 19, 2011 at 11:29 AM, Khem Raj <raj.khem@gmail.com> wrote:
> On Fri, Aug 19, 2011 at 9:23 AM, Phil Blundell <philb@gnu.org> wrote:
>> On Thu, 2011-08-18 at 13:55 -0700, Saul Wold wrote:
>>> # Third digit in PV should be incremented after a minor release
>>> # happens from this branch on gcc e.g. currently its 4.6.0
>>> @@ -90,6 +90,7 @@ EXTRA_OECONF_BASE = " --enable-lto \
>>> --disable-bootstrap \
>>> --disable-libgomp \
>>> --disable-libmudflap \
>>> + --with-linker-hash-style=${LINKER_HASH_STYLE} \
>>> --enable-cheaders=c_global "
>>>
>>> EXTRA_OECONF_INITIAL = "--disable-libmudflap \
>>
>> Which gcc did you test this against? As far as I can tell this patch
>> was only applied to the trunk (as of May this year) and not the 4.6
>> branch. The corresponding configury certainly doesn't seem to exist in
>> the oe-core build tree that I happen to have lying around in front of
>> me, so it isn't apparent that this patch will have any useful effect.
>>
>
> Yes that patch is missing
> I noted it in mail to other thread. the patch was being applied
> in meta-oe. I will redo these 2 patches and resend
I have pushed what I am testing again right now its here
http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/linker-hash-choice
>
>> p.
>>
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>>
>
^ permalink raw reply [flat|nested] 51+ messages in thread
* [CONSOLIDATED PULL 17/32] task-core-tools: Use LTTNGUST variable instead of hardcoding lttng-ust
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (15 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 16/32] gcc-4.6: Use --with-linker-hash-style configure option Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 18/32] gdb: Add lttng-ust to DEPENDS only for eglibc Saul Wold
` (15 subsequent siblings)
32 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
This helps build on uclibc where lttng-ust is not included
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-core/tasks/task-core-tools.bb | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/tasks/task-core-tools.bb b/meta/recipes-core/tasks/task-core-tools.bb
index b0eb7d4..11ea723 100644
--- a/meta/recipes-core/tasks/task-core-tools.bb
+++ b/meta/recipes-core/tasks/task-core-tools.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "Tools tasks for OE-Core"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r10"
+PR = "r11"
PACKAGES = "\
task-core-tools-debug \
@@ -76,8 +76,8 @@ LTTNGUST_libc-uclibc = ""
# MIPS.
RDEPENDS_task-core-tools-profile_append_qemux86 = " valgrind lttng-ust ${SYSTEMTAP}"
RDEPENDS_task-core-tools-profile_append_qemux86-64 = " ${LTTNGUST} ${SYSTEMTAP}"
-RDEPENDS_task-core-tools-profile_append_qemuppc = " lttng-ust ${SYSTEMTAP}"
-RDEPENDS_task-core-tools-profile_append_qemuarm = " lttng-ust"
+RDEPENDS_task-core-tools-profile_append_qemuppc = " ${LTTNGUST} ${SYSTEMTAP}"
+RDEPENDS_task-core-tools-profile_append_qemuarm = " ${LTTNGUST}"
RDEPENDS_task-core-tools-testapps = "\
blktool \
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* [CONSOLIDATED PULL 18/32] gdb: Add lttng-ust to DEPENDS only for eglibc
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (16 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 17/32] task-core-tools: Use LTTNGUST variable instead of hardcoding lttng-ust Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 19/32] task-core-boot: allow distribution to override default dev_manager provider with VIRTUAL-RUNTIME_dev_manager Saul Wold
` (14 subsequent siblings)
32 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-devtools/gdb/gdb-common.inc | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc
index df6c70f..9879e97 100644
--- a/meta/recipes-devtools/gdb/gdb-common.inc
+++ b/meta/recipes-devtools/gdb/gdb-common.inc
@@ -2,9 +2,16 @@ DESCRIPTION = "gdb - GNU debugger"
HOMEPAGE = "http://www.gnu.org/software/gdb/"
LICENSE="GPLv3+"
SECTION = "devel"
-DEPENDS = "ncurses readline elfutils lttng-ust"
+DEPENDS = "ncurses readline elfutils ${LTTNGUST}"
-INC_PR = "r2"
+LTTNGUST = "lttng-ust"
+LTTNGUST_libc-uclibc = ""
+LTTNGUST_mips = ""
+LTTNGUST_mipsel = ""
+LTTNGUST_mips64 = ""
+LTTNGUST_mips64el = ""
+
+INC_PR = "r3"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* [CONSOLIDATED PULL 19/32] task-core-boot: allow distribution to override default dev_manager provider with VIRTUAL-RUNTIME_dev_manager
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (17 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 18/32] gdb: Add lttng-ust to DEPENDS only for eglibc Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 20/32] bluez4: update recipe from meta-oe Saul Wold
` (13 subsequent siblings)
32 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-core/tasks/task-core-boot.bb | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/tasks/task-core-boot.bb b/meta/recipes-core/tasks/task-core-boot.bb
index eb2b548..9116c38 100644
--- a/meta/recipes-core/tasks/task-core-boot.bb
+++ b/meta/recipes-core/tasks/task-core-boot.bb
@@ -17,6 +17,9 @@ PR = "r8"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
+# Distro can override dev_manager provider
+VIRTUAL-RUNTIME_dev_manager ?= "udev"
+
PACKAGES = "\
task-core-boot \
task-core-boot-dbg \
@@ -33,7 +36,7 @@ RDEPENDS_task-core-boot = "\
netbase \
sysvinit \
tinylogin \
- udev \
+ ${VIRTUAL-RUNTIME_dev_manager} \
${VIRTUAL-RUNTIME_update-alternatives} \
${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* [CONSOLIDATED PULL 20/32] bluez4: update recipe from meta-oe
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (18 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 19/32] task-core-boot: allow distribution to override default dev_manager provider with VIRTUAL-RUNTIME_dev_manager Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 21/32] initrdscripts: fix init-live.sh Saul Wold
` (12 subsequent siblings)
32 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Martin Jansa <Martin.Jansa@gmail.com>
* fix DEPENDS
* fix typo in --enable-pandd option
* remove unsupported options
* update packaging
* remove distro override which doesn't belong to oe-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-connectivity/bluez/bluez4_4.96.bb | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/meta/recipes-connectivity/bluez/bluez4_4.96.bb b/meta/recipes-connectivity/bluez/bluez4_4.96.bb
index ebd2849..edba167 100644
--- a/meta/recipes-connectivity/bluez/bluez4_4.96.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.96.bb
@@ -7,12 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \
file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
-DEPENDS = "gst-plugins-base alsa-lib libusb dbus-glib libnl"
+DEPENDS = "udev gst-plugins-base alsa-lib libusb dbus-glib usbpath"
RDEPENDS_${PN}-dev = "bluez-hcidump"
-# For angstrom we want this to replace at least bluez-libs
-PROVIDES_append_angstrom = " bluez-utils bluez-libs"
-
ASNEEDED = ""
PR = "r0"
@@ -24,6 +21,7 @@ SRC_URI = "\
SRC_URI[md5sum] = "296111afac49e3f9035085ac14daf518"
SRC_URI[sha256sum] = "c06fd50fd77909cad55e3181a42c6bce7cfcf7abb8cd87871c13d0d70f87fa99"
+
S = "${WORKDIR}/bluez-${PV}"
inherit autotools
@@ -32,20 +30,16 @@ EXTRA_OECONF = "\
--enable-gstreamer \
--enable-alsa \
--enable-usb \
- --enable-netlink \
--enable-tools \
--enable-bccmd \
--enable-hid2hci \
--enable-dfutool \
--enable-hidd \
- --enable-pandd \
+ --enable-pand \
--enable-dund \
--disable-cups \
--enable-test \
- --enable-manpages \
--enable-configfiles \
- --enable-initscripts \
- --disable-pcmciarules \
"
do_install_append() {
@@ -59,8 +53,8 @@ do_install_append() {
PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so"
-FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so"
-FILES_${PN} += "${libdir}/bluetooth/plugins/*.so"
+FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
+FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${base_libdir}/systemd/"
FILES_${PN}-dev += "\
${libdir}/bluetooth/plugins/*.la \
${libdir}/alsa-lib/*.la \
@@ -70,4 +64,5 @@ FILES_${PN}-dev += "\
FILES_${PN}-dbg += "\
${libdir}/bluetooth/plugins/.debug \
${libdir}/*/.debug \
+ ${base_libdir}/udev/.debug \
"
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* [CONSOLIDATED PULL 21/32] initrdscripts: fix init-live.sh
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (19 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 20/32] bluez4: update recipe from meta-oe Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-22 4:30 ` Tom Zanussi
2011-08-18 20:55 ` [CONSOLIDATED PULL 22/32] curl: Use BPN instead of PN for style like lib${PN} Saul Wold
` (11 subsequent siblings)
32 siblings, 1 reply; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Jingdong Lu <jingdong.lu@windriver.com>
Fix bug: [YOCTO #686]
Because the variable "ROOT_IMAGE" in init-live.sh is not correct, it fails to
run when using liveCD. Modify value of "ROOT_IMAGE" to "isolinux/rootfs.img".
If we want to use liveCD, we also need to add some kernel options related to
CDROM support when compling kernel.
Signed-off-by: Jingdong Lu <jingdong.lu@windriver.com>
---
meta/recipes-core/initrdscripts/files/init-live.sh | 2 +-
.../initrdscripts/initramfs-live-boot_1.0.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
index f3e5145..1cd87e8 100644
--- a/meta/recipes-core/initrdscripts/files/init-live.sh
+++ b/meta/recipes-core/initrdscripts/files/init-live.sh
@@ -1,7 +1,7 @@
#!/bin/sh
ROOT_MOUNT="/rootfs/"
-ROOT_IMAGE=rootfs.img
+ROOT_IMAGE="isolinux/rootfs.img"
MOUNT="/bin/mount"
UMOUNT="/bin/umount"
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
index 7051cbd..140fb1d 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
SRC_URI = "file://init-live.sh"
-PR = "r3"
+PR = "r4"
do_install() {
install -m 0755 ${WORKDIR}/init-live.sh ${D}/init
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* Re: [CONSOLIDATED PULL 21/32] initrdscripts: fix init-live.sh
2011-08-18 20:55 ` [CONSOLIDATED PULL 21/32] initrdscripts: fix init-live.sh Saul Wold
@ 2011-08-22 4:30 ` Tom Zanussi
0 siblings, 0 replies; 51+ messages in thread
From: Tom Zanussi @ 2011-08-22 4:30 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, 2011-08-18 at 13:55 -0700, Saul Wold wrote:
> From: Jingdong Lu <jingdong.lu@windriver.com>
>
> Fix bug: [YOCTO #686]
> Because the variable "ROOT_IMAGE" in init-live.sh is not correct, it fails to
> run when using liveCD. Modify value of "ROOT_IMAGE" to "isolinux/rootfs.img".
> If we want to use liveCD, we also need to add some kernel options related to
> CDROM support when compling kernel.
>
This causes hddimgs to no longer work. e.g. trying to boot jasperforest,
sugarbay, or fri2 using a -live hddimg, the boot hangs with the
following or something similar:
input: Plus More Enterprise LTD. USB-compliant keyboard as /devices/pci0000:00/0
000:00:1a.0/usb1/1-1/1-1.3/1-1.3:1.0/input/input4
generic-usb 0003:0518:0001.0002: input: USB HID v1.10 Keyboard [Plus More Enterp
rise LTD. USB-compliant keyboard] on usb-0000:00:1a.0-1.3/input0
input: Plus More Enterprise LTD. USB-compliant keyboard as /devices/pci0000:00/0
000:00:1a.0/usb1/1-1/1-1.3/1-1.3:1.1/input/input5
generic-usb 0003:0518:0001.0003: input: USB HID v1.10 Mouse [Plus More Enterpris
e LTD. USB-compliant keyboard] on usb-0000:00:1a.0-1.3/input1
scsi 6:0:0:0: Direct-Access SMI USB DISK 1100 PQ: 0 ANSI: 0 CCS
sd 6:0:0:0: Attached scsi generic sg2 type 0
sd 6:0:0:0: [sdb] 3915776 512-byte logical blocks: (2.00 GB/1.86 GiB)
sd 6:0:0:0: [sdb] Write Protect is off
sd 6:0:0:0: [sdb] No Caching mode page present
sd 6:0:0:0: [sdb] Assuming drive cache: write through
sd 6:0:0:0: [sdb] No Caching mode page present
sd 6:0:0:0: [sdb] Assuming drive cache: write through
sdb:
sd 6:0:0:0: [sdb] No Caching mode page present
sd 6:0:0:0: [sdb] Assuming drive cache: write through
sd 6:0:0:0: [sdb] Attached SCSI removable disk
Reverting commit 30ba9839a2dfcd144c3369644c00e1551b820b33 fixes the problem.
Tom
> Signed-off-by: Jingdong Lu <jingdong.lu@windriver.com>
> ---
> meta/recipes-core/initrdscripts/files/init-live.sh | 2 +-
> .../initrdscripts/initramfs-live-boot_1.0.bb | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
> index f3e5145..1cd87e8 100644
> --- a/meta/recipes-core/initrdscripts/files/init-live.sh
> +++ b/meta/recipes-core/initrdscripts/files/init-live.sh
> @@ -1,7 +1,7 @@
> #!/bin/sh
>
> ROOT_MOUNT="/rootfs/"
> -ROOT_IMAGE=rootfs.img
> +ROOT_IMAGE="isolinux/rootfs.img"
> MOUNT="/bin/mount"
> UMOUNT="/bin/umount"
>
> diff --git a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
> index 7051cbd..140fb1d 100644
> --- a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
> +++ b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
> @@ -3,7 +3,7 @@ LICENSE = "MIT"
> LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
> SRC_URI = "file://init-live.sh"
>
> -PR = "r3"
> +PR = "r4"
>
> do_install() {
> install -m 0755 ${WORKDIR}/init-live.sh ${D}/init
^ permalink raw reply [flat|nested] 51+ messages in thread
* [CONSOLIDATED PULL 22/32] curl: Use BPN instead of PN for style like lib${PN}
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (20 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 21/32] initrdscripts: fix init-live.sh Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 23/32] ea-acl: " Saul Wold
` (10 subsequent siblings)
32 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Dongxiao Xu <dongxiao.xu@intel.com>
When supporting multilib, ${PN} will be extended with MLPREFIX. However
if a package name contains ${PN} with styles like lib${PN}, such
extension will cause error. Use BPN in this case.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
meta/recipes-support/curl/curl_7.21.7.bb | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-support/curl/curl_7.21.7.bb b/meta/recipes-support/curl/curl_7.21.7.bb
index 28344e2..2ec4402 100644
--- a/meta/recipes-support/curl/curl_7.21.7.bb
+++ b/meta/recipes-support/curl/curl_7.21.7.bb
@@ -45,9 +45,9 @@ PACKAGE_ARCH_${PN}-certs = "all"
FILES_${PN}-doc = "${mandir}/man1/curl.1"
-FILES_lib${PN} = "${libdir}/lib*.so.*"
-RRECOMMENDS_lib${PN} += "${PN}-certs"
-FILES_lib${PN}-dev = "${includedir} \
+FILES_lib${BPN} = "${libdir}/lib*.so.*"
+RRECOMMENDS_lib${BPN} += "${PN}-certs"
+FILES_lib${BPN}-dev = "${includedir} \
${libdir}/lib*.so \
${libdir}/lib*.a \
${libdir}/lib*.la \
@@ -55,7 +55,7 @@ FILES_lib${PN}-dev = "${includedir} \
${datadir}/aclocal \
${bindir}/*-config"
-FILES_lib${PN}-doc = "${mandir}/man3 \
+FILES_lib${BPN}-doc = "${mandir}/man3 \
${mandir}/man1/curl-config.1"
BBCLASSEXTEND = "native nativesdk"
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* [CONSOLIDATED PULL 23/32] ea-acl: Use BPN instead of PN for style like lib${PN}
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (21 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 22/32] curl: Use BPN instead of PN for style like lib${PN} Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 24/32] attr: " Saul Wold
` (9 subsequent siblings)
32 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Dongxiao Xu <dongxiao.xu@intel.com>
When supporting multilib, ${PN} will be extended with MLPREFIX. However
if a package name contains ${PN} with styles like lib${PN}, such
extension will cause error. Use BPN in this case.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
meta/recipes-support/attr/ea-acl.inc | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
index 4e79421..2ef1389 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -18,9 +18,9 @@ do_install () {
PACKAGES =+ "lib${BPN} lib${BPN}-dev lib${BPN}-doc"
-FILES_lib${PN} = "${base_libdir}/lib*.so.*"
+FILES_lib${BPN} = "${base_libdir}/lib*.so.*"
-FILES_lib${PN}-dev = "${includedir} \
+FILES_lib${BPN}-dev = "${includedir} \
${libdir}/lib*.so \
${libdir}/lib*.a \
${libdir}/lib*.la \
@@ -28,7 +28,7 @@ FILES_lib${PN}-dev = "${includedir} \
${base_libdir}/lib*.a \
${base_libdir}/lib*.la"
-FILES_lib${PN}-doc = "${mandir}/man2 \
+FILES_lib${BPN}-doc = "${mandir}/man2 \
${mandir}/man3"
BBCLASSEXTEND = "native"
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* [CONSOLIDATED PULL 24/32] attr: Use BPN instead of PN for style like lib${PN}
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (22 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 23/32] ea-acl: " Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 25/32] acl: " Saul Wold
` (8 subsequent siblings)
32 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Dongxiao Xu <dongxiao.xu@intel.com>
When supporting multilib, ${PN} will be extended with MLPREFIX. However
if a package name contains ${PN} with styles like lib${PN}, such
extension will cause error. Use BPN in this case.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
meta/recipes-support/attr/attr.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc
index c110340..6deb004 100644
--- a/meta/recipes-support/attr/attr.inc
+++ b/meta/recipes-support/attr/attr.inc
@@ -6,7 +6,7 @@ DEPENDS = "ncurses"
LICENSE = "LGPLv2.1+ & GPLv2+"
LICENSE_${PN} = "GPLv2+"
-LICENSE_lib${PN} = "LGPLv2.1+"
+LICENSE_lib${BPN} = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \
file://attr/attr.c;endline=17;md5=be0403261f0847e5f43ed5b08d19593c \
file://libattr/libattr.c;endline=17;md5=7970f77049f8fa1199fff62a7ab724fb"
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* [CONSOLIDATED PULL 25/32] acl: Use BPN instead of PN for style like lib${PN}
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (23 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 24/32] attr: " Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 26/32] procps: Fix lib path to support multilib Saul Wold
` (7 subsequent siblings)
32 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Dongxiao Xu <dongxiao.xu@intel.com>
When supporting multilib, ${PN} will be extended with MLPREFIX. However
if a package name contains ${PN} with styles like lib${PN}, such
extension will cause error. Use BPN in this case.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
meta/recipes-support/attr/acl.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-support/attr/acl.inc b/meta/recipes-support/attr/acl.inc
index 15a87a5..b504517 100644
--- a/meta/recipes-support/attr/acl.inc
+++ b/meta/recipes-support/attr/acl.inc
@@ -4,7 +4,7 @@ SECTION = "libs"
LICENSE = "LGPLv2.1+ & GPLv2+"
LICENSE_${PN} = "GPLv2+"
-LICENSE_lib${PN} = "LGPLv2.1+"
+LICENSE_lib${BPN} = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \
file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764"
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* [CONSOLIDATED PULL 26/32] procps: Fix lib path to support multilib
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (24 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 25/32] acl: " Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-19 14:18 ` Richard Purdie
2011-08-18 20:55 ` [CONSOLIDATED PULL 27/32] eglibc: check dependencies among eglibc options Saul Wold
` (6 subsequent siblings)
32 siblings, 1 reply; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Dongxiao Xu <dongxiao.xu@intel.com>
Remove the install.patch which hardcode the lib paths.
Change ${PN} to ${BPN} in file names.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
.../procps/procps-3.2.8/install.patch | 29 --------------------
meta/recipes-extended/procps/procps.inc | 3 +-
meta/recipes-extended/procps/procps_3.2.8.bb | 8 +++---
3 files changed, 5 insertions(+), 35 deletions(-)
delete mode 100644 meta/recipes-extended/procps/procps-3.2.8/install.patch
diff --git a/meta/recipes-extended/procps/procps-3.2.8/install.patch b/meta/recipes-extended/procps/procps-3.2.8/install.patch
deleted file mode 100644
index b52a2c9..0000000
--- a/meta/recipes-extended/procps/procps-3.2.8/install.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
---- procps-3.2.5.virgin/Makefile 2005-01-26 05:55:26.000000000 +0100
-+++ procps-3.2.5/Makefile 2005-08-03 04:55:26.346984488 +0200
-@@ -30,7 +30,10 @@
- install := install -D --owner 0 --group 0
-
- # Lame x86-64 /lib64 and /usr/lib64 abomination:
--lib64 := lib$(shell [ -d /lib64 ] && echo 64)
-+# lib64 := lib$(shell [ -d /lib64 ] && echo 64)
-+
-+# Equally lame hack to work around makefile lameness when the host arch is 64bit, but the target is not.
-+lib64 := lib
-
- usr/bin := $(DESTDIR)/usr/bin/
- bin := $(DESTDIR)/bin/
-@@ -211,10 +214,10 @@
- ###### install
-
- $(BINFILES) : all
-- $(install) --mode a=rx $(notdir $@) $@
-+ $(install) -m 555 $(notdir $@) $@
-
- $(MANFILES) : all
-- $(install) --mode a=r $(notdir $@) $@
-+ $(install) -m 444 $(notdir $@) $@
-
- install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL))
- cd $(usr/bin) && $(ln_f) skill snice
diff --git a/meta/recipes-extended/procps/procps.inc b/meta/recipes-extended/procps/procps.inc
index ada3257..c3081c3 100644
--- a/meta/recipes-extended/procps/procps.inc
+++ b/meta/recipes-extended/procps/procps.inc
@@ -12,7 +12,6 @@ DEPENDS = "ncurses"
FILES_${PN} += "${base_libdir}/libproc-*.so"
-SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
- file://install.patch"
+SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz"
inherit autotools
diff --git a/meta/recipes-extended/procps/procps_3.2.8.bb b/meta/recipes-extended/procps/procps_3.2.8.bb
index b1a7de7..a38077e 100644
--- a/meta/recipes-extended/procps/procps_3.2.8.bb
+++ b/meta/recipes-extended/procps/procps_3.2.8.bb
@@ -1,6 +1,6 @@
require procps.inc
-PR = "r1"
+PR = "r2"
inherit update-rc.d update-alternatives
@@ -22,10 +22,10 @@ SRC_URI += "file://procmodule.patch \
SRC_URI[md5sum] = "9532714b6846013ca9898984ba4cd7e0"
SRC_URI[sha256sum] = "11ed68d8a4433b91cd833deb714a3aa849c02aea738c42e6b4557982419c1535"
-FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \
- ${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \
+FILES = "${bindir}/top.${BPN} ${base_bindir}/ps.${BPN} ${bindir}/uptime.${BPN} ${base_bindir}/kill.${BPN} \
+ ${bindir}/free.${BPN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \
${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \
- ${base_sbindir}/sysctl.${PN}"
+ ${base_sbindir}/sysctl.${BPN}"
CONFFILES_${PN} = "${sysconfdir}/sysctl.conf"
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* Re: [CONSOLIDATED PULL 26/32] procps: Fix lib path to support multilib
2011-08-18 20:55 ` [CONSOLIDATED PULL 26/32] procps: Fix lib path to support multilib Saul Wold
@ 2011-08-19 14:18 ` Richard Purdie
0 siblings, 0 replies; 51+ messages in thread
From: Richard Purdie @ 2011-08-19 14:18 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, 2011-08-18 at 13:55 -0700, Saul Wold wrote:
> From: Dongxiao Xu <dongxiao.xu@intel.com>
>
> Remove the install.patch which hardcode the lib paths.
> Change ${PN} to ${BPN} in file names.
>
> Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
> ---
> .../procps/procps-3.2.8/install.patch | 29 --------------------
> meta/recipes-extended/procps/procps.inc | 3 +-
> meta/recipes-extended/procps/procps_3.2.8.bb | 8 +++---
> 3 files changed, 5 insertions(+), 35 deletions(-)
> delete mode 100644 meta/recipes-extended/procps/procps-3.2.8/install.patch
>
> diff --git a/meta/recipes-extended/procps/procps-3.2.8/install.patch b/meta/recipes-extended/procps/procps-3.2.8/install.patch
> deleted file mode 100644
> index b52a2c9..0000000
> --- a/meta/recipes-extended/procps/procps-3.2.8/install.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -Upstream-Status: Inappropriate [configuration]
> -
> ---- procps-3.2.5.virgin/Makefile 2005-01-26 05:55:26.000000000 +0100
> -+++ procps-3.2.5/Makefile 2005-08-03 04:55:26.346984488 +0200
> -@@ -30,7 +30,10 @@
> - install := install -D --owner 0 --group 0
> -
> - # Lame x86-64 /lib64 and /usr/lib64 abomination:
> --lib64 := lib$(shell [ -d /lib64 ] && echo 64)
> -+# lib64 := lib$(shell [ -d /lib64 ] && echo 64)
> -+
> -+# Equally lame hack to work around makefile lameness when the host arch is 64bit, but the target is not.
> -+lib64 := lib
Both these cases are plain wrong. We can't simply drop this patch since
we may be building 64 bit on a 32 bit system and /lib64 may not exist.
Dropping the patch will therefore fix some cases and break others (e.g.
what a about x32?).
We likely need to heavier patch the Makefile.
Cheers,
Richard
^ permalink raw reply [flat|nested] 51+ messages in thread
* [CONSOLIDATED PULL 27/32] eglibc: check dependencies among eglibc options
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (25 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 26/32] procps: Fix lib path to support multilib Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 28/32] mailx: update license and distro tracking fileds Saul Wold
` (5 subsequent siblings)
32 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Kang Kai <kai.kang@windriver.com>
Fixes [Yocto #1212]
'libc-inet' and 'ipv4' are the same thing, so remove 'libc-inet'
from the default DISTRO_FEATURES_LIBC in file default-distrovars.inc.
Check the dependencies among eglibc configurable options, make sure
that eglibc could be compile successfully only with part of the options.
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
meta/conf/distro/include/default-distrovars.inc | 2 +-
meta/recipes-core/eglibc/eglibc-options.inc | 75 ++++++++++++++++++++++-
2 files changed, 75 insertions(+), 2 deletions(-)
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index 45b03d5..79c6e14 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -12,7 +12,7 @@ LOCALE_UTF8_ONLY ?= "0"
DISTRO_FEATURES_LIBC ?= "ipv4 ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \
libc-crypt-ufc libc-db-aliases libc-envz libc-fcvt libc-fmtmsg libc-fstab libc-ftraverse \
- libc-getlogin libc-idn libc-inet libc-inet-anl libc-libm libc-libm-big libc-locales libc-locale-code \
+ libc-getlogin libc-idn libc-inet-anl libc-libm libc-libm-big libc-locales libc-locale-code \
libc-memusage libc-nis libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams libc-sunrpc \
libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \
libc-posix-wchar-io"
diff --git a/meta/recipes-core/eglibc/eglibc-options.inc b/meta/recipes-core/eglibc/eglibc-options.inc
index 119ceef..112029d 100644
--- a/meta/recipes-core/eglibc/eglibc-options.inc
+++ b/meta/recipes-core/eglibc/eglibc-options.inc
@@ -10,10 +10,83 @@ def eglibc_cfg(feature, features, tokens, cnf):
cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG = ${S}/nss/nsswitch.conf"])
cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS = ${S}/nss/fixed-nsswitch.functions"])
+# arrange the dependencies among eglibc configuable options according to file option-groups.def from eglibc source code
+def distro_features_check_deps(distro_features):
+ new_dep = True
+ while new_dep:
+ new_dep = False
+
+ if 'ipv6' in distro_features and 'ipv4' not in distro_features:
+ new_dep = True
+ distro_features.extend(['ipv4'])
+
+ if 'ipv4' in distro_features and 'libc-nsswitch' not in distro_features:
+ new_dep = True
+ distro_features.extend(['libc-nsswitch'])
+
+ if 'libc-cxx-tests' in distro_features:
+ if 'libc-posix-wchar-io' not in distro_features:
+ new_dep = True
+ distro_features.extend(['libc-posix-wchar-io'])
+ if 'libc-libm' not in distro_features:
+ new_dep = True
+ distro_features.extend(['libc-libm'])
+
+ if 'libc-catgets' in distro_features and 'libc-locale-code' not in distro_features:
+ new_dep = True
+ distro_features.extend(['libc-locale-code'])
+
+ if 'libc-crypt-ufc' in distro_features and 'libc-crypt' not in distro_features:
+ new_dep = True
+ distro_features.extend(['libc-crypt'])
+
+ if 'libc-getlogin' in distro_features and 'libc-utmp' not in distro_features:
+ new_dep = True
+ distro_features.extend(['libc-utmp'])
+
+ if 'libc-inet-anl' in distro_features and 'ipv4' not in distro_features:
+ new_dep = True
+ distro_features.extend(['ipv4'])
+
+ if 'libc-locale-code' in distro_features and 'libc-posix-clang-wchar' not in distro_features:
+ new_dep = True
+ distro_features.extend(['libc-posix-clang-wchar'])
+
+ if 'libc-nis' in distro_features:
+ if 'ipv4' not in distro_features:
+ new_dep = True
+ distro_features.extend(['ipv4'])
+ if 'libc-sunrpc' not in distro_features:
+ new_dep = True
+ distro_features.extend(['libc-sunrpc'])
+
+ if 'libc-rcmd' in distro_features and 'ipv4' not in distro_features:
+ new_dep = True
+ distro_features.extend(['ipv4'])
+
+ if 'libc-sunrpc' in distro_features and 'ipv4' not in distro_features:
+ new_dep = True
+ distro_features.extend(['ipv4'])
+
+ if 'libc-utmpx' in distro_features and 'libc-utmp' not in distro_features:
+ new_dep = True
+ distro_features.extend(['libc-utmp'])
+
+ if 'libc-posix-regexp-glibc' in distro_features and 'libc-posix-regexp' not in distro_features:
+ new_dep = True
+ distro_features.extend(['libc-posix-regexp'])
+
+ if 'libc-posix-wchar-io' in distro_features and 'libc-posix-clang-wchar' not in distro_features:
+ new_dep = True
+ distro_features.extend(['libc-posix-clang-wchar'])
+
# Map distro features to eglibc options settings
def features_to_eglibc_settings(d):
cnf = ([])
distro_features = (bb.data.getVar('DISTRO_FEATURES', d, True) or '').split()
+
+ distro_features_check_deps(distro_features)
+
eglibc_cfg('ipv6', distro_features, 'OPTION_EGLIBC_ADVANCED_INET6', cnf)
eglibc_cfg('libc-backtrace', distro_features, 'OPTION_EGLIBC_BACKTRACE', cnf)
eglibc_cfg('libc-big-macros', distro_features, 'OPTION_EGLIBC_BIG_MACROS', cnf)
@@ -31,7 +104,7 @@ def features_to_eglibc_settings(d):
eglibc_cfg('libc-ftraverse', distro_features, 'OPTION_EGLIBC_FTRAVERSE', cnf)
eglibc_cfg('libc-getlogin', distro_features, 'OPTION_EGLIBC_GETLOGIN', cnf)
eglibc_cfg('libc-idn', distro_features, 'OPTION_EGLIBC_IDN', cnf)
- eglibc_cfg('libc-inet', distro_features, 'OPTION_EGLIBC_INET', cnf)
+ eglibc_cfg('ipv4', distro_features, 'OPTION_EGLIBC_INET', cnf)
eglibc_cfg('libc-inet-anl', distro_features, 'OPTION_EGLIBC_INET_ANL', cnf)
eglibc_cfg('libc-libm', distro_features, 'OPTION_EGLIBC_LIBM', cnf)
eglibc_cfg('libc-libm-big', distro_features, 'OPTION_EGLIBC_LIBM_BIG', cnf)
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* [CONSOLIDATED PULL 28/32] mailx: update license and distro tracking fileds
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (26 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 27/32] eglibc: check dependencies among eglibc options Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 29/32] slang: add homepage and update distro tracking fields Saul Wold
` (4 subsequent siblings)
32 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Kang Kai <kai.kang@windriver.com>
update mailx license and bump up PR, and update distro tracking fields.
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 9 +++++++--
meta/recipes-extended/mailx/mailx_12.5.bb | 4 ++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 984e330..4f89ad7 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -5699,8 +5699,13 @@ RECIPE_MAINTAINER_pn-docbook-utils = "Scott Garman <scott.a.garman@intel.com>"
RECIPE_LATEST_VERSION_pn-task-qte-toolchain-target = "1.0"
RECIPE_MANUAL_CHECK_DATE_pn-task-qte-toolchain-target = "Feb 28, 2011"
DISTRO_PN_ALIAS_pn-task-qte-toolchain-target = "Intel"
-RECIPE_LATEST_VERSION_pn-mailx = "12.4"
-RECIPE_MANUAL_CHECK_DATE_pn-mailx = "Feb 28, 2011"
+
+RECIPE_STATUS_pn-mailx = "green"
+RECIPE_LATEST_VERSION_pn-mailx = "12.5"
+RECIPE_LAST_UPDATE_pn-mailx = "Jul 1, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-mailx = "Jul 28, 2011"
+RECIPE_MAINTAINER_pn-mailx = "Kai Kang <kai.kang@windriver.com>"
+
RECIPE_LATEST_VERSION_pn-libgcc = "4.5.1"
RECIPE_MANUAL_CHECK_DATE_pn-libgcc = "Feb 28, 2011"
diff --git a/meta/recipes-extended/mailx/mailx_12.5.bb b/meta/recipes-extended/mailx/mailx_12.5.bb
index 1173b0a..52b906f 100644
--- a/meta/recipes-extended/mailx/mailx_12.5.bb
+++ b/meta/recipes-extended/mailx/mailx_12.5.bb
@@ -6,8 +6,8 @@ for MIME, IMAP, POP3, SMTP, and S/MIME."
HOMEPAGE = "http://heirloom.sourceforge.net/mailx.html"
SECTION = "console/network"
-PR = "r0"
-LICENSE = "GPL"
+PR = "r1"
+LICENSE = "BSD & MPL-1"
LIC_FILES_CHKSUM = "file://COPYING;md5=4202a0a62910cf94f7af8a3436a2a2dd"
SRC_URI = "${DEBIAN_MIRROR}/main/h/heirloom-mailx/heirloom-mailx_${PV}.orig.tar.gz;name=archive \
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* [CONSOLIDATED PULL 29/32] slang: add homepage and update distro tracking fields
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (27 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 28/32] mailx: update license and distro tracking fileds Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 30/32] alsa-tools: update license and add " Saul Wold
` (3 subsequent siblings)
32 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Kang Kai <kai.kang@windriver.com>
Add slang homepage and bump up PR.
Update distro tracking fields.
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 5 +++--
meta/recipes-extended/slang/slang_2.2.4.bb | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 4f89ad7..f2b0701 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -5731,8 +5731,9 @@ RECIPE_MAINTAINER_pn-linuxdoc-tools = "Scott Garman <scott.a.garman@intel.com>"
RECIPE_STATUS_pn-slang = "green"
RECIPE_LATEST_VERSION_pn-slang = "2.2.4"
-RECIPE_LAST_UPDATE_pn-slang = "Apr 10, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-slang = "Jun 6, 2011"
+RECIPE_LAST_UPDATE_pn-slang = "Jul 28, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-slang = "Jun 28, 2011"
+RECIPE_MAINTAINER_pn-slang = "Kai Kang <kai.kang@windriver.com>"
RECIPE_STATUS_pn-libnewt = "green"
RECIPE_LATEST_VERSION_pn-libnewt = "0.52.12"
diff --git a/meta/recipes-extended/slang/slang_2.2.4.bb b/meta/recipes-extended/slang/slang_2.2.4.bb
index 4bf5737..77e63da 100644
--- a/meta/recipes-extended/slang/slang_2.2.4.bb
+++ b/meta/recipes-extended/slang/slang_2.2.4.bb
@@ -7,9 +7,10 @@ The S-Lang library, provided in this package, provides the S-Lang \
extension language. S-Lang's syntax resembles C, which makes it easy \
to recode S-Lang procedures in C if you need to."
+HOMEPAGE = "http://www.jedsoft.org/slang/"
SECTION = "libs"
DEPENDS = "pcre"
-PR = "r5"
+PR = "r6"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=a52a18a472d4f7e45479b06563717c02"
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* [CONSOLIDATED PULL 30/32] alsa-tools: update license and add distro tracking fields
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (28 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 29/32] slang: add homepage and update distro tracking fields Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 31/32] newt: update " Saul Wold
` (2 subsequent siblings)
32 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Kang Kai <kai.kang@windriver.com>
Update license and other informations, then bump up PR.
Update distro tracking fields.
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 7 ++++---
.../recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb | 11 +++++++----
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index f2b0701..bce4518 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -5770,10 +5770,11 @@ RECIPE_COMMENTS_pn-rxvt-unicode = ""
RECIPE_LAST_UPDATE_pn-rxvt-unicode = "May 25, 2011"
RECIPE_MAINTAINER_pn-rxvt-unicode = "Saul Wold <sgw@linux.intel.com>"
-RECIPE_STATUS_pn-alsa-tools = "red"
+RECIPE_STATUS_pn-alsa-tools = "green"
RECIPE_LATEST_VERIONS_pn-alsa-tools = "1.0.24.1
-RECIPE_LAST_UPDATE_pn-alsa-tools = "Jan 31, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-alsa-tools = "Jun 7, 2011"
+RECIPE_LAST_UPDATE_pn-alsa-tools = "Jul 28, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-alsa-tools = "Jul 28, 2011"
+RECIPE_MAINTAINER_pn-alsa-tools = "Kai Kang <kai.kang@windriver.com>"
RECIPE_STATUS_pn-mesa-demos = "red"
RECIPE_LATEST_VERSION_pn-mesa-demos = "8.0.1"
diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb
index 1bf9cd0..ed2886d 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb
+++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb
@@ -1,13 +1,16 @@
BROKEN = "1"
-DESCRIPTION = "Alsa Tools"
+DESCRIPTION = "Alsa Tools package contains advanced tools for certain sound cards."
+HOMEPAGE = "http://www.alsa-project.org"
+BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php"
SECTION = "console/utils"
-LICENSE = "GPLv2"
+LICENSE = "GPLv2 & LGPLv2+"
DEPENDS = "alsa-lib ncurses"
-PR = "r2"
+PR = "r3"
-LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+ file://ld10k1/COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34"
SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \
file://autotools.patch"
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* [CONSOLIDATED PULL 31/32] newt: update distro tracking fields
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (29 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 30/32] alsa-tools: update license and add " Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 32/32] file: new file version 5.07 Saul Wold
2011-08-19 16:14 ` [CONSOLIDATED PULL 00/32] Various Fixes, Updates Richard Purdie
32 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Kang Kai <kai.kang@windriver.com>
Update newt distro tracking fields
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index bce4518..22042b1 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -5736,10 +5736,10 @@ RECIPE_MANUAL_CHECK_DATE_pn-slang = "Jun 28, 2011"
RECIPE_MAINTAINER_pn-slang = "Kai Kang <kai.kang@windriver.com>"
RECIPE_STATUS_pn-libnewt = "green"
-RECIPE_LATEST_VERSION_pn-libnewt = "0.52.12"
-RECIPE_LAST_UPDATE_pn-libnewt = "Aug 06, 2010"
-RECIPE_MANUAL_CHECK_DATE_pn-libnewt = "Jun 4, 2011"
-RECIPE_NO_UPDATE_REASON_pn-libnewt = ""
+RECIPE_LATEST_VERSION_pn-libnewt = "0.52.13"
+RECIPE_MAINTAINER_pn-libnewt = "Kai Kang <kai.kang@windriver.com>"
+RECIPE_LAST_UPDATE_pn-libnewt = "Jul 27, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-libnewt = "Jul 27, 2011"
RECIPE_STATUS_pn-createrepo = "green"
RECIPE_LATEST_VERSION_pn-createrepo = "0.9.9"
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* [CONSOLIDATED PULL 32/32] file: new file version 5.07
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (30 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 31/32] newt: update " Saul Wold
@ 2011-08-18 20:55 ` Saul Wold
2011-08-19 16:14 ` [CONSOLIDATED PULL 00/32] Various Fixes, Updates Richard Purdie
32 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-08-18 20:55 UTC (permalink / raw)
To: openembedded-core
From: Adrian Alonso <aalonso00@gmail.com>
* file version 5.07 also prevents magic file mistmatch
in Fedora 15
* related to bug 1358.
http://bugzilla.pokylinux.org/show_bug.cgi?id=1358
* v2 remove previous file version 5.04
remove unused patchs
Signed-off-by: Adrian Alonso <aalonso00@gmail.com>
---
meta/recipes-devtools/file/file/ge-le.patch | 72 --------------------
.../file/file/stringb-compat.patch | 31 ---------
.../file/{file_5.04.bb => file_5.07.bb} | 9 +--
3 files changed, 3 insertions(+), 109 deletions(-)
delete mode 100644 meta/recipes-devtools/file/file/ge-le.patch
delete mode 100644 meta/recipes-devtools/file/file/stringb-compat.patch
rename meta/recipes-devtools/file/{file_5.04.bb => file_5.07.bb} (79%)
diff --git a/meta/recipes-devtools/file/file/ge-le.patch b/meta/recipes-devtools/file/file/ge-le.patch
deleted file mode 100644
index fb7d671..0000000
--- a/meta/recipes-devtools/file/file/ge-le.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Upstream-Status: Pending
-
-`>=' and `<=' was silently ignored in previous version,
-but causes an warning in file 5.04. Add support for these
-two operators as a feature extension, however, users should
-not rely on them.
-
-8/17/2010 - created by Qing He <qing.he@intel.com>
-
-diff --git a/src/apprentice.c b/src/apprentice.c
-index 3d4c3cf..a2b86ed 100644
---- a/src/apprentice.c
-+++ b/src/apprentice.c
-@@ -1396,11 +1396,10 @@ parse(struct magic_set *ms, struct magic_entry **mentryp, uint32_t *nmentryp,
- m->reln = *l;
- ++l;
- if (*l == '=') {
-- if (ms->flags & MAGIC_CHECK) {
-- file_magwarn(ms, "%c= not supported",
-- m->reln);
-- return -1;
-- }
-+ if (m->reln == '>')
-+ m->reln = 'g';
-+ else if (m->reln == '<')
-+ m->reln = 'l';
- ++l;
- }
- break;
-diff --git a/src/softmagic.c b/src/softmagic.c
-index d8a5675..1648e43 100644
---- a/src/softmagic.c
-+++ b/src/softmagic.c
-@@ -1955,6 +1955,38 @@ magiccheck(struct magic_set *ms, struct magic *m)
- }
- break;
-
-+ case 'g':
-+ if (m->flag & UNSIGNED) {
-+ matched = v >= l;
-+ if ((ms->flags & MAGIC_DEBUG) != 0)
-+ (void) fprintf(stderr, "%llu >= %llu = %d\n",
-+ (unsigned long long)v,
-+ (unsigned long long)l, matched);
-+ }
-+ else {
-+ matched = (int64_t) v >= (int64_t) l;
-+ if ((ms->flags & MAGIC_DEBUG) != 0)
-+ (void) fprintf(stderr, "%lld >= %lld = %d\n",
-+ (long long)v, (long long)l, matched);
-+ }
-+ break;
-+
-+ case 'l':
-+ if (m->flag & UNSIGNED) {
-+ matched = v <= l;
-+ if ((ms->flags & MAGIC_DEBUG) != 0)
-+ (void) fprintf(stderr, "%llu <= %llu = %d\n",
-+ (unsigned long long)v,
-+ (unsigned long long)l, matched);
-+ }
-+ else {
-+ matched = (int64_t) v <= (int64_t) l;
-+ if ((ms->flags & MAGIC_DEBUG) != 0)
-+ (void) fprintf(stderr, "%lld <= %lld = %d\n",
-+ (long long)v, (long long)l, matched);
-+ }
-+ break;
-+
- case '&':
- matched = (v & l) == l;
- if ((ms->flags & MAGIC_DEBUG) != 0)
diff --git a/meta/recipes-devtools/file/file/stringb-compat.patch b/meta/recipes-devtools/file/file/stringb-compat.patch
deleted file mode 100644
index 8aba31e..0000000
--- a/meta/recipes-devtools/file/file/stringb-compat.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream-Status: Pending
-
-`B' in file 4.x has the same meaning with `W' in file 5,
-let `B' be an alias of `W'.
-
-8/17/2010 - created by Qing He <qing.he@intel.com>
-
-diff --git a/src/apprentice.c b/src/apprentice.c
-index 58826c3..3d4c3cf 100644
---- a/src/apprentice.c
-+++ b/src/apprentice.c
-@@ -1340,6 +1340,7 @@ parse(struct magic_set *ms, struct magic_entry **mentryp, uint32_t *nmentryp,
- "zero range");
- l = t - 1;
- break;
-+ case CHAR_COMPACT_BLANK:
- case CHAR_COMPACT_WHITESPACE:
- m->str_flags |= STRING_COMPACT_WHITESPACE;
- break;
-diff --git a/src/file.h b/src/file.h
-index c07f2d4..42cf416 100644
---- a/src/file.h
-+++ b/src/file.h
-@@ -282,6 +282,7 @@ struct magic {
- #define STRING_TEXTTEST BIT(5)
- #define STRING_BINTEST BIT(6)
- #define CHAR_COMPACT_WHITESPACE 'W'
-+#define CHAR_COMPACT_BLANK 'B'
- #define CHAR_COMPACT_OPTIONAL_WHITESPACE 'w'
- #define CHAR_IGNORE_LOWERCASE 'c'
- #define CHAR_IGNORE_UPPERCASE 'C'
diff --git a/meta/recipes-devtools/file/file_5.04.bb b/meta/recipes-devtools/file/file_5.07.bb
similarity index 79%
rename from meta/recipes-devtools/file/file_5.04.bb
rename to meta/recipes-devtools/file/file_5.07.bb
index 1f9c78e..9b5b51f 100644
--- a/meta/recipes-devtools/file/file_5.04.bb
+++ b/meta/recipes-devtools/file/file_5.07.bb
@@ -10,16 +10,14 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03
DEPENDS = "zlib file-native"
DEPENDS_virtclass-native = "zlib-native"
-PR = "r2"
+PR = "r0"
SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
- file://stringb-compat.patch \
- file://ge-le.patch \
file://dump \
file://filesystems"
-SRC_URI[md5sum] = "accade81ff1cc774904b47c72c8aeea0"
-SRC_URI[sha256sum] = "4c9e6e7994e74cb3386374ae91b055d26ac96b9d3e82fd157ae2d62e87a4260c"
+SRC_URI[md5sum] = "b8d1f9a8a644067bd0a703cebf3f4858"
+SRC_URI[sha256sum] = "c968bfe97d87f9f564728a894d57be2c6bba9a2006763fffff85c5f72a9a3c2f"
inherit autotools
@@ -35,5 +33,4 @@ do_install_append_virtclass-native() {
--magic-file ${datadir}/misc/magic.mgc
}
-
BBCLASSEXTEND = "native"
--
1.7.6
^ permalink raw reply related [flat|nested] 51+ messages in thread* Re: [CONSOLIDATED PULL 00/32] Various Fixes, Updates
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
` (31 preceding siblings ...)
2011-08-18 20:55 ` [CONSOLIDATED PULL 32/32] file: new file version 5.07 Saul Wold
@ 2011-08-19 16:14 ` Richard Purdie
32 siblings, 0 replies; 51+ messages in thread
From: Richard Purdie @ 2011-08-19 16:14 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, 2011-08-18 at 13:55 -0700, Saul Wold wrote:
> The following changes since commit 2e83e6755441cb14bd907d306974338c15173189:
>
> kernel: restore crtsavres.o to enable building external modules on powerpc (2011-08-17 15:46:16 +0100)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib sgw/stage
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
>
> Adrian Alonso (1):
> file: new file version 5.07
>
> Anders Darander (3):
> qt4: allow a reduction in build time
> qemu: modify search paths for libgl
> scripts/runqemu: modify search paths for libgl
>
> Dongxiao Xu (7):
> busybox: Change ${PN} to ${BPN} in file names
> sysvinit: Change ${PN} to ${BPN} in file names
> curl: Use BPN instead of PN for style like lib${PN}
> ea-acl: Use BPN instead of PN for style like lib${PN}
> attr: Use BPN instead of PN for style like lib${PN}
> acl: Use BPN instead of PN for style like lib${PN}
> procps: Fix lib path to support multilib
>
> Jingdong Lu (1):
> initrdscripts: fix init-live.sh
>
> Joshua Lock (1):
> glib-2.0: explicitly disable dtrace and systemtap for native varaint
>
> Kang Kai (6):
> at: make at usable for common user
> eglibc: check dependencies among eglibc options
> mailx: update license and distro tracking fileds
> slang: add homepage and update distro tracking fields
> alsa-tools: update license and add distro tracking fields
> newt: update distro tracking fields
>
> Khem Raj (4):
> conf,recipes: Redefine LINKER_HASH_STYLE
> gcc-4.6: Use --with-linker-hash-style configure option
> task-core-tools: Use LTTNGUST variable instead of hardcoding
> lttng-ust
> gdb: Add lttng-ust to DEPENDS only for eglibc
>
> Koen Kooi (1):
> tcl: fix networking breakage
>
> Martin Jansa (2):
> task-core-boot: allow distribution to override default dev_manager
> provider with VIRTUAL-RUNTIME_dev_manager
> bluez4: update recipe from meta-oe
>
> Noor Ahsan (1):
> mtd-utils: Added recipe of newer version 1.4.4.
>
> Paul Eggleton (2):
> image.bbclass, kernel.bbclass: create warning file about deleting
> deploydir files
> sanity.bbclass: add optional untested host distro warning
>
> Phil Blundell (2):
> libxkbcommon: new
> libxslt: fix packaging of static libraries
>
> Wenzong Fan (1):
> perl-native: Update find_perl to find the perl wrapper
Thanks for putting this together Saul. I've either merged these or
commented on the mailing list.
Cheers,
Richard
^ permalink raw reply [flat|nested] 51+ messages in thread