denzil pull request1
cover denzil pull request1
Hello,
This is my first pull request for denzil since the 1.2.1 release was made.
It has been run through the autobuilder, which is having some issues with running sanity tests and buildhistory, so if the build succeeded for everything except for those steps, I note it as "Green with known AB issues" below.
Autobuilder Test Report: sgarman/denzil-next-pull1
eclipse-plugin: Green
http://autobuilder.yoctoproject.org:8010/builders/eclipse-plugin/builds/491
nightly-x86: Green with known AB issues
http://autobuilder.yoctoproject.org:8010/builders/nightly-x86/builds/633
nightly-x86-64: Green with known AB issues
http://autobuilder.yoctoproject.org:8010/builders/nightly-x86-64/builds/572
nightly-arm: Red: see below
http://autobuilder.yoctoproject.org:8010/builders/nightly-arm/builds/571
connman-gnome do_configure failed
configure: error: dbus-glib > = 0.73 is required
nightly-mips: Green with known AB issues
http://autobuilder.yoctoproject.org:8010/builders/nightly-mips
nightly-ppc: Green with known AB issues
http://autobuilder.yoctoproject.org:8010/builders/nightly-ppc/builds/527
nightly-world: Green
http://autobuilder.yoctoproject.org:8010/builders/nightly-world/builds/221
nightly-non-gpl3: Green
http://autobuilder.yoctoproject.org:8010/builders/nightly-non-gpl3/builds/204
nightly-multilib: Green
http://autobuilder.yoctoproject.org:8010/builders/nightly-multilib/builds/205
nightly-tiny: Green
http://autobuilder.yoctoproject.org:8010/builders/nightly-tiny/builds/185
Scott
The following changes since commit 73cdebf60df225ee10f2eb215935be3b61e1b831:
documentation/dev-manual/dev-manual-kernel-appendix.xml: Add note about conflict (2012-06-29 15:54:26 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib sgarman/denzil-next-pull1
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgarman/denzil-next-pull1
Enrico Scholz (1):
libtool: fixed parallel build related race
Khem Raj (1):
xserver-xorg: Fix build on powerpc
Martin Donnelly (1):
augeas: Add libxml2 dependency
Matthew McClintock (13):
bitbake/fetch2: remove references to ChecksumError class libxml-parser-perl_2.41.bb: fix MakeMaker issues with using wrong
CC/LD/etc
qemu-0.15.1: add patch to fix compilatation problems on powerpc packagedata.py: Fix get_subpkgedata_fn for multilib dtc.inc: fix for libdir == /usr/lib64 openjade-native_1.3.2.bb: fix typo and change the deps exclusion to
correct var
gcc-configure-common.inc: use --with-long-double-128 on powerpc to
comply with ABI
gcc: gcc-cross-canadian: use correct location for libraries for
powerpc64
libgomp: add libgomp (openmp) library, and build for powerpc targets
by default
sysvinit-inittab_2.88dsf.bb: Allow multiple serial port consoles to
be defined
gcc-package-runtime.inc: Fix QA warning task-core-tools-testapps.bb: kexec-tools does not work on e5500-64b
parts
u-boot.inc: update linker arguments to pass --sysroot arg
Nitin A Kamble (1):
tcl: fix target recipe build issue on older distros
Otavio Salvador (2):
shadow-native: use 'users' group by default
shadow: use 'users' group by default
Paul Eggleton (5):
classes/rootfs_*: fix splitting package dependency strings
buildhistory_analysis: fix error when version specifier missing scripts/buildhistory-diff: add GitPython version check classes/license: fix manifest to work with deb
cooker: fix UnboundLocalError when exception occurs during parsing
Richard Purdie (9):
bitbake: fetch2/__init__: Make it clearer when uri_replace doesn't
return a match
bitbake: fetch2: Fix error handling in uri_replace()
bitbake: fetch2: Only cache data if fn is set, its pointless caching
it against a None value
bitbake: fetch2: Ensure when downloading we are consistently in the
same directory
bitbake: fetch2: Split try_mirrors into two parts
bitbake: fetch2: Explicitly check for mirror tarballs in mirror
handling code
bitbake: fetch2: Improve mirror looping to consider more cases
bitbake: fetch2: Handle errors orruring when building mirror urls utils.bbclass: add helper function to add all multilib variants of a
specific package
Saul Wold (4):
xinetd: Update to 2.3.15
curl: enable ssl support
curl: Use gnutls for target and openssl for native
foomatic: fix perl path for target
Scott Garman (1):
kernel.bbclass: Copy bounds.h only if it exists, needed for 2.6.x.
Ting Liu (2):
lsof: define linux C library type when using eglibc image_types.bbclass: redefine EXTRA_IMAGECMD_jffs2 to leverage
siteinfo
Tom Zanussi (14):
yocto-bsp: add new strip_base() function
yocto-bsp: strip '/base' from kernel branches in templates
yocto-bsp: update default branch names
yocto-bsp: allow branch display filtering
yocto-bsp: use branches_base
yocto-bsp: add standard branch mapping
yocto-bsp: use standard branch mapping in bsp templates
yocto-bsp: use rstrip() for assignment lines
yocto-bsp: remove 'branch' statements in .scc if reusing branch
yocto-bsp: add some standard policy
yocto-bsp: add i586 option for i386
yocto-bsp: use emgd 1.10 for i386 template
yocto-bsp: generate default properties even if json specified
yocto-bsp: use base branches for qemu 'newbranch' case
Zhenhua Luo (3):
linux-dtb: add multi-dtb build support
valgrind: fix default.supp missing issue task-core-sdk.bb: add libgomp and libgomp-dev by RECOMMENDS
bitbake/lib/bb/cooker.py | 2 +
bitbake/lib/bb/fetch2/__init__.py | 158 ++++++++++++--------
meta/classes/image_types.bbclass | 7 +-
meta/classes/kernel.bbclass | 5 +
meta/classes/license.bbclass | 2 +-
meta/classes/rootfs_deb.bbclass | 4 +-
meta/classes/rootfs_ipk.bbclass | 4 +-
meta/classes/utils.bbclass | 9 ++
meta/lib/oe/buildhistory_analysis.py | 2 +-
meta/lib/oe/packagedata.py | 8 +
meta/recipes-bsp/u-boot/u-boot.inc | 2 +-
meta/recipes-bsp/u-boot/u-boot_2011.03.bb | 2 +-
meta/recipes-bsp/u-boot/u-boot_2011.06.bb | 2 +-
.../sysvinit/sysvinit-inittab_2.88dsf.bb | 22 ++-
meta/recipes-core/tasks/task-core-sdk.bb | 6 +-
.../recipes-core/tasks/task-core-tools-testapps.bb | 1 +
meta/recipes-devtools/gcc/gcc-4.6.inc | 2 +-
meta/recipes-devtools/gcc/gcc-configure-common.inc | 4 +
.../recipes-devtools/gcc/gcc-configure-runtime.inc | 7 +
.../recipes-devtools/gcc/gcc-cross-canadian_4.6.bb | 4 +-
meta/recipes-devtools/gcc/gcc-package-runtime.inc | 13 ++
meta/recipes-devtools/libtool/libtool-2.4.2.inc | 3 +-
.../openjade/openjade-native_1.3.2.bb | 2 +-
.../perl/libxml-parser-perl_2.41.bb | 11 +-
.../qemu-0.15.1/0001-ppc64-Fix-linker-script.patch | 46 ++++++
meta/recipes-devtools/qemu/qemu_0.15.1.bb | 3 +-
.../tcl/fix_issue_with_old_distro_glibc.patch | 109 ++++++++++++++
meta/recipes-devtools/tcltk/tcl_8.5.11.bb | 5 +-
meta/recipes-devtools/valgrind/valgrind_3.7.0.bb | 6 +-
meta/recipes-extended/augeas/augeas.inc | 2 +-
.../foomatic/foomatic-filters_4.0.7.bb | 3 +-
meta/recipes-extended/lsof/lsof_4.85.bb | 7 +-
.../shadow/shadow-native_4.1.4.3.bb | 5 +-
meta/recipes-extended/shadow/shadow_4.1.4.3.bb | 5 +-
.../xinetd/{xinetd_2.3.14.bb => xinetd_2.3.15.bb} | 6 +-
.../xorg-xserver/xserver-xorg-1.11.2.inc | 9 +-
.../xserver-xorg-1.11.2/gcc-47-warning.patch | 33 ++++
meta/recipes-kernel/dtc/dtc.inc | 4 +-
meta/recipes-kernel/linux/linux-dtb.inc | 36 ++++-
meta/recipes-support/curl/curl_7.24.0.bb | 11 +-
scripts/buildhistory-diff | 8 +-
scripts/lib/bsp/engine.py | 44 +++++-
scripts/lib/bsp/kernel.py | 18 +++
.../linux/files/{{=machine}}-standard.scc | 1 +
...yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend" | 8 +-
...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 8 +-
...linux-yocto_3.0\": }} linux-yocto_3.0.bbappend" | 8 +-
...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 8 +-
.../arch/i386/conf/machine/{{=machine}}.conf | 14 +-
.../linux/files/{{=machine}}-preempt-rt.scc | 7 +
.../linux/files/{{=machine}}-standard.scc | 14 +-
.../recipes-kernel/linux/files/{{=machine}}.scc | 2 +-
...yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend" | 8 +-
...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 8 +-
...linux-yocto_3.0\": }} linux-yocto_3.0.bbappend" | 8 +-
...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 8 +-
.../linux/files/{{=machine}}-standard.scc | 1 +
...yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend" | 8 +-
...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 8 +-
...linux-yocto_3.0\": }} linux-yocto_3.0.bbappend" | 8 +-
...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 8 +-
.../linux/files/{{=machine}}-standard.scc | 1 +
...yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend" | 8 +-
...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 8 +-
...linux-yocto_3.0\": }} linux-yocto_3.0.bbappend" | 8 +-
...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 8 +-
.../linux/files/{{=machine}}-preempt-rt.scc | 5 +-
.../linux/files/{{=machine}}-standard.scc | 9 +-
...yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend" | 24 +--
...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 24 +--
...linux-yocto_3.0\": }} linux-yocto_3.0.bbappend" | 24 +--
...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 24 +--
.../linux/files/{{=machine}}-preempt-rt.scc | 7 +
.../linux/files/{{=machine}}-standard.scc | 10 +-
...yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend" | 8 +-
...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 8 +-
...linux-yocto_3.0\": }} linux-yocto_3.0.bbappend" | 8 +-
...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 8 +-
78 files changed, 708 insertions(+), 261 deletions(-)
create mode 100644 meta/recipes-devtools/qemu/qemu-0.15.1/0001-ppc64-Fix-linker-script.patch
create mode 100644 meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
rename meta/recipes-extended/xinetd/{xinetd_2.3.14.bb => xinetd_2.3.15.bb} (90%)
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patchSignature · 1 line
1.7.9.5
PATCH 1/57 xinetd: Update to 2.3.15
From: Saul Wold <[email protected]>
(From OE-Core rev: 17d7f2a9ee4c56bc697f05a8e703ddb02c262d99)
---
.../xinetd/{xinetd_2.3.14.bb => xinetd_2.3.15.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-extended/xinetd/{xinetd_2.3.14.bb => xinetd_2.3.15.bb} (90%)meta/recipes-extended/xinetd/xinetd_2.3.15.bb renamed from meta/recipes-extended/xinetd/xinetd_2.3.14.bb +3 -3
@@ -7,7 +7,7 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8ad8615198542444f84d28a6cf226dd8" DEPENDS = "" -PR ="r1" +PR = "r0" SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \ file://xinetd.init \
@@ -17,8 +17,8 @@ SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \ file://xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch \ " -SRC_URI[md5sum] = "567382d7972613090215c6c54f9b82d9" -SRC_URI[sha256sum] = "760e0e617c609a0509ef63fc7e9580d2f1d88c6113bb6d63273de7de7cd0bc1f" +SRC_URI[md5sum] = "77358478fd58efa6366accae99b8b04c" +SRC_URI[sha256sum] = "bf4e060411c75605e4dcbdf2ac57c6bd9e1904470a2f91e01ba31b50a80a5be3" inherit autotools update-rc.d
Signature · 1 line
1.7.9.5
PATCH 2/57 linux-dtb: add multi-dtb build support
In reply to Scott GarmanFrom: Zhenhua Luo <[email protected]>
including following enhancement:
* support multi-dtb build
* skip dtb build and install when KERNEL_DEVICETREE is empty
* print a warning message when specified dts file is not available
(From OE-Core rev: 66f7921f34dfa8b3c7f8f7184715214164f3f8b0)
--- meta/recipes-kernel/linux/linux-dtb.inc | 36 +++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 7 deletions(-)
meta/recipes-kernel/linux/linux-dtb.inc +29 -7
@@ -15,13 +15,35 @@ python __anonymous () { do_install_append() { if test -n "${KERNEL_DEVICETREE}"; then - dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o devicetree ${KERNEL_DEVICETREE} - install -m 0644 devicetree ${D}/boot/devicetree-${KERNEL_VERSION} - install -d ${DEPLOYDIR} - install -m 0644 devicetree ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.dtb - cd ${DEPLOYDIR} - rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb - ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb + for DTS_FILE in ${KERNEL_DEVICETREE}; do + if [ ! -f ${DTS_FILE} ]; then + echo "Warning: ${DTS_FILE} is not available!" + continue + fi + DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'` + DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"` + DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"` + dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o ${DTS_BASE_NAME} ${DTS_FILE} + install -m 0644 ${DTS_BASE_NAME} ${D}/boot/devicetree-${DTB_SYMLINK_NAME}.dtb + done fi } +do_deploy_append() { + if test -n "${KERNEL_DEVICETREE}"; then + for DTS_FILE in ${KERNEL_DEVICETREE}; do + if [ ! -f ${DTS_FILE} ]; then + echo "Warning: ${DTS_FILE} is not available!" + continue + fi + DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'` + DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"` + DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"` + install -d ${DEPLOYDIR} + install -m 0644 ${B}/${DTS_BASE_NAME} ${DEPLOYDIR}/${DTB_NAME}.dtb + cd ${DEPLOYDIR} + ln -sf ${DTB_NAME}.dtb ${DTB_SYMLINK_NAME}.dtb + cd - + done + fi +}
Signature · 1 line
1.7.9.5
PATCH 3/57 bitbake: fetch2/__init__: Make it clearer when uri_replace doesn't return a match
In reply to Scott GarmanFrom: Richard Purdie <[email protected]>
(From Poky rev: dc9976331c5cbb0983adb54f6deb97b9203bacbc)
(Bitbake rev: eb96609864dec95a516e6e687dd6a2f31d523acf)
--- bitbake/lib/bb/fetch2/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
bitbake/lib/bb/fetch2/__init__.py +4 -2
@@ -200,8 +200,10 @@ def uri_replace(ud, uri_find, uri_replace, d): if basename and not result_decoded[loc].endswith(basename): result_decoded[loc] = os.path.join(result_decoded[loc], basename) else: - return ud.url + return None result = encodeurl(result_decoded) + if result == ud.url: + return None logger.debug(2, "For url %s returning %s" % (ud.url, result)) return result
@@ -462,7 +464,7 @@ def try_mirrors(d, origud, mirrors, check = False): except ValueError: continue newuri = uri_replace(origud, find, replace, ld) - if newuri == origud.url: + if not newuri: continue try: ud = FetchData(newuri, ld)
Signature · 1 line
1.7.9.5
PATCH 4/57 bitbake: fetch2: Fix error handling in uri_replace()
In reply to Scott GarmanFrom: Richard Purdie <[email protected]>
(From Poky rev: 1bfba28a583cb167f60e05ecdf34d0786dc1eec5)
(Bitbake rev: aa7467a764ddcbc7d65af99e88cf093b6ec6d24e)
--- bitbake/lib/bb/fetch2/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
bitbake/lib/bb/fetch2/__init__.py +2 -1
@@ -174,7 +174,8 @@ def encodeurl(decoded): def uri_replace(ud, uri_find, uri_replace, d): if not ud.url or not uri_find or not uri_replace: - logger.debug(1, "uri_replace: passed an undefined value, not replacing") + logger.error("uri_replace: passed an undefined value, not replacing") + return None uri_decoded = list(decodeurl(ud.url)) uri_find_decoded = list(decodeurl(uri_find)) uri_replace_decoded = list(decodeurl(uri_replace))
Signature · 1 line
1.7.9.5
PATCH 5/57 bitbake: fetch2: Only cache data if fn is set, its pointless caching it against a None value
In reply to Scott GarmanFrom: Richard Purdie <[email protected]>
(From Poky rev: c2df30bf6d1f8c263a38c45866936c1bf496ece5)
(Bitbake rev: f4b59cc6e1c3ddc168a1678ce39ff402ea1ff4cc)
--- bitbake/lib/bb/fetch2/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
bitbake/lib/bb/fetch2/__init__.py +2 -2
@@ -904,14 +904,14 @@ class Fetch(object): self.ud = {} fn = d.getVar('FILE', True) - if cache and fn in urldata_cache: + if cache and fn and fn in urldata_cache: self.ud = urldata_cache[fn] for url in urls: if url not in self.ud: self.ud[url] = FetchData(url, d) - if cache: + if fn and cache: urldata_cache[fn] = self.ud def localpath(self, url):
Signature · 1 line
1.7.9.5
PATCH 6/57 bitbake: fetch2: Ensure when downloading we are consistently in the same directory
In reply to Scott GarmanFrom: Richard Purdie <[email protected]>
This assists with build reproducuility. It also avoids errors if cwd happens not to exist when we call into the fetcher. That situation would be unusual but I hit it with the unit tests.
(From Poky rev: 86517af9e066c2da1d580fa66b7c7f0340f3403e)
(Bitbake rev: b886c6c15a58643e06ca5ad7a3ff1f7766e4f48c)
--- bitbake/lib/bb/fetch2/__init__.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
bitbake/lib/bb/fetch2/__init__.py +5 -1
@@ -471,6 +471,8 @@ def try_mirrors(d, origud, mirrors, check = False): ud = FetchData(newuri, ld) ud.setup_localpath(ld) + os.chdir(ld.getVar("DL_DIR", True)) + if check: found = ud.method.checkstatus(newuri, ud, ld) if found:
@@ -965,6 +967,8 @@ class Fetch(object): if premirroronly: self.d.setVar("BB_NO_NETWORK", "1") + os.chdir(self.d.getVar("DL_DIR", True)) + firsterr = None if not localpath and ((not os.path.exists(ud.donestamp)) or m.need_update(u, ud, self.d)): try:
@@ -1024,7 +1028,7 @@ class Fetch(object): except: # Finally, try checking uri, u, from MIRRORS mirrors = mirror_from_string(self.d.getVar('MIRRORS', True)) - ret = try_mirrors (self.d, ud, mirrors, True) + ret = try_mirrors(self.d, ud, mirrors, True) if not ret: raise FetchError("URL %s doesn't work" % u, u)
Signature · 1 line
1.7.9.5
PATCH 7/57 bitbake: fetch2: Split try_mirrors into two parts
In reply to Scott GarmanFrom: Richard Purdie <[email protected]>
There are no functionality changes in this change
(From Poky rev: d222ebb7c75d74fde4fd04ea6feb27e10a862bae)
(Bitbake rev: db62e109cc36380ff8b8918628c9dea14ac9afbc)
Conflicts:
bitbake/lib/bb/fetch2/__init__.py
--- bitbake/lib/bb/fetch2/__init__.py | 108 ++++++++++++++++++++----------------- 1 file changed, 59 insertions(+), 49 deletions(-)
bitbake/lib/bb/fetch2/__init__.py +59 -49
@@ -449,6 +449,60 @@ def check_network_access(d, info = "", url = None): else: logger.debug(1, "Fetcher accessed the network with the command %s" % info) +def try_mirror_url(newuri, origud, ud, ld, check = False): + # Return of None or a value means we're finished + # False means try another url + try: + if check: + found = ud.method.checkstatus(newuri, ud, ld) + if found: + return found + return False + + os.chdir(ld.getVar("DL_DIR", True)) + + if not os.path.exists(ud.donestamp) or ud.method.need_update(newuri, ud, ld): + ud.method.download(newuri, ud, ld) + if hasattr(ud.method,"build_mirror_data"): + ud.method.build_mirror_data(newuri, ud, ld) + + if not ud.localpath or not os.path.exists(ud.localpath): + return False + + if ud.localpath == origud.localpath: + return ud.localpath + + # We may be obtaining a mirror tarball which needs further processing by the real fetcher + # If that tarball is a local file:// we need to provide a symlink to it + dldir = ld.getVar("DL_DIR", True) + if os.path.basename(ud.localpath) != os.path.basename(origud.localpath): + open(ud.donestamp, 'w').close() + dest = os.path.join(dldir, os.path.basename(ud.localpath)) + if not os.path.exists(dest): + os.symlink(ud.localpath, dest) + return None + # Otherwise the result is a local file:// and we symlink to it + if not os.path.exists(origud.localpath): + os.symlink(ud.localpath, origud.localpath) + update_stamp(newuri, origud, ld) + return ud.localpath + + except bb.fetch2.NetworkAccess: + raise + + except bb.fetch2.BBFetchException as e: + if isinstance(e, ChecksumError): + logger.warn("Mirror checksum failure for url %s (original url: %s)\nCleaning and trying again." % (newuri, origud.url)) + logger.warn(str(e)) + else: + logger.debug(1, "Mirror fetch failure for url %s (original url: %s)" % (newuri, origud.url)) + logger.debug(1, str(e)) + try: + ud.method.clean(ud, ld) + except UnboundLocalError: + pass + return False + def try_mirrors(d, origud, mirrors, check = False): """ Try to use a mirrored version of the sources.
@@ -467,56 +521,12 @@ def try_mirrors(d, origud, mirrors, check = False): newuri = uri_replace(origud, find, replace, ld) if not newuri: continue - try: - ud = FetchData(newuri, ld) - ud.setup_localpath(ld) + ud = FetchData(newuri, ld) + ud.setup_localpath(ld) - os.chdir(ld.getVar("DL_DIR", True)) - - if check: - found = ud.method.checkstatus(newuri, ud, ld) - if found: - return found - continue - - if not os.path.exists(ud.donestamp) or ud.method.need_update(newuri, ud, ld): - ud.method.download(newuri, ud, ld) - if os.path.exists(ud.localpath): - open(ud.donestamp, 'w').close() - if hasattr(ud.method,"build_mirror_data"): - ud.method.build_mirror_data(newuri, ud, ld) - - if not ud.localpath or not os.path.exists(ud.localpath): - continue - - if ud.localpath == origud.localpath: - return ud.localpath - - # We may be obtaining a mirror tarball which needs further processing by the real fetcher - # If that tarball is a local file:// we need to provide a symlink to it - dldir = ld.getVar("DL_DIR", True) - if os.path.basename(ud.localpath) != os.path.basename(origud.localpath): - dest = os.path.join(dldir, os.path.basename(ud.localpath)) - if not os.path.exists(dest): - os.symlink(ud.localpath, dest) - return None - # Otherwise the result is a local file:// and we symlink to it - if not os.path.exists(origud.localpath): - os.symlink(ud.localpath, origud.localpath) - return ud.localpath - - except bb.fetch2.NetworkAccess: - raise - - except bb.fetch2.BBFetchException as e: - logger.debug(1, "Mirror fetch failure for url %s (original url: %s)" % (newuri, origud.url)) - logger.debug(1, str(e)) - try: - if os.path.isfile(ud.localpath): - bb.utils.remove(ud.localpath) - except UnboundLocalError: - pass - continue + ret = try_mirror_url(newuri, origud, ud, ld, check) + if ret != False: + return ret return None def srcrev_internal_helper(ud, d, name):
Signature · 1 line
1.7.9.5
PATCH 8/57 bitbake: fetch2: Explicitly check for mirror tarballs in mirror handling code
In reply to Scott GarmanFrom: Richard Purdie <[email protected]>
With support for things like git:// -> git:// urls, we need to be more explicity about the mirrortarball check since we need to fall through to the following code in other cases.
(From Poky rev: 28e858cd6f7509468ef3e527a86820b9e06044db)
(Bitbake rev: a2459f5ca2f517964287f9a7c666a6856434e631)
--- bitbake/lib/bb/fetch2/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
bitbake/lib/bb/fetch2/__init__.py +2 -1
@@ -475,7 +475,8 @@ def try_mirror_url(newuri, origud, ud, ld, check = False): # We may be obtaining a mirror tarball which needs further processing by the real fetcher # If that tarball is a local file:// we need to provide a symlink to it dldir = ld.getVar("DL_DIR", True) - if os.path.basename(ud.localpath) != os.path.basename(origud.localpath): + if origud.mirrortarball and os.path.basename(ud.localpath) == os.path.basename(origud.mirrortarball) \ + and os.path.basename(ud.localpath) != os.path.basename(origud.localpath): open(ud.donestamp, 'w').close() dest = os.path.join(dldir, os.path.basename(ud.localpath)) if not os.path.exists(dest):
Signature · 1 line
1.7.9.5
PATCH 9/57 bitbake: fetch2: Improve mirror looping to consider more cases
In reply to Scott GarmanFrom: Richard Purdie <[email protected]>
Currently we only consider one pass through the mirror list. This doesn't catch cases where for example you might want to setup a mirror of a mirror and allow multiple redirection. There is no reason we can't support this and the patch loops through the list recursively now.
As a safeguard, it will stop if any duplicate urls are found, hence avoiding circular dependency looping.
(From Poky rev: 0ec0a4412865e54495c07beea1ced8355da58073)
(Bitbake rev: e585730e931e6abdb15ba8a3849c5fd22845b891)
--- bitbake/lib/bb/fetch2/__init__.py | 41 ++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 12 deletions(-)
bitbake/lib/bb/fetch2/__init__.py +29 -12
@@ -449,6 +449,30 @@ def check_network_access(d, info = "", url = None): else: logger.debug(1, "Fetcher accessed the network with the command %s" % info) +def build_mirroruris(origud, mirrors, ld): + uris = [] + uds = [] + + def adduri(uri, ud, uris, uds): + for line in mirrors: + try: + (find, replace) = line + except ValueError: + continue + newuri = uri_replace(ud, find, replace, ld) + if not newuri or newuri in uris or newuri == origud.url: + continue + uris.append(newuri) + newud = FetchData(newuri, ld) + newud.setup_localpath(ld) + uds.append(newud) + + adduri(newuri, newud, uris, uds) + + adduri(None, origud, uris, uds) + + return uris, uds + def try_mirror_url(newuri, origud, ud, ld, check = False): # Return of None or a value means we're finished # False means try another url
@@ -514,18 +538,11 @@ def try_mirrors(d, origud, mirrors, check = False): mirrors is the list of mirrors we're going to try """ ld = d.createCopy() - for line in mirrors: - try: - (find, replace) = line - except ValueError: - continue - newuri = uri_replace(origud, find, replace, ld) - if not newuri: - continue - ud = FetchData(newuri, ld) - ud.setup_localpath(ld) - - ret = try_mirror_url(newuri, origud, ud, ld, check) + + uris, uds = build_mirroruris(origud, mirrors, ld) + + for index, uri in enumerate(uris): + ret = try_mirror_url(uri, origud, uds[index], ld, check) if ret != False: return ret return None
Signature · 1 line
1.7.9.5
PATCH 10/57 bitbake: fetch2: Handle errors orruring when building mirror urls
In reply to Scott GarmanFrom: Richard Purdie <[email protected]>
When we build the mirror urls, its possible an error will occur. If it does, it should just mean we don't attempt this mirror url. The current code actually aborts *all* the mirrors, not just the failed url.
This patch catches and logs the exception allowing things to continue.
(Bitbake rev: c35cbd1a1403865cf4f59ec88e1881669868103c)
--- bitbake/lib/bb/fetch2/__init__.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
bitbake/lib/bb/fetch2/__init__.py +11 -2
@@ -462,9 +462,18 @@ def build_mirroruris(origud, mirrors, ld): newuri = uri_replace(ud, find, replace, ld) if not newuri or newuri in uris or newuri == origud.url: continue + try: + newud = FetchData(newuri, ld) + newud.setup_localpath(ld) + except bb.fetch2.BBFetchException as e: + logger.debug(1, "Mirror fetch failure for url %s (original url: %s)" % (newuri, origud.url)) + logger.debug(1, str(e)) + try: + ud.method.clean(ud, ld) + except UnboundLocalError: + pass + continue uris.append(newuri) - newud = FetchData(newuri, ld) - newud.setup_localpath(ld) uds.append(newud) adduri(newuri, newud, uris, uds)
Signature · 1 line
1.7.9.5
PATCH 11/57 bitbake/fetch2: remove references to ChecksumError class
In reply to Scott GarmanFrom: Matthew McClintock <[email protected]>
From: Matthew McClintock <[email protected]>
When merging fetch2 improvements from master into denzil, there were too many dependencies to pull in the entire ChecksumError class, so this patch removes references to ChecksumError for compatability.
Fixes this issue:
NameError: global name 'ChecksumError' is not defined
--- bitbake/lib/bb/fetch2/__init__.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
bitbake/lib/bb/fetch2/__init__.py +2 -6
@@ -525,12 +525,8 @@ def try_mirror_url(newuri, origud, ud, ld, check = False): raise except bb.fetch2.BBFetchException as e: - if isinstance(e, ChecksumError): - logger.warn("Mirror checksum failure for url %s (original url: %s)\nCleaning and trying again." % (newuri, origud.url)) - logger.warn(str(e)) - else: - logger.debug(1, "Mirror fetch failure for url %s (original url: %s)" % (newuri, origud.url)) - logger.debug(1, str(e)) + logger.debug(1, "Mirror fetch failure for url %s (original url: %s)" % (newuri, origud.url)) + logger.debug(1, str(e)) try: ud.method.clean(ud, ld) except UnboundLocalError:
Signature · 1 line
1.7.9.5
PATCH 12/57 valgrind: fix default.supp missing issue
In reply to Scott GarmanFrom: Zhenhua Luo <[email protected]>
When run valgrind, following error appears:
==2254== FATAL: can't open suppressions file "/usr/lib/valgrind/default.supp"
(From OE-Core rev: 0b3261d513cdad80174a9b9e804981c50bcb7ca2)
--- meta/recipes-devtools/valgrind/valgrind_3.7.0.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
meta/recipes-devtools/valgrind/valgrind_3.7.0.bb +5 -1
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c46082167a314d785d012a244748d803 \ X11DEPENDS = "virtual/libx11" DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" -PR = "r4" +PR = "r5" SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ file://fix_issue_caused_by_ccache.patch \
@@ -30,6 +30,10 @@ EXTRA_OECONF = "--enable-tls" EXTRA_OEMAKE = "-w" PARALLEL_MAKE = "" +do_install_append () { + install -m 644 ${S}/default.supp ${D}/${libdir}/valgrind/ +} + FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug/*" RRECOMMENDS_${PN}_powerpc += "${TCLIBC}-dbg" RRECOMMENDS_${PN}_powerpc64 += "${TCLIBC}-dbg"
Signature · 1 line
1.7.9.5
PATCH 13/57 libxml-parser-perl_2.41.bb: fix MakeMaker issues with using wrong CC/LD/etc
In reply to Scott GarmanFrom: Matthew McClintock <[email protected]>
MakeMaker has a bug where it does not propagate CC/LD/etc information down to subproject it generates Makefiles for... this recipe has has an Expat subproject which has issues building if we are using sstate-cache and it will reference the old sysroots and be unable to build properly. There is an upstream MakeMaker bug for this issue but we can work around it by fixing up the Makefiles for now
See:
https://rt.cpan.org/Public/Bug/Display.html?id=28632
(From OE-Core rev: 2c3629a698e537c69c71039bc6172b3c0e617ff1)
--- .../perl/libxml-parser-perl_2.41.bb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb +9 -2
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=2;endline=6;md5=c8767d7516229f07b26e DEPENDS += "expat expat-native" -PR = "r2" +PR = "r3" SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz" SRC_URI[md5sum] = "c320d2ffa459e6cdc6f9f59c1185855e"
@@ -13,10 +13,17 @@ SRC_URI[sha256sum] = "b48197cd2265a26c5f016489f11a7b450d8833cb8b3d6a46ee15975740 S = "${WORKDIR}/XML-Parser-${PV}" -EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}" +EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR} CC=${CC} LD=${LD} FULL_AR=${AR}" inherit cpan +# fix up sub MakeMaker project as arguments don't get propagated though +# see https://rt.cpan.org/Public/Bug/Display.html?id=28632 +do_configure_append() { + sed 's:--sysroot=.*\(\s\|$\):--sysroot=${STAGING_DIR_TARGET} :g' -i Makefile Expat/Makefile + sed 's:^FULL_AR = .*:FULL_AR = ${AR}:g' -i Expat/Makefile +} + do_compile() { export LIBC="$(find ${STAGING_DIR_TARGET}/${base_libdir}/ -name 'libc-*.so')" cpan_do_compile
Signature · 1 line
1.7.9.5
PATCH 14/57 qemu-0.15.1: add patch to fix compilatation problems on powerpc
In reply to Scott GarmanFrom: Matthew McClintock <[email protected]>
ERROR: Function failed: do_compile (see /opt/yocto/cache-build/p5020ds-64b/build_p5020ds-64b_release/tmp/work/ppc64e5500-fsl-linux/qemu-0.15.1-r6/temp/log.do_compile.28447 for further information)
ERROR: Logfile of failure stored in: /opt/yocto/cache-build/p5020ds-64b/build_p5020ds-64b_release/tmp/work/ppc64e5500-fsl-linux/qemu-0.15.1-r6/temp/log.do_compile.28447 Log data follows:
| DEBUG: SITE files ['endian-big', 'bit-64', 'powerpc-common', 'common-linux', 'common-glibc', 'powerpc-linux', 'powerpc64-linux', 'common'] | ERROR: Function failed: do_compile (see /opt/yocto/cache-build/p5020ds-64b/build_p5020ds-64b_release/tmp/work/ppc64e5500-fsl-linux/qemu-0.15.1-r6/temp/log.do_compile.28447 for further information) | NOTE: make -j 24 | LINK ppc-linux-user/qemu-ppc | /opt/yocto/cache-build/p5020ds-64b/build_p5020ds-64b_release/tmp/sysroots/x86_64-linux/usr/libexec/ppc64e5500-fsl-linux/gcc/powerpc64-fsl-linux/4.6.4/ld:/opt/yocto/cache-build/p5020ds-64b/build_p5020ds-64b_release/tmp/work/ppc64e5500-fsl-linux/qemu-0.15.1-r6/qemu-0.15.1/ppc64.ld:84: syntax error | collect2: ld returned 1 exit status | make[1]: *** [qemu-ppc] Error 1 | make: *** [subdir-ppc-linux-user] Error 2 | make: *** Waiting for unfinished jobs.... | ERROR: oe_runmake failed
(From OE-Core rev: a9207aad5b163a071cd8298517d61514c587e0ed)
--- .../qemu-0.15.1/0001-ppc64-Fix-linker-script.patch | 46 ++++++++++++++++++++ meta/recipes-devtools/qemu/qemu_0.15.1.bb | 3 +- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/qemu/qemu-0.15.1/0001-ppc64-Fix-linker-script.patch
meta/recipes-devtools/qemu/qemu-0.15.1/0001-ppc64-Fix-linker-script.patch new file +46 -0
@@ -0,0 +1,46 @@ +Upstream-Status: Backport + +From 7c0a3409627604c111d5c5e1ce4e0224c2b56315 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <[email protected]> +Date: Tue, 4 Oct 2011 05:14:52 +0000 +Subject: [PATCH] ppc64: Fix linker script +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Since commit 8733f609 (Fix linker scripts) linking on Linux/ppc64 fails: + + LINK ppc64-linux-user/qemu-ppc64 +/usr/lib64/gcc/powerpc64-suse-linux/4.3/../../../../powerpc64-suse-linux/bin/ld:/home/afaerber/qemu/ppc64.ld:84: syntax error +collect2: ld gab 1 als Ende-Status zurück +make[1]: *** [qemu-ppc64] Fehler 1 +make: *** [subdir-ppc64-linux-user] Fehler 2 + +Fix by removing a leftover line in the ppc64 linker script. + +Cc: Gerd Hoffmann <[email protected]> +Cc: Blue Swirl <[email protected]> +Signed-off-by: Andreas Färber <[email protected]> +Signed-off-by: Alexander Graf <[email protected]> +--- + ppc64.ld | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ppc64.ld b/ppc64.ld +index 0059ee5..0a7c0dd 100644 +--- a/ppc64.ld ++++ b/ppc64.ld +@@ -81,8 +81,8 @@ SECTIONS + .sdata2 : { *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) } + .sbss2 : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) } + .eh_frame_hdr : { *(.eh_frame_hdr) } +-*(.gcc_except_table.*) } /* Adjust the address for the data segment. We want to +-adjust up to + the same address within the page on the next page up. */ ++ /* Adjust the address for the data segment. We want to adjust up to ++ the same address within the page on the next page up. */ + . = ALIGN (0x10000) - ((0x10000 - .) & (0x10000 - 1)); . = DATA_SEGMENT_ALIGN + (0x10000, 0x1000); /* Exception handling */ + .eh_frame : { KEEP (*(.eh_frame)) } +-- +1.7.10 +
meta/recipes-devtools/qemu/qemu_0.15.1.bb +2 -1
@@ -3,7 +3,7 @@ require qemu.inc LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" -PR = "r6" +PR = "r7" FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" FILESDIR = "${WORKDIR}"
@@ -19,6 +19,7 @@ SRC_URI = "\ file://larger_default_ram_size.patch \ file://arm-bgr.patch \ file://a4d1f142542935b90d2eb30f3aead4edcf455fe6.patch \ + file://0001-ppc64-Fix-linker-script.patch \ " # Only use the GL passthrough patches for native/nativesdk versions
Signature · 1 line
1.7.9.5
PATCH 15/57 packagedata.py: Fix get_subpkgedata_fn for multilib
In reply to Scott GarmanFrom: Matthew McClintock <[email protected]>
This happens when tryng to add libgcc-dev to as a multilib package (e.g. IMAGE_INSTALL_append = " lib32-libgcc-dev")
| Processing task-core-boot... | Processing fman-ucode... | Processing dosfstools... | Processing lib32-libgcc-dev... | Unable to find package lib32-libgcc-dev (libgcc-dev)!
NOTE: package fsl-image-full-1.0-r1.1.3.6: task do_rootfs: Failed
RPM (or bitbake?) is looking in the tmp/pkgdata, however some of these file paths are mungned for the multilib scenario:
$ find tmp/pkgdata/ | grep libgcc-dev$ tmp/pkgdata/ppce5500-fsl-linux/runtime/lib32-libgcc-dev tmp/pkgdata/ppc64e5500-fsl-linux/runtime/libgcc-dev
This patch fixes where we look for these files so they can be found and properly installed for the multilib root file system
(From OE-Core rev: 4e65ddda5d351bd9f2172e77e656903f61a52f34)
--- meta/lib/oe/packagedata.py | 8 ++++++++ 1 file changed, 8 insertions(+)
meta/lib/oe/packagedata.py +8 -0
@@ -27,6 +27,14 @@ def read_pkgdatafile(fn): def get_subpkgedata_fn(pkg, d): archs = d.expand("${PACKAGE_ARCHS}").split(" ") + mlarchs = d.getVar("MULTILIB_PACKAGE_ARCHS", d) or None + + if mlarchs: + for mlarch in mlarchs.split(" "): + if "_" in mlarch: + prefix, split, new_arch = mlarch.partition("_") + archs.append(new_arch) + archs.reverse() pkgdata = d.expand('${TMPDIR}/pkgdata/') targetdir = d.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/')
Signature · 1 line
1.7.9.5
PATCH 16/57 dtc.inc: fix for libdir == /usr/lib64
In reply to Scott GarmanFrom: Matthew McClintock <[email protected]>
On 64bit systems dtc will still install libaries in /usr/lib unless we havet this override
(From OE-Core rev: b60579e66601ba60669a9e1194409fcd8b80530e)
--- meta/recipes-kernel/dtc/dtc.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-kernel/dtc/dtc.inc +2 -2
@@ -10,8 +10,8 @@ SRC_URI = "git://www.jdl.com/software/dtc.git;protocol=git \ file://make_install.patch \ " -EXTRA_OEMAKE='PREFIX="${prefix}"' -INC_PR = "r2" +EXTRA_OEMAKE='PREFIX="${prefix}" LIBDIR="${libdir}"' +INC_PR = "r3" S = "${WORKDIR}/git"
Signature · 1 line
1.7.9.5
PATCH 17/57 openjade-native_1.3.2.bb: fix typo and change the deps exclusion to correct var
In reply to Scott GarmanFrom: Matthew McClintock <[email protected]>
(From OE-Core rev: 4be17f018f8dd0ed576498badc03ee13095b2263)
--- .../openjade/openjade-native_1.3.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/openjade/openjade-native_1.3.2.bb +1 -1
@@ -32,7 +32,7 @@ CONFIGUREOPTS := "${@d.getVar('CONFIGUREOPTS', True).replace('--datadir=${datadi # CONFIGUREOPTS has hard coded paths so we need to ignore it's vardeps # there are other bits in there too but they are picked up by other variable # dependencies so it all works out -do_configure[vardepsexclude] += "CONNFIGUREOPTS" +oe_runconf[vardepsexclude] += "CONFIGUREOPTS" CFLAGS =+ "-I${S}/include"
Signature · 1 line
1.7.9.5
PATCH 18/57 gcc-configure-common.inc: use --with-long-double-128 on powerpc to comply with ABI
In reply to Scott GarmanFrom: Matthew McClintock <[email protected]>
(From OE-Core rev: 243539efec94e79dade2525d0ab3586eea48c529)
--- meta/recipes-devtools/gcc/gcc-4.6.inc | 2 +- meta/recipes-devtools/gcc/gcc-configure-common.inc | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)
meta/recipes-devtools/gcc/gcc-4.6.inc +1 -1
@@ -1,6 +1,6 @@ require gcc-common.inc -PR = "r25" +PR = "r26" # Third digit in PV should be incremented after a minor release # happens from this branch on gcc e.g. currently its 4.6.0
meta/recipes-devtools/gcc/gcc-configure-common.inc +4 -0
@@ -53,6 +53,10 @@ EXTRA_OECONF_append_linux-uclibceabi = " --disable-__cxa_atexit" EXTRA_OECONF_FPU = "${@get_gcc_fpu_setting(bb, d)}" CPPFLAGS = "" +# powerpc needs this to comply with the ABI +EXTRA_OECONF_append_powerpc = " --with-long-double-128" +EXTRA_OECONF_append_powerpc64 = " --with-long-double-128" + # Used by configure to define additional values for FLAGS_FOR_TARGET - # passed to all the compilers. ARCH_FLAGS_FOR_TARGET = "${TARGET_CC_ARCH}"
Signature · 1 line
1.7.9.5
PATCH 19/57 gcc: gcc-cross-canadian: use correct location for libraries for powerpc64
In reply to Scott GarmanFrom: Matthew McClintock <[email protected]>
This fixes the issue where gcc invokes the linker with an incorrect -L library location and gives up because it can't find libraries. It was looking in a /lib folder instead of /lib64
(From OE-Core rev: 1b428f0151a5b86332b501871bf4a925b43580a5)
--- meta/recipes-devtools/gcc/gcc-4.6.inc | 2 +- .../recipes-devtools/gcc/gcc-cross-canadian_4.6.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-devtools/gcc/gcc-4.6.inc +1 -1
@@ -1,6 +1,6 @@ require gcc-common.inc -PR = "r26" +PR = "r27" # Third digit in PV should be incremented after a minor release # happens from this branch on gcc e.g. currently its 4.6.0
meta/recipes-devtools/gcc/gcc-cross-canadian_4.6.bb +2 -2
@@ -9,8 +9,8 @@ DEPENDS += "gmp-nativesdk mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk" RDEPENDS_${PN} += "mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk" SYSTEMHEADERS = "/usr/include" -SYSTEMLIBS = "/lib/" -SYSTEMLIBS1 = "/usr/lib/" +SYSTEMLIBS = "${target_base_libdir}/" +SYSTEMLIBS1 = "${target_libdir}/" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \
Signature · 1 line
1.7.9.5
PATCH 20/57 libgomp: add libgomp (openmp) library, and build for powerpc targets by default
In reply to Scott GarmanFrom: Matthew McClintock <[email protected]>
(From OE-Core rev: b76a7bc8dcb7aed7d6f026e77a226837004c50af)
--- meta/recipes-devtools/gcc/gcc-4.6.inc | 2 +- .../recipes-devtools/gcc/gcc-configure-runtime.inc | 7 +++++++ meta/recipes-devtools/gcc/gcc-package-runtime.inc | 12 ++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-)
meta/recipes-devtools/gcc/gcc-4.6.inc +1 -1
@@ -1,6 +1,6 @@ require gcc-common.inc -PR = "r27" +PR = "r28" # Third digit in PV should be incremented after a minor release # happens from this branch on gcc e.g. currently its 4.6.0
meta/recipes-devtools/gcc/gcc-configure-runtime.inc +7 -0
@@ -9,6 +9,8 @@ EXTRA_OECONF_PATHS = " \ --with-build-sysroot=${STAGING_DIR_TARGET}" RUNTIMETARGET = "libssp libstdc++-v3" +RUNTIMETARGET_append_powerpc = " libgomp" +RUNTIMETARGET_append_powerpc64 = " libgomp" # ? # libiberty # libmudflap
@@ -36,6 +38,11 @@ do_install () { for d in ${RUNTIMETARGET}; do cd ${B}/$d/ oe_runmake 'DESTDIR=${D}' install + if [ "$d" = "libgomp" ]; then + rm -rf ${D}${datadir}/info/libgomp.info ${D}${datadir}/info/dir + rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude + rmdir --ignore-fail-on-non-empty -p ${D}${datadir}/info + fi done chown -R root:root ${D} }
meta/recipes-devtools/gcc/gcc-package-runtime.inc +12 -0
@@ -13,6 +13,9 @@ PACKAGES = "\ libgfortran-dev \ libmudflap \ libmudflap-dev \ + libgomp \ + libgomp-dev \ + libgomp-staticdev \ " # The base package doesn't exist, so we clear the recommends. RRECOMMENDS_${PN}-dbg = ""
@@ -61,3 +64,12 @@ FILES_libmudflap-dev = "\ ${libdir}/libmudflap*.a \ ${libdir}/libmudflap*.la" +FILES_libgomp-dev = "\ + ${libdir}/libgomp*.so \ + ${libdir}/libgomp*.la \ + ${libdir}/libgomp.spec \ + ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/omp.h \ + " +FILES_libgomp-staticdev = "\ + ${libdir}/libgomp*.a \ + "
Signature · 1 line
1.7.9.5
PATCH 21/57 sysvinit-inittab_2.88dsf.bb: Allow multiple serial port consoles to be defined
In reply to Scott GarmanFrom: Matthew McClintock <[email protected]>
Set SERIAL_CONSOLES if you want to define multiple serial consoles, also if you need to check for the presence of the serial consoles you can also define SERIAL_CONSOLES_CHECK to determine if these are present when you boot. This will prevent error message that pop up when the serial port is not present.
SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
The above lines in machine.conf or elsewhere will have the effect of having two serial consoles and removing any that are not present at boot
(From OE-Core rev: eecd65f188ba2c924626b7e1bf5c8e2eb51e9b59)
--- .../sysvinit/sysvinit-inittab_2.88dsf.bb | 22 ++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +20 -2
@@ -2,7 +2,7 @@ DESCRIPTION = "Inittab for sysvinit" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -PR = "r6" +PR = "r7" SRC_URI = "file://inittab"
@@ -26,7 +26,8 @@ do_install() { for i in $tmp do j=`echo ${i} | sed s/\;/\ /g` - echo "${idx}:2345:respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab + echo "${idx}:12345:respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab + idx=`expr $idx + 1` done
@@ -51,6 +52,23 @@ EOF fi } +pkg_postinst_${PN} () { +# run this on the target +if [ "x$D" == "x" ]; then + tmp="${SERIAL_CONSOLES_CHECK}" + for i in $tmp + do + j=`echo ${i} | sed s/^.*\;//g` + if [ -z "`cat /proc/consoles | grep ${j}`" ]; then + sed -i /^.*${j}$/d /etc/inittab + fi + done + kill -HUP 1 +else + exit 1 +fi +} + # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf. # Set PACKAGE_ARCH appropriately. PACKAGE_ARCH = "${MACHINE_ARCH}"
Signature · 1 line
1.7.9.5
PATCH 22/57 lsof: define linux C library type when using eglibc
In reply to Scott GarmanFrom: Ting Liu <[email protected]>
lsof tries to compile a temp c source file and execute the binary to determine linux C library type (file Configure, line 2689-2717). It is inpracticable for cross-compilation and may have build issue on some distros since it depends on host settings.
Fix below error when building for 64bit target on 64bit host:
[...]
| dsock.c:481:44: error: 'TCP_LISTEN' undeclared (first use in this function) | dsock.c:482:45: error: 'TCP_CLOSING' undeclared (first use in this function) [...]
| make: *** [dsock.o] Error 1
The actual issue exists in do_configure:
[...]
Testing C library type with cc ... done
Cannot determine C library type; assuming it is not glibc.
Which is in turn caused by missing 'gnu/stubs-32.h" when compiling the temp c source file on host:
[...]
fatal error: gnu/stubs-32.h: No such file or directory compilation terminated.
file gnu/stubs-32.h is provided by 32bit glibc.
(From OE-Core rev: fbf22dfe1a0dca3fc7ac56e4fd274c0145efbc70)
--- meta/recipes-extended/lsof/lsof_4.85.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
meta/recipes-extended/lsof/lsof_4.85.bb +6 -1
@@ -3,7 +3,7 @@ DESCRIPTION = "Lsof is a Unix-specific diagnostic tool. \ Its name stands for LiSt Open Files, and it does just that." SECTION = "devel" LICENSE = "BSD" -PR = "r0" +PR = "r1" SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2"
@@ -29,6 +29,11 @@ LSOF_OS_libc-glibc = "linux" export LSOF_INCLUDE = "${STAGING_INCDIR}" do_configure () { + if [ "x${EGLIBCVERSION}" != "x" ];then + LINUX_CLIB=`echo ${EGLIBCVERSION} |sed -e 's,\.,,g'` + LINUX_CLIB="-DGLIBCV=${LINUX_CLIB}" + export LINUX_CLIB + fi yes | ./Configure ${LSOF_OS} }
Signature · 1 line
1.7.9.5
PATCH 23/57 task-core-sdk.bb: add libgomp and libgomp-dev by RECOMMENDS
In reply to Scott GarmanFrom: Zhenhua Luo <[email protected]>
(From OE-Core rev: b2b682331cc1ec54448b5002ff94672d09fe9e7c)
--- meta/recipes-core/tasks/task-core-sdk.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
meta/recipes-core/tasks/task-core-sdk.bb +5 -1
@@ -7,7 +7,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" DEPENDS = "task-core-console" -PR = "r7" +PR = "r8" ALLOW_EMPTY = "1" #PACKAGEFUNCS =+ 'generate_sdk_pkgs'
@@ -48,6 +48,10 @@ RDEPENDS_task-core-sdk = "\ file \ tcl" +RRECOMMENDS_task-core-sdk = "\ + libgomp \ + libgomp-dev" + #python generate_sdk_pkgs () { # poky_pkgs = read_pkgdata('task-core', d)['PACKAGES'] # pkgs = d.getVar('PACKAGES', True).split()
Signature · 1 line
1.7.9.5
PATCH 24/57 augeas: Add libxml2 dependency
In reply to Scott GarmanFrom: Martin Donnelly <[email protected]>
This patch fixes the following Augeas configure error.
| checking for LIBXML... no | configure: error: Package requirements (libxml-2.0) were not met: | | No package 'libxml-2.0' found | | Consider adjusting the PKG_CONFIG_PATH environment variable if you | installed software in a non-standard prefix. | | Alternatively, you may set the environment variables LIBXML_CFLAGS | and LIBXML_LIBS to avoid the need to call pkg-config. | See the pkg-config man page for more details. | ERROR: oe_runconf failed
(From OE-Core rev: 72edbba1ad212986be74aaa15eb9c785c6456d30)
--- meta/recipes-extended/augeas/augeas.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/augeas/augeas.inc +1 -1
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff" SRC_URI = "http://augeas.net/download/${BP}.tar.gz" -DEPENDS = "readline" +DEPENDS = "readline libxml2" inherit autotools
Signature · 1 line
1.7.9.5
PATCH 25/57 curl: enable ssl support
In reply to Scott GarmanFrom: Saul Wold <[email protected]>
This patch enables ssl support for curl to allow git to clone from https / ssl sites. We do not want to enable gnutls for native or nativesdk, as it adds additional dependency and increase build time
[YOCTO #2532]
(From OE-Core rev: 653786096cb13560537905410e737e0dd9a9cf57)
--- meta/recipes-support/curl/curl_7.24.0.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
meta/recipes-support/curl/curl_7.24.0.bb +5 -5
@@ -5,10 +5,10 @@ SECTION = "console/network" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac" -DEPENDS = "zlib gnutls" -DEPENDS_virtclass-native = "zlib-native" -DEPENDS_virtclass-nativesdk = "zlib-nativesdk" -PR = "r0" +DEPENDS = "zlib gnutls openssl" +DEPENDS_virtclass-native = "zlib-native openssl-native" +DEPENDS_virtclass-nativesdk = "zlib-nativesdk openssl-nativesdk" +PR = "r1" SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://noldlibpath.patch \
@@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01 inherit autotools pkgconfig binconfig EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ - --without-ssl \ + --with-ssl \ --without-libssh2 \ --with-random=/dev/urandom \ --without-libidn \
Signature · 1 line
1.7.9.5
PATCH 26/57 curl: Use gnutls for target and openssl for native
In reply to Scott GarmanFrom: Saul Wold <[email protected]>
Since gnutls is available on the target use it, but we do not build gnutls for the native side as it adds too many dependecies, so use openssl.
(From OE-Core rev: 87610064a435f8b8b5694e4d6627e53b25d8f713)
--- meta/recipes-support/curl/curl_7.24.0.bb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
meta/recipes-support/curl/curl_7.24.0.bb +6 -7
@@ -5,10 +5,10 @@ SECTION = "console/network" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac" -DEPENDS = "zlib gnutls openssl" +DEPENDS = "zlib gnutls" DEPENDS_virtclass-native = "zlib-native openssl-native" -DEPENDS_virtclass-nativesdk = "zlib-nativesdk openssl-nativesdk" -PR = "r1" +DEPENDS_virtclass-nativesdk = "zlib-nativesdk" +PR = "r2" SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://noldlibpath.patch \
@@ -20,7 +20,6 @@ SRC_URI[sha256sum] = "ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01 inherit autotools pkgconfig binconfig EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ - --with-ssl \ --without-libssh2 \ --with-random=/dev/urandom \ --without-libidn \
@@ -28,9 +27,9 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ ${CURLGNUTLS} \ " -CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../" -CURLGNUTLS_virtclass-native = "--without-gnutls" -CURLGNUTLS_virtclass-nativesdk = "--without-gnutls" +CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../ --without-ssl" +CURLGNUTLS_virtclass-native = "--without-gnutls --with-ssl" +CURLGNUTLS_virtclass-nativesdk = "--without-gnutls --without-ssl" do_configure_prepend() { sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac
Signature · 1 line
1.7.9.5
PATCH 27/57 xserver-xorg: Fix build on powerpc
In reply to Scott GarmanFrom: Khem Raj <[email protected]>
(From OE-Core rev: 8a11f42d3ed526fae0c0bb050d7d0519904591b4)
--- .../xorg-xserver/xserver-xorg-1.11.2.inc | 9 +++--- .../xserver-xorg-1.11.2/gcc-47-warning.patch | 33 ++++++++++++++++++++ 2 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc +5 -4
@@ -1,10 +1,11 @@ -SRC_URI += "file://crosscompile.patch" - # Misc build failure for master HEAD -SRC_URI += "file://fix_open_max_preprocessor_error.patch" +SRC_URI += "file://crosscompile.patch \ + file://fix_open_max_preprocessor_error.patch \ + file://gcc-47-warning.patch \ + " SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" -PR = "r1" +PR = "r2"
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch new file +33 -0
@@ -0,0 +1,33 @@ +This patch fixes errors on powerpc like below + +| lnx_video.c: In function 'unmapVidMem': +| lnx_video.c:472:24: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] + +Its in 1.12 branch + +http://cgit.freedesktop.org/xorg/xserver/commit/?h=server-1.12-branch&id=eb3377ffb8a7baa26c9831e56ed782d48b28fa71 + +Upstream-Status: Backport + +Signed-off-by: Khem Raj <[email protected]> + +Index: xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c +=================================================================== +--- xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c 2012-05-01 06:32:34.186489019 -0700 ++++ xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c 2012-05-01 06:49:14.926537452 -0700 +@@ -469,11 +469,11 @@ + static void + unmapVidMem(int ScreenNum, pointer Base, unsigned long Size) + { +- memType alignOff = (memType)Base +- - ((memType)Base & ~(getpagesize() - 1)); ++ uintptr_t alignOff = (uintptr_t)Base ++ - ((uintptr_t)Base & ~(getpagesize() - 1)); + +- DebugF("alignment offset: %lx\n",alignOff); +- munmap((caddr_t)((memType)Base - alignOff), (Size + alignOff)); ++ DebugF("alignment offset: %lx\n",(unsigned long)alignOff); ++ munmap((void*)((uintptr_t)Base - alignOff), (Size + alignOff)); + } + +
Signature · 1 line
1.7.9.5
PATCH 28/57 kernel.bbclass: Copy bounds.h only if it exists, needed for 2.6.x.
In reply to Scott GarmanFrom: Leon Woestenberg <[email protected]>
Linux 2.6.x kernels did not (all) have the bounds.h file, so copy only iff exists.
(See OE-Core 02ac0d1b65389e1779d5f95047f761d7a82ef7a4)
--- meta/classes/kernel.bbclass | 5 +++++ 1 file changed, 5 insertions(+)
meta/classes/kernel.bbclass +5 -0
@@ -183,6 +183,11 @@ kernel_do_install() { cp arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o fi + # Necessary for building modules like compat-wireless. + if [ -f include/generated/bounds.h ]; then + cp include/generated/bounds.h $kerneldir/include/generated/bounds.h + fi + # Remove the following binaries which cause strip errors # during do_package for cross-compiled platforms bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \
Signature · 1 line
1.7.9.5
PATCH 29/57 gcc-package-runtime.inc: Fix QA warning
In reply to Scott GarmanFrom: Matthew McClintock <[email protected]>
Quoted 3 lines
ERROR: QA Issue: gcc-runtime: Files/directories were installed but not shipped
/usr/lib/libgomp.so.1.0.0
/usr/lib/libgomp.so.1
(From OE-Core rev: fee3def2ca49e3349758d9cd9a9cf5645f03cf18)
--- meta/recipes-devtools/gcc/gcc-package-runtime.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-devtools/gcc/gcc-package-runtime.inc +2 -1
@@ -64,8 +64,9 @@ FILES_libmudflap-dev = "\ ${libdir}/libmudflap*.a \ ${libdir}/libmudflap*.la" +FILES_libgomp = "${libdir}/libgomp*${SOLIBS}" FILES_libgomp-dev = "\ - ${libdir}/libgomp*.so \ + ${libdir}/libgomp*${SOLIBSDEV} \ ${libdir}/libgomp*.la \ ${libdir}/libgomp.spec \ ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/omp.h \
Signature · 1 line
1.7.9.5
PATCH 30/57 task-core-tools-testapps.bb: kexec-tools does not work on e5500-64b parts
In reply to Scott GarmanFrom: Matthew McClintock <[email protected]>
This prevents kexec from building for this part since it does not work
(From OE-Core rev: c7beda1b779ce189c614fcce13e9ccf2c1b4ca6c)
--- .../recipes-core/tasks/task-core-tools-testapps.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-core/tasks/task-core-tools-testapps.bb +1 -0
@@ -22,6 +22,7 @@ KEXECTOOLS ?= "kexec" KEXECTOOLS_mips ?= "" KEXECTOOLS_mipsel ?= "" KEXECTOOLS_powerpc ?= "" +KEXECTOOLS_e5500-64b ?= "" RDEPENDS_${PN} = "\ blktool \
Signature · 1 line
1.7.9.5
PATCH 31/57 image_types.bbclass: redefine EXTRA_IMAGECMD_jffs2 to leverage siteinfo
In reply to Scott GarmanFrom: Ting Liu <[email protected]>
(From OE-Core rev: 7c803cea58737ea0abc62cd21c3813d955f07224)
--- meta/classes/image_types.bbclass | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
meta/classes/image_types.bbclass +6 -1
@@ -188,7 +188,12 @@ IMAGE_CMD_ubi () { IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS}" EXTRA_IMAGECMD = "" -EXTRA_IMAGECMD_jffs2 ?= "--pad --little-endian --eraseblock=0x40000" + +inherit siteinfo +JFFS2_ENDIANNESS ?= "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '--little-endian', '--big-endian', d)}" +JFFS2_ERASEBLOCK ?= "0x40000" +EXTRA_IMAGECMD_jffs2 ?= "--pad ${JFFS2_ENDIANNESS} --eraseblock=${JFFS2_ERASEBLOCK} --no-cleanmarkers" + # Change these if you want default genext2fs behavior (i.e. create minimal inode number) EXTRA_IMAGECMD_ext2 ?= "-i 8192" EXTRA_IMAGECMD_ext3 ?= "-i 8192"
Signature · 1 line
1.7.9.5
PATCH 32/57 libtool: fixed parallel build related race
In reply to Scott GarmanFrom: Enrico Scholz <[email protected]>
While building libtool, the libtool script itself will be regenerated because OE modifies a dependency[1]. With -jX, this operation (--> removal, creation of non-x file, 'chmod a+x') can happen at a time when the script is going to be executed. This can cause errors like:
| arm-linux-gnueabi-libtool: compile: ccache arm-linux-gnueabi-gcc ... | ... | /bin/sh ./config.status libtool | ... | arm-linux-gnueabi-libtool: compile: ccache arm-linux-gnueabi-gcc ... | /bin/sh: ./arm-linux-gnueabi-libtool: Permission denied | make[2]: *** [libltdl/libltdl_libltdl_la-lt__alloc.lo] Error 126
I am not sure whether the custom do_compile_prepend() is still needed. For now only the issue above will be fixed by executing ./config.status yet again.
[1] see 648290d5bf4d6ff50d3643bb7ad902dfc23aa702
(From OE-Core rev: e065c11b6066f8c1d37496b58dd853a684cd9136)
--- meta/recipes-devtools/libtool/libtool-2.4.2.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-devtools/libtool/libtool-2.4.2.inc +2 -1
@@ -8,7 +8,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" -INC_PR = "r2" +INC_PR = "r3" SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ file://trailingslash.patch \
@@ -27,6 +27,7 @@ do_compile_prepend () { # Sometimes this file doesn't get rebuilt, force the issue rm -f ${S}/libltdl/config/ltmain.sh make libltdl/config/ltmain.sh + ./config.status } inherit autotools
Signature · 1 line
1.7.9.5
PATCH 33/57 utils.bbclass: add helper function to add all multilib variants of a specific package
In reply to Scott GarmanFrom: Richard Purdie <[email protected]>
This is useful for the scenario where we want to add 'gcc' to the root file system for all multilib variants
(From OE-Core rev: 7cd54693363882854cd026ebe071e9f2e03d364e)
--- meta/classes/utils.bbclass | 9 +++++++++ 1 file changed, 9 insertions(+)
meta/classes/utils.bbclass +9 -0
@@ -351,6 +351,15 @@ def extend_variants(d, var, extend, delim=':'): variants.append(eext[1]) return " ".join(variants) +def multilib_pkg_extend(d, pkg): + variants = (d.getVar("MULTILIB_VARIANTS", True) or "").split() + if not variants: + return pkg + pkgs = pkg + for v in variants: + pkgs = pkgs + " " + v + "-" + pkg + return pkgs + def all_multilib_tune_values(d, var, unique = True, need_split = True, delim = ' '): """Return a string of all ${var} in all multilib tune configuration""" values = []
Signature · 1 line
1.7.9.5
PATCH 34/57 tcl: fix target recipe build issue on older distros
In reply to Scott GarmanFrom: Nitin A Kamble <[email protected]>
the builddir is put in front of the LD_LIBRARY_PATH, causing dynamically linking of target library with native tclsh.
Fix this behavior to cross build tcl correctly.
This issue got exposed when eglibc-2.15 was configured for the target.
(From OE-Core rev: 76e8df78bdb641b045e34dcf01d7b9eb626401dc)
--- .../tcl/fix_issue_with_old_distro_glibc.patch | 109 ++++++++++++++++++++ meta/recipes-devtools/tcltk/tcl_8.5.11.bb | 5 +- 2 files changed, 112 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch new file +109 -0
@@ -0,0 +1,109 @@ +Upstream-Status: inappropriate [embedded specific] + +Fixes tcl target recipe build on old distros which have glibc older than 2.14 + +| + echo 'NOTE: make DESTDIR=/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image install' +| NOTE: make DESTDIR=/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image install +| + make DESTDIR=/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image install +| Making directory /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image/usr/lib +| Installing message catalogs +| Making directory /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image/usr/share/man +| tclsh: /lib64/libc.so.6: version `GLIBC_2.14' not found (required by /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/tcl8.5.11/unix/libtcl8.5.so) +| Making directory /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image/usr/bin +| make: *** [install-msgs] Error 1 + +Signed-Off-By: Nitin A Kamble <[email protected]> +2012/04/26 + +Index: unix/Makefile.in +=================================================================== +--- unix.orig/Makefile.in ++++ unix/Makefile.in +@@ -592,12 +592,12 @@ tcltest-real: + # % make test TESTFLAGS="-verbose bps -file fileName.test" + + test: tcltest@EXEEXT@ +- @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ ++ @LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ + TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ + ./tcltest@EXEEXT@ $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) + + gdb-test: tcltest@EXEEXT@ +- @echo "set env @LD_LIBRARY_PATH_VAR@=\"`pwd`:$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run ++ @echo "set env @LD_LIBRARY_PATH_VAR@=\"$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run + @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run + @echo "set args $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) -singleproc 1" >> gdb.run + $(GDB) ./tcltest@EXEEXT@ --command=gdb.run +@@ -605,27 +605,27 @@ gdb-test: tcltest@EXEEXT@ + + # Useful target to launch a built tcltest with the proper path,... + runtest: tcltest@EXEEXT@ +- @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ ++ @LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ + TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ + ./tcltest@EXEEXT@ + + # Useful target for running the test suite with an unwritable current + # directory... + ro-test: tcltest@EXEEXT@ +- @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ ++ @LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ + TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ + echo 'exec chmod -w .;package require tcltest;tcltest::temporaryDirectory /tmp;source ../tests/all.tcl;exec chmod +w .' | ./tcltest@EXEEXT@ + + # This target can be used to run tclsh from the build directory + # via `make shell SCRIPT=/tmp/foo.tcl` + shell: ${TCL_EXE} +- @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ ++ @LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ + TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ + ${TCL_EXE} $(SCRIPT) + + # This target can be used to run tclsh inside either gdb or insight + gdb: ${TCL_EXE} +- @echo "set env @LD_LIBRARY_PATH_VAR@=\"`pwd`:$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run ++ @echo "set env @LD_LIBRARY_PATH_VAR@=\"$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run + @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run + $(GDB) ${TCL_EXE} --command=gdb.run + rm gdb.run +@@ -633,12 +633,12 @@ gdb: ${TCL_EXE} + VALGRINDARGS=--tool=memcheck --num-callers=8 --leak-resolution=high --leak-check=yes --show-reachable=yes -v + + valgrind: ${TCL_EXE} tcltest@EXEEXT@ +- @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ ++ @LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ + TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ + valgrind $(VALGRINDARGS) ./tcltest@EXEEXT@ $(TOP_DIR)/tests/all.tcl -singleproc 1 $(TESTFLAGS) + + valgrindshell: ${TCL_EXE} +- @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ ++ @LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ + TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ + valgrind $(VALGRINDARGS) ${TCL_EXE} $(SCRIPT) + +@@ -802,14 +802,14 @@ install-libraries: libraries $(INSTALL_T + + install-tzdata: ${TCL_EXE} + @echo "Installing time zone data" +- @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ ++ @@LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ + TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ + ${TCL_EXE} $(TOOL_DIR)/installData.tcl \ + $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata + + install-msgs: ${TCL_EXE} + @echo "Installing message catalogs" +- @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ ++ @@LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ + TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ + ${TCL_EXE} $(TOOL_DIR)/installData.tcl \ + $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs +@@ -1733,7 +1733,7 @@ html-tk: ${TCL_EXE} + @EXTRA_BUILD_HTML@ + + BUILD_HTML = \ +- @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ ++ @@LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ + TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ + ${TCL_EXE} $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \ + --srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS)
meta/recipes-devtools/tcltk/tcl_8.5.11.bb +3 -2
@@ -11,13 +11,14 @@ LIC_FILES_CHKSUM = "file://../license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 file://../win/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \ " -PR = "r5" +PR = "r6" BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \ file://tcl-add-soname.patch" SRC_URI = "${BASE_SRC_URI} \ - file://fix_non_native_build_issue.patch " + file://fix_non_native_build_issue.patch \ + file://fix_issue_with_old_distro_glibc.patch " SRC_URI[md5sum] = "b01a9691c83990b3db0ce62d1012ca67" SRC_URI[sha256sum] = "8addc385fa6b5be4605e6d68fbdc4c0e674c5af1dc1c95ec5420390c4b08042a"
Signature · 1 line
1.7.9.5
PATCH 36/57 shadow-native: use 'users' group by default
In reply to Scott GarmanFrom: Otavio Salvador <[email protected]>
The rootfs has 'users' group at number 100 and without this fix it would assign to a non-existent group and if a group with gid as 1000 is created later it would own all files for users created.
(From OE-Core rev: e06414092c7aa4fce1173f00e610a33a0deca9cd)
Reworked commit to fix merge conflicts with denzil branch.
--- .../shadow/shadow-native_4.1.4.3.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb +4 -1
@@ -7,7 +7,7 @@ LICENSE = "BSD | Artistic-1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \ file://src/passwd.c;firstline=8;endline=30;md5=2899a045e90511d0e043b85a7db7e2fe" -PR = "r4" +PR = "r5" SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \ file://shadow.automake-1.11.patch \
@@ -44,6 +44,9 @@ do_install_append() { sed -i 's:/bin/bash:/bin/sh:g' ${D}${sysconfdir}/default/useradd sed -i '/^CREATE_MAIL_SPOOL/ s:^:#:' ${D}${sysconfdir}/default/useradd + # Use users group by default + sed -i 's,^GROUP=1000,GROUP=100,g' ${D}${sysconfdir}/default/useradd + install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} for i in passwd chfn newgrp chsh ; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}
Signature · 1 line
1.7.9.5
PATCH 35/57 u-boot.inc: update linker arguments to pass --sysroot arg
In reply to Scott GarmanFrom: Matthew McClintock <[email protected]>
If we are building from sstate-cache it's possible to be building from another folder on another machine, therefore the linker requires that a proper --sysroot is passed too it so it can find things like libgcc.a and avoid errors such as:
| arm-poky-linux-gnueabi-gcc -g -O2 -fno-common -ffixed-r8 -msoft-float -D__KERNEL__ -DCONFIG_SYS_TEXT_BASE=0x80008000 -I/local/yocto/upstream/label/ubuntu1204-64b/machine/beagleboard/poky/edison/tmp/work/beagleboard-poky-linux-gnueabi/u-boot-v2011.06+git5+b1af6f532e0d348b153d5c148369229d24af361a-r0/git/include -fno-builtin -ffreestanding -nostdinc -isystem /local/yocto/upstream/label/ubuntu1204-64b/machine/beagleboard/poky/edison/tmp/sysroots/x86_64-linux/usr/bin/armv7a-vfp-neon-poky-linux-gnueabi/../../lib/armv7a-vfp-neon-poky-linux-gnueabi/gcc/arm-poky-linux-gnueabi/4.6.3/include -pipe -DCONFIG_ARM -D__ARM__ -marm -mabi=aapcs-linux -mno-thumb-interwork -march=armv5 -Wall -Wstrict-prototypes -fno-stack-protector -fno-toplevel-reorder -o hello_world.o hello_world.c -c | arm-poky-linux-gnueabi-gcc -g -O2 -fno-common -ffixed-r8 -msoft-float -D__KERNEL__ -DCONFIG_SYS_TEXT_BASE=0x80008000 -I/local/yocto/upstream/label/ubuntu1204-64b/machine/beagleboard/poky/edison/tmp/work/beagleboard-poky-linux-gnueabi/u-boot-v2011.06+git5+b1af6f532e0d348b153d5c148369229d24af361a-r0/git/include -fno-builtin -ffreestanding -nostdinc -isystem /local/yocto/upstream/label/ubuntu1204-64b/machine/beagleboard/poky/edison/tmp/sysroots/x86_64-linux/usr/bin/armv7a-vfp-neon-poky-linux-gnueabi/../../lib/armv7a-vfp-neon-poky-linux-gnueabi/gcc/arm-poky-linux-gnueabi/4.6.3/include -pipe -DCONFIG_ARM -D__ARM__ -marm -mabi=aapcs-linux -mno-thumb-interwork -march=armv5 -Wall -Wstrict-prototypes -fno-stack-protector -fno-toplevel-reorder -o stubs.o stubs.c -c | arm-poky-linux-gnueabi-ld -r -o libstubs.o stubs.o | arm-poky-linux-gnueabi-ld -g -Ttext 0x80300000 \ | -o hello_world -e hello_world hello_world.o libstubs.o \ | -L. -lgcc | arm-poky-linux-gnueabi-ld: cannot find -lgcc | make[1]: *** [hello_world] Error 1
(From OE-Core rev: 923eb657f24a1feaa93172eda8f87252e86bfea2)
--- meta/recipes-bsp/u-boot/u-boot.inc | 2 +- meta/recipes-bsp/u-boot/u-boot_2011.03.bb | 2 +- meta/recipes-bsp/u-boot/u-boot_2011.06.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-bsp/u-boot/u-boot.inc +1 -1
@@ -8,7 +8,7 @@ inherit deploy PARALLEL_MAKE="" # GCC 4.5.1 builds unusable binaries using -Os, remove it from OPTFLAGS -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} OPTFLAGS='-O2'" +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} OPTFLAGS='-O2' CC='${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}'" python () { if not d.getVar("UBOOT_MACHINE", True):
meta/recipes-bsp/u-boot/u-boot_2011.03.bb +1 -1
@@ -17,7 +17,7 @@ FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/u-boot-git/${MACHINE}" SRCREV = "19b54a701811220221fc4d5089a2bb18892018ca" PV = "v2011.03+git${SRCPV}" -PR = "r6" +PR = "r7" SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
meta/recipes-bsp/u-boot/u-boot_2011.06.bb +1 -1
@@ -17,7 +17,7 @@ FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/u-boot-git/${MACHINE}" SRCREV = "b1af6f532e0d348b153d5c148369229d24af361a" PV = "v2011.06+git${SRCPV}" -PR = "r1" +PR = "r2" SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
Signature · 1 line
1.7.9.5
PATCH 37/57 shadow: use 'users' group by default
In reply to Scott GarmanFrom: Otavio Salvador <[email protected]>
The rootfs has 'users' group at number 100 and without this fix it would assign to a non-existent group and if a group with gid as 1000 is created later it would own all files for users created.
(From OE-Core rev: a67d77d25cbab0d88b9ff76e3f28429d4ac4f34b)
Reworked commit to fix merge conflicts with denzil branch.
--- meta/recipes-extended/shadow/shadow_4.1.4.3.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-extended/shadow/shadow_4.1.4.3.bb +4 -1
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \ DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} = "shadow-securetty ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" -PR = "r8" +PR = "r9" SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \ file://login_defs_pam.sed \
@@ -83,6 +83,9 @@ do_install_append() { sed -i 's:/bin/bash:/bin/sh:g' ${D}${sysconfdir}/default/useradd sed -i '/^CREATE_MAIL_SPOOL/ s:^:#:' ${D}${sysconfdir}/default/useradd + # Use users group by default + sed -i 's,^GROUP=1000,GROUP=100,g' ${D}${sysconfdir}/default/useradd + install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} for i in passwd chfn newgrp chsh groups ; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}
Signature · 1 line
1.7.9.5
PATCH 38/57 foomatic: fix perl path for target
In reply to Scott GarmanFrom: Saul Wold <[email protected]>
This problem appears on F17 when configure finds /bin/perl, since the beh script is a target side script, we need to set PERL in the do_configure_prepend in order for the correct perl to be used
(From OE-Core rev: 5290e82ecef08b5e573d7442627276d7b42c6b93)
Reworked commit to fix merge conflicts with denzil branch.
--- .../foomatic/foomatic-filters_4.0.7.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-extended/foomatic/foomatic-filters_4.0.7.bb +2 -1
@@ -10,7 +10,7 @@ format using a printer-specific, but spooler-independent PPD file. \ " DEPENDS += "cups perl libxml2" -PR = "r3" +PR = "r4" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://${WORKDIR}/foomatic-filters-${PV}/COPYING;md5=393a5ca445f6965873eca0259a17f833"
@@ -25,6 +25,7 @@ inherit autotools EXTRA_OECONF += "--disable-file-converter-check --with-file-converter=texttops" do_configure_prepend() { + export PERL="${bindir}/env perl" export LIB_CUPS=${exec_prefix}/lib/cups # /usr/lib NOT libdir export CUPS_BACKENDS=${exec_prefix}/lib/cups/backend # /usr/lib NOT libdir export CUPS_FILTERS=${exec_prefix}/lib/cups/filter # /usr/lib NOT libdir
Signature · 1 line
1.7.9.5
PATCH 39/57 classes/rootfs_*: fix splitting package dependency strings
In reply to Scott GarmanFrom: Paul Eggleton <[email protected]>
If a + character appears in a version specification within the list of package dependencies, the version will not be removed from the list in list_package_depends/recommends leading to garbage appearing in the dependency graphs generated by buildhistory. To avoid any future problems due to unusual characters appearing in versions, change the regex to match almost any character.
Fixes [YOCTO #2451].
(From OE-Core rev: 36d1717e2ad4ca1620ee9f01b524b5ff2f499b26)
--- meta/classes/rootfs_deb.bbclass | 4 ++-- meta/classes/rootfs_ipk.bbclass | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
meta/classes/rootfs_deb.bbclass +2 -2
@@ -101,11 +101,11 @@ get_package_filename() { } list_package_depends() { - ${DPKG_QUERY_COMMAND} -s $1 | grep ^Depends | sed -e 's/^Depends: //' -e 's/,//g' -e 's:([=<>]* [0-9a-zA-Z.~\-]*)::g' + ${DPKG_QUERY_COMMAND} -s $1 | grep ^Depends | sed -e 's/^Depends: //' -e 's/,//g' -e 's:([=<>]* [^ )]*)::g' } list_package_recommends() { - ${DPKG_QUERY_COMMAND} -s $1 | grep ^Recommends | sed -e 's/^Recommends: //' -e 's/,//g' -e 's:([=<>]* [0-9a-zA-Z.~\-]*)::g' + ${DPKG_QUERY_COMMAND} -s $1 | grep ^Recommends | sed -e 's/^Recommends: //' -e 's/,//g' -e 's:([=<>]* [^ )]*)::g' } rootfs_check_package_exists() {
meta/classes/rootfs_ipk.bbclass +2 -2
@@ -143,11 +143,11 @@ get_package_filename() { } list_package_depends() { - opkg-cl ${IPKG_ARGS} info $1 | grep ^Depends | sed -e 's/^Depends: //' -e 's/,//g' -e 's:([=<>]* [0-9a-zA-Z.~\-]*)::g' + opkg-cl ${IPKG_ARGS} info $1 | grep ^Depends | sed -e 's/^Depends: //' -e 's/,//g' -e 's:([=<>]* [^ )]*)::g' } list_package_recommends() { - opkg-cl ${IPKG_ARGS} info $1 | grep ^Recommends | sed -e 's/^Recommends: //' -e 's/,//g' -e 's:([=<>]* [0-9a-zA-Z.~\-]*)::g' + opkg-cl ${IPKG_ARGS} info $1 | grep ^Recommends | sed -e 's/^Recommends: //' -e 's/,//g' -e 's:([=<>]* [^ )]*)::g' } rootfs_check_package_exists() {
Signature · 1 line
1.7.9.5
PATCH 40/57 buildhistory_analysis: fix error when version specifier missing
In reply to Scott GarmanFrom: Paul Eggleton <[email protected]>
Passing None to split_versions() will raise an exception, so check that the version is specified before passing it in.
(From OE-Core rev: 90caa605bd24279e4a9204e279492754119a8a55)
--- meta/lib/oe/buildhistory_analysis.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oe/buildhistory_analysis.py +1 -1
@@ -272,7 +272,7 @@ def compare_pkg_lists(astr, bstr): if k in depverb: dva = depvera[k] dvb = depverb[k] - if dva != dvb: + if dva and dvb and dva != dvb: if bb.utils.vercmp(split_version(dva), split_version(dvb)) < 0: remove.append(k)
Signature · 1 line
1.7.9.5
PATCH 41/57 scripts/buildhistory-diff: add GitPython version check
In reply to Scott GarmanFrom: Paul Eggleton <[email protected]>
Display an error if the user does not have at least version 0.3.1 of GitPython installed.
(From OE-Core rev: 2f0f5a895504924b5a21699854678e9bc25b447c)
--- scripts/buildhistory-diff | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
scripts/buildhistory-diff +6 -2
@@ -7,16 +7,20 @@ import sys import os +from distutils.version import LooseVersion # Ensure PythonGit is installed (buildhistory_analysis needs it) try: import git except ImportError: - print("Please install PythonGit 0.3.1 or later in order to use this script") + print("Please install GitPython (python-git) 0.3.1 or later in order to use this script") sys.exit(1) - def main(): + if LooseVersion(git.__version__) < '0.3.1': + print("Version of GitPython is too old, please install GitPython (python-git) 0.3.1 or later in order to use this script") + sys.exit(1) + if (len(sys.argv) < 3): print("Report significant differences in the buildhistory repository") print("Syntax: %s <buildhistory-path> <since-revision> [to-revision]" % os.path.basename(sys.argv[0]))
Signature · 1 line
1.7.9.5
PATCH 42/57 classes/license: fix manifest to work with deb
In reply to Scott GarmanFrom: Paul Eggleton <[email protected]>
Prepend the license manifest creation call to ROOTFS_POSTPROCESS_COMMAND instead of appending to ROOTFS_POSTINSTALL_COMMAND. The latter is not implemented for the deb backend (and probably ought to just be removed completely), and by using _prepend we can still ensure it occurs before package info is removed (and before buildhistory in case it is needed there in future).
(From OE-Core rev: 56fafe083fdb63f156a081344fb1d836e3182bf0)
--- meta/classes/license.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/license.bbclass +1 -1
@@ -382,7 +382,7 @@ do_populate_lic[sstate-name] = "populate-lic" do_populate_lic[sstate-inputdirs] = "${LICSSTATEDIR}" do_populate_lic[sstate-outputdirs] = "${LICENSE_DIRECTORY}/" -ROOTFS_POSTINSTALL_COMMAND += "license_create_manifest; " +ROOTFS_POSTPROCESS_COMMAND_prepend = "license_create_manifest; " python do_populate_lic_setscene () { sstate_setscene(d)
Signature · 1 line
1.7.9.5
PATCH 43/57 cooker: fix UnboundLocalError when exception occurs during parsing
In reply to Scott GarmanFrom: Paul Eggleton <[email protected]>
Fix a recent regression where we see the following additional error after an error occurs during parsing:
ERROR: Command execution failed: Traceback (most recent call last):
File "/home/paul/poky/poky/bitbake/lib/bb/command.py", line 84, in runAsyncCommand
self.cooker.updateCache()
File "/home/paul/poky/poky/bitbake/lib/bb/cooker.py", line 1202, in updateCache
if not self.parser.parse_next():
File "/home/paul/poky/poky/bitbake/lib/bb/cooker.py", line 1672, in parse_next
self.virtuals += len(result)
UnboundLocalError: local variable 'result' referenced before assignment
(Bitbake rev: 1ae0181ba49ccfcb2d889de5dd1d8912b9e49157)
--- bitbake/lib/bb/cooker.py | 2 ++ 1 file changed, 2 insertions(+)
bitbake/lib/bb/cooker.py +2 -0
@@ -1644,6 +1644,8 @@ class CookerParser(object): yield result def parse_next(self): + result = [] + parsed = None try: parsed, result = self.results.next() except StopIteration:
Signature · 1 line
1.7.9.5
PATCH 44/57 yocto-bsp: add new strip_base() function
In reply to Scott GarmanFrom: Tom Zanussi <[email protected]>
Add a strip_base() function to remove '/base' from the branch names presented to the user.
--- scripts/lib/bsp/engine.py | 10 ++++++++++ 1 file changed, 10 insertions(+)
scripts/lib/bsp/engine.py +10 -0
@@ -449,6 +449,16 @@ def boolean(input_str, name): return name +def strip_base(input_str): + """ + strip '/base' off the end of input_str, so we can use 'base' in + the branch names we present to the user. + """ + if input_str and input_str.endswith("/base"): + return input_str[:-len("/base")] + return input_str.strip() + + deferred_choices = {} def gen_choices_defer(input_line, context, checklist = False):
Signature · 1 line
1.7.9.5
PATCH 45/57 yocto-bsp: strip '/base' from kernel branches in templates
In reply to Scott GarmanFrom: Tom Zanussi <[email protected]>
For new branches, users can specify /base branches, but we don't want the '/base' in the resultant branch name, so remove it.
Fixes [YOCTO #2693].
--- ...yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend" | 4 ++-- ...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 4 ++-- ...linux-yocto_3.0\": }} linux-yocto_3.0.bbappend" | 4 ++-- ...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 4 ++-- ...yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend" | 4 ++-- ...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 4 ++-- ...linux-yocto_3.0\": }} linux-yocto_3.0.bbappend" | 4 ++-- ...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 4 ++-- ...yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend" | 4 ++-- ...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 4 ++-- ...linux-yocto_3.0\": }} linux-yocto_3.0.bbappend" | 4 ++-- ...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 4 ++-- ...yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend" | 4 ++-- ...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 4 ++-- ...linux-yocto_3.0\": }} linux-yocto_3.0.bbappend" | 4 ++-- ...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 4 ++-- ...yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend" | 4 ++-- ...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 4 ++-- ...linux-yocto_3.0\": }} linux-yocto_3.0.bbappend" | 4 ++-- ...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 4 ++-- ...yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend" | 4 ++-- ...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 4 ++-- ...linux-yocto_3.0\": }} linux-yocto_3.0.bbappend" | 4 ++-- ...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 4 ++-- 24 files changed, 48 insertions(+), 48 deletions(-)
scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend +2 -2
@@ -13,12 +13,12 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "y": }} -KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if need_new_kbranch == "y": }} -YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" KMACHINE_{{=machine}} = "{{=machine}}"
scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend +2 -2
@@ -13,12 +13,12 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "y": }} -KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if need_new_kbranch == "y": }} -YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" KMACHINE_{{=machine}} = "{{=machine}}"
scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.0\": }} linux-yocto_3.0.bbappend +2 -2
@@ -13,7 +13,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard" }} {{ if need_new_kbranch == "y": }} -KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
@@ -24,7 +24,7 @@ KMACHINE_{{=machine}} = "{{=machine}}" KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" {{ if need_new_kbranch == "y": }} -YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=existing_kbranch}}"
scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend +2 -2
@@ -13,12 +13,12 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default" }} {{ if need_new_kbranch == "y": }} -KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if need_new_kbranch == "y": }} -YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" KMACHINE_{{=machine}} = "{{=machine}}"
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend +2 -2
@@ -13,12 +13,12 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "y": }} -KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if need_new_kbranch == "y": }} -YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" KMACHINE_{{=machine}} = "{{=machine}}"
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend +2 -2
@@ -13,12 +13,12 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "y": }} -KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if need_new_kbranch == "y": }} -YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" KMACHINE_{{=machine}} = "{{=machine}}"
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.0\": }} linux-yocto_3.0.bbappend +2 -2
@@ -13,7 +13,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} {{ if need_new_kbranch == "y": }} -KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
@@ -24,7 +24,7 @@ KMACHINE_{{=machine}} = "{{=machine}}" KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" {{ if need_new_kbranch == "y": }} -YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=existing_kbranch}}"
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend +2 -2
@@ -13,12 +13,12 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} {{ if need_new_kbranch == "y": }} -KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if need_new_kbranch == "y": }} -YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" KMACHINE_{{=machine}} = "{{=machine}}"
scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend +2 -2
@@ -13,12 +13,12 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "y": }} -KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if need_new_kbranch == "y": }} -YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" KMACHINE_{{=machine}} = "{{=machine}}"
scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend +2 -2
@@ -13,12 +13,12 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "y": }} -KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if need_new_kbranch == "y": }} -YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" KMACHINE_{{=machine}} = "{{=machine}}"
scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.0\": }} linux-yocto_3.0.bbappend +2 -2
@@ -13,7 +13,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard" }} {{ if need_new_kbranch == "y": }} -KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
@@ -24,7 +24,7 @@ KMACHINE_{{=machine}} = "{{=machine}}" KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" {{ if need_new_kbranch == "y": }} -YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=existing_kbranch}}"
scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend +2 -2
@@ -13,12 +13,12 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default" }} {{ if need_new_kbranch == "y": }} -KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if need_new_kbranch == "y": }} -YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" KMACHINE_{{=machine}} = "{{=machine}}"
scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend +2 -2
@@ -13,12 +13,12 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "y": }} -KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if need_new_kbranch == "y": }} -YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" KMACHINE_{{=machine}} = "{{=machine}}"
scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend +2 -2
@@ -13,12 +13,12 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "y": }} -KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if need_new_kbranch == "y": }} -YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" KMACHINE_{{=machine}} = "{{=machine}}"
scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.0\": }} linux-yocto_3.0.bbappend +2 -2
@@ -13,7 +13,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard" }} {{ if need_new_kbranch == "y": }} -KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
@@ -24,7 +24,7 @@ KMACHINE_{{=machine}} = "{{=machine}}" KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" {{ if need_new_kbranch == "y": }} -YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=existing_kbranch}}"
scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend +2 -2
@@ -13,12 +13,12 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default" }} {{ if need_new_kbranch == "y": }} -KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if need_new_kbranch == "y": }} -YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" KMACHINE_{{=machine}} = "{{=machine}}"
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend +2 -2
@@ -37,12 +37,12 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "y": }} -KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if need_new_kbranch == "y": }} -YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" KMACHINE_{{=machine}} = "{{=machine}}"
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend +2 -2
@@ -37,12 +37,12 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "y": }} -KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if need_new_kbranch == "y": }} -YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" KMACHINE_{{=machine}} = "{{=machine}}"
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.0\": }} linux-yocto_3.0.bbappend +2 -2
@@ -37,12 +37,12 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/mti-malta32-be" }} {{ if need_new_kbranch == "y": }} -KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if need_new_kbranch == "y": }} -YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" KMACHINE_{{=machine}} = "{{=machine}}"
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend +2 -2
@@ -37,12 +37,12 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/mti-malta32-be" }} {{ if need_new_kbranch == "y": }} -KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if need_new_kbranch == "y": }} -YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" KMACHINE_{{=machine}} = "{{=machine}}"
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend +2 -2
@@ -13,12 +13,12 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "y": }} -KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if need_new_kbranch == "y": }} -YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" KMACHINE_{{=machine}} = "{{=machine}}"
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend +2 -2
@@ -13,12 +13,12 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "y": }} -KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if need_new_kbranch == "y": }} -YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" KMACHINE_{{=machine}} = "{{=machine}}"
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.0\": }} linux-yocto_3.0.bbappend +2 -2
@@ -13,7 +13,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/common-pc-64/base" }} {{ if need_new_kbranch == "y": }} -KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
@@ -24,7 +24,7 @@ KMACHINE_{{=machine}} = "{{=machine}}" KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" {{ if need_new_kbranch == "y": }} -YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=existing_kbranch}}"
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend +2 -2
@@ -13,12 +13,12 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc-64/base" }} {{ if need_new_kbranch == "y": }} -KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if need_new_kbranch == "y": }} -YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" +YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" KMACHINE_{{=machine}} = "{{=machine}}"
Signature · 1 line
1.7.9.5
PATCH 46/57 yocto-bsp: update default branch names
In reply to Scott GarmanFrom: Tom Zanussi <[email protected]>
Make sure the default branch names match branch names found in the kernel branch listing.
Fixes [YOCTO #2587].
--- ...yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend" | 2 +- ...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 2 +- ...linux-yocto_3.0\": }} linux-yocto_3.0.bbappend" | 4 ++-- ...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 4 ++-- ...yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend" | 2 +- ...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 2 +- ...linux-yocto_3.0\": }} linux-yocto_3.0.bbappend" | 2 +- ...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 2 +- ...yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend" | 2 +- ...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 2 +- ...linux-yocto_3.0\": }} linux-yocto_3.0.bbappend" | 4 ++-- ...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 4 ++-- ...yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend" | 2 +- ...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 2 +- ...linux-yocto_3.0\": }} linux-yocto_3.0.bbappend" | 4 ++-- ...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 4 ++-- ...yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend" | 10 +++++----- ...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 10 +++++----- ...linux-yocto_3.0\": }} linux-yocto_3.0.bbappend" | 10 +++++----- ...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 10 +++++----- ...yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend" | 2 +- ...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 2 +- ...linux-yocto_3.0\": }} linux-yocto_3.0.bbappend" | 2 +- ...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 2 +- 24 files changed, 46 insertions(+), 46 deletions(-)
scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend +1 -1
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "n": }} {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }}
scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend +1 -1
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "n": }} {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.0\": }} linux-yocto_3.0.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend +1 -1
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "n": }} {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }}
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend +1 -1
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "n": }} {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.0\": }} linux-yocto_3.0.bbappend +1 -1
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} {{ if need_new_kbranch == "n": }} {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }}
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend +1 -1
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} {{ if need_new_kbranch == "n": }} {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }}
scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend +1 -1
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "n": }} {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }}
scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend +1 -1
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "n": }} {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.0\": }} linux-yocto_3.0.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend +1 -1
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "n": }} {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }}
scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend +1 -1
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "n": }} {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.0\": }} linux-yocto_3.0.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend +5 -5
@@ -7,31 +7,31 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y" and qemuarch == "arm": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"arm" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"arm" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "n" and qemuarch == "arm": }} {{ input type:"choicelist" name:"existing_kbranch" nameappend:"arm" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "y" and qemuarch == "powerpc": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/qemu-ppc32" }} {{ if need_new_kbranch == "n" and qemuarch == "powerpc": }} {{ input type:"choicelist" name:"existing_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/qemu-ppc32" }} {{ if need_new_kbranch == "y" and qemuarch == "i386": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "n" and qemuarch == "i386": }} {{ input type:"choicelist" name:"existing_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "y" and qemuarch == "x86_64": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "n" and qemuarch == "x86_64": }} {{ input type:"choicelist" name:"existing_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "y" and qemuarch == "mips": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "n" and qemuarch == "mips": }} {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }}
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend +5 -5
@@ -7,31 +7,31 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y" and qemuarch == "arm": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "n" and qemuarch == "arm": }} {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "y" and qemuarch == "powerpc": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/qemu-ppc32" }} {{ if need_new_kbranch == "n" and qemuarch == "powerpc": }} {{ input type:"choicelist" name:"existing_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/qemu-ppc32" }} {{ if need_new_kbranch == "y" and qemuarch == "i386": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "n" and qemuarch == "i386": }} {{ input type:"choicelist" name:"existing_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "y" and qemuarch == "x86_64": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "n" and qemuarch == "x86_64": }} {{ input type:"choicelist" name:"existing_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "y" and qemuarch == "mips": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "n" and qemuarch == "mips": }} {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.0\": }} linux-yocto_3.0.bbappend +5 -5
@@ -7,31 +7,31 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y" and qemuarch == "arm": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base your new BSP branch on:" default:"yocto/standard" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base your new BSP branch on:" default:"yocto/standard/arm-versatile-926ejs" }} {{ if need_new_kbranch == "n" and qemuarch == "arm": }} {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose an existing machine branch to use for this BSP:" default:"yocto/standard/arm-versatile-926ejs" }} {{ if need_new_kbranch == "y" and qemuarch == "powerpc": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/qemu-ppc32" }} {{ if need_new_kbranch == "n" and qemuarch == "powerpc": }} {{ input type:"choicelist" name:"existing_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/qemu-ppc32" }} {{ if need_new_kbranch == "y" and qemuarch == "i386": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/common-pc" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/common-pc/base" }} {{ if need_new_kbranch == "n" and qemuarch == "i386": }} {{ input type:"choicelist" name:"existing_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/common-pc/base" }} {{ if need_new_kbranch == "y" and qemuarch == "x86_64": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/common-pc-64" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/common-pc-64/base" }} {{ if need_new_kbranch == "n" and qemuarch == "x86_64": }} {{ input type:"choicelist" name:"existing_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/common-pc-64/base" }} {{ if need_new_kbranch == "y" and qemuarch == "mips": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/mti-malta32-be" }} {{ if need_new_kbranch == "n" and qemuarch == "mips": }} {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/mti-malta32-be" }}
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend +5 -5
@@ -7,31 +7,31 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y" and qemuarch == "arm": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/arm-versatile-926ejs" }} {{ if need_new_kbranch == "n" and qemuarch == "arm": }} {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/arm-versatile-926ejs" }} {{ if need_new_kbranch == "y" and qemuarch == "powerpc": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/qemu-ppc32" }} {{ if need_new_kbranch == "n" and qemuarch == "powerpc": }} {{ input type:"choicelist" name:"existing_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/qemu-ppc32" }} {{ if need_new_kbranch == "y" and qemuarch == "i386": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc/base" }} {{ if need_new_kbranch == "n" and qemuarch == "i386": }} {{ input type:"choicelist" name:"existing_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc/base" }} {{ if need_new_kbranch == "y" and qemuarch == "x86_64": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc-64" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc-64/base" }} {{ if need_new_kbranch == "n" and qemuarch == "x86_64": }} {{ input type:"choicelist" name:"existing_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc-64/base" }} {{ if need_new_kbranch == "y" and qemuarch == "mips": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/mti-malta32-be" }} {{ if need_new_kbranch == "n" and qemuarch == "mips": }} {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/mti-malta32-be" }}
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend +1 -1
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "n": }} {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }}
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend +1 -1
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "n": }} {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.0\": }} linux-yocto_3.0.bbappend +1 -1
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/common-pc-64" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/common-pc-64/base" }} {{ if need_new_kbranch == "n": }} {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/common-pc-64/base" }}
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend +1 -1
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc-64" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc-64/base" }} {{ if need_new_kbranch == "n": }} {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc-64/base" }}
Signature · 1 line
1.7.9.5
PATCH 47/57 yocto-bsp: allow branch display filtering
In reply to Scott GarmanFrom: Tom Zanussi <[email protected]>
Add a "branches_base" property that can be used to allow only matching branches to be returned from all_branches().
--- scripts/lib/bsp/engine.py | 7 +++++++ scripts/lib/bsp/kernel.py | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+)
scripts/lib/bsp/engine.py +7 -0
@@ -473,6 +473,11 @@ def gen_choices_defer(input_line, context, checklist = False): except KeyError: nameappend = "" + try: + branches_base = input_line.props["branches_base"] + except KeyError: + branches_base = "" + filename = input_line.props["filename"] closetag_start = filename.find(CLOSE_TAG)
@@ -488,6 +493,8 @@ def gen_choices_defer(input_line, context, checklist = False): captured_context["filename"] = filename context["nameappend"] = nameappend captured_context["nameappend"] = nameappend + context["branches_base"] = branches_base + captured_context["branches_base"] = branches_base deferred_choice = (input_line, captured_context, checklist) key = name + "_" + filename + "_" + nameappend
scripts/lib/bsp/kernel.py +18 -0
@@ -711,6 +711,16 @@ def all_branches(context): tmp = os.popen(gitcmd).read() branches = [] + base_prefixes = None + + try: + branches_base = context["branches_base"] + if branches_base: + base_prefixes = branches_base.split(":") + except KeyError: + pass + + arch = context["arch"] if tmp: tmpline = tmp.split("\n")
@@ -719,6 +729,14 @@ def all_branches(context): break; idx = line.find("refs/heads/") kbranch = line[idx + len("refs/heads/"):] + kbranch_prefix = kbranch.rsplit("/", 1)[0] + + if base_prefixes: + for base_prefix in base_prefixes: + if kbranch_prefix == base_prefix: + branches.append(kbranch) + continue + if (kbranch.find("/") != -1 and (kbranch.find("standard") != -1 or kbranch.find("base") != -1) or kbranch == "base"):
Signature · 1 line
1.7.9.5
PATCH 48/57 yocto-bsp: use branches_base
In reply to Scott GarmanFrom: Tom Zanussi <[email protected]>
--- ...yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend" | 4 ++-- ...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 4 ++-- ...linux-yocto_3.0\": }} linux-yocto_3.0.bbappend" | 4 ++-- ...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 4 ++-- ...yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend" | 4 ++-- ...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 4 ++-- ...linux-yocto_3.0\": }} linux-yocto_3.0.bbappend" | 4 ++-- ...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 4 ++-- ...yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend" | 4 ++-- ...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 4 ++-- ...linux-yocto_3.0\": }} linux-yocto_3.0.bbappend" | 4 ++-- ...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 4 ++-- ...yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend" | 4 ++-- ...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 4 ++-- ...linux-yocto_3.0\": }} linux-yocto_3.0.bbappend" | 4 ++-- ...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 4 ++-- ...yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend" | 20 ++++++++++---------- ...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 20 ++++++++++---------- ...linux-yocto_3.0\": }} linux-yocto_3.0.bbappend" | 20 ++++++++++---------- ...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 20 ++++++++++---------- ...yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend" | 4 ++-- ...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 4 ++-- ...linux-yocto_3.0\": }} linux-yocto_3.0.bbappend" | 4 ++-- ...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 4 ++-- 24 files changed, 80 insertions(+), 80 deletions(-)
scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.0\": }} linux-yocto_3.0.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.0\": }} linux-yocto_3.0.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard:yocto/standard/common-pc" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard:yocto/standard/common-pc" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default:standard/default/common-pc" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default:standard/default/common-pc" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.0\": }} linux-yocto_3.0.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.0\": }} linux-yocto_3.0.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend +10 -10
@@ -7,34 +7,34 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y" and qemuarch == "arm": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"arm" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"arm" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "n" and qemuarch == "arm": }} -{{ input type:"choicelist" name:"existing_kbranch" nameappend:"arm" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"existing_kbranch" nameappend:"arm" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "y" and qemuarch == "powerpc": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/qemu-ppc32" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/qemu-ppc32" }} {{ if need_new_kbranch == "n" and qemuarch == "powerpc": }} -{{ input type:"choicelist" name:"existing_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/qemu-ppc32" }} +{{ input type:"choicelist" name:"existing_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/qemu-ppc32" }} {{ if need_new_kbranch == "y" and qemuarch == "i386": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "n" and qemuarch == "i386": }} -{{ input type:"choicelist" name:"existing_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"existing_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "y" and qemuarch == "x86_64": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "n" and qemuarch == "x86_64": }} -{{ input type:"choicelist" name:"existing_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"existing_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "y" and qemuarch == "mips": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "n" and qemuarch == "mips": }} -{{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend +10 -10
@@ -7,34 +7,34 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y" and qemuarch == "arm": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "n" and qemuarch == "arm": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "y" and qemuarch == "powerpc": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/qemu-ppc32" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/qemu-ppc32" }} {{ if need_new_kbranch == "n" and qemuarch == "powerpc": }} -{{ input type:"choicelist" name:"existing_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/qemu-ppc32" }} +{{ input type:"choicelist" name:"existing_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/qemu-ppc32" }} {{ if need_new_kbranch == "y" and qemuarch == "i386": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "n" and qemuarch == "i386": }} -{{ input type:"choicelist" name:"existing_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"existing_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "y" and qemuarch == "x86_64": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "n" and qemuarch == "x86_64": }} -{{ input type:"choicelist" name:"existing_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"existing_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "y" and qemuarch == "mips": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "n" and qemuarch == "mips": }} -{{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.0\": }} linux-yocto_3.0.bbappend +10 -10
@@ -7,34 +7,34 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y" and qemuarch == "arm": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base your new BSP branch on:" default:"yocto/standard/arm-versatile-926ejs" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard" prio:"20" msg:"Please choose a machine branch to base your new BSP branch on:" default:"yocto/standard/arm-versatile-926ejs" }} {{ if need_new_kbranch == "n" and qemuarch == "arm": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose an existing machine branch to use for this BSP:" default:"yocto/standard/arm-versatile-926ejs" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard" prio:"20" msg:"Please choose an existing machine branch to use for this BSP:" default:"yocto/standard/arm-versatile-926ejs" }} {{ if need_new_kbranch == "y" and qemuarch == "powerpc": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/qemu-ppc32" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/qemu-ppc32" }} {{ if need_new_kbranch == "n" and qemuarch == "powerpc": }} -{{ input type:"choicelist" name:"existing_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/qemu-ppc32" }} +{{ input type:"choicelist" name:"existing_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/qemu-ppc32" }} {{ if need_new_kbranch == "y" and qemuarch == "i386": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/common-pc/base" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard:yocto/standard/common-pc" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/common-pc/base" }} {{ if need_new_kbranch == "n" and qemuarch == "i386": }} -{{ input type:"choicelist" name:"existing_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/common-pc/base" }} +{{ input type:"choicelist" name:"existing_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard:yocto/standard/common-pc" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/common-pc/base" }} {{ if need_new_kbranch == "y" and qemuarch == "x86_64": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/common-pc-64/base" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard:yocto/standard/common-pc-64" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/common-pc-64/base" }} {{ if need_new_kbranch == "n" and qemuarch == "x86_64": }} -{{ input type:"choicelist" name:"existing_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/common-pc-64/base" }} +{{ input type:"choicelist" name:"existing_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard:yocto/standard/common-pc-64" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/common-pc-64/base" }} {{ if need_new_kbranch == "y" and qemuarch == "mips": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/mti-malta32-be" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/mti-malta32-be" }} {{ if need_new_kbranch == "n" and qemuarch == "mips": }} -{{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/mti-malta32-be" }} +{{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/mti-malta32-be" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend +10 -10
@@ -7,34 +7,34 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y" and qemuarch == "arm": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/arm-versatile-926ejs" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/arm-versatile-926ejs" }} {{ if need_new_kbranch == "n" and qemuarch == "arm": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/arm-versatile-926ejs" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/arm-versatile-926ejs" }} {{ if need_new_kbranch == "y" and qemuarch == "powerpc": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/qemu-ppc32" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/qemu-ppc32" }} {{ if need_new_kbranch == "n" and qemuarch == "powerpc": }} -{{ input type:"choicelist" name:"existing_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/qemu-ppc32" }} +{{ input type:"choicelist" name:"existing_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/qemu-ppc32" }} {{ if need_new_kbranch == "y" and qemuarch == "i386": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc/base" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" branches_base:"standard/default:standard/default/common-pc" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc/base" }} {{ if need_new_kbranch == "n" and qemuarch == "i386": }} -{{ input type:"choicelist" name:"existing_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc/base" }} +{{ input type:"choicelist" name:"existing_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" branches_base:"standard/default:standard/default/common-pc" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc/base" }} {{ if need_new_kbranch == "y" and qemuarch == "x86_64": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc-64/base" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" branches_base:"standard/default:standard/default/common-pc-64" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc-64/base" }} {{ if need_new_kbranch == "n" and qemuarch == "x86_64": }} -{{ input type:"choicelist" name:"existing_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc-64/base" }} +{{ input type:"choicelist" name:"existing_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" branches_base:"standard/default:standard/default/common-pc-64" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc-64/base" }} {{ if need_new_kbranch == "y" and qemuarch == "mips": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/mti-malta32-be" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/mti-malta32-be" }} {{ if need_new_kbranch == "n" and qemuarch == "mips": }} -{{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/mti-malta32-be" }} +{{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/mti-malta32-be" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.0\": }} linux-yocto_3.0.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/common-pc-64/base" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard:yocto/standard/common-pc-64" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/common-pc-64/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/common-pc-64/base" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard:yocto/standard/common-pc-64" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/common-pc-64/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend +2 -2
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc-64/base" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default:standard/default/common-pc-64" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc-64/base" }} {{ if need_new_kbranch == "n": }} -{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc-64/base" }} +{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default:standard/default/common-pc-64" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc-64/base" }} {{ if need_new_kbranch == "y": }} KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
Signature · 1 line
1.7.9.5
PATCH 49/57 yocto-bsp: add standard branch mapping
In reply to Scott GarmanFrom: Tom Zanussi <[email protected]>
Add a mechanism to distinguish common-pc variants of standard branches.
--- scripts/lib/bsp/engine.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
scripts/lib/bsp/engine.py +21 -0
@@ -1503,3 +1503,24 @@ def yocto_bsp_list(args, scripts_path, properties_file): return False return True + + +def map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch): + """ + Return the linux-yocto bsp branch to use with the specified + kbranch. This handles the -standard variants for 3.0 and 3.2; the + other variants don't need mappings. + """ + if need_new_kbranch == "y": + kbranch = new_kbranch + else: + kbranch = existing_kbranch + + if (kbranch.startswith("standard/default/common-pc-64") or + kbranch.startswith("yocto/standard/common-pc-64")): + return "bsp/common-pc-64/common-pc-64-standard" + if (kbranch.startswith("standard/default/common-pc") or + kbranch.startswith("yocto/standard/common-pc")): + return "bsp/common-pc/common-pc-standard" + else: + return "ktypes/standard"
Signature · 1 line
1.7.9.5
PATCH 50/57 yocto-bsp: use standard branch mapping in bsp templates
In reply to Scott GarmanFrom: Tom Zanussi <[email protected]>
---
.../linux/files/{{=machine}}-standard.scc | 2 +-
.../linux/files/{{=machine}}-standard.scc | 4 ++--
.../linux/files/{{=machine}}-standard.scc | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc +1 -1
@@ -2,7 +2,7 @@ define KMACHINE {{=machine}} define KTYPE standard define KARCH i386 -include ktypes/standard +include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} branch {{=machine}} include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-standard.scc +2 -2
@@ -12,10 +12,10 @@ define KARCH powerpc define KARCH mips {{ if qemuarch == "i386": }} -include bsp/common-pc/common-pc-standard +include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} branch {{=machine}} {{ if qemuarch == "x86_64": }} -include bsp/common-pc-64/common-pc-64-standard +include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} branch {{=machine}} {{ if qemuarch == "arm": }} include bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-standard.scc +1 -1
@@ -2,7 +2,7 @@ define KMACHINE {{=machine}} define KTYPE standard define KARCH x86_64 -include bsp/common-pc-64/common-pc-64-standard +include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} branch {{=machine}} include {{=machine}}.scc
Signature · 1 line
1.7.9.5
PATCH 51/57 yocto-bsp: use rstrip() for assignment lines
In reply to Scott GarmanFrom: Tom Zanussi <[email protected]>
strip() isn't necessary and causes unintended formatting changes in the output; rstrip() remove the trailing newlines as intended while leaving indenting whitespace intact.
--- scripts/lib/bsp/engine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/lib/bsp/engine.py +1 -1
@@ -668,7 +668,7 @@ class SubstrateBase(object): """ Expand all tags in a line. """ - expanded_line = AssignmentLine(line.strip()) + expanded_line = AssignmentLine(line.rstrip()) while start != -1: end = line.find(CLOSE_TAG, start)
Signature · 1 line
1.7.9.5
PATCH 52/57 yocto-bsp: remove 'branch' statements in .scc if reusing branch
In reply to Scott GarmanFrom: Tom Zanussi <[email protected]>
If reusing a branch (need_new_branch == 'n') we don't need to branch in the .scc, so make it conditional on need_new_branch.
---
.../linux/files/{{=machine}}-standard.scc | 1 +
.../linux/files/{{=machine}}-standard.scc | 1 +
.../linux/files/{{=machine}}-standard.scc | 1 +
.../linux/files/{{=machine}}-standard.scc | 1 +
.../linux/files/{{=machine}}-preempt-rt.scc | 5 +----
.../linux/files/{{=machine}}-standard.scc | 5 +----
.../linux/files/{{=machine}}-standard.scc | 1 +
7 files changed, 7 insertions(+), 8 deletions(-)scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/{{=machine}}-standard.scc +1 -0
@@ -3,6 +3,7 @@ define KTYPE standard define KARCH arm include ktypes/standard +{{ if need_new_kbranch == "y": }} branch {{=machine}} include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc +1 -0
@@ -3,6 +3,7 @@ define KTYPE standard define KARCH i386 include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} +{{ if need_new_kbranch == "y": }} branch {{=machine}} include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/{{=machine}}-standard.scc +1 -0
@@ -3,6 +3,7 @@ define KTYPE standard define KARCH mips include ktypes/standard +{{ if need_new_kbranch == "y": }} branch {{=machine}} include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/{{=machine}}-standard.scc +1 -0
@@ -3,6 +3,7 @@ define KTYPE standard define KARCH powerpc include ktypes/standard +{{ if need_new_kbranch == "y": }} branch {{=machine}} include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc +1 -4
@@ -13,18 +13,15 @@ define KARCH mips {{ if qemuarch == "i386": }} include bsp/common-pc/common-pc-preempt-rt -branch {{=machine}} {{ if qemuarch == "x86_64": }} include bsp/common-pc-64/common-pc-64-preempt-rt -branch {{=machine}} {{ if qemuarch == "arm": }} include bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt -branch {{=machine}} {{ if qemuarch == "powerpc": }} include bsp/qemu-ppc32/qemu-ppc32-rt -branch {{=machine}} {{ if qemuarch == "mips": }} include bsp/mti-malta32/mti-malta32-be-preempt-rt +{{ if need_new_kbranch == "y": }} branch {{=machine}} include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-standard.scc +1 -4
@@ -13,18 +13,15 @@ define KARCH mips {{ if qemuarch == "i386": }} include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} -branch {{=machine}} {{ if qemuarch == "x86_64": }} include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} -branch {{=machine}} {{ if qemuarch == "arm": }} include bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard -branch {{=machine}} {{ if qemuarch == "powerpc": }} include bsp/qemu-ppc32/qemu-ppc32-standard -branch {{=machine}} {{ if qemuarch == "mips": }} include bsp/mti-malta32/mti-malta32-be-standard +{{ if need_new_kbranch == "y": }} branch {{=machine}} include {{=machine}}.scc
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-standard.scc +1 -0
@@ -3,6 +3,7 @@ define KTYPE standard define KARCH x86_64 include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} +{{ if need_new_kbranch == "y": }} branch {{=machine}} include {{=machine}}.scc
Signature · 1 line
1.7.9.5
PATCH 53/57 yocto-bsp: add some standard policy
In reply to Scott GarmanFrom: Tom Zanussi <[email protected]>
Add some useful default options to to the i386 and x86_64 templates.
---
.../linux/files/{{=machine}}-preempt-rt.scc | 7 +++++++
.../linux/files/{{=machine}}-standard.scc | 7 +++++++
.../linux/files/{{=machine}}-preempt-rt.scc | 7 +++++++
.../linux/files/{{=machine}}-standard.scc | 7 +++++++
4 files changed, 28 insertions(+)scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc +7 -0
@@ -6,3 +6,10 @@ define KARCH i386 include ktypes/preempt-rt include {{=machine}}.scc + +# default policy for preempt-rt kernels +include cfg/usb-mass-storage.scc +include cfg/boot-live.scc +include features/logbuf/size-normal.scc +include features/latencytop/latencytop.scc +include features/profiling/profiling.scc
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc +7 -0
@@ -7,3 +7,10 @@ include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch) branch {{=machine}} include {{=machine}}.scc + +# default policy for standard kernels +include cfg/usb-mass-storage.scc +include cfg/boot-live.scc +include features/logbuf/size-normal.scc +include features/latencytop/latencytop.scc +include features/profiling/profiling.scc
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc +7 -0
@@ -6,3 +6,10 @@ define KARCH x86_64 include ktypes/preempt-rt include {{=machine}}.scc + +# default policy for preempt-rt kernels +include cfg/usb-mass-storage.scc +include cfg/boot-live.scc +include features/logbuf/size-normal.scc +include features/latencytop/latencytop.scc +include features/profiling/profiling.scc
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-standard.scc +7 -0
@@ -7,3 +7,10 @@ include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch) branch {{=machine}} include {{=machine}}.scc + +# default policy for standard kernels +include cfg/usb-mass-storage.scc +include cfg/boot-live.scc +include features/logbuf/size-normal.scc +include features/latencytop/latencytop.scc +include features/profiling/profiling.scc
Signature · 1 line
1.7.9.5
PATCH 54/57 yocto-bsp: add i586 option for i386
In reply to Scott GarmanFrom: Tom Zanussi <[email protected]>
---
.../arch/i386/conf/machine/{{=machine}}.conf | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf +5 -2
@@ -9,12 +9,15 @@ PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" {{ input type:"choicelist" name:"tunefile" prio:"40" msg:"Which machine tuning would you like to use?" default:"tune_core2" }} +{{ input type:"choice" val:"tune_i586" msg:"i586 tuning optimizations" }} {{ input type:"choice" val:"tune_atom" msg:"Atom tuning optimizations" }} {{ input type:"choice" val:"tune_core2" msg:"Core2 tuning optimizations" }} +{{ if tunefile == "tune_i586": }} +require conf/machine/include/tune-i586.inc {{ if tunefile == "tune_atom": }} -include conf/machine/include/tune-atom.inc +require conf/machine/include/tune-atom.inc {{ if tunefile == "tune_core2": }} -include conf/machine/include/tune-core2.inc +require conf/machine/include/tune-core2.inc require conf/machine/include/ia32-base.inc
Signature · 1 line
1.7.9.5
PATCH 55/57 yocto-bsp: use emgd 1.10 for i386 template
In reply to Scott GarmanFrom: Tom Zanussi <[email protected]>
Make i386 template use emgd 1.10 for denzil, along with associated changes.
---
.../arch/i386/conf/machine/{{=machine}}.conf | 7 ++++---
.../linux/files/{{=machine}}-standard.scc | 4 ++++
.../recipes-kernel/linux/files/{{=machine}}.scc | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf +4 -3
@@ -23,13 +23,14 @@ require conf/machine/include/ia32-base.inc {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} -{{ if xserver == "y": }} +{{ if xserver == "y" and kernel_choice == "linux-yocto_3.2": }} {{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_i915" }} - {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} {{ input type:"choice" val:"xserver_emgd" msg:"EMGD xserver support (proprietary)" }} {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} +{{ if xserver == "y" and kernel_choice != "linux-yocto_3.2": xserver_choice = "xserver_i915" }} + {{ if xserver == "y": }} XSERVER ?= "${XSERVER_IA32_BASE} \ ${XSERVER_IA32_EXT} \
@@ -45,7 +46,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \ {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} PREFERRED_VERSION_xserver-xorg ?= "1.9.3" PREFERRED_VERSION_mesa-dri ?= "7.11" -PREFERRED_VERSION_emgd-driver-bin ?= "1.8" +PREFERRED_VERSION_emgd-driver-bin ?= "1.10" {{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }} APPEND += "video=vesafb vga=0x318"
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc +4 -0
@@ -6,6 +6,10 @@ include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch) {{ if need_new_kbranch == "y": }} branch {{=machine}} +{{ if xserver == "y" and xserver_choice == "xserver_emgd": }} +include features/emgd/emgd-1.10.scc +git merge emgd-1.10 + include {{=machine}}.scc # default policy for standard kernels
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}.scc +1 -1
@@ -15,7 +15,7 @@ include features/hpet/hpet.scc include features/ericsson-3g/f5521gw.scc {{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }} -include features/framebuffer/vesafb.scc +include cfg/vesafb.scc include cfg/usb-mass-storage.scc include cfg/boot-live.scc
Signature · 1 line
1.7.9.5
PATCH 56/57 yocto-bsp: generate default properties even if json specified
In reply to Scott GarmanFrom: Tom Zanussi <[email protected]>
Users seem to want to specify incomplete property sets when using json input. Allow this by generating default properties before the user-specified properties are applied; the user will then get the defaults for any unspecified values, and avoid cryptic backtraces.
--- scripts/lib/bsp/engine.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
scripts/lib/bsp/engine.py +2 -2
@@ -1245,10 +1245,10 @@ def yocto_bsp_create(machine, arch, scripts_path, bsp_output_dir, codedump, prop gen_program_header_lines(program_lines) + gen_initial_property_vals(input_lines, program_lines) + if properties: gen_supplied_property_vals(properties, program_lines) - else: - gen_initial_property_vals(input_lines, program_lines) gen_program_machine_lines(machine, program_lines)
Signature · 1 line
1.7.9.5
PATCH 57/57 yocto-bsp: use base branches for qemu 'newbranch' case
In reply to Scott GarmanFrom: Tom Zanussi <[email protected]>
The branch updating for the [YOCTO #2587] fix inadvertently changed some of the qemu branch names incorrectly, fix it.
--- ...yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend" | 2 +- ...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 2 +- ...linux-yocto_3.0\": }} linux-yocto_3.0.bbappend" | 6 +++--- ...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-)
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.0\": }} linux-yocto-rt_3.0.bbappend +1 -1
@@ -13,7 +13,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" nameappend:"arm" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "y" and qemuarch == "powerpc": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/qemu-ppc32" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} {{ if need_new_kbranch == "n" and qemuarch == "powerpc": }} {{ input type:"choicelist" name:"existing_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/qemu-ppc32" }}
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend +1 -1
@@ -13,7 +13,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "y" and qemuarch == "powerpc": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/qemu-ppc32" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} {{ if need_new_kbranch == "n" and qemuarch == "powerpc": }} {{ input type:"choicelist" name:"existing_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/qemu-ppc32" }}
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.0\": }} linux-yocto_3.0.bbappend +3 -3
@@ -7,13 +7,13 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y" and qemuarch == "arm": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard" prio:"20" msg:"Please choose a machine branch to base your new BSP branch on:" default:"yocto/standard/arm-versatile-926ejs" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard" prio:"20" msg:"Please choose a machine branch to base your new BSP branch on:" default:"yocto/standard/base" }} {{ if need_new_kbranch == "n" and qemuarch == "arm": }} {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard" prio:"20" msg:"Please choose an existing machine branch to use for this BSP:" default:"yocto/standard/arm-versatile-926ejs" }} {{ if need_new_kbranch == "y" and qemuarch == "powerpc": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/qemu-ppc32" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} {{ if need_new_kbranch == "n" and qemuarch == "powerpc": }} {{ input type:"choicelist" name:"existing_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/qemu-ppc32" }}
@@ -31,7 +31,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard:yocto/standard/common-pc-64" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/common-pc-64/base" }} {{ if need_new_kbranch == "y" and qemuarch == "mips": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/mti-malta32-be" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/base" }} {{ if need_new_kbranch == "n" and qemuarch == "mips": }} {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"yocto/standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/mti-malta32-be" }}
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend +3 -3
@@ -7,13 +7,13 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y" and qemuarch == "arm": }} -{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/arm-versatile-926ejs" }} +{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} {{ if need_new_kbranch == "n" and qemuarch == "arm": }} {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/arm-versatile-926ejs" }} {{ if need_new_kbranch == "y" and qemuarch == "powerpc": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/qemu-ppc32" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} {{ if need_new_kbranch == "n" and qemuarch == "powerpc": }} {{ input type:"choicelist" name:"existing_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/qemu-ppc32" }}
@@ -31,7 +31,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ input type:"choicelist" name:"existing_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" branches_base:"standard/default:standard/default/common-pc-64" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc-64/base" }} {{ if need_new_kbranch == "y" and qemuarch == "mips": }} -{{ input type:"choicelist" name:"new_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/mti-malta32-be" }} +{{ input type:"choicelist" name:"new_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} {{ if need_new_kbranch == "n" and qemuarch == "mips": }} {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/mti-malta32-be" }}
Signature · 1 line
1.7.9.5
Richard Purdie
AppliedQuoted 11 lines · Scott Garman
Hello,
This is my first pull request for denzil since the 1.2.1 release was made.
It has been run through the autobuilder, which is having some issues with running sanity tests and buildhistory, so if the build succeeded for everything except for those steps, I note it as "Green with known AB issues" below.
git://git.yoctoproject.org/poky-contribsgarman/denzil-next-pull1
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgarman/denzil-next-pull1
Merged to denzil although the valgrind commit slipped out of the OE-Core pull request. I dealt with that :). Thanks for putting this together.
Cheers,
Richard