00/14] Updated with more Fixes
Richard,
Here is a second larger collection of patches from the team.
This set address at least 10 of the 1.2 bugs.
Sau!
The following changes since commit 1a82989345fb98becb487d270fd93a5e6dffeb47:
runqemu-internal: Add console=tty for qemuppc and NFS (2012-04-06 01:12:15 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/stage
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
Andrei Gherzan (1):
package.bbclass: needs_ldconfig from linux_so is needed in global
namespace
Darren Hart (4):
create-pull-request: Assume remote branch from local branch
grub-efi: Include GPT partition EXT FS support
syslinux: Update distro-tracking fields
hello-mod: Move hello-mod from meta to meta-skeleton
Joshua Lock (1):
mesa-common: package gl.pc in libgl-dev
Lianhao Lu (1):
adt-installer: Fixed ppc kernel naming.
Martin Jansa (1):
gdb: add --with-libexpat-prefix
Robert Yang (2):
git 1.7.7: remove perl.mak before compile
meta-toolchain: runqemu falied on FC16/Opensuse12.1 x86_64
Saul Wold (1):
at: Fix origin location of install pam.conf from from ${P} -> ${BP}
Scott Garman (1):
shadow-native: disable logging to syslog
Xiaofeng Yan (1):
opkg: Add the condition for the content of arch.conf when enable
multilib
Zhai Edwin (1):
qemu: Fix gl failure from 64b target on 32b host
.../recipes-kernel/hello-mod/files/COPYING | 0
.../recipes-kernel/hello-mod/files/Makefile | 0
.../recipes-kernel/hello-mod/files/hello.c | 0
.../recipes-kernel/hello-mod/hello-mod_0.1.bb | 0
meta/classes/package.bbclass | 4 +-
.../conf/distro/include/distro_tracking_fields.inc | 5 +-
meta/conf/distro/include/tcmode-default.inc | 4 +-
meta/recipes-bsp/grub/grub-efi-native_1.99.bb | 4 +-
meta/recipes-devtools/gdb/gdb-common.inc | 4 +-
meta/recipes-devtools/git/git.inc | 6 ++
.../installer/adt-installer/adt_installer | 4 +-
.../installer/adt-installer/adt_installer.conf | 20 +++---
.../installer/adt-installer_1.0.bb | 2 +-
meta/recipes-devtools/opkg/opkg-config-base_1.0.bb | 7 ++-
.../qemu/qemu-0.15.1/opengl-args-copy-fix.patch | 66 ++++++++++++++++++++
meta/recipes-devtools/qemu/qemu_0.15.1.bb | 3 +-
meta/recipes-extended/at/at_3.1.13.bb | 4 +-
.../shadow/files/disable-syslog.patch | 34 ++++++++++
.../shadow/shadow-native_4.1.4.3.bb | 5 +-
meta/recipes-graphics/mesa/mesa-common.inc | 2 +-
scripts/create-pull-request | 11 +++-
21 files changed, 153 insertions(+), 32 deletions(-)
rename {meta => meta-skeleton}/recipes-kernel/hello-mod/files/COPYING (100%)
rename {meta => meta-skeleton}/recipes-kernel/hello-mod/files/Makefile (100%)
rename {meta => meta-skeleton}/recipes-kernel/hello-mod/files/hello.c (100%)
rename {meta => meta-skeleton}/recipes-kernel/hello-mod/hello-mod_0.1.bb (100%)
create mode 100644 meta/recipes-devtools/qemu/qemu-0.15.1/opengl-args-copy-fix.patch
create mode 100644 meta/recipes-extended/shadow/files/disable-syslog.patchSignature · 1 line
1.7.7.6
[CONSOLIDATED PULL [v2] 01/14] create-pull-request: Assume remote branch from local branch
From: Darren Hart <[email protected]>
It is common to use the same remote branch name as the local branch name. In this case, it would be nice not to have to specify the remote branch name.
Make the -b argument optional and assume the remote branch is the same name as the local branch. Print a NOTE to this effect so as not to catch the user by surprise:
NOTE: Assuming remote branch 'notthere', use -b to override.
If the remote branch doesn't exist, a WARNING is displayed just as if the user had used -b to specify a non-existent branch:
WARNING: Branch 'notthere' was not found on the contrib git tree.
Please check your remote and branch parameter before sending.
--- scripts/create-pull-request | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)
scripts/create-pull-request +8 -3
@@ -34,8 +34,8 @@ RFC=0 usage() { CMD=$(basename $0) cat <<EOM -Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s subject] [-r relative_to] [-i commit_id] -u remote -b branch - -b branch Branch name in the specified remote +Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s subject] [-r relative_to] [-i commit_id] -u remote [-b branch] + -b branch Branch name in the specified remote (default: current branch) -c Create an RFC (Request for Comment) patch series -h Display this help message -i commit_id Ending commit (default: HEAD)
@@ -120,7 +120,12 @@ while getopts "b:chi:m:o:p:r:s:u:" OPT; do esac done -if [ -z "$BRANCH" ] || [ -z "$REMOTE_URL" ]; then +if [ -z "$BRANCH" ]; then + BRANCH=$(git branch | grep -e "^\* " | cut -d' ' -f2) + echo "NOTE: Assuming remote branch '$BRANCH', use -b to override." +fi + +if [ -z "$REMOTE_URL" ]; then usage exit 1 fi
Signature · 1 line
1.7.7.6
[CONSOLIDATED PULL [v2] 02/14] mesa-common: package gl.pc in libgl-dev
In reply to Saul WoldFrom: Joshua Lock <[email protected]>
gl.pc should be packaged in libgl-dev not the mesa-dev package
Fixes [YOCTO #2059]
--- meta/recipes-graphics/mesa/mesa-common.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-graphics/mesa/mesa-common.inc +1 -1
@@ -46,7 +46,7 @@ FILES_libglu = "${libdir}/libGLU.so.*" FILES_libosmesa = "${libdir}/libOSMesa.so.*" FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL" -FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL" +FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc" FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h" FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
Signature · 1 line
1.7.7.6
[CONSOLIDATED PULL [v2] 05/14] package.bbclass: needs_ldconfig from linux_so is needed in global namespace
In reply to Saul WoldFrom: Andrei Gherzan <[email protected]>
"The suite of statements in a function definition executes with a local namespace that is different from the global namespace. This means that all variables created within a function are local to that function. When the suite finishes, these working variables are discarded."
In this way the needs_ldconfig variable in linux_so never gets True in the statements below this function. As global statement is generally discouraged, a return value would be a clean and fast way to solve this issue.
[YOCTO #2205]
--- meta/classes/package.bbclass | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
meta/classes/package.bbclass +3 -1
@@ -1263,6 +1263,7 @@ python package_do_shlibs() { lf = bb.utils.lockfile(d.expand("${PACKAGELOCK}")) def linux_so(root, path, file): + needs_ldconfig = False cmd = d.getVar('OBJDUMP', True) + " -p " + pipes.quote(os.path.join(root, file)) + " 2>/dev/null" cmd = "PATH=\"%s\" %s" % (d.getVar('PATH', True), cmd) fd = os.popen(cmd)
@@ -1283,6 +1284,7 @@ python package_do_shlibs() { needs_ldconfig = True if snap_symlinks and (file != this_soname): renames.append((os.path.join(root, file), os.path.join(root, this_soname))) + return needs_ldconfig def darwin_so(root, path, file): fullpath = os.path.join(root, file)
@@ -1382,7 +1384,7 @@ python package_do_shlibs() { if targetos == "darwin" or targetos == "darwin8": darwin_so(root, dirs, file) elif os.access(path, os.X_OK) or lib_re.match(file): - linux_so(root, dirs, file) + needs_ldconfig = linux_so(root, dirs, file) for (old, new) in renames: bb.note("Renaming %s to %s" % (old, new)) os.rename(old, new)
Signature · 1 line
1.7.7.6
[CONSOLIDATED PULL [v2] 04/14] qemu: Fix gl failure from 64b target on 32b host
In reply to Saul WoldFrom: Zhai Edwin <[email protected]>
Data from 64b target is truncated by 32b host. This patch makes type of data buf in host same as target.
[YOCTO #2221] got fixed.
[Bumped PR - sgw]
--- .../qemu/qemu-0.15.1/opengl-args-copy-fix.patch | 66 ++++++++++++++++++++ meta/recipes-devtools/qemu/qemu_0.15.1.bb | 3 +- 2 files changed, 68 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-devtools/qemu/qemu-0.15.1/opengl-args-copy-fix.patch
meta/recipes-devtools/qemu/qemu-0.15.1/opengl-args-copy-fix.patch new file +66 -0
@@ -0,0 +1,66 @@ +This patch fix GL application failure from 64b target on 32b host + +64b target produce 64b args buffer, but qemu parse it as 32b and get wrong +data. To avoid this, the type of args buffer in qemu should be same as target, +that is, target_phys_addr_t. The only potential issue is that we need copy +the data in buffer one by one, or else data corruption when 32b/64b for +target/host combination. + +Upstream-Status: Inappropriate [other] - depends on qemu gl patch + +Signed-off-by: Zhai Edwin <[email protected]> + +Index: qemu-0.15.1/target-i386/opengl_func.h +=================================================================== +--- qemu-0.15.1.orig/target-i386/opengl_func.h 2012-04-06 10:00:08.000000000 +0800 ++++ qemu-0.15.1/target-i386/opengl_func.h 2012-04-06 10:47:38.000000000 +0800 +@@ -25,10 +25,10 @@ + #include "mesa_gl.h" + #include "mesa_glext.h" + +-/* Argument list are internally of a type that can hold a target pointer +- * or a host pointer. If 32b target runs on 64b host, it should be big enough +- * to hold host pointer */ +-typedef long unsigned int arg_t; ++/* Argument list are internally of a type that point to a buffer passed from ++ * target. It should have same type as target, so that we can support 32b ++ * target on 64b host, and vice versa */ ++typedef target_phys_addr_t arg_t; + + enum { + TYPE_NONE, +Index: qemu-0.15.1/Makefile.target +=================================================================== +--- qemu-0.15.1.orig/Makefile.target 2012-04-06 10:00:08.000000000 +0800 ++++ qemu-0.15.1/Makefile.target 2012-04-06 10:00:08.000000000 +0800 +@@ -128,7 +128,7 @@ + gl_beginend.h: ../target-i386/beginend_funcs.sh + $< > $@ + opengl_exec.o : opengl_exec.c server_stub.c gl_func.h opengl_func.h gl_beginend.h +- $(CC) $(GL_CFLAGS) $(DEFINES) -c -o $@ $< -I. -I../target-i386 ++ $(CC) $(GL_CFLAGS) $(DEFINES) -c -o $@ $< -I.. -I. -I../fpu -I../target-i386 -DNEED_CPU_H + + ######################################################### + # Linux user emulator target +Index: qemu-0.15.1/target-i386/opengl_exec.c +=================================================================== +--- qemu-0.15.1.orig/target-i386/opengl_exec.c 2012-04-06 10:00:08.000000000 +0800 ++++ qemu-0.15.1/target-i386/opengl_exec.c 2012-04-06 10:39:22.000000000 +0800 +@@ -37,16 +37,12 @@ + #include <mesa_gl.h> + #include <mesa_glx.h> + +-// TODO +-typedef long unsigned int target_phys_addr_t; +- ++#include "exec.h" + #include "opengl_func.h" + + #include "mesa_glu.h" + #include "mesa_mipmap.c" + +-#include "../qemu-common.h" +- + //#define SYSTEMATIC_ERROR_CHECK + #define BUFFER_BEGINEND + #define glGetError() 0
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 = "r4" +PR = "r5" FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" FILESDIR = "${WORKDIR}"
@@ -29,6 +29,7 @@ QEMUGLPATCHES = "\ file://enable-i386-linux-user.patch \ file://qemugl-fix.patch \ file://opengl-sdl-fix.patch \ + file://opengl-args-copy-fix.patch \ " SRC_URI_append_virtclass-native = "\
Signature · 1 line
1.7.7.6
[CONSOLIDATED PULL [v2] 03/14] shadow-native: disable logging to syslog
In reply to Saul WoldFrom: Scott Garman <[email protected]>
Disable use of syslog to prevent sysroot user and group additions from writing entries to the host's syslog.
This fixes [YOCTO #2012]
--- .../shadow/files/disable-syslog.patch | 34 ++++++++++++++++++++ .../shadow/shadow-native_4.1.4.3.bb | 5 ++- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-extended/shadow/files/disable-syslog.patch
meta/recipes-extended/shadow/files/disable-syslog.patch new file +34 -0
@@ -0,0 +1,34 @@ +Disable use of syslog to prevent sysroot user and group additions from +writing entries to the host's syslog. This patch should only be used +with the shadow-native recipe. + +Upstream-Status: Inappropriate [disable feature] + +Signed-off-by: Scott Garman <[email protected]> + +diff -urN shadow-4.1.4.3.orig//src/groupadd.c shadow-4.1.4.3/src/groupadd.c +--- shadow-4.1.4.3.orig//src/groupadd.c 2011-02-13 09:58:16.000000000 -0800 ++++ shadow-4.1.4.3/src/groupadd.c 2012-04-05 10:05:59.440001758 -0700 +@@ -34,6 +34,9 @@ + + #ident "$Id: groupadd.c 3015 2009-06-05 22:16:56Z nekral-guest $" + ++/* Disable use of syslog since we're running this command against a sysroot */ ++#undef USE_SYSLOG ++ + #include <ctype.h> + #include <fcntl.h> + #include <getopt.h> +diff -urN shadow-4.1.4.3.orig//src/useradd.c shadow-4.1.4.3/src/useradd.c +--- shadow-4.1.4.3.orig//src/useradd.c 2011-02-13 09:58:16.000000000 -0800 ++++ shadow-4.1.4.3/src/useradd.c 2012-04-05 10:06:25.076001315 -0700 +@@ -34,6 +34,9 @@ + + #ident "$Id: useradd.c 3015 2009-06-05 22:16:56Z nekral-guest $" + ++/* Disable use of syslog since we're running this command against a sysroot */ ++#undef USE_SYSLOG ++ + #include <assert.h> + #include <ctype.h> + #include <errno.h>
meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb +3 -2
@@ -7,14 +7,15 @@ LICENSE = "BSD | Artistic-1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \ file://src/passwd.c;firstline=8;endline=30;md5=2899a045e90511d0e043b85a7db7e2fe" -PR = "r3" +PR = "r4" SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \ file://shadow.automake-1.11.patch \ file://shadow-4.1.3-dots-in-usernames.patch \ file://shadow-4.1.4.2-env-reset-keep-locale.patch \ file://add_root_cmd_options.patch \ - file://useradd.patch" + file://disable-syslog.patch \ + file://useradd.patch" SRC_URI[md5sum] = "b8608d8294ac88974f27b20f991c0e79" SRC_URI[sha256sum] = "633f5bb4ea0c88c55f3642c97f9d25cbef74f82e0b4cf8d54e7ad6f9f9caa778"
Signature · 1 line
1.7.7.6
[CONSOLIDATED PULL [v2] 08/14] meta-toolchain: runqemu falied on FC16/Opensuse12.1 x86_64
In reply to Saul WoldFrom: Robert Yang <[email protected]>
runqemu can't launch a target image on Fedora 16 64bit or Opensuse 12.1 64bit, this is because runqemu needs the host's libGL.so, which requires GLIBC_2.14 which is defined in libc.so.6, but our default libc.so.6 is version 2.13, here is the message from Richard:
The easiest solution would be to change the nativesdk libc to 2.15. I don't think we plan to do this for the target libc for 1.2 but we could change nativesdk's version if its well tested
[YOCTO #1968]
--- meta/conf/distro/include/tcmode-default.inc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
meta/conf/distro/include/tcmode-default.inc +2 -2
@@ -44,9 +44,9 @@ PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}" PREFERRED_VERSION_linux-libc-headers-nativesdk ?= "${LINUXLIBCVERSION}" PREFERRED_VERSION_eglibc ?= "${EGLIBCVERSION}" PREFERRED_VERSION_eglibc-locale ?= "${EGLIBCVERSION}" -PREFERRED_VERSION_eglibc-nativesdk ?= "${EGLIBCVERSION}" +PREFERRED_VERSION_eglibc-nativesdk ?= "2.15" PREFERRED_VERSION_eglibc-initial ?= "${EGLIBCVERSION}" -PREFERRED_VERSION_eglibc-initial-nativesdk ?= "${EGLIBCVERSION}" +PREFERRED_VERSION_eglibc-initial-nativesdk ?= "2.15" PREFERRED_VERSION_cross-localedef-native ?= "${EGLIBCVERSION}" PREFERRED_VERSION_uclibc ?= "${UCLIBCVERSION}" PREFERRED_VERSION_uclibc-initial ?= "${UCLIBCVERSION}"
Signature · 1 line
1.7.7.6
[CONSOLIDATED PULL [v2] 07/14] git 1.7.7: remove perl.mak before compile
In reply to Saul WoldFrom: Robert Yang <[email protected]>
The git may fail to rebuild when perl's Config.pm or config.h changes, this is because Makefile detects that perl/perl.mak is out of date. Remove perl.mak to let Makefile regenerate it would fix the error. Both git and git-native have this problem.
To reproduce the error: (On x86_64 host)
$ bitbake git-native $ touch tmp/sysroots/x86_64-linux/usr/lib/perl-native/perl/5.14.2/Config.pm $ bitbake git-native -ccompile -f
[YOCTO #2156]
--- meta/recipes-devtools/git/git.inc | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
meta/recipes-devtools/git/git.inc +6 -0
@@ -12,6 +12,12 @@ EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl --without- inherit autotools perlnative +do_compile_prepend () { + # Remove perl/perl.mak to fix the out-of-date perl.mak error + # during rebuild + rm -f perl/perl.mak +} + do_install () { oe_runmake install DESTDIR="${D}" bindir=${bindir} \ template_dir=${datadir}/git-core/templates \
Signature · 1 line
1.7.7.6
[CONSOLIDATED PULL [v2] 06/14] grub-efi: Include GPT partition EXT FS support
In reply to Saul WoldFrom: Darren Hart <[email protected]>
Fixes [YOCTO 2257]
GPT partitions are common for EFI systems. Add support for them by including the part_gpt partition module in the grub-efi image. In order to allow for loading a Linux kernel from an EXT* filesystem, include the ext2 module as well.
With this fix applied, I was able to boot from a USB key using a GPT partition table with the following layout:
$ sudo gdisk -l /dev/sdc GPT fdisk (gdisk) version 0.8.2
Partition table scan:
MBR: protective
BSD: not present
APM: not present
GPT: present
Found valid GPT with protective MBR; using GPT. Disk /dev/sdc: 7669824 sectors, 3.7 GiB
Logical sector size: 512 bytes
Disk identifier (GUID): 68FA7CD4-E0C3-4A8E-82B5-1331C9B17A3C Partition table holds up to 128 entries
First usable sector is 34, last usable sector is 7669790 Partitions will be aligned on 2-sector boundaries Total free space is 7428816 sectors (3.5 GiB)
Number Start (sector) End (sector) Size Code Name
1 34 32801 16.0 MiB 0700 # FAT16
2 32802 240974 101.6 MiB 0700 # EXT3From within GRUB, booted as bootia32.efi from the BOOT partition, I booted the OS with the following commands:
grub> linux (hd0,gpt2)/vmlinuz rootwait root=/dev/sda2 console=ttyS0,115200 grub> boot
This change will enable BSP developers to use the grub-efi image in their own images as well as enable upcoming changes to the installer to support EFI.
--- meta/recipes-bsp/grub/grub-efi-native_1.99.bb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-bsp/grub/grub-efi-native_1.99.bb +2 -2
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" # FIXME: We should be able to optionally drop freetype as a dependency DEPENDS = "help2man-native autogen-native" RDEPENDS_${PN} = "diffutils freetype" -PR = "r5" +PR = "r6" # Native packages do not normally rebuild when the target changes. # Ensure this is built once per HOST-TARGET pair.
@@ -61,7 +61,7 @@ EXTRA_OECONF = "--with-platform=efi --disable-grub-mkfont \ do_mkimage() { ./grub-mkimage -p /EFI/BOOT -d ./grub-core/ \ -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE} \ - boot linux fat serial part_msdos normal efi_gop + boot linux ext2 fat serial part_msdos part_gpt normal efi_gop } addtask mkimage after do_compile before do_install
Signature · 1 line
1.7.7.6
[CONSOLIDATED PULL [v2] 09/14] adt-installer: Fixed ppc kernel naming.
In reply to Saul WoldFrom: Lianhao Lu <[email protected]>
1. Fixed the ppc kernel naming.
2. Disabled opkg shared library to avoid runtime opkg-cl launching error.
3. Adjusted the variable sequence in adt-installer.conf
Fixed bug [YOCTO #2233]
--- .../installer/adt-installer/adt_installer | 4 ++-- .../installer/adt-installer/adt_installer.conf | 20 ++++++++++---------- .../installer/adt-installer_1.0.bb | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-)
meta/recipes-devtools/installer/adt-installer/adt_installer +2 -2
@@ -170,7 +170,7 @@ if [ ! -x "$LOCAL_OPKG_LOC/bin/opkg-cl" ]; then check_result echo_info "Configure opkg ...\n" - ./autogen.sh --prefix=$parent_folder/$LOCAL_OPKG_LOC --with-opkglibdir=$OPKG_LIBDIR --disable-curl --disable-ssl-curl --disable-gpg --disable-shave >> $parent_folder/$YOCTOADT_INSTALL_LOG_FILE + ./autogen.sh --prefix=$parent_folder/$LOCAL_OPKG_LOC --with-opkglibdir=$OPKG_LIBDIR --enable-shared=no --disable-curl --disable-ssl-curl --disable-gpg --disable-shave >> $parent_folder/$YOCTOADT_INSTALL_LOG_FILE check_result echo_info "Make opkg ...\n"
@@ -241,7 +241,7 @@ get_qemu_image() if [ "$1" == "x86" ] || [ "$1" == "x86_64" ]; then qemu_kernel="bzImage-qemu$target.bin" - elif [ "$1" == "mips" ]; then + elif [ "$1" == "ppc" ] || [ "$1" == "mips" ]; then qemu_kernel="vmlinux-qemu$target.bin" else qemu_kernel="zImage-qemu$target.bin"
meta/recipes-devtools/installer/adt-installer/adt_installer.conf +10 -10
@@ -42,7 +42,7 @@ YOCTOADT_NFS_UTIL="Y" #YOCTOADT_ROOTFS_$arch is for specifying what root filesystem image files you want to download from the repository. The valid values to replace $arch are: arm, x86, x86_64, powerpc, mips. The valid image files are: minimal, minimal-dev, sato, sato-dev, sato-sdk,lsb, lsb-dev, lsb-sdk. If you want to download multiple images, the entries are space separated YOCTOADT_ROOTFS_arm="minimal sato-sdk" #Specify which root filesystem file to use to extract as target sysroot. Please ensure the entry is in the list of downloaded root filesystem files that specified above in YOCTOADT_ROOTFS_$arch -YOCTOADT_TARGET_SYSROOT_IMAGE_arm="minimal" +YOCTOADT_TARGET_SYSROOT_IMAGE_arm="sato-sdk" #The location where the target sysroot will be setup YOCTOADT_TARGET_SYSROOT_LOC_arm="$HOME/test-yocto/arm"
@@ -52,14 +52,14 @@ YOCTOADT_TARGET_SYSROOT_LOC_arm="$HOME/test-yocto/arm" #YOCTOADT_TARGET_SYSROOT_LOC_x86="$HOME/test-yocto/x86" #Here's some template of other arches, which you need to change the value in "" -#YOCTOADT_TARGET_SYSROOT_IMAGE_x86_64="" -#YOCTOADT_TARGET_SYSROOT_LOC_x86_64="" -#YOCTOADT_ROOTFS_x86_64="" +#YOCTOADT_ROOTFS_x86_64="sato-sdk" +#YOCTOADT_TARGET_SYSROOT_IMAGE_x86_64="sato-sdk" +#YOCTOADT_TARGET_SYSROOT_LOC_x86_64="$HOME/test-yocto/x86_64" -#YOCTOADT_TARGET_SYSROOT_IMAGE_ppc="" -#YOCTOADT_TARGET_SYSROOT_LOC_ppc="" -#YOCTOADT_ROOTFS_ppc="" +#YOCTOADT_ROOTFS_ppc="sato-sdk" +#YOCTOADT_TARGET_SYSROOT_IMAGE_ppc="sato-sdk" +#YOCTOADT_TARGET_SYSROOT_LOC_ppc="$HOME/test-yocto/ppc" -#YOCTOADT_TARGET_SYSROOT_IMAGE_mips="" -#YOCTOADT_TARGET_SYSROOT_LOC_mips="" -#YOCTOADT_ROOTFS_mips="" +#YOCTOADT_ROOTFS_mips="sato-sdk" +#YOCTOADT_TARGET_SYSROOT_IMAGE_mips="sato-sdk" +#YOCTOADT_TARGET_SYSROOT_LOC_mips="$HOME/test-yocto/mips"
meta/recipes-devtools/installer/adt-installer_1.0.bb +1 -1
@@ -30,7 +30,7 @@ ALLOW_EMPTY = "1" PACKAGES = "" -PR = "r8" +PR = "r9" ADT_DEPLOY = "${TMPDIR}/deploy/sdk/" ADT_DIR = "${WORKDIR}/adt-installer/"
Signature · 1 line
1.7.7.6
[CONSOLIDATED PULL [v2] 12/14] at: Fix origin location of install pam.conf from from ${P} -> ${BP}
In reply to Saul WoldThis patch changes P to BP to address where a file is installed from when building with PAM enabled and using multi-lib.
[YOCTO #2224]
--- meta/recipes-extended/at/at_3.1.13.bb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-extended/at/at_3.1.13.bb +2 -2
@@ -11,7 +11,7 @@ PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits" RCONFLICTS_${PN} = "atd" RREPLACES_${PN} = "atd" -PR = "r0" +PR = "r1" SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \ file://configure.patch \
@@ -56,7 +56,7 @@ do_install () { for feature in ${DISTRO_FEATURES}; do if [ "$feature" = "pam" ]; then - install -D -m 0644 ${WORKDIR}/${P}/pam.conf ${D}${sysconfdir}/pam.d/atd + install -D -m 0644 ${WORKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd break fi done
Signature · 1 line
1.7.7.6
[CONSOLIDATED PULL [v2] 11/14] gdb: add --with-libexpat-prefix
In reply to Saul WoldFrom: Martin Jansa <[email protected]>
* otherwise it sometimes finds host's expat
--- meta/recipes-devtools/gdb/gdb-common.inc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/gdb/gdb-common.inc +2 -2
@@ -11,7 +11,7 @@ LTTNGUST_mipsel = "" LTTNGUST_mips64 = "" LTTNGUST_mips64el = "" -INC_PR = "r7" +INC_PR = "r8" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \
@@ -36,7 +36,7 @@ B = "${WORKDIR}/build-${TARGET_SYS}" EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'" -EXPAT = "--with-expat" +EXPAT = "--with-expat --with-libexpat-prefix=${STAGING_DIR_HOST}" EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \ --with-curses --disable-multilib --with-system-readline --disable-sim \
Signature · 1 line
1.7.7.6
[CONSOLIDATED PULL [v2] 13/14] syslinux: Update distro-tracking fields
In reply to Saul WoldFrom: Darren Hart <[email protected]>
Add reason for not updating syslinux this release.
--- .../conf/distro/include/distro_tracking_fields.inc | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +3 -2
@@ -1518,15 +1518,16 @@ RECIPE_COMMENTS_pn-bash = "" RECIPE_STATUS_pn-syslinux = "yellow" # need mangling on LDFLAGS -RECIPE_LAST_UPDATE_pn-syslinux = "Nov 16, 2010" +RECIPE_LAST_UPDATE_pn-syslinux = "Apr 4, 2012" RECIPE_MAINTAINER_pn-syslinux = "Darren Hart <[email protected]>" RECIPE_DEPENDENCY_CHECK_pn-syslinux = "not done" -RECIPE_LATEST_VERSION_pn-syslinux = "3.86" +RECIPE_LATEST_VERSION_pn-syslinux = "4.03" RECIPE_PATCH_pn-syslinux+cross-build = "use poky toolchain instead of host" RECIPE_INTEL_SECTION_pn-syslinux = "base utils" RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-syslinux = "2 months" RECIPE_LATEST_RELEASE_DATE_pn-syslinux = "Apr 01, 2010" RECIPE_COMMENTS_pn-syslinux = "" +RECIPE_NO_UPDATE_REASON_pn-syslinux-"Waiting for 4.06 for 3.3 kernel headers support" RECIPE_STATUS_pn-sysvinit = "green" RECIPE_LAST_UPDATE_pn-sysvinit = "Jun 18, 2010"
Signature · 1 line
1.7.7.6
[CONSOLIDATED PULL [v2] 10/14] opkg: Add the condition for the content of arch.conf when enable multilib
In reply to Saul WoldFrom: Xiaofeng Yan <[email protected]>
After successfully installed some lib32 multilib packages into the x86-64 image, we just found that the file content of /var/lib/opkg/status in rootfs changed after the very 1st boot, many lib32 related packages information are missing in that file.
The missing arch "x86" in arch.conf cause the above problem. Adding the condition for the content of arch.conf when enable multilib. If build multilib image, "ALL_MULTILIB_PACKAGE_ARCHS" will be used instead of "PACKAGE_ARCHS".
[YOCTO #1522]
--- meta/recipes-devtools/opkg/opkg-config-base_1.0.bb | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
meta/recipes-devtools/opkg/opkg-config-base_1.0.bb +6 -1
@@ -9,7 +9,12 @@ do_compile() { archconf=${S}/${sysconfdir}/opkg/arch.conf rm -f $archconf - ipkgarchs="${PACKAGE_ARCHS}" + multilibs="${@d.getVar('MULTILIBS',True)}" + if [ "X${multilibs}" == "XNone" ]; then + ipkgarchs="${PACKAGE_ARCHS}" + else + ipkgarchs="${ALL_MULTILIB_PACKAGE_ARCHS}" + fi priority=1 for arch in $ipkgarchs; do echo "arch $arch $priority" >> $archconf
Signature · 1 line
1.7.7.6
[CONSOLIDATED PULL [v2] 14/14] hello-mod: Move hello-mod from meta to meta-skeleton
In reply to Saul WoldFrom: Darren Hart <[email protected]>
Fixes [YOCTO #1501]
hello-mod is an example kernel module, and does not provide any real functionality. As such, it would be better placed under meta-skeleton than meta.
---
.../recipes-kernel/hello-mod/files/COPYING | 0
.../recipes-kernel/hello-mod/files/Makefile | 0
.../recipes-kernel/hello-mod/files/hello.c | 0
.../recipes-kernel/hello-mod/hello-mod_0.1.bb | 0
4 files changed, 0 insertions(+), 0 deletions(-)
rename {meta => meta-skeleton}/recipes-kernel/hello-mod/files/COPYING (100%)
rename {meta => meta-skeleton}/recipes-kernel/hello-mod/files/Makefile (100%)
rename {meta => meta-skeleton}/recipes-kernel/hello-mod/files/hello.c (100%)
rename {meta => meta-skeleton}/recipes-kernel/hello-mod/hello-mod_0.1.bb (100%)meta-skeleton/recipes-kernel/hello-mod/files/COPYING renamed from meta/recipes-kernel/hello-mod/files/COPYING +0 -0
meta-skeleton/recipes-kernel/hello-mod/files/Makefile renamed from meta/recipes-kernel/hello-mod/files/Makefile +0 -0
meta-skeleton/recipes-kernel/hello-mod/files/hello.c renamed from meta/recipes-kernel/hello-mod/files/hello.c +0 -0
meta-skeleton/recipes-kernel/hello-mod/hello-mod_0.1.bb renamed from meta/recipes-kernel/hello-mod/hello-mod_0.1.bb +0 -0
Signature · 1 line
1.7.7.6
Re: [CONSOLIDATED PULL [v2] 10/14] opkg: Add the condition for the content of arch.conf when enable multilib
In reply to Saul WoldQuoted 27 lines · Saul Wold
From: Xiaofeng Yan <[email protected]>
After successfully installed some lib32 multilib packages into the x86-64 image, we just found that the file content of
/var/lib/opkg/statusin rootfs changed after the very 1st boot, many lib32 related packages information are missing in that file.The missing arch "x86" in arch.conf cause the above problem. Adding the condition for the content of arch.conf when enable multilib. If build multilib image, "
ALL_MULTILIB_PACKAGE_ARCHS" will be used instead of "PACKAGE_ARCHS".[YOCTO #1522]
Signed-off-by Xiaofeng Yan <[email protected]>--- meta/recipes-devtools/opkg/opkg-config-base_1.0.bb | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)meta/recipes-devtools/opkg/opkg-config-base_1.0.bb +0
-0@@ -9,7 +9,12 @@ do_compile() { archconf=${S}/${sysconfdir}/opkg/arch.conf rm -f $archconf
meta/recipes-devtools/opkg/opkg-config-base_1.0.bb do_compile() { · line 20
Quoted 10 lines
meta/recipes-devtools/opkg/opkg-config-base_1.0.bb +6
-1- ipkgarchs="${PACKAGE_ARCHS}" + multilibs="${@d.getVar('MULTILIBS',True)}" + if [ "X${multilibs}" == "XNone" ]; then + ipkgarchs="${PACKAGE_ARCHS}" + else + ipkgarchs="${ALL_MULTILIB_PACKAGE_ARCHS}" + fi priority=1 for arch in $ipkgarchs; do echo "arch $arch $priority" >> $archconf
I've taken this but is there any reason we can't just use ${ALL_MULTILIB_PACKAGE_ARCHS} in all cases?
Cheers,
Richard
Re: [CONSOLIDATED PULL [v2] 05/14] package.bbclass: needs_ldconfig from linux_so is needed in global namespace
In reply to Saul WoldQuoted 39 lines · Saul Wold
From: Andrei Gherzan <[email protected]>
"The suite of statements in a function definition executes with a local namespace that is different from the global namespace. This means that all variables created within a function are local to that function. When the suite finishes, these working variables are discarded."
In this way the
needs_ldconfigvariable inlinux_sonever gets True in the statements below this function. As global statement is generally discouraged, a return value would be a clean and fast way to solve this issue.[YOCTO #2205]
Signed-off-by Andrei Gherzan <[email protected]>--- meta/classes/package.bbclass | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)meta/classes/package.bbclass +2
-0@@ -1263,6 +1263,7 @@ python package_do_shlibs() { lf = bb.utils.lockfile(d.expand("${PACKAGELOCK}")) def linux_so(root, path, file): + needs_ldconfig = False cmd = d.getVar('OBJDUMP', True) + " -p " + pipes.quote(os.path.join(root, file)) + " 2>/dev/null" cmd = "PATH=\"%s\" %s" % (d.getVar('PATH', True), cmd) fd = os.popen(cmd)@@ -1283,6 +1284,7 @@ python package_do_shlibs() { needs_ldconfig = True if snap_symlinks and (file != this_soname): renames.append((os.path.join(root, file), os.path.join(root, this_soname))) + return needs_ldconfig def darwin_so(root, path, file): fullpath = os.path.join(root, file)
meta/classes/package.bbclass python package_do_shlibs() { · line 1387
Quoted 5 lines
meta/classes/package.bbclass +1
-1@@ -1382,7 +1384,7 @@ python package_do_shlibs() { if targetos == "darwin" or targetos == "darwin8": darwin_so(root, dirs, file) elif os.access(path, os.X_OK) or lib_re.match(file): - linux_so(root, dirs, file) + needs_ldconfig = linux_so(root, dirs, file)
I've replied with a question on this elsewhere.
Cheers,
Richard
Re: [CONSOLIDATED PULL [v2] 10/14] opkg: Add the condition for the content of arch.conf when enable multilib
In reply to Saul WoldQuoted 27 lines · Saul Wold
From: Xiaofeng Yan <[email protected]>
After successfully installed some lib32 multilib packages into the x86-64 image, we just found that the file content of
/var/lib/opkg/statusin rootfs changed after the very 1st boot, many lib32 related packages information are missing in that file.The missing arch "x86" in arch.conf cause the above problem. Adding the condition for the content of arch.conf when enable multilib. If build multilib image, "
ALL_MULTILIB_PACKAGE_ARCHS" will be used instead of "PACKAGE_ARCHS".[YOCTO #1522]
Signed-off-by Xiaofeng Yan <[email protected]>--- meta/recipes-devtools/opkg/opkg-config-base_1.0.bb | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)meta/recipes-devtools/opkg/opkg-config-base_1.0.bb +0
-0@@ -9,7 +9,12 @@ do_compile() { archconf=${S}/${sysconfdir}/opkg/arch.conf rm -f $archconf
meta/recipes-devtools/opkg/opkg-config-base_1.0.bb do_compile() { · line 20
Quoted 10 lines
meta/recipes-devtools/opkg/opkg-config-base_1.0.bb +6
-1- ipkgarchs="${PACKAGE_ARCHS}" + multilibs="${@d.getVar('MULTILIBS',True)}" + if [ "X${multilibs}" == "XNone" ]; then + ipkgarchs="${PACKAGE_ARCHS}" + else + ipkgarchs="${ALL_MULTILIB_PACKAGE_ARCHS}" + fi priority=1 for arch in $ipkgarchs; do echo "arch $arch $priority" >> $archconf
Sorry, I should be clear in my reply. My question is why isn't there a variable that just lists all of the current compatible package architectures, whether they're multilibs or otherwise. I'm slightly concerned we need this if statement.
Its likely cleaning this up is 1.3 material though.
Cheers,
Richard
Richard Purdie
AppliedQuoted 46 lines · Saul Wold
Richard,
Here is a second larger collection of patches from the team.
This set address at least 10 of the 1.2 bugs.
Sau!
The following changes since commit
1a82989345fb98becb487d270fd93a5e6dffeb47:runqemu-internal: Add console=tty for qemuppc and NFS (2012-04-06 01:12:15 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contribsgw/stage
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stageAndrei Gherzan (1):
package.bbclass:needs_ldconfigfromlinux_sois needed in global
namespaceDarren Hart (4):
create-pull-request: Assume remote branch from local branch
grub-efi: Include GPT partition EXT FS support
syslinux: Update distro-tracking fields
hello-mod: Move hello-mod from meta to meta-skeletonJoshua Lock (1):
mesa-common: package gl.pc in libgl-devLianhao Lu (1):
adt-installer: Fixed ppc kernel naming.Martin Jansa (1):
gdb: add --with-libexpat-prefixRobert Yang (2):
git 1.7.7: remove perl.mak before compile
meta-toolchain: runqemu falied on FC16/Opensuse12.1x86_64Saul Wold (1):
at: Fix origin location of install pam.conf from from ${P} -> ${BP}Scott Garman (1):
shadow-native: disable logging to syslog
Quoted 6 lines
Xiaofeng Yan (1):
opkg: Add the condition for the content of arch.conf when enable
multilibZhai Edwin (1):
qemu: Fix gl failure from 64b target on 32b host
Merged to master apart from the package.bbclass change which I have a question on in a different thread. I also wondered if the opkg change could be improved but that is 1.3 material.
Cheers,
Richard