* [CONSOLIDATED PULL 01/25] busybox: don't strip the main binary
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
@ 2011-08-12 7:49 ` Saul Wold
2011-08-12 7:49 ` [CONSOLIDATED PULL 02/25] insane: add linux-gnu to the platform data Saul Wold
` (25 subsequent siblings)
26 siblings, 0 replies; 30+ messages in thread
From: Saul Wold @ 2011-08-12 7:49 UTC (permalink / raw)
To: openembedded-core
From: Chris Larson <chris_larson@mentor.com>
With this, we get a useful busybox-dbg package.
Signed-off-by: Chris Larson <chris_larson@mentor.com>
---
meta/recipes-core/busybox/busybox.inc | 3 ++-
meta/recipes-core/busybox/busybox_1.18.4.bb | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 5eba0ca..d46c135 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -120,7 +120,8 @@ do_configure () {
do_compile() {
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
- base_do_compile
+ oe_runmake busybox_unstripped
+ cp busybox_unstripped busybox
}
do_install () {
diff --git a/meta/recipes-core/busybox/busybox_1.18.4.bb b/meta/recipes-core/busybox/busybox_1.18.4.bb
index d18af6f..b4681a4 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 = "r7"
+PR = "r8"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://udhcpscript.patch \
--
1.7.3.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [CONSOLIDATED PULL 02/25] insane: add linux-gnu to the platform data
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
2011-08-12 7:49 ` [CONSOLIDATED PULL 01/25] busybox: don't strip the main binary Saul Wold
@ 2011-08-12 7:49 ` Saul Wold
2011-08-12 7:49 ` [CONSOLIDATED PULL 03/25] nativesdk: inherit relocatable Saul Wold
` (24 subsequent siblings)
26 siblings, 0 replies; 30+ messages in thread
From: Saul Wold @ 2011-08-12 7:49 UTC (permalink / raw)
To: openembedded-core
From: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Chris Larson <chris_larson@mentor.com>
---
meta/classes/insane.bbclass | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 0267fad..a660a06 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -80,6 +80,9 @@ def package_qa_get_machine_dict():
"arm" : (40, 0, 0, True, 32),
"armeb" : (40, 0, 0, False, 32),
},
+ "linux-gnu" : {
+ "powerpc": (20, 0, 0, False, 32),
+ },
"linux-gnuspe" : {
"powerpc": (20, 0, 0, False, 32),
},
--
1.7.3.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [CONSOLIDATED PULL 03/25] nativesdk: inherit relocatable
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
2011-08-12 7:49 ` [CONSOLIDATED PULL 01/25] busybox: don't strip the main binary Saul Wold
2011-08-12 7:49 ` [CONSOLIDATED PULL 02/25] insane: add linux-gnu to the platform data Saul Wold
@ 2011-08-12 7:49 ` Saul Wold
2011-08-12 7:49 ` [CONSOLIDATED PULL 04/25] sanity: shift the required utils into a variable Saul Wold
` (23 subsequent siblings)
26 siblings, 0 replies; 30+ messages in thread
From: Saul Wold @ 2011-08-12 7:49 UTC (permalink / raw)
To: openembedded-core
From: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Chris Larson <chris_larson@mentor.com>
---
meta/classes/nativesdk.bbclass | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass
index 152d053..a495555 100644
--- a/meta/classes/nativesdk.bbclass
+++ b/meta/classes/nativesdk.bbclass
@@ -1,3 +1,5 @@
+inherit relocatable
+
# SDK packages are built either explicitly by the user,
# or indirectly via dependency. No need to be in 'world'.
EXCLUDE_FROM_WORLD = "1"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [CONSOLIDATED PULL 04/25] sanity: shift the required utils into a variable
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
` (2 preceding siblings ...)
2011-08-12 7:49 ` [CONSOLIDATED PULL 03/25] nativesdk: inherit relocatable Saul Wold
@ 2011-08-12 7:49 ` Saul Wold
2011-08-12 7:49 ` [CONSOLIDATED PULL 05/25] package: include SECTION in the pkgdata Saul Wold
` (22 subsequent siblings)
26 siblings, 0 replies; 30+ messages in thread
From: Saul Wold @ 2011-08-12 7:49 UTC (permalink / raw)
To: openembedded-core
From: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Chris Larson <chris_larson@mentor.com>
---
meta/classes/sanity.bbclass | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 999e15d..d50c843 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -2,6 +2,8 @@
# Sanity check the users setup for common misconfigurations
#
+SANITY_REQUIRED_UTILITIES ?= "patch diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk chrpath wget cpio"
+
def raise_sanity_error(msg):
bb.fatal(""" Poky's config sanity checker detected a potential misconfiguration.
Either fix the cause of this error or at your own risk disable the checker (see sanity.conf).
@@ -213,7 +215,7 @@ def check_sanity(e):
if not check_app_exists('${BUILD_PREFIX}g++', e.data):
missing = missing + "C++ Compiler (%sg++)," % data.getVar("BUILD_PREFIX", e.data, True)
- required_utilities = "patch diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk chrpath wget cpio"
+ required_utilities = e.data.getVar('SANITY_REQUIRED_UTILITIES', True)
if "qemu-native" in assume_provided:
if not check_app_exists("qemu-arm", e.data):
--
1.7.3.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [CONSOLIDATED PULL 05/25] package: include SECTION in the pkgdata
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
` (3 preceding siblings ...)
2011-08-12 7:49 ` [CONSOLIDATED PULL 04/25] sanity: shift the required utils into a variable Saul Wold
@ 2011-08-12 7:49 ` Saul Wold
2011-08-12 7:49 ` [CONSOLIDATED PULL 06/25] package: allow setting a section for locale packages Saul Wold
` (21 subsequent siblings)
26 siblings, 0 replies; 30+ messages in thread
From: Saul Wold @ 2011-08-12 7:49 UTC (permalink / raw)
To: openembedded-core
From: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Chris Larson <chris_larson@mentor.com>
---
meta/classes/package.bbclass | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index bb0ba68..0a954ef 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1051,6 +1051,7 @@ python emit_pkgdata() {
write_if_exists(sf, pkg, 'RSUGGESTS')
write_if_exists(sf, pkg, 'RREPLACES')
write_if_exists(sf, pkg, 'RCONFLICTS')
+ write_if_exists(sf, pkg, 'SECTION')
write_if_exists(sf, pkg, 'PKG')
write_if_exists(sf, pkg, 'ALLOW_EMPTY')
write_if_exists(sf, pkg, 'FILES')
--
1.7.3.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [CONSOLIDATED PULL 06/25] package: allow setting a section for locale packages
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
` (4 preceding siblings ...)
2011-08-12 7:49 ` [CONSOLIDATED PULL 05/25] package: include SECTION in the pkgdata Saul Wold
@ 2011-08-12 7:49 ` Saul Wold
2011-08-12 7:49 ` [CONSOLIDATED PULL 07/25] cross: also empty PACKAGES_DYNAMIC Saul Wold
` (20 subsequent siblings)
26 siblings, 0 replies; 30+ messages in thread
From: Saul Wold @ 2011-08-12 7:49 UTC (permalink / raw)
To: openembedded-core
From: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Chris Larson <chris_larson@mentor.com>
---
meta/classes/package.bbclass | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 0a954ef..100f465 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -44,6 +44,8 @@ inherit prserv
PKGD = "${WORKDIR}/package"
PKGDEST = "${WORKDIR}/packages-split"
+LOCALE_SECTION ?= ''
+
# rpm is used for the per-file dependency identification
PACKAGE_DEPENDS += "rpm-native"
@@ -401,6 +403,7 @@ python package_do_split_locales() {
summary = bb.data.getVar('SUMMARY', d, True) or pn
description = bb.data.getVar('DESCRIPTION', d, True) or ""
+ locale_section = bb.data.getVar('LOCALE_SECTION', d, True)
for l in locales:
ln = legitimize_package_name(l)
pkg = pn + '-locale-' + ln
@@ -410,6 +413,8 @@ python package_do_split_locales() {
bb.data.setVar('RPROVIDES_' + pkg, '%s-locale %s-translation' % (pn, ln), d)
bb.data.setVar('SUMMARY_' + pkg, '%s - %s translations' % (summary, l), d)
bb.data.setVar('DESCRIPTION_' + pkg, '%s This package contains language translation files for the %s locale.' % (description, l), d)
+ if locale_section:
+ bb.data.setVar('SECTION_' + pkg, locale_section, d)
bb.data.setVar('PACKAGES', ' '.join(packages), d)
--
1.7.3.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [CONSOLIDATED PULL 07/25] cross: also empty PACKAGES_DYNAMIC
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
` (5 preceding siblings ...)
2011-08-12 7:49 ` [CONSOLIDATED PULL 06/25] package: allow setting a section for locale packages Saul Wold
@ 2011-08-12 7:49 ` Saul Wold
2011-08-12 7:49 ` [CONSOLIDATED PULL 08/25] linux-yocto: update SRCREVs for preempt-rt support + build fixes Saul Wold
` (19 subsequent siblings)
26 siblings, 0 replies; 30+ messages in thread
From: Saul Wold @ 2011-08-12 7:49 UTC (permalink / raw)
To: openembedded-core
From: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Chris Larson <chris_larson@mentor.com>
---
meta/classes/cross.bbclass | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index 519aa0d..5681ab9 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -5,6 +5,8 @@ inherit relocatable
EXCLUDE_FROM_WORLD = "1"
PACKAGES = ""
+PACKAGES_DYNAMIC = ""
+PACKAGES_DYNAMIC_virtclass-native = ""
HOST_ARCH = "${BUILD_ARCH}"
HOST_VENDOR = "${BUILD_VENDOR}"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [CONSOLIDATED PULL 08/25] linux-yocto: update SRCREVs for preempt-rt support + build fixes
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
` (6 preceding siblings ...)
2011-08-12 7:49 ` [CONSOLIDATED PULL 07/25] cross: also empty PACKAGES_DYNAMIC Saul Wold
@ 2011-08-12 7:49 ` Saul Wold
2011-08-12 7:49 ` [CONSOLIDATED PULL 09/25] rpm: Fix the canonical arch --target processing and cleanup Saul Wold
` (18 subsequent siblings)
26 siblings, 0 replies; 30+ messages in thread
From: Saul Wold @ 2011-08-12 7:49 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Updating the SRCREVs for linux-yocto to pickup a series of changes
that were made to support the build/boot of preempt-rt on 3.0.x.
7782fc6 routerstationpro: remove CONFIG_PREEMPT* definitions
b51300c meta/rt: sugarbay preempt-rt support
735711e meta/rt: common-pc[-64] preempt-rt no branch fix
53026bf meta/rt: jasperforest preempt-rt support
99bc260 meta/rt: fri2 preempt-rt support
e746ab8 meta/rt: fishriver preempt-rt support
fa1b73f meta/rt: emenlow preempt-rt support
1f686ab meta/rt: crownbay preempt-rt support
64a5069 meta/rt: arm-versatile-926ejs preempt-rt support
7f827a1 meta/rt: mti-malta32-be preempt-rt support
930a983 meta/rt: qemu-ppc32 preempt-rt support
367fc55 meta-rt: rsp preempt-rt support
b8a62ea meta/rt: mpc8315 preempt-rt support
b5f9daa meta/rt: beagleboard preempt-rt support
1e6e9eb meta/rt: use CONFIG_PREEMPT_RT_FULL for 3.0 kernels
eb5a06b boot: move -Os patch to standard branch
c692a23 meta/rt: remove explicit patch references
8a2ac6b meta/rt: updating to rt8
76b3679 meta: atom-pc update definition to re-use preempt-rt
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/recipes-kernel/linux/linux-yocto_3.0.bb | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index a7bd67a..ba352e2 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -14,13 +14,13 @@ KMETA = meta
LINUX_VERSION ?= "3.0"
LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
-SRCREV_machine_qemuarm = "30a2cec4e9d7048681c1d239f49cc935287a7012"
-SRCREV_machine_qemumips = "f9b9688cefaa87d898394902acfb858d6b0f1e28"
-SRCREV_machine_qemuppc = "a46a4c356f8bcf7a30d967a1b43633b824cd07a1"
-SRCREV_machine_qemux86 = "efaab1f75dbc577922c862fa19d45c3f31cb99cb"
-SRCREV_machine_qemux86-64 = "c30a56850c73c74af2d056d803081a0d829ce35c"
-SRCREV_machine = "318b059a472128f67119f367f51f11893ee60269"
-SRCREV_meta = "76b3679beff6c640388a609ccf87f46bb7bf0f2b"
+SRCREV_machine_qemuarm = "36b4cdddcafc711f0ec9ad97882f23a6443c61b2"
+SRCREV_machine_qemumips = "2db2aacc589a518a74e8a8543e80403f09de8134"
+SRCREV_machine_qemuppc = "c0f5dd4ef37b445d8ac73b11dd93e0ffdb7e9f6d"
+SRCREV_machine_qemux86 = "c29beadfd4364aca9358ac0fdb8356c1dbbdacb2"
+SRCREV_machine_qemux86-64 = "d0b814813bce09971c5cbb0d22bacb8842146fa0"
+SRCREV_machine = "ad13129a87957656c18584793abcee51de0e196a"
+SRCREV_meta = "7782fc673afd6a1c742409896ae787560d96fce8"
PR = "r0"
PV = "${LINUX_VERSION}+git${SRCPV}"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [CONSOLIDATED PULL 09/25] rpm: Fix the canonical arch --target processing and cleanup
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
` (7 preceding siblings ...)
2011-08-12 7:49 ` [CONSOLIDATED PULL 08/25] linux-yocto: update SRCREVs for preempt-rt support + build fixes Saul Wold
@ 2011-08-12 7:49 ` Saul Wold
2011-08-12 7:49 ` [CONSOLIDATED PULL 10/25] package_rpm.bbclass: Update the platform config and --target Saul Wold
` (17 subsequent siblings)
26 siblings, 0 replies; 30+ messages in thread
From: Saul Wold @ 2011-08-12 7:49 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
[YOCTO #1352]
Fix the canonical arch --target processor to work with the way OE
handles the GNU canonical arch.
Also cleanup a number of files that are no longer used, and refactor
the no-loop patch into the "no-loopmsg" patch.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../recipes-devtools/rpm/rpm/export-rpmbag-h.patch | 45 -------
meta/recipes-devtools/rpm/rpm/hdraddorappend.patch | 22 ----
meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch | 134 ++++++++++++++++++++
meta/recipes-devtools/rpm/rpm/rpm-no-loop.patch | 38 ------
meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch | 16 +++
meta/recipes-devtools/rpm/rpm/rpm-nrescan.patch | 17 ---
meta/recipes-devtools/rpm/rpm_5.4.0.bb | 8 +-
7 files changed, 153 insertions(+), 127 deletions(-)
delete mode 100644 meta/recipes-devtools/rpm/rpm/export-rpmbag-h.patch
delete mode 100644 meta/recipes-devtools/rpm/rpm/hdraddorappend.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch
delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-no-loop.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch
delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-nrescan.patch
diff --git a/meta/recipes-devtools/rpm/rpm/export-rpmbag-h.patch b/meta/recipes-devtools/rpm/rpm/export-rpmbag-h.patch
deleted file mode 100644
index 2f203fb..0000000
--- a/meta/recipes-devtools/rpm/rpm/export-rpmbag-h.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-rpmbag.h (added in 5.1.10) is used by rpmts.h, thus should be
-exported. Change Makefile.in as well since currently autoreconf
-is not performed for rpm.
-
-8/26/2010 - created by Qing He <qing.he@intel.com>
-
-diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
-index ce9e4f7..0d825b6 100644
---- a/rpmio/Makefile.am
-+++ b/rpmio/Makefile.am
-@@ -59,12 +59,12 @@ pkginc_HEADERS = \
- argv.h envvar.h fts.h mire.h rpmbc.h rpmcb.h rpmdav.h rpmgc.h \
- rpmhash.h rpmio.h rpmiotypes.h rpmio-stub.h rpmku.h rpmlog.h \
- rpmmacro.h rpmmg.h rpmnss.h rpmpgp.h rpmsq.h rpmssl.h rpmsw.h \
-- rpmurl.h rpmxar.h ugid.h rpmuuid.h rpmzlog.h yarn.h
-+ rpmurl.h rpmxar.h ugid.h rpmuuid.h rpmzlog.h yarn.h rpmbag.h
- noinst_HEADERS = \
- ar.h cpio.h crc.h fnmatch.h glob.h iosm.h \
- md2.h md4.h poptIO.h rmd128.h rmd160.h rmd256.h rmd320.h sha224.h \
- salsa10.h salsa20.h tar.h tiger.h \
-- rpmbag.h rpmbf.h rpmbz.h rpmhook.h rpmio_internal.h rpmlua.h
-+ rpmbf.h rpmbz.h rpmhook.h rpmio_internal.h rpmlua.h
-
- usrlibdir = $(libdir)
- usrlib_LTLIBRARIES = librpmio.la
-diff --git a/rpmio/Makefile.in b/rpmio/Makefile.in
-index ef76570..0b212bd 100644
---- a/rpmio/Makefile.in
-+++ b/rpmio/Makefile.in
-@@ -638,13 +638,13 @@ pkginc_HEADERS = \
- argv.h envvar.h fts.h mire.h rpmbc.h rpmcb.h rpmdav.h rpmgc.h \
- rpmhash.h rpmio.h rpmiotypes.h rpmio-stub.h rpmku.h rpmlog.h \
- rpmmacro.h rpmmg.h rpmnss.h rpmpgp.h rpmsq.h rpmssl.h rpmsw.h \
-- rpmurl.h rpmxar.h ugid.h rpmuuid.h rpmzlog.h yarn.h
-+ rpmurl.h rpmxar.h ugid.h rpmuuid.h rpmzlog.h yarn.h rpmbag.h
-
- noinst_HEADERS = \
- ar.h cpio.h crc.h fnmatch.h glob.h iosm.h \
- md2.h md4.h poptIO.h rmd128.h rmd160.h rmd256.h rmd320.h sha224.h \
- salsa10.h salsa20.h tar.h tiger.h \
-- rpmbag.h rpmbf.h rpmbz.h rpmhook.h rpmio_internal.h rpmlua.h
-+ rpmbf.h rpmbz.h rpmhook.h rpmio_internal.h rpmlua.h
-
- usrlibdir = $(libdir)
- usrlib_LTLIBRARIES = librpmio.la
diff --git a/meta/recipes-devtools/rpm/rpm/hdraddorappend.patch b/meta/recipes-devtools/rpm/rpm/hdraddorappend.patch
deleted file mode 100644
index 020337a..0000000
--- a/meta/recipes-devtools/rpm/rpm/hdraddorappend.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/lib/rpm4compat.h b/lib/rpm4compat.h
-index b957f8e..b1954d5 100644
---- a/lib/rpm4compat.h
-+++ b/lib/rpm4compat.h
-@@ -211,6 +211,17 @@ static inline int headerAddEntry(Header h, int_32 tag, int_32 type, const void *
- return headerPut(h, he, 0);
- }
-
-+static inline int headerAddOrAppendEntry(Header h, int_32 tag, int_32 type, const void * p, int_32 c) {
-+ HE_t he = (HE_s*)memset(alloca(sizeof(*he)), 0, sizeof(*he));
-+
-+ he->tag = (rpmTag)tag;
-+ he->t = (rpmTagType)type;
-+ he->p.str = (const char*)p;
-+ he->c = (rpmTagCount)c;
-+ he->append = 1;
-+ return headerPut(h, he, 0);
-+}
-+
- static inline int headerRemoveEntry(Header h, int_32 tag) {
- HE_t he = (HE_s*)memset(alloca(sizeof(*he)), 0, sizeof(*he));
-
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch b/meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch
new file mode 100644
index 0000000..3619058
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch
@@ -0,0 +1,134 @@
+lib/rpmrc.c: Update --target processing to support full GNU canonical arch
+
+Prior to this patch, when using --target, RPM supported the format:
+ <arch>
+ <arch>-<os>
+ <arch>-<os>-gnu
+ <arch>-<arbitrary items>-<os>
+ <arch>-<arbitrary items>-<os>-gnu
+
+This patch changes the list of supported items to:
+ <arch>
+ <arch>-<os>
+ <arch>-<os>-gnu
+ <arch>-<vendor>-<os>
+ <arch>-<vendor>-<os>-<extension>
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+
+Index: rpm-5.4.0/lib/rpmrc.c
+===================================================================
+--- rpm-5.4.0.orig/lib/rpmrc.c 2011-08-10 17:04:35.798814821 -0500
++++ rpm-5.4.0/lib/rpmrc.c 2011-08-10 17:33:51.505871895 -0500
+@@ -916,8 +916,8 @@
+
+ static void rpmRebuildTargetVars(const char ** target, const char ** canontarget)
+ {
+-
+- char *ca = NULL, *co = NULL, *ct = NULL;
++ /* ca = arch, cv = vendor, co = os, ce = extension, ct = canon target */
++ char *ca = NULL, *cv = NULL, *co = NULL, *ce = NULL, *ct = NULL;
+ int x;
+
+ /* Rebuild the compat table to recalculate the current target arch. */
+@@ -927,23 +927,60 @@
+ rpmSetTables(RPM_MACHTABLE_BUILDARCH, RPM_MACHTABLE_BUILDOS);
+
+ if (target && *target) {
++ /* GNU canonical format is:
++ * <arch>-<vendor>-<os>[-extension]
++ *
++ * We support the both the GNU canonical format
++ * as well as the traditional RPM formats:
++ * <arch>
++ * <arch>-<os>[-gnu]
++ */
+ char *c;
+ /* Set arch and os from specified build target */
+ ca = xstrdup(*target);
+- if ((c = strchr(ca, '-')) != NULL) {
++ if ((c = strchr(ca, '-')) == NULL) {
++ /* Format is <arch> */
++ ;
++ } else {
+ *c++ = '\0';
+-
+- if ((co = strrchr(c, '-')) == NULL) {
+- co = c;
++ cv = c;
++
++ if ((c = strchr(c, '-')) == NULL) {
++ /* Format is <arch>-<os> */
++ co = cv;
++ cv = NULL;
+ } else {
+- if (!xstrcasecmp(co, "-gnu"))
+- *co = '\0';
+- if ((co = strrchr(c, '-')) == NULL)
+- co = c;
+- else
+- co++;
++ *c++ = '\0';
++ co = c;
++
++ if ((c = strchr(c, '-')) == NULL) {
++ /* Might be:
++ * <arch>-<vendor>-<os>
++ * <arch>-<os>-gnu
++ */
++ if (!xstrcasecmp(co, "gnu")) {
++ /* Format was <arch>-<os>-gnu */
++ ce = co;
++ co = cv;
++ cv = NULL;
++ }
++ } else {
++ /* Format was <arch>-<vendor>-<os>-<extension> */
++ *c++ = '\0';
++ ce = c;
++ }
+ }
++ if (cv != NULL) cv = xstrdup(cv);
+ if (co != NULL) co = xstrdup(co);
++ if (ce != NULL) {
++ /* We need to prefix it with a "-" */
++ char * lce = NULL;
++
++ lce = xmalloc(strlen(ce) + sizeof("-"));
++ sprintf(lce, "-%s", ce);
++
++ ce = lce;
++ }
+ }
+ } else {
+ const char *a = NULL;
+@@ -988,8 +1025,16 @@
+ addMacro(NULL, "_target", NULL, ct, RMIL_RPMRC);
+ delMacro(NULL, "_target_cpu");
+ addMacro(NULL, "_target_cpu", NULL, ca, RMIL_RPMRC);
++ if (cv) {
++ delMacro(NULL, "_target_vendor");
++ addMacro(NULL, "_target_vendor", NULL, cv, RMIL_RPMRC);
++ }
+ delMacro(NULL, "_target_os");
+ addMacro(NULL, "_target_os", NULL, co, RMIL_RPMRC);
++ if (ce) {
++ delMacro(NULL, "_gnu");
++ addMacro(NULL, "_gnu", NULL, ce, RMIL_RPMRC);
++ }
+
+ if (canontarget)
+ *canontarget = ct;
+@@ -997,8 +1041,12 @@
+ ct = _free(ct);
+ ca = _free(ca);
+ /*@-usereleased@*/
++ cv = _free(cv);
++ /*@-usereleased@*/
+ co = _free(co);
+ /*@=usereleased@*/
++ ce = _free(ce);
++ /*@-usereleased@*/
+ }
+
+ void rpmFreeRpmrc(void)
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-no-loop.patch b/meta/recipes-devtools/rpm/rpm/rpm-no-loop.patch
deleted file mode 100644
index 1f0dbcb..0000000
--- a/meta/recipes-devtools/rpm/rpm/rpm-no-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-The LOOP: ... messages appear to be errors, but in reality they are
-simply debug messages that indicate there is one or more dependency
-loop within the system.
-
-Due to Poky packages owning all of the directories they use, a large
-number of depedency loops may be present. So disabling this message
-seems to make the most sense.
-
-Signed-off-by: mark.hatle@windriver.com
-
-diff -ur rpm-5.1.10.orig/lib/depends.c rpm-5.1.10/lib/depends.c
---- rpm-5.1.10.orig/lib/depends.c 2010-09-29 12:23:48.307048065 -0500
-+++ rpm-5.1.10/lib/depends.c 2010-09-29 12:33:23.306022259 -0500
-@@ -2044,9 +2044,11 @@
- * Attempt to unravel a dependency loop by eliminating Requires's.
- */
- if (zap) {
-+#if 0
- rpmlog(msglvl,
- _("removing %s \"%s\" from tsort relations.\n"),
- (rpmteNEVRA(p) ? rpmteNEVRA(p) : "???"), dp);
-+#endif
- rpmteTSI(p)->tsi_count--;
- if (tsi_prev) tsi_prev->tsi_next = tsi->tsi_next;
- tsi->tsi_next = NULL;
-@@ -2676,10 +2678,12 @@
- /* Unchain predecessor loop. */
- rpmteTSI(p)->tsi_chain = NULL;
-
-+#if 0
- if (!printed) {
- rpmlog(msglvl, _("LOOP:\n"));
- printed = 1;
- }
-+#endif
-
- /* Find (and destroy if co-requisite) "q <- p" relation. */
- dp = zapRelation(q, p, 1, &nzaps, msglvl);
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch b/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch
new file mode 100644
index 0000000..4aded75
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch
@@ -0,0 +1,16 @@
+lib/order.c: Make the dependency loop messages into debug msgs
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+
+diff -urN rpm-5.4.0.orig/lib/order.c rpm-5.4.0/lib/order.c
+--- rpm-5.4.0.orig/lib/order.c 2010-12-13 17:36:39.000000000 -0600
++++ rpm-5.4.0/lib/order.c 2011-08-10 11:11:43.194686332 -0500
+@@ -2170,7 +2170,7 @@
+ const char * dp;
+ rpmlogLvl msglvl = (anaconda || (rpmtsDFlags(ts) & RPMDEPS_FLAG_DEPLOOPS))
+ ? RPMLOG_WARNING : RPMLOG_ERR;
+-#if defined(RPM_VENDOR_MANDRIVA) /* loop-detection-optional-loglevel */
++#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_POKY) /* loop-detection-optional-loglevel */
+ // Report loops as debug-level message by default (7 = RPMLOG_DEBUG), overridable
+ msglvl = rpmExpandNumeric("%{?_loop_detection_loglevel}%{?!_loop_detection_loglevel:7}");
+ #endif
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-nrescan.patch b/meta/recipes-devtools/rpm/rpm/rpm-nrescan.patch
deleted file mode 100644
index db4f8b3..0000000
--- a/meta/recipes-devtools/rpm/rpm/rpm-nrescan.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-We need to increase the number of dependency rescans as we have a large
-number of self-referencing dependencies within Poky. 100 seem reasonable.
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-
-diff -ur rpm-5.1.10.orig/lib/depends.c rpm-5.1.10/lib/depends.c
---- rpm-5.1.10.orig/lib/depends.c 2010-08-20 17:12:43.000000000 -0500
-+++ rpm-5.1.10/lib/depends.c 2010-09-02 13:37:21.966116309 -0500
-@@ -2310,7 +2310,7 @@
- int numOrderList;
- int npeer = 128; /* XXX more than deep enough for now. */
- int * peer = memset(alloca(npeer*sizeof(*peer)), 0, (npeer*sizeof(*peer)));
-- int nrescans = 10;
-+ int nrescans = 100;
- int _printed = 0;
- char deptypechar;
- size_t tsbytes;
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index c0e3208..0882df7 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -45,7 +45,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}"
extrarpmdeps = "python perl"
extrarpmdeps_virtclass-native = ""
-PR = "r19"
+PR = "r20"
# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
# in order to extract the distribution SRPM into a format we can extract...
@@ -61,14 +61,12 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.0-0.20101229.src.rpm;ex
file://rpm-tools-mtree-LDFLAGS.patch \
file://fprint-pointer-fix.patch \
file://rpm-fileclass.patch \
+ file://rpm-canonarch.patch \
+ file://rpm-no-loopmsg.patch \
"
-# file://hdraddorappend.patch \
-# file://export-rpmbag-h.patch \
-# file://rpm-nrescan.patch \
# file://rpm-autoconf.patch \
# file://remove-compiled-tests.patch;apply=no \
-# file://rpm-no-loop.patch \
# "
SRC_URI[md5sum] = "19c1a7f68d7765eeb7615c9c4e54e380"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [CONSOLIDATED PULL 10/25] package_rpm.bbclass: Update the platform config and --target
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
` (8 preceding siblings ...)
2011-08-12 7:49 ` [CONSOLIDATED PULL 09/25] rpm: Fix the canonical arch --target processing and cleanup Saul Wold
@ 2011-08-12 7:49 ` Saul Wold
2011-08-12 7:50 ` [CONSOLIDATED PULL 11/25] init-install.sh: Fix make partition and make file system issues Saul Wold
` (16 subsequent siblings)
26 siblings, 0 replies; 30+ messages in thread
From: Saul Wold @ 2011-08-12 7:49 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
When constructing the /etc/rpm/platform file, we need to ensure that
the any, all, and noarch platforms will allow any "linux" variant to
be installable, not just matching variants.. i.e.
arm-oe-linux-gnueabi should be able to install noarch-oe-linux
Also ensure that we pass the full canonical arch via the --target=
parameter. This allows us to define the proper platform settings
for all packages.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/classes/package_rpm.bbclass | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 59e8d48..5c67f69 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -177,7 +177,15 @@ package_install_internal_rpm () {
echo "${platform}${TARGET_VENDOR}-${TARGET_OS}" > ${target_rootfs}/etc/rpm/platform
if [ ! -z "$platform_extra" ]; then
for pt in $platform_extra ; do
- echo "$pt-.*-${TARGET_OS}" >> ${target_rootfs}/etc/rpm/platform
+ case $pt in
+ noarch | any | all)
+ os="`echo ${TARGET_OS} | sed "s,-.*,,"`.*"
+ ;;
+ *)
+ os="${TARGET_OS}"
+ ;;
+ esac
+ echo "$pt-.*-$os" >> ${target_rootfs}/etc/rpm/platform
done
fi
@@ -821,13 +829,13 @@ python do_package_rpm () {
targetsys = bb.data.getVar('TARGET_SYS', d, True)
targetvendor = bb.data.getVar('TARGET_VENDOR', d, True)
pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH}', d)
- pkgarch = bb.data.expand('${PACKAGE_ARCH}', d)
+ pkgarch = bb.data.expand('${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}', d)
magicfile = bb.data.expand('${STAGING_DIR_NATIVE}/usr/share/misc/magic.mgc', d)
bb.mkdirhier(pkgwritedir)
os.chmod(pkgwritedir, 0755)
cmd = rpmbuild
- cmd = cmd + " --nodeps --short-circuit --target " + pkgarch + targetvendor + "-linux-gnu --buildroot " + pkgd
+ cmd = cmd + " --nodeps --short-circuit --target " + pkgarch + " --buildroot " + pkgd
cmd = cmd + " --define '_topdir " + workdir + "' --define '_rpmdir " + pkgwritedir + "'"
cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'"
cmd = cmd + " --define '_use_internal_dependency_generator 0'"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [CONSOLIDATED PULL 11/25] init-install.sh: Fix make partition and make file system issues
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
` (9 preceding siblings ...)
2011-08-12 7:49 ` [CONSOLIDATED PULL 10/25] package_rpm.bbclass: Update the platform config and --target Saul Wold
@ 2011-08-12 7:50 ` Saul Wold
2011-08-12 7:50 ` [CONSOLIDATED PULL 12/25] automake: Update for python.m4 to respect libdir Saul Wold
` (15 subsequent siblings)
26 siblings, 0 replies; 30+ messages in thread
From: Saul Wold @ 2011-08-12 7:50 UTC (permalink / raw)
To: openembedded-core
From: Mei Lei <lei.mei@intel.com>
[YOCTO #1151]
Change the offset from the beginning of the disk to aligne the blocks.
In this script, we use mkfs.ext3 to create file system after partition, but we use mkpartfs to create file system repeatly,
and get some warnings about choose another specific tools to create file system for reliability.
So use mkpart instead of mkpartfs and only use mkfs.ext3 to create file system.
Signed-off-by: Mei Lei <lei.mei@intel.com>
---
.../initrdscripts/files/init-install.sh | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh
index b9d9029..5e6b81c 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -105,13 +105,13 @@ echo "Creating new partition table on /dev/${device} ..."
parted /dev/${device} mklabel msdos
echo "Creating boot partition on /dev/${device}1"
-parted /dev/${device} mkpartfs primary ext2 0 $boot_size
+parted /dev/${device} mkpart primary 1 $boot_size
echo "Creating rootfs partition on /dev/${device}2"
-parted /dev/${device} mkpartfs primary ext2 $rootfs_start $rootfs_end
+parted /dev/${device} mkpart primary $rootfs_start $rootfs_end
echo "Creating swap partition on /dev/${device}3"
-parted /dev/${device} mkpartfs primary linux-swap $swap_start $disk_size
+parted /dev/${device} mkpart primary $swap_start $disk_size
parted /dev/${device} print
--
1.7.3.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [CONSOLIDATED PULL 12/25] automake: Update for python.m4 to respect libdir
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
` (10 preceding siblings ...)
2011-08-12 7:50 ` [CONSOLIDATED PULL 11/25] init-install.sh: Fix make partition and make file system issues Saul Wold
@ 2011-08-12 7:50 ` Saul Wold
2011-08-12 7:50 ` [CONSOLIDATED PULL 13/25] xcb-proto: update based on changes to python.m4 in automake Saul Wold
` (14 subsequent siblings)
26 siblings, 0 replies; 30+ messages in thread
From: Saul Wold @ 2011-08-12 7:50 UTC (permalink / raw)
To: openembedded-core
From: Kumar Gala <galak@kernel.crashing.org>
As we tweak libdir we need python libs that utilize configure to respect
it setting. By updating the python.m4 template, when we regen automake
files they will than respect the setting of libdir which is standard for
any autotools based recipe.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
meta/recipes-devtools/automake/automake.inc | 2 +-
.../automake/automake/python-libdir.patch | 60 ++++++++++++++++++++
meta/recipes-devtools/automake/automake_1.11.1.bb | 3 +-
3 files changed, 63 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-devtools/automake/automake/python-libdir.patch
diff --git a/meta/recipes-devtools/automake/automake.inc b/meta/recipes-devtools/automake/automake.inc
index 96d797f..f217e14 100644
--- a/meta/recipes-devtools/automake/automake.inc
+++ b/meta/recipes-devtools/automake/automake.inc
@@ -4,7 +4,7 @@ Standards. Automake requires the use of Autoconf."
LICENSE = "GPLv2"
HOMEPAGE = "http://www.gnu.org/software/automake/"
SECTION = "devel"
-PR = "r3"
+PR = "r4"
SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 "
diff --git a/meta/recipes-devtools/automake/automake/python-libdir.patch b/meta/recipes-devtools/automake/automake/python-libdir.patch
new file mode 100644
index 0000000..63dafca
--- /dev/null
+++ b/meta/recipes-devtools/automake/automake/python-libdir.patch
@@ -0,0 +1,60 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
+
+Index: automake-1.11.1/m4/python.m4
+===================================================================
+--- automake-1.11.1.orig/m4/python.m4
++++ automake-1.11.1/m4/python.m4
+@@ -88,12 +88,13 @@ python2.1 python2.0])
+ [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
+ AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
+
+- dnl Use the values of $prefix and $exec_prefix for the corresponding
+- dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made
++ dnl Use the values of $prefix, $libdir and $exec_prefix for the corresponding
++ dnl values of PYTHON_PREFIX PYTHON_LIB_PREFIX, and PYTHON_EXEC_PREFIX. These are made
+ dnl distinct variables so they can be overridden if need be. However,
+ dnl general consensus is that you shouldn't need this ability.
+
+ AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
++ AC_SUBST([PYTHON_LIB_PREFIX], ['${libdir}'])
+ AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
+
+ dnl At times (like when building shared libraries) you may want
+@@ -122,7 +123,7 @@ python2.1 python2.0])
+ am_py_prefix=$prefix
+ fi
+ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
+- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
++ echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"`
+ case $am_cv_python_pythondir in
+ $am_py_prefix*)
+ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
+@@ -132,7 +133,7 @@ python2.1 python2.0])
+ case $am_py_prefix in
+ /usr|/System*) ;;
+ *)
+- am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
++ am_cv_python_pythondir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages
+ ;;
+ esac
+ ;;
+@@ -160,7 +161,7 @@ python2.1 python2.0])
+ am_py_exec_prefix=$exec_prefix
+ fi
+ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
+- echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
++ echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"`
+ case $am_cv_python_pyexecdir in
+ $am_py_exec_prefix*)
+ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
+@@ -170,7 +171,7 @@ python2.1 python2.0])
+ case $am_py_exec_prefix in
+ /usr|/System*) ;;
+ *)
+- am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
++ am_cv_python_pyexecdir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages
+ ;;
+ esac
+ ;;
diff --git a/meta/recipes-devtools/automake/automake_1.11.1.bb b/meta/recipes-devtools/automake/automake_1.11.1.bb
index c66155f..fee9597 100644
--- a/meta/recipes-devtools/automake/automake_1.11.1.bb
+++ b/meta/recipes-devtools/automake/automake_1.11.1.bb
@@ -33,7 +33,8 @@ PATHFIXPATCH = "file://path_prog_fixes.patch;patch=1"
PATHFIXPATCH_virtclass-native = ""
SRC_URI += "${PATHFIXPATCH} \
- file://prefer-cpio-over-pax-for-ustar-archives.patch"
+ file://prefer-cpio-over-pax-for-ustar-archives.patch \
+ file://python-libdir.patch"
SRC_URI[md5sum] = "c2972c4d9b3e29c03d5f2af86249876f"
SRC_URI[sha256sum] = "5b159d3c0e0a1f87de71b68bcb9f1a1c49e9e71749c9b723f17e2e1e0295c7ae"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [CONSOLIDATED PULL 13/25] xcb-proto: update based on changes to python.m4 in automake
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
` (11 preceding siblings ...)
2011-08-12 7:50 ` [CONSOLIDATED PULL 12/25] automake: Update for python.m4 to respect libdir Saul Wold
@ 2011-08-12 7:50 ` Saul Wold
2011-08-12 7:50 ` [CONSOLIDATED PULL 14/25] tune-ppce5500: Add a set of tune files for PowerPC e5500 core Saul Wold
` (13 subsequent siblings)
26 siblings, 0 replies; 30+ messages in thread
From: Saul Wold @ 2011-08-12 7:50 UTC (permalink / raw)
To: openembedded-core
From: Kumar Gala <galak@kernel.crashing.org>
1. We dont need the aclocal patch as this will be handled by automake
2. We need to update xcb-proto.pc.in to know about ${libdir} since
we'll end up with something like:
pythondir=${libdir}/python2.6/site-packages
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
.../xcb/xcb-proto-1.6/aclocal.patch | 22 --------------------
.../xcb/xcb-proto-1.6/xcb-proto-libdir.patch | 14 ++++++++++++
meta/recipes-graphics/xcb/xcb-proto.inc | 2 +-
meta/recipes-graphics/xcb/xcb-proto_1.6.bb | 2 +-
meta/recipes-graphics/xcb/xcb-proto_git.bb | 2 +-
5 files changed, 17 insertions(+), 25 deletions(-)
delete mode 100644 meta/recipes-graphics/xcb/xcb-proto-1.6/aclocal.patch
create mode 100644 meta/recipes-graphics/xcb/xcb-proto-1.6/xcb-proto-libdir.patch
diff --git a/meta/recipes-graphics/xcb/xcb-proto-1.6/aclocal.patch b/meta/recipes-graphics/xcb/xcb-proto-1.6/aclocal.patch
deleted file mode 100644
index 124f146..0000000
--- a/meta/recipes-graphics/xcb/xcb-proto-1.6/aclocal.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-diff -ruN xcb-proto-1.6-orig/aclocal.m4 xcb-proto-1.6/aclocal.m4
---- xcb-proto-1.6-orig/aclocal.m4 2011-07-08 15:45:33.000000000 +0800
-+++ xcb-proto-1.6/aclocal.m4 2011-07-08 15:48:19.000000000 +0800
-@@ -518,6 +518,7 @@
- dnl general consensus is that you shouldn't need this ability.
-
- AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
-+ AC_SUBST([PYTHON_LIB_PREFIX], ['${libdir}'])
- AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
-
- dnl At times (like when building shared libraries) you may want
-@@ -546,7 +547,7 @@
- am_py_prefix=$prefix
- fi
- am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
-- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
-+ echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"`
- case $am_cv_python_pythondir in
- $am_py_prefix*)
- am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
diff --git a/meta/recipes-graphics/xcb/xcb-proto-1.6/xcb-proto-libdir.patch b/meta/recipes-graphics/xcb/xcb-proto-1.6/xcb-proto-libdir.patch
new file mode 100644
index 0000000..708f329
--- /dev/null
+++ b/meta/recipes-graphics/xcb/xcb-proto-1.6/xcb-proto-libdir.patch
@@ -0,0 +1,14 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
+
+Index: xcb-proto-1.6/xcb-proto.pc.in
+===================================================================
+--- xcb-proto-1.6.orig/xcb-proto.pc.in
++++ xcb-proto-1.6/xcb-proto.pc.in
+@@ -1,4 +1,5 @@
+ prefix=@prefix@
++libdir=@libdir@
+ datarootdir=@datarootdir@
+ datadir=@datadir@
+ xcbincludedir=@xcbincludedir@
diff --git a/meta/recipes-graphics/xcb/xcb-proto.inc b/meta/recipes-graphics/xcb/xcb-proto.inc
index 76688c9..85f89be 100644
--- a/meta/recipes-graphics/xcb/xcb-proto.inc
+++ b/meta/recipes-graphics/xcb/xcb-proto.inc
@@ -10,7 +10,7 @@ SECTION = "x11/libs"
LICENSE = "MIT-X"
SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2 \
- file://aclocal.patch"
+ file://xcb-proto-libdir.patch"
inherit autotools pkgconfig
diff --git a/meta/recipes-graphics/xcb/xcb-proto_1.6.bb b/meta/recipes-graphics/xcb/xcb-proto_1.6.bb
index 1868f1a..9d35596 100644
--- a/meta/recipes-graphics/xcb/xcb-proto_1.6.bb
+++ b/meta/recipes-graphics/xcb/xcb-proto_1.6.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \
file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65"
-PR = "r2"
+PR = "r3"
SRC_URI[md5sum] = "04313e1d914b44d0e457f6c494fc178b"
SRC_URI[sha256sum] = "f52bc1159b12496f002404eb5793c01277b20c82cb72c5ff076d7b25da9b5ca2"
diff --git a/meta/recipes-graphics/xcb/xcb-proto_git.bb b/meta/recipes-graphics/xcb/xcb-proto_git.bb
index 2711213..4358fee 100644
--- a/meta/recipes-graphics/xcb/xcb-proto_git.bb
+++ b/meta/recipes-graphics/xcb/xcb-proto_git.bb
@@ -3,7 +3,7 @@ DEFAULT_PREFERENCE = "-1"
include xcb-proto.inc
SRCREV = "d81ca233e98be8fa59e8c90d262c0516944c5a66"
PV = "1.2+gitr${SRCPV}"
-PR = "r2"
+PR = "r3"
SRC_URI = "git://anongit.freedesktop.org/git/xcb/proto;protocol=git"
S = "${WORKDIR}/git"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [CONSOLIDATED PULL 14/25] tune-ppce5500: Add a set of tune files for PowerPC e5500 core
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
` (12 preceding siblings ...)
2011-08-12 7:50 ` [CONSOLIDATED PULL 13/25] xcb-proto: update based on changes to python.m4 in automake Saul Wold
@ 2011-08-12 7:50 ` Saul Wold
2011-08-12 7:50 ` [CONSOLIDATED PULL 15/25] package_rpm: Fix attemptonly and suggest packages Saul Wold
` (12 subsequent siblings)
26 siblings, 0 replies; 30+ messages in thread
From: Saul Wold @ 2011-08-12 7:50 UTC (permalink / raw)
To: openembedded-core
From: Kumar Gala <galak@kernel.crashing.org>
The PPC e5500 is a 64-bit core so we add both a 32 and 64-bit set of
tune files to allow for:
* pure 32-bit build
* pure 64-bit build
* 32-bit base, 64-bit multilib
* 64-bit base, 32-bit multilib
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
meta/conf/machine/include/tune-ppce5500-32b.inc | 15 +++++++++++++++
meta/conf/machine/include/tune-ppce5500-64b.inc | 15 +++++++++++++++
2 files changed, 30 insertions(+), 0 deletions(-)
create mode 100644 meta/conf/machine/include/tune-ppce5500-32b.inc
create mode 100644 meta/conf/machine/include/tune-ppce5500-64b.inc
diff --git a/meta/conf/machine/include/tune-ppce5500-32b.inc b/meta/conf/machine/include/tune-ppce5500-32b.inc
new file mode 100644
index 0000000..7a9e533
--- /dev/null
+++ b/meta/conf/machine/include/tune-ppce5500-32b.inc
@@ -0,0 +1,15 @@
+DEFAULTTUNE ?= "ppce5500"
+
+require conf/machine/include/powerpc/arch-powerpc64.inc
+
+TUNEVALID[ppce5500] = "Enable ppce5500 specific processor optimizations"
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce5500", "-mcpu=e5500", "", d)}"
+TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppce5500", "ppce5500", "${PPCPKGARCH}", d)}"
+
+AVAILTUNES = "ppce5500"
+TUNE_FEATURES_tune-ppce5500 = "m32 ppce5500"
+PACKAGE_EXTRA_ARCHS_tune-ppce5500 = "powerpc ppce5500"
+BASE_LIB_tune-ppce5500 = "lib"
+
+# glibc configure options to get e5500 specific library (for sqrt)
+GLIBC_EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "ppce5500", "--with-cpu=e5500", "", d)}"
diff --git a/meta/conf/machine/include/tune-ppce5500-64b.inc b/meta/conf/machine/include/tune-ppce5500-64b.inc
new file mode 100644
index 0000000..683d25f
--- /dev/null
+++ b/meta/conf/machine/include/tune-ppce5500-64b.inc
@@ -0,0 +1,15 @@
+DEFAULTTUNE ?= "ppc64e5500"
+
+require conf/machine/include/powerpc/arch-powerpc64.inc
+
+TUNEVALID[ppc64e5500] = "Enable ppc64e5500 specific processor optimizations"
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppc64e5500", "-mcpu=e5500", "", d)}"
+TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppc64e5500", "ppc64e5500", "${PPCPKGARCH}", d)}"
+
+AVAILTUNES = "ppc64e5500"
+TUNE_FEATURES_tune-ppc64e5500 = "m64 ppc64e5500"
+PACKAGE_EXTRA_ARCHS_tune-ppc64e5500 = "powerpc64 ppc64e5500"
+BASE_LIB_tune-ppc64e5500 = "lib64"
+
+# glibc configure options to get e5500 specific library (for sqrt)
+GLIBC_EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "ppc64e5500", "--with-cpu=e5500", "", d)}"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [CONSOLIDATED PULL 15/25] package_rpm: Fix attemptonly and suggest packages
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
` (13 preceding siblings ...)
2011-08-12 7:50 ` [CONSOLIDATED PULL 14/25] tune-ppce5500: Add a set of tune files for PowerPC e5500 core Saul Wold
@ 2011-08-12 7:50 ` Saul Wold
2011-08-12 7:50 ` [CONSOLIDATED PULL 16/25] meta-rt: refresh linux-yocto-rt recipe Saul Wold
` (11 subsequent siblings)
26 siblings, 0 replies; 30+ messages in thread
From: Saul Wold @ 2011-08-12 7:50 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
[YOCTO #1325] [YOCTO #1366]
Packages that were in the PACKAGE_ATTEMPTONLY and SUGGESTS were not
being properly found, which was causing image creation failures.
In PACKAGE_ATTEMPTONLY, when an item was not found, it caused an
error. This should have been a note, followed by skipping the
package.
The SUGGESTS processing was simply broken. It was using a
non-existant function, due to an apparently typo.
In addition to the above, the MLPREFIX processing was not being
done properly, preventing multilib packages from working in this
with PACKAGE_ATTEMPTONLY. (SUGGESTS doesn't need this as the names
are munged when creating the packages.)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/classes/package_rpm.bbclass | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 5c67f69..b15786d 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -257,10 +257,16 @@ package_install_internal_rpm () {
echo "Adding attempt only packages..."
for pkg in ${package_attemptonly} ; do
echo "Processing $pkg..."
- pkg_name=$(resolve_package_rpm $pkg ${confbase}.conf)
+ archvar=base_archs
+ ml_pkg=$(echo ${pkg} | sed "s,^${MLPREFIX}\(.*\),\1,")
+ if [ "${ml_pkg}" != "${pkg}" ]; then
+ archvar=ml_archs
+ fi
+
+ pkg_name=$(resolve_package_rpm ${confbase}-${archvar}.conf ${ml_pkg})
if [ -z "$pkg_name" ]; then
- echo "Unable to find package $pkg!"
- exit 1
+ echo "Note: Unable to find package $pkg ($ml_pkg) -- PACKAGE_INSTALL_ATTEMPTONLY"
+ continue
fi
echo "Attempting $pkg_name..." >> "${WORKDIR}/temp/log.do_${task}_attemptonly.${PID}"
${RPM} --predefine "_rpmds_sysinfo_path ${target_rootfs}/etc/rpm/sysinfo" \
@@ -297,8 +303,17 @@ package_install_internal_rpm () {
# Ohh there was a new one, we'll need to loop again...
loop=1
echo "Processing $pkg..."
- pkg_name=$(resolve_package $pkg ${confbase}.conf)
- if [ -z "$pkg_name" ]; then
+ found=0
+ for archvar in base_archs ml_archs ; do
+ pkg_name=$(resolve_package_rpm ${confbase}-${archvar}.conf ${pkg})
+ if [ -n "$pkg_name" ]; then
+ found=1
+ break
+ fi
+ done
+
+ if [ $found -eq 0 ]; then
+ echo "Note: Unable to find package $pkg -- suggests"
echo "Unable to find package $pkg." >> "${WORKDIR}/temp/log.do_${task}_recommend.${PID}"
continue
fi
--
1.7.3.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [CONSOLIDATED PULL 16/25] meta-rt: refresh linux-yocto-rt recipe
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
` (14 preceding siblings ...)
2011-08-12 7:50 ` [CONSOLIDATED PULL 15/25] package_rpm: Fix attemptonly and suggest packages Saul Wold
@ 2011-08-12 7:50 ` Saul Wold
2011-08-12 7:50 ` [CONSOLIDATED PULL 17/25] meta-rt: rt-tests v0.73 instead of AUTOREV Saul Wold
` (10 subsequent siblings)
26 siblings, 0 replies; 30+ messages in thread
From: Saul Wold @ 2011-08-12 7:50 UTC (permalink / raw)
To: openembedded-core
From: Darren Hart <dvhart@linux.intel.com>
Rename the recipe to match the linux-yocto recipe renames using the kernel
version in the PV portion of the filename.
Add the SRCREVs to the recipe as was done with the core linux-yocto recipes.
Add qemux86 as it is also present in the linux-yocto-2.6.34.git repository.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
meta-rt/conf/layer.conf | 6 ------
...to-rt_stablegit.bb => linux-yocto-rt_2.6.34.bb} | 12 +++++++++---
2 files changed, 9 insertions(+), 9 deletions(-)
rename meta-rt/recipes-kernel/{linux-yocto-rt_stablegit.bb => linux-yocto-rt_2.6.34.bb} (65%)
diff --git a/meta-rt/conf/layer.conf b/meta-rt/conf/layer.conf
index 94ebc02..f105405 100644
--- a/meta-rt/conf/layer.conf
+++ b/meta-rt/conf/layer.conf
@@ -15,9 +15,3 @@ BBFILE_PRIORITY_rt = "8"
# specified kernel providers and leave it up to the kernel recipe to
# determine COMPATIBLE_MACHINE.
PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-rt"
-
-# preempt_rt SRCREVs, one for meta, one per machine
-SRCREV_meta_pn-linux-yocto-rt ?= "b0615811ce38836d1ade230e3bdb1efaaa68471f"
-SRCREV_machine_pn-linux-yocto-rt_qemux86-64 ?= "f49444f06875894389e640bcda6c3f6ceb1f0c3e"
-SRCREV_machine_pn-linux-yocto-rt_atom-pc ?= "78dacaf8222c9492ba17f652989ef3466423bdc2"
-
diff --git a/meta-rt/recipes-kernel/linux-yocto-rt_stablegit.bb b/meta-rt/recipes-kernel/linux-yocto-rt_2.6.34.bb
similarity index 65%
rename from meta-rt/recipes-kernel/linux-yocto-rt_stablegit.bb
rename to meta-rt/recipes-kernel/linux-yocto-rt_2.6.34.bb
index cba1321..01a6761 100644
--- a/meta-rt/recipes-kernel/linux-yocto-rt_stablegit.bb
+++ b/meta-rt/recipes-kernel/linux-yocto-rt_2.6.34.bb
@@ -1,6 +1,7 @@
inherit kernel
require recipes-kernel/linux/linux-yocto.inc
+KMACHINE_qemux86 = "common_pc"
KMACHINE_qemux86-64 = "common_pc_64"
KMACHINE_atom-pc = "atom-pc"
@@ -11,11 +12,16 @@ LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE_EXTENSION}"
KMETA = wrs_meta
KBRANCH = ${KMACHINE}-${LINUX_KERNEL_TYPE}
-PR = "r1"
+SRCREV_machine_qemux86 = "439602eb6acd53d9beb8493710310214fc7bd749"
+SRCREV_machine_qemux86-64 = "3c84c45ad3c3592f9c7ff4076de9bee417cd322e"
+SRCREV_machine_atom-pc = "269d71029adcf4d1dbf8441f091d824478d8c87d"
+SRCREV_meta = "e1f85a470934a0cf6abde5d95533e74501822c6b"
+
+PR = "r2"
PV = "${LINUX_VERSION}+git${SRCPV}"
SRCREV_FORMAT = "meta_machine"
-COMPATIBLE_MACHINE = "(qemux86-64|atom-pc)"
+COMPATIBLE_MACHINE = "(qemux86|qemux86-64|atom-pc)"
# this performs a fixup on the SRCREV for new/undefined BSPs
python __anonymous () {
@@ -25,7 +31,7 @@ python __anonymous () {
bb.data.setVar("LINUX_KERNEL_TYPE_EXTENSION", kerntype, d)
}
-SRC_URI = "git://git.yoctoproject.org/linux-2.6-windriver.git;protocol=git;nocheckout=1;branch=${KBRANCH},wrs_meta;name=machine,meta"
+SRC_URI = "git://git.yoctoproject.org/linux-yocto-2.6.34.git;protocol=git;nocheckout=1;branch=${KBRANCH},wrs_meta;name=machine,meta"
# Functionality flags
KERNEL_REVISION_CHECKING ?= "t"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [CONSOLIDATED PULL 17/25] meta-rt: rt-tests v0.73 instead of AUTOREV
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
` (15 preceding siblings ...)
2011-08-12 7:50 ` [CONSOLIDATED PULL 16/25] meta-rt: refresh linux-yocto-rt recipe Saul Wold
@ 2011-08-12 7:50 ` Saul Wold
2011-08-12 16:09 ` Richard Purdie
2011-08-12 7:50 ` [CONSOLIDATED PULL 18/25] meta-rt: canonicalize directory structure Saul Wold
` (9 subsequent siblings)
26 siblings, 1 reply; 30+ messages in thread
From: Saul Wold @ 2011-08-12 7:50 UTC (permalink / raw)
To: openembedded-core
From: Darren Hart <dvhart@linux.intel.com>
AUTOREV is handy is a development aid, but it really shouldn't be used as a
default as it breaks the consistency and repeatability of a build. It also
causes additional fetches which may not be desired or expected.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
.../{rt-tests_git.bb => rt-tests_0.73.bb} | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
rename meta-rt/recipes-tests/{rt-tests_git.bb => rt-tests_0.73.bb} (97%)
diff --git a/meta-rt/recipes-tests/rt-tests_git.bb b/meta-rt/recipes-tests/rt-tests_0.73.bb
similarity index 97%
rename from meta-rt/recipes-tests/rt-tests_git.bb
rename to meta-rt/recipes-tests/rt-tests_0.73.bb
index 35af022..6334bcd 100644
--- a/meta-rt/recipes-tests/rt-tests_git.bb
+++ b/meta-rt/recipes-tests/rt-tests_0.73.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2 & GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://src/cyclictest/cyclictest.c;beginline=7;endline=9;md5=ce162fe491d19d2ec67dff6dbc938d50 \
file://src/pi_tests/pi_stress.c;beginline=6;endline=19;md5=bd426a634a43ec612e9fbf125dfcc949"
-SRCREV = ${AUTOREV}
+SRCREV = v0.73
PV = "git${SRCPV}"
PR = "r0"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [CONSOLIDATED PULL 17/25] meta-rt: rt-tests v0.73 instead of AUTOREV
2011-08-12 7:50 ` [CONSOLIDATED PULL 17/25] meta-rt: rt-tests v0.73 instead of AUTOREV Saul Wold
@ 2011-08-12 16:09 ` Richard Purdie
2011-08-12 16:30 ` Darren Hart
0 siblings, 1 reply; 30+ messages in thread
From: Richard Purdie @ 2011-08-12 16:09 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2011-08-12 at 00:50 -0700, Saul Wold wrote:
> From: Darren Hart <dvhart@linux.intel.com>
>
> AUTOREV is handy is a development aid, but it really shouldn't be used as a
> default as it breaks the consistency and repeatability of a build. It also
> causes additional fetches which may not be desired or expected.
>
> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
> ---
> .../{rt-tests_git.bb => rt-tests_0.73.bb} | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
> rename meta-rt/recipes-tests/{rt-tests_git.bb => rt-tests_0.73.bb} (97%)
>
> diff --git a/meta-rt/recipes-tests/rt-tests_git.bb b/meta-rt/recipes-tests/rt-tests_0.73.bb
> similarity index 97%
> rename from meta-rt/recipes-tests/rt-tests_git.bb
> rename to meta-rt/recipes-tests/rt-tests_0.73.bb
> index 35af022..6334bcd 100644
> --- a/meta-rt/recipes-tests/rt-tests_git.bb
> +++ b/meta-rt/recipes-tests/rt-tests_0.73.bb
> @@ -6,7 +6,7 @@ LICENSE = "GPLv2 & GPLv2+"
> LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
> file://src/cyclictest/cyclictest.c;beginline=7;endline=9;md5=ce162fe491d19d2ec67dff6dbc938d50 \
> file://src/pi_tests/pi_stress.c;beginline=6;endline=19;md5=bd426a634a43ec612e9fbf125dfcc949"
> -SRCREV = ${AUTOREV}
> +SRCREV = v0.73
> PV = "git${SRCPV}"
> PR = "r0"
Sorry, but this is nearly as bad as the system has to hit the network to
resolve "v0.73" into a revision. Please can you do something like:
# This revision is v0.73
SRCREV = "xxx"
which I appreciate is ugly but there is no nice way to do this (and
support offline builds).
Cheers,
Richard
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [CONSOLIDATED PULL 17/25] meta-rt: rt-tests v0.73 instead of AUTOREV
2011-08-12 16:09 ` Richard Purdie
@ 2011-08-12 16:30 ` Darren Hart
0 siblings, 0 replies; 30+ messages in thread
From: Darren Hart @ 2011-08-12 16:30 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 08/12/2011 09:09 AM, Richard Purdie wrote:
> On Fri, 2011-08-12 at 00:50 -0700, Saul Wold wrote:
>> From: Darren Hart <dvhart@linux.intel.com>
>>
>> AUTOREV is handy is a development aid, but it really shouldn't be used as a
>> default as it breaks the consistency and repeatability of a build. It also
>> causes additional fetches which may not be desired or expected.
>>
>> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
>> ---
>> .../{rt-tests_git.bb => rt-tests_0.73.bb} | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>> rename meta-rt/recipes-tests/{rt-tests_git.bb => rt-tests_0.73.bb} (97%)
>>
>> diff --git a/meta-rt/recipes-tests/rt-tests_git.bb b/meta-rt/recipes-tests/rt-tests_0.73.bb
>> similarity index 97%
>> rename from meta-rt/recipes-tests/rt-tests_git.bb
>> rename to meta-rt/recipes-tests/rt-tests_0.73.bb
>> index 35af022..6334bcd 100644
>> --- a/meta-rt/recipes-tests/rt-tests_git.bb
>> +++ b/meta-rt/recipes-tests/rt-tests_0.73.bb
>> @@ -6,7 +6,7 @@ LICENSE = "GPLv2 & GPLv2+"
>> LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
>> file://src/cyclictest/cyclictest.c;beginline=7;endline=9;md5=ce162fe491d19d2ec67dff6dbc938d50 \
>> file://src/pi_tests/pi_stress.c;beginline=6;endline=19;md5=bd426a634a43ec612e9fbf125dfcc949"
>> -SRCREV = ${AUTOREV}
>> +SRCREV = v0.73
>> PV = "git${SRCPV}"
>> PR = "r0"
>
> Sorry, but this is nearly as bad as the system has to hit the network to
> resolve "v0.73" into a revision. Please can you do something like:
Duh. Apologies. I'll spin up a fix immediately.
--
Darren
>
> # This revision is v0.73
> SRCREV = "xxx"
>
> which I appreciate is ugly but there is no nice way to do this (and
> support offline builds).
>
> Cheers,
>
> Richard
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
^ permalink raw reply [flat|nested] 30+ messages in thread
* [CONSOLIDATED PULL 18/25] meta-rt: canonicalize directory structure
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
` (16 preceding siblings ...)
2011-08-12 7:50 ` [CONSOLIDATED PULL 17/25] meta-rt: rt-tests v0.73 instead of AUTOREV Saul Wold
@ 2011-08-12 7:50 ` Saul Wold
2011-08-12 7:50 ` [CONSOLIDATED PULL 19/25] meta-rt: add linux-yocto-rt_3.0 recipe Saul Wold
` (8 subsequent siblings)
26 siblings, 0 replies; 30+ messages in thread
From: Saul Wold @ 2011-08-12 7:50 UTC (permalink / raw)
To: openembedded-core
From: Darren Hart <dvhart@linux.intel.com>
Use the more standard recipes-*/*/*.bb layout.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
meta-rt/conf/layer.conf | 5 +++--
.../{ => linux}/linux-yocto-rt_2.6.34.bb | 0
.../recipes-tests/{ => rt-tests}/rt-tests_0.73.bb | 0
3 files changed, 3 insertions(+), 2 deletions(-)
rename meta-rt/recipes-kernel/{ => linux}/linux-yocto-rt_2.6.34.bb (100%)
rename meta-rt/recipes-tests/{ => rt-tests}/rt-tests_0.73.bb (100%)
diff --git a/meta-rt/conf/layer.conf b/meta-rt/conf/layer.conf
index f105405..59f42b6 100644
--- a/meta-rt/conf/layer.conf
+++ b/meta-rt/conf/layer.conf
@@ -5,8 +5,9 @@ RSP_ROOT ?= "sda1"
BBPATH := "${BBPATH}:${LAYERDIR}"
# We have an images and various recipe-* directories, add to BBFILES
-BBFILES := "${BBFILES} ${LAYERDIR}/images/*.bb ${LAYERDIR}/images/*.bbappend ${LAYERDIR}/recipes-*/*.bb ${LAYERDIR}/recipes-*/*.bbappend"
-
+BBFILES := "${BBFILES} ${LAYERDIR}/images/*.bb ${LAYERDIR}/images/*.bbappend \
+ ${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
+
BBFILE_COLLECTIONS += "rt"
BBFILE_PATTERN_rt := "^${LAYERDIR}/"
BBFILE_PRIORITY_rt = "8"
diff --git a/meta-rt/recipes-kernel/linux-yocto-rt_2.6.34.bb b/meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
similarity index 100%
rename from meta-rt/recipes-kernel/linux-yocto-rt_2.6.34.bb
rename to meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
diff --git a/meta-rt/recipes-tests/rt-tests_0.73.bb b/meta-rt/recipes-tests/rt-tests/rt-tests_0.73.bb
similarity index 100%
rename from meta-rt/recipes-tests/rt-tests_0.73.bb
rename to meta-rt/recipes-tests/rt-tests/rt-tests_0.73.bb
--
1.7.3.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [CONSOLIDATED PULL 19/25] meta-rt: add linux-yocto-rt_3.0 recipe
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
` (17 preceding siblings ...)
2011-08-12 7:50 ` [CONSOLIDATED PULL 18/25] meta-rt: canonicalize directory structure Saul Wold
@ 2011-08-12 7:50 ` Saul Wold
2011-08-12 7:50 ` [CONSOLIDATED PULL 20/25] meta-rt: remove atom-pc support from the main layer Saul Wold
` (7 subsequent siblings)
26 siblings, 0 replies; 30+ messages in thread
From: Saul Wold @ 2011-08-12 7:50 UTC (permalink / raw)
To: openembedded-core
From: Darren Hart <dvhart@linux.intel.com>
Add the initial linux-yocto-rt_3.0 recipe.
qemumips and qemuppc doesn't work quite yet, so they have been omitted from
COMPATIBLE_MACHINE.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 46 ++++++++++++++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
create mode 100644 meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
diff --git a/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
new file mode 100644
index 0000000..c8a175d
--- /dev/null
+++ b/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -0,0 +1,46 @@
+inherit kernel
+require recipes-kernel/linux/linux-yocto.inc
+
+KMACHINE = "common-pc"
+KMACHINE_qemux86 = "common-pc"
+KMACHINE_qemux86-64 = "common-pc-64"
+KMACHINE_qemuarm = "arm-versatile-926ejs"
+KMACHINE_qemuppc = "qemu-ppc32"
+KMACHINE_qemumips = "mti-malta32-be"
+
+KBRANCH = "yocto/standard/preempt-rt/base"
+KMETA = meta
+
+LINUX_VERSION ?= "3.0"
+LINUX_KERNEL_TYPE = "preempt-rt"
+LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
+
+SRCREV_machine = "7e1e5b6c8a13c615feb0d7b6d37988a094aae98f"
+SRCREV_meta = "7782fc673afd6a1c742409896ae787560d96fce8"
+
+PR = "r0"
+PV = "${LINUX_VERSION}+git${SRCPV}"
+SRCREV_FORMAT = "meta_machine"
+
+SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
+
+# Omit broken machines from COMPATIBLE_MACHINE
+# qemuppc hangs at boot
+# qemumips panics at boot
+COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm)"
+
+# Functionality flags
+KERNEL_REVISION_CHECKING ?= "t"
+KERNEL_FEATURES=features/netfilter
+KERNEL_FEATURES_append=" features/taskstats"
+KERNEL_FEATURES_append_qemux86=" cfg/sound"
+KERNEL_FEATURES_append_qemux86-64=" cfg/sound"
+
+YOCTO_KERNEL_META_DATA=t
+
+# extra tasks
+addtask kernel_link_vmlinux after do_compile before do_install
+addtask validate_branches before do_patch after do_kernel_checkout
+addtask kernel_configcheck after do_configure before do_compile
+
+require recipes-kernel/linux/linux-tools.inc
--
1.7.3.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [CONSOLIDATED PULL 20/25] meta-rt: remove atom-pc support from the main layer
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
` (18 preceding siblings ...)
2011-08-12 7:50 ` [CONSOLIDATED PULL 19/25] meta-rt: add linux-yocto-rt_3.0 recipe Saul Wold
@ 2011-08-12 7:50 ` Saul Wold
2011-08-12 7:50 ` [CONSOLIDATED PULL 21/25] meta-rt: rename minimal-rt images to -rt, drop live image Saul Wold
` (6 subsequent siblings)
26 siblings, 0 replies; 30+ messages in thread
From: Saul Wold @ 2011-08-12 7:50 UTC (permalink / raw)
To: openembedded-core
From: Darren Hart <dvhart@linux.intel.com>
meta-rt resides in oe-core, as such it should only support the
qemu* machines. BSP layers should add support for specific
hardware platforms.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
.../recipes-kernel/linux/linux-yocto-rt_2.6.34.bb | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb b/meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
index 01a6761..d58b86b 100644
--- a/meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
+++ b/meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
@@ -3,7 +3,6 @@ require recipes-kernel/linux/linux-yocto.inc
KMACHINE_qemux86 = "common_pc"
KMACHINE_qemux86-64 = "common_pc_64"
-KMACHINE_atom-pc = "atom-pc"
LINUX_VERSION ?= "2.6.34"
LINUX_KERNEL_TYPE = "preempt_rt"
@@ -14,14 +13,13 @@ KBRANCH = ${KMACHINE}-${LINUX_KERNEL_TYPE}
SRCREV_machine_qemux86 = "439602eb6acd53d9beb8493710310214fc7bd749"
SRCREV_machine_qemux86-64 = "3c84c45ad3c3592f9c7ff4076de9bee417cd322e"
-SRCREV_machine_atom-pc = "269d71029adcf4d1dbf8441f091d824478d8c87d"
SRCREV_meta = "e1f85a470934a0cf6abde5d95533e74501822c6b"
PR = "r2"
PV = "${LINUX_VERSION}+git${SRCPV}"
SRCREV_FORMAT = "meta_machine"
-COMPATIBLE_MACHINE = "(qemux86|qemux86-64|atom-pc)"
+COMPATIBLE_MACHINE = "(qemux86|qemux86-64)"
# this performs a fixup on the SRCREV for new/undefined BSPs
python __anonymous () {
--
1.7.3.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [CONSOLIDATED PULL 21/25] meta-rt: rename minimal-rt images to -rt, drop live image
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
` (19 preceding siblings ...)
2011-08-12 7:50 ` [CONSOLIDATED PULL 20/25] meta-rt: remove atom-pc support from the main layer Saul Wold
@ 2011-08-12 7:50 ` Saul Wold
2011-08-12 7:50 ` [CONSOLIDATED PULL 22/25] meta-rt: add an -rt-sdk image Saul Wold
` (5 subsequent siblings)
26 siblings, 0 replies; 30+ messages in thread
From: Saul Wold @ 2011-08-12 7:50 UTC (permalink / raw)
To: openembedded-core
From: Darren Hart <dvhart@linux.intel.com>
Remove "minimal" from the image recipe names for -rt. Additional recipes types
will be added (-rt-sdk for example) and there is no need to keep so many image
type descriptors.
Drop the -live image as it is now obsolete.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
.../{core-image-minimal-rt.bb => core-image-rt.bb} | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
rename meta-rt/images/{core-image-minimal-rt.bb => core-image-rt.bb} (78%)
diff --git a/meta-rt/images/core-image-minimal-rt.bb b/meta-rt/images/core-image-rt.bb
similarity index 78%
rename from meta-rt/images/core-image-minimal-rt.bb
rename to meta-rt/images/core-image-rt.bb
index 32a9b92..e11f159 100644
--- a/meta-rt/images/core-image-minimal-rt.bb
+++ b/meta-rt/images/core-image-rt.bb
@@ -2,7 +2,7 @@
# Copyright (C) 2010 Intel Corporation.
#
-DESCRIPTION = "Minimal Real-Time Linux Image"
+DESCRIPTION = "Real-Time Linux Image"
DEPENDS = "linux-yocto-rt"
require recipes-core/images/core-image-minimal.bb
--
1.7.3.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [CONSOLIDATED PULL 22/25] meta-rt: add an -rt-sdk image
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
` (20 preceding siblings ...)
2011-08-12 7:50 ` [CONSOLIDATED PULL 21/25] meta-rt: rename minimal-rt images to -rt, drop live image Saul Wold
@ 2011-08-12 7:50 ` Saul Wold
2011-08-12 7:50 ` [CONSOLIDATED PULL 23/25] meta-rt: default KMACHINE and SRCREV_machine to avoid parsing errors Saul Wold
` (4 subsequent siblings)
26 siblings, 0 replies; 30+ messages in thread
From: Saul Wold @ 2011-08-12 7:50 UTC (permalink / raw)
To: openembedded-core
From: Darren Hart <dvhart@linux.intel.com>
Add images including the SDK without the addition of the grapical environment or
packages.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
meta-rt/images/core-image-rt-sdk.bb | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
create mode 100644 meta-rt/images/core-image-rt-sdk.bb
diff --git a/meta-rt/images/core-image-rt-sdk.bb b/meta-rt/images/core-image-rt-sdk.bb
new file mode 100644
index 0000000..6e98343
--- /dev/null
+++ b/meta-rt/images/core-image-rt-sdk.bb
@@ -0,0 +1,15 @@
+#
+# Copyright (C) 2011 Intel Corporation.
+#
+
+DESCRIPTION = "Real-Time Linux Image with SDK support"
+DEPENDS = "linux-yocto-rt"
+
+require recipes-core/images/core-image-minimal.bb
+
+IMAGE_FEATURES += "dev-pkgs tools-sdk"
+EXTRA_IMAGE_FEATURES += "tools-debug tools-profile tools-testapps debug-tweaks"
+
+IMAGE_INSTALL += "rt-tests"
+
+LICENSE = "MIT"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [CONSOLIDATED PULL 23/25] meta-rt: default KMACHINE and SRCREV_machine to avoid parsing errors
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
` (21 preceding siblings ...)
2011-08-12 7:50 ` [CONSOLIDATED PULL 22/25] meta-rt: add an -rt-sdk image Saul Wold
@ 2011-08-12 7:50 ` Saul Wold
2011-08-12 7:50 ` [CONSOLIDATED PULL 24/25] Move meta-rt recipes to oe-core (meta) Saul Wold
` (3 subsequent siblings)
26 siblings, 0 replies; 30+ messages in thread
From: Saul Wold @ 2011-08-12 7:50 UTC (permalink / raw)
To: openembedded-core
From: Darren Hart <dvhart@linux.intel.com>
Without a default KMACHINE and SRCREV_machine the git URL will fail to
expand to something usable and we get a parsing error. This approach was
also used in the non-rt version of this recipe.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
.../recipes-kernel/linux/linux-yocto-rt_2.6.34.bb | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb b/meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
index d58b86b..0ca53ae 100644
--- a/meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
+++ b/meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
@@ -1,6 +1,7 @@
inherit kernel
require recipes-kernel/linux/linux-yocto.inc
+KMACHINE = "common-pc"
KMACHINE_qemux86 = "common_pc"
KMACHINE_qemux86-64 = "common_pc_64"
@@ -13,6 +14,7 @@ KBRANCH = ${KMACHINE}-${LINUX_KERNEL_TYPE}
SRCREV_machine_qemux86 = "439602eb6acd53d9beb8493710310214fc7bd749"
SRCREV_machine_qemux86-64 = "3c84c45ad3c3592f9c7ff4076de9bee417cd322e"
+SRCREV_machine = "439602eb6acd53d9beb8493710310214fc7bd749"
SRCREV_meta = "e1f85a470934a0cf6abde5d95533e74501822c6b"
PR = "r2"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [CONSOLIDATED PULL 24/25] Move meta-rt recipes to oe-core (meta)
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
` (22 preceding siblings ...)
2011-08-12 7:50 ` [CONSOLIDATED PULL 23/25] meta-rt: default KMACHINE and SRCREV_machine to avoid parsing errors Saul Wold
@ 2011-08-12 7:50 ` Saul Wold
2011-08-12 7:50 ` [CONSOLIDATED PULL 25/25] recipes-rt: add a README documenting the contents of recipes-rt Saul Wold
` (2 subsequent siblings)
26 siblings, 0 replies; 30+ messages in thread
From: Saul Wold @ 2011-08-12 7:50 UTC (permalink / raw)
To: openembedded-core
From: Darren Hart <dvhart@linux.intel.com>
Keeping the rt recipes in their own layer has led to maintenance issues,
particularly with the linux-yocto-rt recipes. As these kernel types are part of
the same linux-yocto source repository, it seems reasonable to include the rt
kernel recipes alongside the standard recipes. A new recipes-rt directory for
the other recipes provides adequate separation and eliminates the need for a
separate layer.
As there is no meta-rt/conf/layer.conf to force the kernel, users must now
specify the rt kernel in their local.conf or in the machine.conf:
PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-rt"
The merging of the rt recipes into the core also eliminates complications with
multiple layer dependencies for new BSP layers. Having to either separate RT
BSPs from standard BSPs or force users to add meta-rt to bblayers even when not
building an RT BSP (because the RT BSPs in the same layer would fail to parse
without it) was sub-optimal at best.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
meta-rt/conf/layer.conf | 18 ------------------
.../recipes-kernel/linux/linux-yocto-rt_2.6.34.bb | 0
.../recipes-kernel/linux/linux-yocto-rt_3.0.bb | 0
.../recipes-rt}/images/core-image-rt-sdk.bb | 0
.../recipes-rt}/images/core-image-rt.bb | 0
.../recipes-rt}/rt-tests/rt-tests_0.73.bb | 0
6 files changed, 0 insertions(+), 18 deletions(-)
delete mode 100644 meta-rt/conf/layer.conf
rename {meta-rt => meta}/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb (100%)
rename {meta-rt => meta}/recipes-kernel/linux/linux-yocto-rt_3.0.bb (100%)
rename {meta-rt => meta/recipes-rt}/images/core-image-rt-sdk.bb (100%)
rename {meta-rt => meta/recipes-rt}/images/core-image-rt.bb (100%)
rename {meta-rt/recipes-tests => meta/recipes-rt}/rt-tests/rt-tests_0.73.bb (100%)
diff --git a/meta-rt/conf/layer.conf b/meta-rt/conf/layer.conf
deleted file mode 100644
index 59f42b6..0000000
--- a/meta-rt/conf/layer.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Default to first disk/first partition
-RSP_ROOT ?= "sda1"
-
-# We have a conf and classes directory, add to BBPATH
-BBPATH := "${BBPATH}:${LAYERDIR}"
-
-# We have an images and various recipe-* directories, add to BBFILES
-BBFILES := "${BBFILES} ${LAYERDIR}/images/*.bb ${LAYERDIR}/images/*.bbappend \
- ${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "rt"
-BBFILE_PATTERN_rt := "^${LAYERDIR}/"
-BBFILE_PRIORITY_rt = "8"
-
-# This layer builds images using a PREEMPT_RT kernel. Override any machine
-# specified kernel providers and leave it up to the kernel recipe to
-# determine COMPATIBLE_MACHINE.
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-rt"
diff --git a/meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb b/meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
similarity index 100%
rename from meta-rt/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
rename to meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
diff --git a/meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
similarity index 100%
rename from meta-rt/recipes-kernel/linux/linux-yocto-rt_3.0.bb
rename to meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
diff --git a/meta-rt/images/core-image-rt-sdk.bb b/meta/recipes-rt/images/core-image-rt-sdk.bb
similarity index 100%
rename from meta-rt/images/core-image-rt-sdk.bb
rename to meta/recipes-rt/images/core-image-rt-sdk.bb
diff --git a/meta-rt/images/core-image-rt.bb b/meta/recipes-rt/images/core-image-rt.bb
similarity index 100%
rename from meta-rt/images/core-image-rt.bb
rename to meta/recipes-rt/images/core-image-rt.bb
diff --git a/meta-rt/recipes-tests/rt-tests/rt-tests_0.73.bb b/meta/recipes-rt/rt-tests/rt-tests_0.73.bb
similarity index 100%
rename from meta-rt/recipes-tests/rt-tests/rt-tests_0.73.bb
rename to meta/recipes-rt/rt-tests/rt-tests_0.73.bb
--
1.7.3.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [CONSOLIDATED PULL 25/25] recipes-rt: add a README documenting the contents of recipes-rt
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
` (23 preceding siblings ...)
2011-08-12 7:50 ` [CONSOLIDATED PULL 24/25] Move meta-rt recipes to oe-core (meta) Saul Wold
@ 2011-08-12 7:50 ` Saul Wold
2011-08-12 15:21 ` [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Kumar Gala
2011-08-12 16:26 ` Richard Purdie
26 siblings, 0 replies; 30+ messages in thread
From: Saul Wold @ 2011-08-12 7:50 UTC (permalink / raw)
To: openembedded-core
From: Darren Hart <dvhart@linux.intel.com>
Document the non-obvious bits of using the recipes-rt recipes.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
meta/recipes-rt/README | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-rt/README
diff --git a/meta/recipes-rt/README b/meta/recipes-rt/README
new file mode 100644
index 0000000..7d7558d
--- /dev/null
+++ b/meta/recipes-rt/README
@@ -0,0 +1,13 @@
+The recipes-rt recipes provide package and image recipes for using and testing
+the PREEMPT_RT kernel. The core-image-rt*.bb images are minimal images with
+a couple extra packages, including rt-tests. In order to build the image with
+the linux-yocto-rt kernel, be sure to include the following line in your
+local.conf, bblayers.conf, or your $MACHINE.conf.
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-rt"
+
+If you are creating a new BSP which should use linux-yocto-rt by default,
+use the line above in the $MACHINE.conf in your BSP layer, and specify the
+following in a linux-yocto-rt bbappend recipe:
+
+COMPATIBLE_MACHINE_$MACHINE = $MACHINE
--
1.7.3.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
` (24 preceding siblings ...)
2011-08-12 7:50 ` [CONSOLIDATED PULL 25/25] recipes-rt: add a README documenting the contents of recipes-rt Saul Wold
@ 2011-08-12 15:21 ` Kumar Gala
2011-08-12 16:26 ` Richard Purdie
26 siblings, 0 replies; 30+ messages in thread
From: Kumar Gala @ 2011-08-12 15:21 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
On Aug 12, 2011, at 2:49 AM, Saul Wold wrote:
> Richard,
>
> This set of changes fixes some current master build failures for
> RPM rootfs (from Mark) and has the Realtime update from Darren and
> Bruce.
>
> In addition there are some updates from Chris Larson and Kumar cleaning
> up various tune and multi-lib issues.
>
> They past my review and initial testing.
>
> Sau!
>
> The following changes since commit a92d56058b21913570bb17ae416c3b00afce055e:
>
> gnome-doc-utils: respect python-dir setting EXTRA_OECONF (2011-08-11 19:13:38 +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
>
> Bruce Ashfield (1):
> linux-yocto: update SRCREVs for preempt-rt support + build fixes
>
> Chris Larson (7):
> busybox: don't strip the main binary
> insane: add linux-gnu to the platform data
> nativesdk: inherit relocatable
> sanity: shift the required utils into a variable
> package: include SECTION in the pkgdata
> package: allow setting a section for locale packages
> cross: also empty PACKAGES_DYNAMIC
>
> Darren Hart (10):
> meta-rt: refresh linux-yocto-rt recipe
> meta-rt: rt-tests v0.73 instead of AUTOREV
> meta-rt: canonicalize directory structure
> meta-rt: add linux-yocto-rt_3.0 recipe
> meta-rt: remove atom-pc support from the main layer
> meta-rt: rename minimal-rt images to -rt, drop live image
> meta-rt: add an -rt-sdk image
> meta-rt: default KMACHINE and SRCREV_machine to avoid parsing errors
> Move meta-rt recipes to oe-core (meta)
> recipes-rt: add a README documenting the contents of recipes-rt
>
> Kumar Gala (3):
> automake: Update for python.m4 to respect libdir
> xcb-proto: update based on changes to python.m4 in automake
> tune-ppce5500: Add a set of tune files for PowerPC e5500 core
Mind pickup up:
tune-ppc: Update to pass glibc configure option to get cpu specific support
(hopefully v4 applies)
- k
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes
2011-08-12 7:49 [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Saul Wold
` (25 preceding siblings ...)
2011-08-12 15:21 ` [CONSOLIDATED PULL 00/25] Meta-RT reorg and other fixes Kumar Gala
@ 2011-08-12 16:26 ` Richard Purdie
26 siblings, 0 replies; 30+ messages in thread
From: Richard Purdie @ 2011-08-12 16:26 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: dvhart@linux.intel.com
On Fri, 2011-08-12 at 00:49 -0700, Saul Wold wrote:
> Richard,
>
> This set of changes fixes some current master build failures for
> RPM rootfs (from Mark) and has the Realtime update from Darren and
> Bruce.
>
> In addition there are some updates from Chris Larson and Kumar cleaning
> up various tune and multi-lib issues.
>
> They past my review and initial testing.
>
> Sau!
>
> The following changes since commit a92d56058b21913570bb17ae416c3b00afce055e:
>
> gnome-doc-utils: respect python-dir setting EXTRA_OECONF (2011-08-11 19:13:38 +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
>
> Bruce Ashfield (1):
> linux-yocto: update SRCREVs for preempt-rt support + build fixes
>
> Chris Larson (7):
> busybox: don't strip the main binary
> insane: add linux-gnu to the platform data
> nativesdk: inherit relocatable
> sanity: shift the required utils into a variable
> package: include SECTION in the pkgdata
> package: allow setting a section for locale packages
> cross: also empty PACKAGES_DYNAMIC
>
> Darren Hart (10):
> meta-rt: refresh linux-yocto-rt recipe
> meta-rt: rt-tests v0.73 instead of AUTOREV
> meta-rt: canonicalize directory structure
> meta-rt: add linux-yocto-rt_3.0 recipe
> meta-rt: remove atom-pc support from the main layer
> meta-rt: rename minimal-rt images to -rt, drop live image
> meta-rt: add an -rt-sdk image
> meta-rt: default KMACHINE and SRCREV_machine to avoid parsing errors
> Move meta-rt recipes to oe-core (meta)
> recipes-rt: add a README documenting the contents of recipes-rt
>
> Kumar Gala (3):
> automake: Update for python.m4 to respect libdir
> xcb-proto: update based on changes to python.m4 in automake
> tune-ppce5500: Add a set of tune files for PowerPC e5500 core
>
> Mark Hatle (3):
> rpm: Fix the canonical arch --target processing and cleanup
> package_rpm.bbclass: Update the platform config and --target
> package_rpm: Fix attemptonly and suggest packages
>
> Mei Lei (1):
> init-install.sh: Fix make partition and make file system issues
Merged to master in full but Darren needs to sort out the rt-tests v0.73
business ASAP as per my email now its being enabled by default.
I merged rather than waiting as there were other patches depending on
that change and it seemed a shame to reject half the patch series on
that minor detail.
Cheers,
Richard
^ permalink raw reply [flat|nested] 30+ messages in thread