[OE-core] [PATCH 1/2] default-distrovars.inc: Do not add DISTRO_EXTRA_RDEPENDS and DISTRO_EXTRA_RRECOMMENDS
We otherwise get these added to image dependencies in distributions and they may not want it but would like to use those variables Signed-off-by: Khem Raj raj.k...@gmail.com --- meta/conf/distro/include/default-distrovars.inc |3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index 9b1d0ee..1aa45c8 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc @@ -14,9 +14,6 @@ LOCALE_UTF8_ONLY ?= 0 DISTRO_FEATURES ?= alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci -DISTRO_EXTRA_RDEPENDS += task-core-boot -DISTRO_EXTRA_RRECOMMENDS += kernel-module-af-packet - IMAGE_FEATURES ?= # This is a list of packages that are used by the build system to build the distribution, they are not -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] tclibc-uclibc.inc: Append -uclibc only to target recipes
Do not define DEPLOY_DIR_IMAGE Append -uclibc to STAGING_DIR_TARGET only for target recipe and cross recipes Append -uclibc to STAGING_DIR_HOST only for target recipes. These changes make sure that we still share the native sysroot Signed-off-by: Khem Raj raj.k...@gmail.com --- meta/conf/distro/include/tclibc-uclibc.inc |5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc index 27f6ec6..4bd313f 100644 --- a/meta/conf/distro/include/tclibc-uclibc.inc +++ b/meta/conf/distro/include/tclibc-uclibc.inc @@ -20,10 +20,9 @@ CXXFLAGS += -fvisibility-inlines-hidden IMAGE_LINGUAS = -DEPLOY_DIR_IMAGE = ${TMPDIR}/deploy/images DEPLOY_DIR_append = -uclibc -STAGING_DIR_TARGET_append = -uclibc -STAGING_DIR_HOST_append = -uclibc +STAGING_DIR_TARGET_append = ${@['-uclibc', ''][oe.utils.inherits(d, 'native', 'nativesdk')]} +STAGING_DIR_HOST_append = ${@['-uclibc', ''][oe.utils.inherits(d, 'native', 'nativesdk', 'cross', 'crosssdk')]} SSTATE_MANIFESTS_append = -uclibc LIBC_DEPENDENCIES = \ -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] tclibc-uclibc.inc: Append -uclibc only to target recipes
On Sun, May 15, 2011 at 11:58 PM, Koen Kooi k...@dominion.thruhere.net wrote: Op 16 mei 2011, om 08:04 heeft Khem Raj het volgende geschreven: Do not define DEPLOY_DIR_IMAGE Append -uclibc to STAGING_DIR_TARGET only for target recipe and cross recipes Append -uclibc to STAGING_DIR_HOST only for target recipes. These changes make sure that we still share the native sysroot I still stay we append tclibc unconditionally. yes thats would simplify things if we agree to use TCLIBC in bitbake.conf Signed-off-by: Khem Raj raj.k...@gmail.com --- meta/conf/distro/include/tclibc-uclibc.inc | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc index 27f6ec6..4bd313f 100644 --- a/meta/conf/distro/include/tclibc-uclibc.inc +++ b/meta/conf/distro/include/tclibc-uclibc.inc @@ -20,10 +20,9 @@ CXXFLAGS += -fvisibility-inlines-hidden IMAGE_LINGUAS = -DEPLOY_DIR_IMAGE = ${TMPDIR}/deploy/images DEPLOY_DIR_append = -uclibc -STAGING_DIR_TARGET_append = -uclibc -STAGING_DIR_HOST_append = -uclibc +STAGING_DIR_TARGET_append = ${@['-uclibc', ''][oe.utils.inherits(d, 'native', 'nativesdk')]} +STAGING_DIR_HOST_append = ${@['-uclibc', ''][oe.utils.inherits(d, 'native', 'nativesdk', 'cross', 'crosssdk')]} SSTATE_MANIFESTS_append = -uclibc LIBC_DEPENDENCIES = \ -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] sstate breakage with multimachine
Hi, This bug gets reintroduced every other week, so let's try to fix it properly this time. The situation: 2 machines (beagleboard, pandaboard) using the same base architecture (armv7a). step 0: rm build pseudone -rf step 1: MACHINE=beagleboard bitbake console-image step 2: MACHINE=omap4430-panda bitbake console-image Step 0 and 1 work great, but I can't get step 2 to work. Attached is the complete output of step 2. As you can see without any updates to the repositories it wants to rebuild (e)glibc. Why does it wants to rebuild all that? Why does it fail? regards, Koen Configured layers: layer repository name: bitbake layer uri: git://git.openembedded.net/bitbake layer branch/revision: master/HEAD Updating layer at layers/bitbake Current branch master is up to date. Layers present in repository: layer repository name: openembedded-core layer uri: git://git.openembedded.org/openembedded-core layer branch/revision: master/HEAD Updating layer at layers/openembedded-core Current branch master is up to date. Layers present in repository: openembedded-core/meta openembedded-core/meta-rt layer repository name: meta-angstrom layer uri: git://git.angstrom-distribution.org/meta-angstrom layer branch/revision: master/HEAD Updating layer at layers/meta-angstrom Current branch master is up to date. Layers present in repository: meta-angstrom layer repository name: meta-openembedded layer uri: git://git.openembedded.net/meta-openembedded layer branch/revision: master/HEAD Updating layer at layers/meta-openembedded Current branch master is up to date. Layers present in repository: meta-openembedded/meta-efl meta-openembedded/meta-oe meta-openembedded/meta-gnome meta-openembedded/meta-gpe layer repository name: meta-texasinstruments layer uri: git://git.angstrom-distribution.org/meta-texasinstruments layer branch/revision: master/HEAD Updating layer at layers/meta-texasinstruments Current branch master is up to date. Layers present in repository: meta-texasinstruments Using /home/koen/.oe/environment-oecore to setup needed variables. It is recommended to do '. /home/koen/.oe/environment-oecore' and run 'bitbake something' without using ./oebb.sh as wrapper Executing: MACHINE=omap4430-panda bitbake console-image Parsing recipes...NOTE: Angstrom DOES NOT support libiconv because the eglibc provided iconv library is used NOTE: Angstrom DOES NOT support gconf-dbus because gconf-dbus has been merged back into main GConf NOTE: Angstrom DOES NOT support gconf-dbus-native because gconf-dbus has been merged back into main GConf NOTE: Angstrom DOES NOT support libiconv because the eglibc provided iconv library is used done. Parsing of 1148 .bb files complete (0 cached, 1148 parsed). 1483 targets, 41 skipped, 0 masked, 0 errors. NOTE: Resolving any missing task queue dependencies NOTE: multiple providers are available for runtime psplash-support (psplash, psplash-angstrom, psplash-omap3pandora, psplash-ti) NOTE: consider defining a PREFERRED_PROVIDER entry to match psplash-support NOTE: Preparing runqueue ERROR: Multiple .bb files are due to be built which each provide virtual/psplash (/OE/tentacle/sources/meta-angstrom/recipes-core/psplash/psplash-angstrom_svn.bb /OE/tentacle/sources/meta-angstrom/recipes-core/psplash/psplash_svn.bb). This usually means one provides something the other doesn't and should. ERROR: Multiple .bb files are due to be built which each provide ssh (/OE/tentacle/sources/openembedded-core/meta/recipes-core/dropbear/dropbear_0.52.bb /OE/tentacle/sources/openembedded-core/meta/recipes-connectivity/openssh/openssh_5.6p1.bb). This usually means one provides something the other doesn't and should. ERROR: Multiple .bb files are due to be built which each provide sshd (/OE/tentacle/sources/openembedded-core/meta/recipes-core/dropbear/dropbear_0.52.bb /OE/tentacle/sources/openembedded-core/meta/recipes-connectivity/openssh/openssh_5.6p1.bb). This usually means one provides something the other doesn't and should. NOTE: Executing SetScene Tasks OE Build Configuration: BB_VERSION= 1.13.0 METADATA_BRANCH = master METADATA_REVISION = ace08f0395e64800cab55eeb30469bb73f94fcca TARGET_ARCH = arm TARGET_OS = linux-gnueabi MACHINE = omap4430-panda DISTRO= angstrom DISTRO_VERSION= v2011.05-core TARGET_FPU= hard NOTE: package initscripts-1.0-r125: task do_populate_sysroot_setscene: Started NOTE: package udev-165-r2: task do_populate_sysroot_setscene: Started NOTE: package tinylogin-1.4-r6: task do_populate_sysroot_setscene: Started NOTE: package psplash-zap-1.0-r7: task do_populate_sysroot_setscene: Started NOTE: package initscripts-1.0-r125: task do_populate_sysroot_setscene: Succeeded NOTE: package tinylogin-1.4-r6: task do_populate_sysroot_setscene: Succeeded NOTE: package psplash-zap-1.0-r7: task do_populate_sysroot_setscene: Succeeded NOTE: package udev-165-r2: task do_populate_sysroot_setscene: Succeeded NOTE: package
Re: [OE-core] [PATCH 2/2] tclibc-uclibc.inc: Append -uclibc only to target recipes
On Mon, 2011-05-16 at 02:55 -0700, Khem Raj wrote: On Sun, May 15, 2011 at 11:58 PM, Koen Kooi k...@dominion.thruhere.net wrote: Op 16 mei 2011, om 08:04 heeft Khem Raj het volgende geschreven: Do not define DEPLOY_DIR_IMAGE Append -uclibc to STAGING_DIR_TARGET only for target recipe and cross recipes Append -uclibc to STAGING_DIR_HOST only for target recipes. These changes make sure that we still share the native sysroot I still stay we append tclibc unconditionally. yes thats would simplify things if we agree to use TCLIBC in bitbake.conf We can't depend on TCLIBC in bitbake.conf since someone still has the option of not using the standard configuration boilerplate we're providing. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] tclibc-uclibc.inc: Append -uclibc only to target recipes
Op 16 mei 2011, om 13:41 heeft Richard Purdie het volgende geschreven: On Mon, 2011-05-16 at 02:55 -0700, Khem Raj wrote: On Sun, May 15, 2011 at 11:58 PM, Koen Kooi k...@dominion.thruhere.net wrote: Op 16 mei 2011, om 08:04 heeft Khem Raj het volgende geschreven: Do not define DEPLOY_DIR_IMAGE Append -uclibc to STAGING_DIR_TARGET only for target recipe and cross recipes Append -uclibc to STAGING_DIR_HOST only for target recipes. These changes make sure that we still share the native sysroot I still stay we append tclibc unconditionally. yes thats would simplify things if we agree to use TCLIBC in bitbake.conf We can't depend on TCLIBC in bitbake.conf since someone still has the option of not using the standard configuration boilerplate we're providing. So we can't add TCLIBC ??= eglibc to bitbake.conf? ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] Upstream-Status: Update patch upstream-status for libfm, eggdbus, screenshot...
From: Zhai Edwin edwin.z...@intel.com Signed-off-by: Zhai Edwin edwin.z...@intel.com --- meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch|2 ++ meta/recipes-core/eggdbus/eggdbus/marshal.patch|2 ++ .../qemu/qemu-git/enable-i386-linux-user.patch |2 ++ meta/recipes-devtools/qemu/qemu-git/fix-nogl.patch |2 ++ .../qemu/qemu-git/linker-flags.patch |3 +++ meta/recipes-devtools/qemu/qemu-git/no-strip.patch |2 ++ .../qemu/qemu-git/qemu-git-qemugl-host.patch |2 ++ .../qemu/qemu-git/qemu-vmware-vga-depth.patch |3 +++ .../qemu-git/qemugl-allow-glxcontext-release.patch |2 ++ .../gtk+/gtk+-2.12.7/filechooser-props.patch |2 ++ .../clutter-box2d/fix-disable-introspection.patch |2 ++ .../screenshot/files/fix_ldadd_order.patch |3 +++ .../libfm/libfm-0.1.14/use_deprecate_func.patch|2 ++ 13 files changed, 29 insertions(+), 0 deletions(-) diff --git a/meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch b/meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch index 0999a85..abd7ff4 100644 --- a/meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch +++ b/meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + Index: eggdbus-0.6/docs/eggdbus/Makefile.am === --- eggdbus-0.6.orig/docs/eggdbus/Makefile.am diff --git a/meta/recipes-core/eggdbus/eggdbus/marshal.patch b/meta/recipes-core/eggdbus/eggdbus/marshal.patch index 2b2cb49..a605a34 100644 --- a/meta/recipes-core/eggdbus/eggdbus/marshal.patch +++ b/meta/recipes-core/eggdbus/eggdbus/marshal.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + Index: eggdbus-0.6/src/eggdbus/Makefile.am === --- eggdbus-0.6.orig/src/eggdbus/Makefile.am diff --git a/meta/recipes-devtools/qemu/qemu-git/enable-i386-linux-user.patch b/meta/recipes-devtools/qemu/qemu-git/enable-i386-linux-user.patch index 3cf0953..76ed3a8 100644 --- a/meta/recipes-devtools/qemu/qemu-git/enable-i386-linux-user.patch +++ b/meta/recipes-devtools/qemu/qemu-git/enable-i386-linux-user.patch @@ -2,6 +2,8 @@ Enable i386-linux-user Signed-off-by: Zhai Edwin edwin.z...@intel.com +Upstream-Status: Inappropriate [configuration] + Index: qemu-0.14.0/Makefile.target === --- qemu-0.14.0.orig/Makefile.target diff --git a/meta/recipes-devtools/qemu/qemu-git/fix-nogl.patch b/meta/recipes-devtools/qemu/qemu-git/fix-nogl.patch index 0219cc8..5a65039 100644 --- a/meta/recipes-devtools/qemu/qemu-git/fix-nogl.patch +++ b/meta/recipes-devtools/qemu/qemu-git/fix-nogl.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + Index: qemu-0.14.0/Makefile.target === --- qemu-0.14.0.orig/Makefile.target diff --git a/meta/recipes-devtools/qemu/qemu-git/linker-flags.patch b/meta/recipes-devtools/qemu/qemu-git/linker-flags.patch index 470cf80..4569643 100644 --- a/meta/recipes-devtools/qemu/qemu-git/linker-flags.patch +++ b/meta/recipes-devtools/qemu/qemu-git/linker-flags.patch @@ -7,6 +7,9 @@ More information is available on the Fedora Wiki: https://fedoraproject.org/wiki/UnderstandingDSOLinkChange JL - 15/06/10 + +Upstream-Status: Inappropriate [configuration] + Index: qemu-0.14.0/Makefile.target === --- qemu-0.14.0.orig/Makefile.target diff --git a/meta/recipes-devtools/qemu/qemu-git/no-strip.patch b/meta/recipes-devtools/qemu/qemu-git/no-strip.patch index cf0d659..098070a 100644 --- a/meta/recipes-devtools/qemu/qemu-git/no-strip.patch +++ b/meta/recipes-devtools/qemu/qemu-git/no-strip.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + Index: qemu-0.14.0/Makefile === --- qemu-0.14.0.orig/Makefile diff --git a/meta/recipes-devtools/qemu/qemu-git/qemu-git-qemugl-host.patch b/meta/recipes-devtools/qemu/qemu-git/qemu-git-qemugl-host.patch index 92467a7..bbc9c9e 100644 --- a/meta/recipes-devtools/qemu/qemu-git/qemu-git-qemugl-host.patch +++ b/meta/recipes-devtools/qemu/qemu-git/qemu-git-qemugl-host.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [other] - qemugl patch need huge changes for upstream + Index: qemu-0.14.0/Makefile.target === --- qemu-0.14.0.orig/Makefile.target diff --git a/meta/recipes-devtools/qemu/qemu-git/qemu-vmware-vga-depth.patch b/meta/recipes-devtools/qemu/qemu-git/qemu-vmware-vga-depth.patch index 42ec98f..c4c5424 100644 --- a/meta/recipes-devtools/qemu/qemu-git/qemu-vmware-vga-depth.patch +++ b/meta/recipes-devtools/qemu/qemu-git/qemu-vmware-vga-depth.patch @@ -1,6 +1,9 @@ # fix VMware VGA driver depth calculation error, which
Re: [OE-core] [PATCH 09/15] bitbake.conf: move VENDOR variables from bitbake.conf to defaultsetup.conf
On Sat, 2011-05-14 at 18:32 -0700, Saul Wold wrote: From: Martin Jansa martin.ja...@gmail.com * empty TARGET_VENDOR was set before weak assignment in defaultsetup.conf * -oecore was changed to -oe to be more consistent with SDK_VENDOR as we had -oesdk as SDK_VENDOR and not -oecoresdk Signed-off-by: Martin Jansa martin.ja...@gmail.com I know I probably indicated otherwise but looking at this patch, I think moving all these entries into distrosetup.conf is not desirable. The real issue here is the default: TARGET_VENDOR = ${BUILD_VENDOR} which when you think about it doesn't actually make much sense. I'm happy for the default just to become: TARGET_VENDOR = -oe in bitbake.conf. Cheers, Richard --- meta/conf/bitbake.conf |4 meta/conf/distro/defaultsetup.conf |5 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 7c72de1..418a15d 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -62,7 +62,6 @@ target_datadir := ${datadir} BUILD_ARCH = ${@os.uname()[4]} BUILD_OS = ${@os.uname()[0].lower()} -BUILD_VENDOR = BUILD_SYS = ${BUILD_ARCH}${BUILD_VENDOR}-${BUILD_OS} BUILD_PREFIX = BUILD_CC_ARCH = @@ -70,7 +69,6 @@ BUILD_EXEEXT = HOST_ARCH = ${TARGET_ARCH} HOST_OS = ${TARGET_OS} -HOST_VENDOR = ${TARGET_VENDOR} HOST_SYS = ${HOST_ARCH}${HOST_VENDOR}-${HOST_OS} HOST_PREFIX = ${TARGET_PREFIX} HOST_CC_ARCH = ${TARGET_CC_ARCH} @@ -78,14 +76,12 @@ HOST_EXEEXT = TARGET_ARCH = INVALID TARGET_OS = INVALID -TARGET_VENDOR = ${BUILD_VENDOR} TARGET_SYS = ${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]} TARGET_PREFIX = ${TARGET_SYS}- TARGET_CC_ARCH = SDK_ARCH = ${BUILD_ARCH} SDK_OS = ${BUILD_OS} -SDK_VENDOR = -oesdk SDK_SYS = ${SDK_ARCH}${SDK_VENDOR}${@['-' + bb.data.getVar('SDK_OS', d, 1), ''][bb.data.getVar('SDK_OS', d, 1) == ('' or 'custom')]} SDK_PREFIX = ${SDK_SYS}- SDK_CC_ARCH = ${BUILD_CC_ARCH} diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf index 8da6c0a..dd9ffc3 100644 --- a/meta/conf/distro/defaultsetup.conf +++ b/meta/conf/distro/defaultsetup.conf @@ -3,7 +3,10 @@ include conf/distro/include/default-versions.inc include conf/distro/include/default-distrovars.inc include conf/distro/include/world-broken.inc -TARGET_VENDOR ?= -oecore +BUILD_VENDOR ?= +TARGET_VENDOR ?= -oe +HOST_VENDOR ?= ${TARGET_VENDOR} +SDK_VENDOR ?= -oesdk TARGET_FPU_arm ?= soft TARGET_FPU_armeb ?= soft ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 14/15] task-core-nfs: fix a bitbake error
On Sat, 2011-05-14 at 18:32 -0700, Saul Wold wrote: From: Nitin A Kamble nitin.a.kam...@intel.com THis fixes following issue: NOTE: Runtime target 'glibc-utilsglibc-utils' is unbuildable, removing... Missing or unbuildable dependency chain was: ['glibc-utilsglibc-utils'] NOTE: Runtime target 'task-core-nfs-server' is unbuildable, removing... Missing or unbuildable dependency chain was: ['task-core-nfs-server', 'glibc-utilsglibc-utils'] Signed-off-by: Nitin A Kamble nitin.a.kam...@intel.com --- meta/recipes-core/tasks/task-core-nfs.bb |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-core/tasks/task-core-nfs.bb b/meta/recipes-core/tasks/task-core-nfs.bb index d5d8291..087f4f0 100644 --- a/meta/recipes-core/tasks/task-core-nfs.bb +++ b/meta/recipes-core/tasks/task-core-nfs.bb @@ -20,7 +20,7 @@ RDEPENDS_task-core-nfs-server = \ nfs-utils # rpcinfo can be useful but only with glibc images -GLIBC_DEPENDENCIES = glibc-utils +GLIBC_DEPENDENCIES = glibc-utils RRECOMMENDS_task-core-nfs-server_append_linux = ${GLIBC_DEPENDENCIES} RRECOMMENDS_task-core-nfs-server_append_linux-gnueabi = ${GLIBC_DEPENDENCIES} This is the wrong place to be adding the space. The space issue is coming from the _append in the lines below and the space should therefore be added there to make it clear why its there. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 00/15] 14-May Consolidated Pull
On Sat, 2011-05-14 at 18:32 -0700, Saul Wold wrote: From: Saul Wold s...@linux.intel.com Richard, Some LSB Fixes from Kang, ARM and MACHINEOVERRIDES tweaks from Khem, and some glib and defaultsetup changes from Martin. Along with a QT4 Update from Paul. Pull URL: git://git.openembedded.org/openembedded-core-contrib Branch: sgw/stage Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage I took these apart from: Khem Raj (4): tune-cortexa8.inc: Define variable for controlling FP ABI gcc-common.inc: Consider hardfp knob for configuring toolchain Martin Jansa (3): bitbake.conf: move VENDOR variables from bitbake.conf to defaultsetup.conf Nitin A Kamble (1): task-core-nfs: fix a bitbake error Which I've sent replies about. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 11/15] gcc-common.inc: Consider hardfp knob for configuring toolchain
Hi Khem, I've a concern about ending up with several different variables all doing the same thing. Why do we need both TARGET_FPU and ARM_FP_ABI? Couldn't we just have values or hard, sort or empty for TARGET_FPU? Cheers, Richard On Sat, 2011-05-14 at 18:32 -0700, Saul Wold wrote: From: Khem Raj raj.k...@gmail.com pass --with-float=hard|soft depending upon ARM_FP_ABI settings Signed-off-by: Khem Raj raj.k...@gmail.com --- meta/recipes-devtools/gcc/gcc-common.inc | 13 ++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc index a3fa234..8b7c3ad 100644 --- a/meta/recipes-devtools/gcc/gcc-common.inc +++ b/meta/recipes-devtools/gcc/gcc-common.inc @@ -8,10 +8,17 @@ NATIVEDEPS = inherit autotools gettext FILESDIR = ${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV} - def get_gcc_fpu_setting(bb, d): -if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: -return --with-float=soft +if bb.data.getVar('TARGET_FPU', d, True) in [ 'soft', 'hard'] and bb.data.getVar('TARGET_OS', d, True).find('linux') = 0 : +# ARM_FP_ABI could be either 'hardfp' or 'softfp' +arm_fpabi = bb.data.getVar('ARM_FP_ABI', d, True) or +if arm_fpabi != : +if arm_fpabi == hardfp: +# reset it to whatever gcc --with-float configure expects which is either 'softfp' or 'hard' +arm_fpabi = hard +return --with-float= + arm_fpabi +else: +return --with-float= + bb.data.getVar('TARGET_FPU', d, True) return def get_gcc_mips_plt_setting(bb, d): ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] Usage of linux (instead of linux-yocto) recipes
Hello, Is someone using regular linux recipes with oe-core (or meta-oe)? -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC 0/3] Move Old Recipes to meta-extras
On 05/15/2011 11:19 PM, Khem Raj wrote: On May 14, 2011, at 5:23 PM, Saul Wolds...@linux.intel.com wrote: From: Saul Wolds...@linux.intel.com This proposes to move the YAFFS2-utils, older clutter-1.4 and older GCC version (4.3.3 and 3.4.4) as they are unused and currently unbuildable. Are we left with any GPLv2 version of gcc after this ? Khem, Is not having a GPLv2 version of gcc an issue? For the non-gplv3 version, my understanding is to have an installed user-space for oe-core for a non-development system, therefore gcc is not an issue. Let me know if you think otherwise. Sau! Pull URL: git://git.openembedded.org/openembedded-core-contrib Branch: sgw/rfc Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/rfc Thanks, Saul Wolds...@linux.intel.com --- Saul Wold (3): yaffs2: Remove yaffs2 from oe-core clutter: Clean up old recipes gcc: Move 4.3.3 and Special kernel gcc-3.4.4 to meta-extras meta/classes/image_types.bbclass |3 - meta/recipes-devtools/gcc/gcc-4.3.3.inc| 71 - .../gcc/gcc-4.3.3/100-uclibc-conf.patch| 37 - .../gcc/gcc-4.3.3/103-uclibc-conf-noupstream.patch | 11 - .../gcc/gcc-4.3.3/110-arm-eabi.patch | 27 - .../gcc/gcc-4.3.3/200-uclibc-locale.patch | 2833 - .../gcc/gcc-4.3.3/203-uclibc-locale-no__x.patch| 233 - .../gcc-4.3.3/204-uclibc-locale-wchar_fix.patch| 48 - .../gcc/gcc-4.3.3/205-uclibc-locale-update.patch | 519 -- .../gcc/gcc-4.3.3/300-libstdc++-pic.patch | 46 - .../gcc/gcc-4.3.3/301-missing-execinfo_h.patch | 11 - .../gcc/gcc-4.3.3/302-c99-snprintf.patch | 13 - .../gcc/gcc-4.3.3/303-c99-complex-ugly-hack.patch | 12 - .../gcc/gcc-4.3.3/304-index_macro.patch| 24 - .../gcc-4.3.3/305-libmudflap-susv3-legacy.patch| 49 - .../gcc/gcc-4.3.3/306-libstdc++-namespace.patch| 36 - .../gcc/gcc-4.3.3/307-locale_facets.patch | 19 - .../gcc-4.3.3/402-libbackend_dep_gcov-iov.h.patch | 13 - .../gcc/gcc-4.3.3/602-sdk-libstdc++-includes.patch | 20 - .../recipes-devtools/gcc/gcc-4.3.3/64bithack.patch | 33 - .../gcc/gcc-4.3.3/740-sh-pr24836.patch | 25 - .../gcc/gcc-4.3.3/800-arm-bigendian.patch | 34 - .../gcc/gcc-4.3.3/801-arm-bigendian-eabi.patch | 14 - .../gcc/gcc-4.3.3/904-flatten-switch-stmt-00.patch | 153 - .../gcc/gcc-4.3.3/arm-nolibfloat.patch | 24 - .../gcc/gcc-4.3.3/arm-softfloat.patch | 16 - .../gcc/gcc-4.3.3/arm-thumb-cache.patch| 29 - .../recipes-devtools/gcc/gcc-4.3.3/arm-thumb.patch | 43 - .../gcc/gcc-4.3.3/cache-amnesia.patch | 31 - .../debian/arm-unbreak-eabi-armv4t.dpatch | 36 - .../gcc/gcc-4.3.3/debian/gcc-ice-hack.dpatch | 331 - .../gcc/gcc-4.3.3/debian/libstdc++-pic.dpatch | 71 - .../gcc/gcc-4.3.3/debian/pr30961.dpatch| 179 - .../fedora/gcc43-c++-builtin-redecl.patch | 102 - .../gcc/gcc-4.3.3/fedora/gcc43-cpp-pragma.patch| 284 - .../gcc/gcc-4.3.3/fedora/gcc43-i386-libgomp.patch | 61 - .../gcc-4.3.3/fedora/gcc43-ia64-libunwind.patch| 538 -- .../fedora/gcc43-java-debug-iface-type.patch | 17 - .../gcc/gcc-4.3.3/fedora/gcc43-java-nomulti.patch | 44 - .../gcc-4.3.3/fedora/gcc43-libgomp-speedup.patch | 2797 .../gcc/gcc-4.3.3/fedora/gcc43-ppc32-retaddr.patch | 86 - .../gcc/gcc-4.3.3/fedora/gcc43-pr27898.patch | 16 - .../gcc/gcc-4.3.3/fedora/gcc43-pr32139.patch | 19 - .../gcc/gcc-4.3.3/fedora/gcc43-pr33763.patch | 153 - .../gcc/gcc-4.3.3/fedora/gcc43-pr35440.patch | 56 - .../gcc/gcc-4.3.3/fedora/gcc43-pr35751.patch | 114 - .../gcc/gcc-4.3.3/fedora/gcc43-rh251682.patch | 89 - .../gcc/gcc-4.3.3/fedora/gcc43-rh330771.patch | 34 - .../gcc/gcc-4.3.3/fedora/gcc43-rh341221.patch | 28 - .../gcc/gcc-4.3.3/fortran-cross-compile-hack.patch | 30 - .../gcc/gcc-4.3.3/fortran-static-linking.patch | 48 - .../gcc/gcc-4.3.3/gcc-4.0.2-e300c2c3.patch | 319 - .../gcc-4.3.3/gcc-4.2.3-linux-multilib-fix.patch | 23 - .../gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch | 31 - .../gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch | 6691 .../gcc/gcc-4.3.3/gcc-arm-frename-registers.patch | 25 - .../gcc/gcc-4.3.3/gcc-flags-for-build.patch| 279 - .../gcc-release-branch/PR-36500-fix-neon.patch | 265 - .../gcc/gcc-4.3.3/gcc41-configure.in.patch | 22 - .../gcc/gcc-4.3.3/gcc43-build-id.patch | 74 - .../gcc/gcc-4.3.3/gcc43-ppc64-ia64-GNU-stack.patch | 86 - meta/recipes-devtools/gcc/gcc-4.3.3/gfortran.patch | 40 - .../gcc/gcc-4.3.3/headerpath.patch | 42 - .../gcc/gcc-4.3.3/intermask-bigendian.patch| 24 - meta/recipes-devtools/gcc/gcc-4.3.3/ldflags.patch | 22 - .../gcc/gcc-4.3.3/optional_libstdc.patch | 23 -
Re: [OE-core] [PATCH] cmake: add support for oe qt4 tools names
On Thu, 2011-05-12 at 15:36 +, Otavio Salvador wrote: The FindQt4 module looks for Qt4 binaries to be able to gather the paths used for compilation and also to be using during other processes (translation update, translation binary generating and like) however OpenEmbedded has renamed those to allow old QMake to be used in parallel with the current one. This patch adds support for the OpenEmbedded specific binary names. Signed-off-by: Otavio Salvador ota...@ossystems.com.br --- meta/recipes-devtools/cmake/cmake-native_2.8.3.bb |2 +- meta/recipes-devtools/cmake/cmake.inc |3 +- .../cmake/cmake/support-oe-qt4-tools-names.patch | 98 3 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch Merged to master, thanks. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 11/15] gcc-common.inc: Consider hardfp knob for configuring toolchain
both softp and hardfp use the actual hardware fpu, but have different calling conventions and are incompatible. So you need vars. Op 16 mei 2011 om 16:44 heeft Richard Purdie richard.pur...@linuxfoundation.org het volgende geschreven: Hi Khem, I've a concern about ending up with several different variables all doing the same thing. Why do we need both TARGET_FPU and ARM_FP_ABI? Couldn't we just have values or hard, sort or empty for TARGET_FPU? Cheers, Richard On Sat, 2011-05-14 at 18:32 -0700, Saul Wold wrote: From: Khem Raj raj.k...@gmail.com pass --with-float=hard|soft depending upon ARM_FP_ABI settings Signed-off-by: Khem Raj raj.k...@gmail.com --- meta/recipes-devtools/gcc/gcc-common.inc | 13 ++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc index a3fa234..8b7c3ad 100644 --- a/meta/recipes-devtools/gcc/gcc-common.inc +++ b/meta/recipes-devtools/gcc/gcc-common.inc @@ -8,10 +8,17 @@ NATIVEDEPS = inherit autotools gettext FILESDIR = ${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV} - def get_gcc_fpu_setting(bb, d): -if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: -return --with-float=soft +if bb.data.getVar('TARGET_FPU', d, True) in [ 'soft', 'hard'] and bb.data.getVar('TARGET_OS', d, True).find('linux') = 0 : +# ARM_FP_ABI could be either 'hardfp' or 'softfp' +arm_fpabi = bb.data.getVar('ARM_FP_ABI', d, True) or +if arm_fpabi != : +if arm_fpabi == hardfp: +# reset it to whatever gcc --with-float configure expects which is either 'softfp' or 'hard' +arm_fpabi = hard +return --with-float= + arm_fpabi +else: +return --with-float= + bb.data.getVar('TARGET_FPU', d, True) return def get_gcc_mips_plt_setting(bb, d): ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC PATCH 03/10] create-pull-request: use git request-pull and arbitrary remotes
On Fri, 2011-05-13 at 20:19 -0700, Darren Hart wrote: +# Set WEB_URL from known remotes +case $REMOTE_URL in + *git.yoctoproject.org*) + WEB_URL=http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=$BRANCH; + ;; + *git.pokylinux.org*) + WEB_URL=http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=$BRANCH; + ;; +esac Nit: what about if this is a remote branch on that server but not for that repo? I'll roll a fix into V2, how about this: diff --git a/scripts/create-pull-request b/scripts/create-pull-request index 43a4b74..869e6e8 100755 --- a/scripts/create-pull-request +++ b/scripts/create-pull-request @@ -70,6 +70,7 @@ while getopts b:chi:m:o:p:r:s:u: OPT; do echo ERROR: git config failed to find a url for '$REMOTE' exit 1 fi + REMOTE_REPO=$(echo $REMOTE_URL | sed s#.*/\(.*\)\(.git\)#\1#) # Rewrite known private URLs to public URLs case $REMOTE_URL in @@ -97,10 +98,10 @@ fi # Set WEB_URL from known remotes case $REMOTE_URL in *git.yoctoproject.org*) - WEB_URL=http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=$BRANCH; + WEB_URL=http://git.yoctoproject.org/cgit.cgi/$REMOTE_REPO/log/?h=$BRANCH; ;; *git.pokylinux.org*) - WEB_URL=http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=$BRANCH; + WEB_URL=http://git.pokylinux.org/cgit.cgi/$REMOTE_REPO/log/?h=$BRANCH; ;; esac Looks good to me. Acked-by: Joshua Lock j...@linux.intel.com Cheers, Joshua -- Joshua Lock Yocto Build System Monkey Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] linux-yocto: branch manipulation changes
Richard/Saul, Recently a few alternate workflow/use cases have been looked at recently. While they aren't existing cases, or ones that were previously supported, they are reasonable so I've tweaked the tools and processing to support them. The first change is to allow AUTOREV processing to skip branch validation (since it doesn't make sense). The second change allows a repository with only a single BSP branch and a meta directory to be present .. and the tools can reconstruct what they need to validate and build the kernel. Tested against the new use cases, and existing ones, all performed properly. Pull URL: git://git.pokylinux.org/poky-contrib.git Branch: zedd/kernel Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel Thanks, Bruce Ashfield bruce.ashfi...@windriver.com --- Bruce Ashfield (1): linux-yocto: detect and avoid branch revision checking for AUTOREV meta/classes/kernel-yocto.bbclass |7 +++ .../kern-tools/kern-tools-native_git.bb|2 +- 2 files changed, 8 insertions(+), 1 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 11/15] gcc-common.inc: Consider hardfp knob for configuring toolchain
On Mon, May 16, 2011 at 7:44 AM, Richard Purdie richard.pur...@linuxfoundation.org wrote: Hi Khem, I've a concern about ending up with several different variables all doing the same thing. Why do we need both TARGET_FPU and ARM_FP_ABI? Couldn't we just have values or hard, sort or empty for TARGET_FPU? As koen already said we have two things here. what type of fpu to use and second case what type of function calling conventions to use when we select a hard fpu. GCC can use FPU instructions even when using non FPU calling convention thats what is conveyed with TARGET_FPU. hardfp calling convention is only possible when you have a real fpu available and is more efficient in many applications so with this patch we can select FP reg argument passing in function calling conventions per hardfp or softfp ABI. Cheers, Richard On Sat, 2011-05-14 at 18:32 -0700, Saul Wold wrote: From: Khem Raj raj.k...@gmail.com pass --with-float=hard|soft depending upon ARM_FP_ABI settings Signed-off-by: Khem Raj raj.k...@gmail.com --- meta/recipes-devtools/gcc/gcc-common.inc | 13 ++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc index a3fa234..8b7c3ad 100644 --- a/meta/recipes-devtools/gcc/gcc-common.inc +++ b/meta/recipes-devtools/gcc/gcc-common.inc @@ -8,10 +8,17 @@ NATIVEDEPS = inherit autotools gettext FILESDIR = ${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV} - def get_gcc_fpu_setting(bb, d): - if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: - return --with-float=soft + if bb.data.getVar('TARGET_FPU', d, True) in [ 'soft', 'hard'] and bb.data.getVar('TARGET_OS', d, True).find('linux') = 0 : + # ARM_FP_ABI could be either 'hardfp' or 'softfp' + arm_fpabi = bb.data.getVar('ARM_FP_ABI', d, True) or + if arm_fpabi != : + if arm_fpabi == hardfp: + # reset it to whatever gcc --with-float configure expects which is either 'softfp' or 'hard' + arm_fpabi = hard + return --with-float= + arm_fpabi + else: + return --with-float= + bb.data.getVar('TARGET_FPU', d, True) return def get_gcc_mips_plt_setting(bb, d): ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC 0/3] Move Old Recipes to meta-extras
On Mon, May 16, 2011 at 7:57 AM, Saul Wold saul.w...@intel.com wrote: On 05/15/2011 11:19 PM, Khem Raj wrote: On May 14, 2011, at 5:23 PM, Saul Wolds...@linux.intel.com wrote: From: Saul Wolds...@linux.intel.com This proposes to move the YAFFS2-utils, older clutter-1.4 and older GCC version (4.3.3 and 3.4.4) as they are unused and currently unbuildable. Are we left with any GPLv2 version of gcc after this ? Khem, Is not having a GPLv2 version of gcc an issue? For the non-gplv3 version, my understanding is to have an installed user-space for oe-core for a non-development system, therefore gcc is not an issue. there are certain parts of gcc which go onto target e.g. libgcc libstdc++ Let me know if you think otherwise. Sau! Pull URL: git://git.openembedded.org/openembedded-core-contrib Branch: sgw/rfc Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/rfc Thanks, Saul Wolds...@linux.intel.com --- Saul Wold (3): yaffs2: Remove yaffs2 from oe-core clutter: Clean up old recipes gcc: Move 4.3.3 and Special kernel gcc-3.4.4 to meta-extras meta/classes/image_types.bbclass | 3 - meta/recipes-devtools/gcc/gcc-4.3.3.inc | 71 - .../gcc/gcc-4.3.3/100-uclibc-conf.patch | 37 - .../gcc/gcc-4.3.3/103-uclibc-conf-noupstream.patch | 11 - .../gcc/gcc-4.3.3/110-arm-eabi.patch | 27 - .../gcc/gcc-4.3.3/200-uclibc-locale.patch | 2833 - .../gcc/gcc-4.3.3/203-uclibc-locale-no__x.patch | 233 - .../gcc-4.3.3/204-uclibc-locale-wchar_fix.patch | 48 - .../gcc/gcc-4.3.3/205-uclibc-locale-update.patch | 519 -- .../gcc/gcc-4.3.3/300-libstdc++-pic.patch | 46 - .../gcc/gcc-4.3.3/301-missing-execinfo_h.patch | 11 - .../gcc/gcc-4.3.3/302-c99-snprintf.patch | 13 - .../gcc/gcc-4.3.3/303-c99-complex-ugly-hack.patch | 12 - .../gcc/gcc-4.3.3/304-index_macro.patch | 24 - .../gcc-4.3.3/305-libmudflap-susv3-legacy.patch | 49 - .../gcc/gcc-4.3.3/306-libstdc++-namespace.patch | 36 - .../gcc/gcc-4.3.3/307-locale_facets.patch | 19 - .../gcc-4.3.3/402-libbackend_dep_gcov-iov.h.patch | 13 - .../gcc/gcc-4.3.3/602-sdk-libstdc++-includes.patch | 20 - .../recipes-devtools/gcc/gcc-4.3.3/64bithack.patch | 33 - .../gcc/gcc-4.3.3/740-sh-pr24836.patch | 25 - .../gcc/gcc-4.3.3/800-arm-bigendian.patch | 34 - .../gcc/gcc-4.3.3/801-arm-bigendian-eabi.patch | 14 - .../gcc/gcc-4.3.3/904-flatten-switch-stmt-00.patch | 153 - .../gcc/gcc-4.3.3/arm-nolibfloat.patch | 24 - .../gcc/gcc-4.3.3/arm-softfloat.patch | 16 - .../gcc/gcc-4.3.3/arm-thumb-cache.patch | 29 - .../recipes-devtools/gcc/gcc-4.3.3/arm-thumb.patch | 43 - .../gcc/gcc-4.3.3/cache-amnesia.patch | 31 - .../debian/arm-unbreak-eabi-armv4t.dpatch | 36 - .../gcc/gcc-4.3.3/debian/gcc-ice-hack.dpatch | 331 - .../gcc/gcc-4.3.3/debian/libstdc++-pic.dpatch | 71 - .../gcc/gcc-4.3.3/debian/pr30961.dpatch | 179 - .../fedora/gcc43-c++-builtin-redecl.patch | 102 - .../gcc/gcc-4.3.3/fedora/gcc43-cpp-pragma.patch | 284 - .../gcc/gcc-4.3.3/fedora/gcc43-i386-libgomp.patch | 61 - .../gcc-4.3.3/fedora/gcc43-ia64-libunwind.patch | 538 -- .../fedora/gcc43-java-debug-iface-type.patch | 17 - .../gcc/gcc-4.3.3/fedora/gcc43-java-nomulti.patch | 44 - .../gcc-4.3.3/fedora/gcc43-libgomp-speedup.patch | 2797 .../gcc/gcc-4.3.3/fedora/gcc43-ppc32-retaddr.patch | 86 - .../gcc/gcc-4.3.3/fedora/gcc43-pr27898.patch | 16 - .../gcc/gcc-4.3.3/fedora/gcc43-pr32139.patch | 19 - .../gcc/gcc-4.3.3/fedora/gcc43-pr33763.patch | 153 - .../gcc/gcc-4.3.3/fedora/gcc43-pr35440.patch | 56 - .../gcc/gcc-4.3.3/fedora/gcc43-pr35751.patch | 114 - .../gcc/gcc-4.3.3/fedora/gcc43-rh251682.patch | 89 - .../gcc/gcc-4.3.3/fedora/gcc43-rh330771.patch | 34 - .../gcc/gcc-4.3.3/fedora/gcc43-rh341221.patch | 28 - .../gcc/gcc-4.3.3/fortran-cross-compile-hack.patch | 30 - .../gcc/gcc-4.3.3/fortran-static-linking.patch | 48 - .../gcc/gcc-4.3.3/gcc-4.0.2-e300c2c3.patch | 319 - .../gcc-4.3.3/gcc-4.2.3-linux-multilib-fix.patch | 23 - .../gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch | 31 - .../gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch | 6691 .../gcc/gcc-4.3.3/gcc-arm-frename-registers.patch | 25 - .../gcc/gcc-4.3.3/gcc-flags-for-build.patch | 279 - .../gcc-release-branch/PR-36500-fix-neon.patch | 265 - .../gcc/gcc-4.3.3/gcc41-configure.in.patch | 22 - .../gcc/gcc-4.3.3/gcc43-build-id.patch | 74 - .../gcc/gcc-4.3.3/gcc43-ppc64-ia64-GNU-stack.patch | 86 - meta/recipes-devtools/gcc/gcc-4.3.3/gfortran.patch | 40 - .../gcc/gcc-4.3.3/headerpath.patch
[OE-core] [PATCH 1/1] linux-yocto: update meta SRCREV
Updating the meta branch to pickup two recent commits for BSP support: [ commit 79669230fd82a3e7e254cf8b596a2388a4333e62 Author: Tom Zanussi tom.zanu...@intel.com Date: Fri Apr 22 15:55:12 2011 -0500 bsp/crownbay: merge emgd branch Add scc commands to merge the yocto/emgd branch into the crownbay BSP. Signed-off-by: Tom Zanussi tom.zanu...@intel.com :100644 100644 89a0725... 0d02b98... M meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc commit ceb1744ec55408cb637929a3f154379e42642890 Author: Tom Zanussi tom.zanu...@intel.com Date: Mon Apr 25 18:15:14 2011 -0500 meta/romley: create initial BSP infrastructure Signed-off-by: Tom Zanussi tom.zanu...@intel.com :00 100644 000... 54ec614... A meta/cfg/kernel-cache/bsp/romley/romley-standard.scc :00 100644 000... 61e5506... A meta/cfg/kernel-cache/bsp/romley/romley.cfg :00 100644 000... 1c4a657... A meta/cfg/kernel-cache/bsp/romley/romley.scc commit ecab1e2bc12a8b0c4d064a00acc3260f6e8528c5 ] Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/recipes-kernel/linux/linux-yocto_git.bb |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto_git.bb b/meta/recipes-kernel/linux/linux-yocto_git.bb index f54033d..3e828c2 100644 --- a/meta/recipes-kernel/linux/linux-yocto_git.bb +++ b/meta/recipes-kernel/linux/linux-yocto_git.bb @@ -20,7 +20,7 @@ SRCREV_machine_qemuppc = 7eb6c68d977d9039a2b5a734172b064a9d19cdc1 SRCREV_machine_qemux86 = ad62d1aab734513cd96c8f4517f816420a218e77 SRCREV_machine_qemux86-64 = b906f358fd404a1e74a961f25079274e0d933ee1 SRCREV_machine = b906f358fd404a1e74a961f25079274e0d933ee1 -SRCREV_meta = ecab1e2bc12a8b0c4d064a00acc3260f6e8528c5 +SRCREV_meta = 79669230fd82a3e7e254cf8b596a2388a4333e62 PR = r18 PV = ${LINUX_VERSION}+git${SRCPV} -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] LIC_FILES_CHKSUM fatal?
On 05/16/2011 01:57 PM, Richard Purdie wrote: On Mon, 2011-05-16 at 17:24 +0100, Phil Blundell wrote: This change, from commit d2d5456cd3b3bd3e52a5dedccca4d46e3a7986d1: diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 225530a..71ed5b6 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -349,7 +349,7 @@ def package_qa_check_license(workdir, d): # just throw a warning now. Once licensing data in entered for enough of the recipes, # this will be converted into error and False will be returned. bb.error(pn + : Recipe file does not have license file information (LIC_FILES_CHKSUM)) -return True +return False means that, contrary to what the comment says, lack of LIC_FILES_CHKSUM is now a fatal error. Was this a deliberate change or an oversight? It was a deliberate change, the comment was missed in the change though. Yes, its annoying and we can have some way to turn it off but for at least the core, having them present is a good thing. Even if this check doesn't treat this as fatal, my experience has been that do_configure() fails if LIC_FILES_CHKSUM is missing. -- Gary Thomas | Consulting for the MLB Associates |Embedded world ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] uclibc?
On Mon, 2011-05-16 at 10:01 -0700, Khem Raj wrote: On Mon, May 16, 2011 at 9:35 AM, Phil Blundell p...@pbcl.net wrote: I've just been trying to build a uclibc-based system from the current head of oe-core but this doesn't seem to be something that works entirely smoothly at the moment. Does anybody have a patchset to fix the uclibc recipes, or is anybody working on such a thing? I have not fixed uclibc in oe-core yet but if you use meta-openembedded layer along with oe-core then the uclibc in that layer should work pretty well on top of oe-core. Eventually it should move into oe-core one of these days. I just tried that and now I get a failure in gcc-intermediate due to missing linux/limits.h. Not quite sure what's gone wrong there. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] perl-native: create_wrapper on perl${PV} too
perl${PV} becomes hostperl when building for the target so we need a wrapper on that too. This is 1e255fbd296e95ff178d66c4a1fe4875a988d7e1 in OE. Signed-off-by: Tom Rini tom_r...@mentor.com --- meta/recipes-devtools/perl/perl-native_5.12.3.bb |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/meta/recipes-devtools/perl/perl-native_5.12.3.bb b/meta/recipes-devtools/perl/perl-native_5.12.3.bb index 0476bdf..c5cd13c 100644 --- a/meta/recipes-devtools/perl/perl-native_5.12.3.bb +++ b/meta/recipes-devtools/perl/perl-native_5.12.3.bb @@ -4,7 +4,7 @@ SECTION = libs LICENSE = Artistic|GPL LIC_FILES_CHKSUM = file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8 -PR = r1 +PR = r2 LIC_FILES_CHKSUM = file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8 @@ -97,6 +97,7 @@ do_install () { done create_wrapper ${D}${bindir}/perl PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl/' + create_wrapper ${D}${bindir}/perl${PV} PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl/' } do_install_append_nylon() { # get rid of definitions not supported by the gcc version we use for nylon... -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] openssh: Don't use ${libdir}exec
This is 1259e0289ce53198cc6c57a9616c8a1623be502a in OE. Signed-off-by: Tom Rini tom_r...@mentor.com --- meta/recipes-connectivity/openssh/openssh_5.6p1.bb |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/openssh/openssh_5.6p1.bb b/meta/recipes-connectivity/openssh/openssh_5.6p1.bb index d93a773..df7fcad 100644 --- a/meta/recipes-connectivity/openssh/openssh_5.6p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_5.6p1.bb @@ -75,8 +75,8 @@ FILES_${PN}-ssh = ${bindir}/ssh.${PN} ${sysconfdir}/ssh/ssh_config FILES_${PN}-sshd = ${sbindir}/sshd ${sysconfdir}/init.d/sshd FILES_${PN}-sshd += ${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config FILES_${PN}-sftp = ${bindir}/sftp -FILES_${PN}-sftp-server = ${libdir}exec/sftp-server -FILES_${PN}-misc = ${bindir}/ssh* ${libdir}exec/ssh* +FILES_${PN}-sftp-server = ${libexecdir}/sftp-server +FILES_${PN}-misc = ${bindir}/ssh* ${libexecdir}/ssh* FILES_${PN}-keygen = ${bindir}/ssh-keygen RDEPENDS_${PN} += ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC 0/3] Move Old Recipes to meta-extras
On 05/16/2011 12:51 PM, Richard Purdie wrote: On Mon, 2011-05-16 at 10:08 -0700, Khem Raj wrote: On Mon, May 16, 2011 at 7:57 AM, Saul Woldsaul.w...@intel.com wrote: On 05/15/2011 11:19 PM, Khem Raj wrote: On May 14, 2011, at 5:23 PM, Saul Wolds...@linux.intel.com wrote: From: Saul Wolds...@linux.intel.com This proposes to move the YAFFS2-utils, older clutter-1.4 and older GCC version (4.3.3 and 3.4.4) as they are unused and currently unbuildable. Are we left with any GPLv2 version of gcc after this ? Khem, Is not having a GPLv2 version of gcc an issue? For the non-gplv3 version, my understanding is to have an installed user-space for oe-core for a non-development system, therefore gcc is not an issue. there are certain parts of gcc which go onto target e.g. libgcc libstdc++ These have specific license exceptions allowing non-gpl code to use them as system libraries though? Richard is correct, there are exception for the runtime parts of GCC. Sorry Khem, I was not catching to original gist of the question. Sau! Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/14] Upstream-Status: Update patch upstream-status for libfm, eggdbus, screenshot...
From: Zhai Edwin edwin.z...@intel.com Signed-off-by: Zhai Edwin edwin.z...@intel.com --- meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch|2 ++ meta/recipes-core/eggdbus/eggdbus/marshal.patch|2 ++ .../qemu/qemu-git/enable-i386-linux-user.patch |2 ++ meta/recipes-devtools/qemu/qemu-git/fix-nogl.patch |2 ++ .../qemu/qemu-git/linker-flags.patch |3 +++ meta/recipes-devtools/qemu/qemu-git/no-strip.patch |2 ++ .../qemu/qemu-git/qemu-git-qemugl-host.patch |2 ++ .../qemu/qemu-git/qemu-vmware-vga-depth.patch |3 +++ .../qemu-git/qemugl-allow-glxcontext-release.patch |2 ++ .../gtk+/gtk+-2.12.7/filechooser-props.patch |2 ++ .../clutter-box2d/fix-disable-introspection.patch |2 ++ .../screenshot/files/fix_ldadd_order.patch |3 +++ .../libfm/libfm-0.1.14/use_deprecate_func.patch|2 ++ 13 files changed, 29 insertions(+), 0 deletions(-) diff --git a/meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch b/meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch index 0999a85..abd7ff4 100644 --- a/meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch +++ b/meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + Index: eggdbus-0.6/docs/eggdbus/Makefile.am === --- eggdbus-0.6.orig/docs/eggdbus/Makefile.am diff --git a/meta/recipes-core/eggdbus/eggdbus/marshal.patch b/meta/recipes-core/eggdbus/eggdbus/marshal.patch index 2b2cb49..a605a34 100644 --- a/meta/recipes-core/eggdbus/eggdbus/marshal.patch +++ b/meta/recipes-core/eggdbus/eggdbus/marshal.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + Index: eggdbus-0.6/src/eggdbus/Makefile.am === --- eggdbus-0.6.orig/src/eggdbus/Makefile.am diff --git a/meta/recipes-devtools/qemu/qemu-git/enable-i386-linux-user.patch b/meta/recipes-devtools/qemu/qemu-git/enable-i386-linux-user.patch index 3cf0953..76ed3a8 100644 --- a/meta/recipes-devtools/qemu/qemu-git/enable-i386-linux-user.patch +++ b/meta/recipes-devtools/qemu/qemu-git/enable-i386-linux-user.patch @@ -2,6 +2,8 @@ Enable i386-linux-user Signed-off-by: Zhai Edwin edwin.z...@intel.com +Upstream-Status: Inappropriate [configuration] + Index: qemu-0.14.0/Makefile.target === --- qemu-0.14.0.orig/Makefile.target diff --git a/meta/recipes-devtools/qemu/qemu-git/fix-nogl.patch b/meta/recipes-devtools/qemu/qemu-git/fix-nogl.patch index 0219cc8..5a65039 100644 --- a/meta/recipes-devtools/qemu/qemu-git/fix-nogl.patch +++ b/meta/recipes-devtools/qemu/qemu-git/fix-nogl.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + Index: qemu-0.14.0/Makefile.target === --- qemu-0.14.0.orig/Makefile.target diff --git a/meta/recipes-devtools/qemu/qemu-git/linker-flags.patch b/meta/recipes-devtools/qemu/qemu-git/linker-flags.patch index 470cf80..4569643 100644 --- a/meta/recipes-devtools/qemu/qemu-git/linker-flags.patch +++ b/meta/recipes-devtools/qemu/qemu-git/linker-flags.patch @@ -7,6 +7,9 @@ More information is available on the Fedora Wiki: https://fedoraproject.org/wiki/UnderstandingDSOLinkChange JL - 15/06/10 + +Upstream-Status: Inappropriate [configuration] + Index: qemu-0.14.0/Makefile.target === --- qemu-0.14.0.orig/Makefile.target diff --git a/meta/recipes-devtools/qemu/qemu-git/no-strip.patch b/meta/recipes-devtools/qemu/qemu-git/no-strip.patch index cf0d659..098070a 100644 --- a/meta/recipes-devtools/qemu/qemu-git/no-strip.patch +++ b/meta/recipes-devtools/qemu/qemu-git/no-strip.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + Index: qemu-0.14.0/Makefile === --- qemu-0.14.0.orig/Makefile diff --git a/meta/recipes-devtools/qemu/qemu-git/qemu-git-qemugl-host.patch b/meta/recipes-devtools/qemu/qemu-git/qemu-git-qemugl-host.patch index 92467a7..bbc9c9e 100644 --- a/meta/recipes-devtools/qemu/qemu-git/qemu-git-qemugl-host.patch +++ b/meta/recipes-devtools/qemu/qemu-git/qemu-git-qemugl-host.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [other] - qemugl patch need huge changes for upstream + Index: qemu-0.14.0/Makefile.target === --- qemu-0.14.0.orig/Makefile.target diff --git a/meta/recipes-devtools/qemu/qemu-git/qemu-vmware-vga-depth.patch b/meta/recipes-devtools/qemu/qemu-git/qemu-vmware-vga-depth.patch index 42ec98f..c4c5424 100644 --- a/meta/recipes-devtools/qemu/qemu-git/qemu-vmware-vga-depth.patch +++ b/meta/recipes-devtools/qemu/qemu-git/qemu-vmware-vga-depth.patch @@ -1,6 +1,9 @@ # fix VMware VGA driver depth calculation error, which
[OE-core] [PATCH 00/14] 16-May-2011 Consolidated Pull Request
From: Saul Wold s...@linux.intel.com Richard, This contains the Kernel updates, Upstream-Status updates along with some changes from Nitin, Khem, Tom and myself. Pull URL: git://git.openembedded.org/openembedded-core-contrib Branch: sgw/stage Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage Thanks, Saul Wold s...@linux.intel.com --- Bruce Ashfield (2): linux-yocto: detect and avoid branch revision checking for AUTOREV linux-yocto: update meta SRCREV Khem Raj (3): opkg: Bump SRCREV to 609 e2fsprogs_1.41.14.bb: Package libraries into separate packages base.bbclass: Fix PR increment bug when PR number is a single digit Mei Lei (1): Add a new task checklicense and fix some bugs in distro_check.py Nitin A Kamble (1): task-core-nfs: fix a bitbake error Saul Wold (1): mutter: Recipe Update for clutter 1.6 update Scott Garman (1): recipes: Add Upstream-Status to various recipe patches Tom Rini (2): openssh: Don't use ${libdir}exec perl-native: create_wrapper on perl${PV} too Yu Ke (2): xserver-kdrive: upgrade from 1.7.99.2 to 1.10.1 Upstream-Status update for several recipes Zhai Edwin (1): Upstream-Status: Update patch upstream-status for libfm, eggdbus, screenshot... meta/classes/base.bbclass | 19 +- meta/classes/distrodata.bbclass| 177 --- meta/classes/kernel-yocto.bbclass |7 + meta/lib/oe/distro_check.py| 27 +- meta/recipes-bsp/keymaps/files/GPLv2.patch |2 + meta/recipes-bsp/libacpi/files/makefile-fix.patch |2 + .../openssh/openssh-5.6p1/nostrip.patch|9 +- meta/recipes-connectivity/openssh/openssh_5.6p1.bb |4 +- .../console-tools-0.3.2/codepage.patch |1 + .../console-tools-0.3.2/compile.patch |2 + .../console-tools-0.3.2/configure.patch|1 + .../console-tools-0.3.2/kbdrate.patch |2 + .../console-tools-0.3.2/uclibc-fileno.patch|2 + .../dbus/dbus-glib-0.92/no-examples.patch |9 +- meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch|2 + meta/recipes-core/eggdbus/eggdbus/marshal.patch|2 + .../recipes-core/expat/expat-2.0.1/autotools.patch | 10 +- .../initscripts/initscripts-1.0/GPLv2.patch|2 + meta/recipes-core/tasks/task-core-nfs.bb |4 +- .../e2fsprogs/e2fsprogs_1.41.14.bb |6 + .../opensp/opensp/attributevalue.patch |3 + .../opensp/opensp/fix-docdir.patch |3 + meta/recipes-devtools/opensp/opensp/m4.patch |3 + .../opensp/opensp/rangmap-fix.patch|3 + meta/recipes-devtools/opkg/opkg.inc|8 +- meta/recipes-devtools/opkg/opkg_svn.bb |3 +- meta/recipes-devtools/perl/perl-native_5.12.3.bb |1 + .../qemu/qemu-git/enable-i386-linux-user.patch |2 + meta/recipes-devtools/qemu/qemu-git/fix-nogl.patch |2 + .../qemu/qemu-git/linker-flags.patch |3 + meta/recipes-devtools/qemu/qemu-git/no-strip.patch |2 + .../qemu/qemu-git/qemu-git-qemugl-host.patch |2 + .../qemu/qemu-git/qemu-vmware-vga-depth.patch |3 + .../qemu-git/qemugl-allow-glxcontext-release.patch |2 + .../sgml-common/sgml-common-0.6.3/autohell.patch |3 + .../sgml-common/sgml-common-0.6.3/license.patch|3 + meta/recipes-extended/at/at-3.1.12/configure.patch |8 +- .../at/at-3.1.12/fix_parallel_build_error.patch|4 + meta/recipes-extended/cpio/cpio-2.11/statdef.patch |8 +- .../pam/libpam/pam-no-innetgr.patch|5 + meta/recipes-extended/sudo/files/libtool.patch | 10 +- .../gtk+/gtk+-2.12.7/filechooser-props.patch |2 + .../clutter-box2d/fix-disable-introspection.patch |2 + .../mesa-demos/dso_linking_change_build_fix.patch |1 + meta/recipes-graphics/mutter/mutter.inc|2 +- .../mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch | 47 ++ meta/recipes-graphics/mutter/mutter_2.28.1.bb |9 +- meta/recipes-graphics/mutter/mutter_git.bb |1 + .../enable-builtin-fonts.patch | 12 - .../xserver-kdrive-1.3.0.0/enable-epson.patch | 11 - .../xserver-kdrive-1.3.0.0/enable-tslib.patch | 12 - .../xserver-kdrive-1.3.0.0/enable-xcalibrate.patch | 110 - .../xserver-kdrive-1.3.0.0/fbdev_use_current.patch | 41 -- .../hide-cursor-and-ppm-root.patch | 307 .../xserver-kdrive-1.3.0.0/kdrive-evdev.patch | 515 .../xserver-kdrive-1.3.0.0/kdrive-use-evdev.patch | 54 -- .../xserver-kdrive-1.3.0.0/optional-xkb.patch | 58 --- .../report-correct-randr12.patch | 29 -- .../xserver-kdrive-1.3.0.0/scheduler.patch | 151 -- .../xserver-kdrive-1.3.0.0/xcalibrate_coords.patch | 122
[OE-core] [PATCH 07/14] Upstream-Status update for several recipes
From: Yu Ke ke...@intel.com - modutils - module-init-tools - libacpi - keymaps - initscripts - console-tools - mesa-demos - xserver-xf86-lite Signed-off-by: Yu Ke ke...@intel.com --- meta/recipes-bsp/keymaps/files/GPLv2.patch |2 ++ meta/recipes-bsp/libacpi/files/makefile-fix.patch |2 ++ .../console-tools-0.3.2/codepage.patch |1 + .../console-tools-0.3.2/compile.patch |2 ++ .../console-tools-0.3.2/configure.patch|1 + .../console-tools-0.3.2/kbdrate.patch |2 ++ .../console-tools-0.3.2/uclibc-fileno.patch|2 ++ .../initscripts/initscripts-1.0/GPLv2.patch|2 ++ .../mesa-demos/dso_linking_change_build_fix.patch |1 + .../fix_open_max_preprocessor_error.patch |2 ++ .../module-init-tools/files/disable_man.patch |2 ++ .../files/grab_module_memset.patch |2 ++ .../files/ignore_arch_directory.patch |2 ++ .../files/modutils_extension.patch |3 +++ .../files/no-static-binaries.patch |2 ++ meta/recipes-kernel/modutils/files/PD.patch|2 ++ meta/recipes-kernel/modutils/files/armeb.patch |2 ++ meta/recipes-kernel/modutils/files/configure.patch |1 + meta/recipes-kernel/modutils/files/gcc4.patch |2 ++ meta/recipes-kernel/modutils/files/lex.l.diff |2 ++ .../modutils/files/modutils-notest.patch |2 ++ .../modutils/files/program_prefix.patch|2 ++ .../modutils/modutils-cross/module.h.diff |2 ++ 23 files changed, 43 insertions(+), 0 deletions(-) diff --git a/meta/recipes-bsp/keymaps/files/GPLv2.patch b/meta/recipes-bsp/keymaps/files/GPLv2.patch index 2611f22..1ee8181 100644 --- a/meta/recipes-bsp/keymaps/files/GPLv2.patch +++ b/meta/recipes-bsp/keymaps/files/GPLv2.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [licensing] + diff --git a/COPYING b/COPYING new file mode 100644 index 000..d511905 diff --git a/meta/recipes-bsp/libacpi/files/makefile-fix.patch b/meta/recipes-bsp/libacpi/files/makefile-fix.patch index 9193929..c34ef34 100644 --- a/meta/recipes-bsp/libacpi/files/makefile-fix.patch +++ b/meta/recipes-bsp/libacpi/files/makefile-fix.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- Makefile |6 +++--- config.mk |3 ++- diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch index f6bd91e..c287014 100644 --- a/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch +++ b/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch @@ -1,3 +1,4 @@ +Upstream-Status: Pending # # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch index 29012fe..c93f511 100644 --- a/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch +++ b/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- console-tools-0.3.2/kbdtools/showkey.c~compile 1999-08-25 17:20:08.0 -0400 +++ console-tools-0.3.2/kbdtools/showkey.c 2004-05-09 03:03:23.0 -0400 @@ -264,7 +264,6 @@ diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch index f5b7532..60ee8ff 100644 --- a/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch +++ b/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch @@ -1,3 +1,4 @@ +Upstream-Status: Pending # # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch index 47d7ea5..f370be8 100644 --- a/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch +++ b/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch @@ -1,6 +1,8 @@ Patch from Matthias Goebl o...@m.goebl.net Added via OE bugtracker: bug #478 +Upstream-Status: Pending + --- console-tools-0.3.2/kbdtools/kbd_mode.c.orig +++ console-tools-0.3.2/kbdtools/kbd_mode.c @@ -29,11 +29,16 @@ diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch index c73d8a3..0c95068 100644 --- a/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch +++ b/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch @@ -1,6 +1,8 @@ Fixing the locale issues isn't enough, console-tools also does a couple of other pretty stupid things (like FILE *f; f-_fileno instead of fileno(f)), +Upstream-Status: Pending + ---
[OE-core] [PATCH 09/14] linux-yocto: detect and avoid branch revision checking for AUTOREV
From: Bruce Ashfield bruce.ashfi...@windriver.com When a BSP or layer specifies an AUTOREV for SRCREV, the logic that matches expected vs real branch heads doesn't apply. We always want the latest. To solve the issues with invalid git revs causing validation failures, we detect the AUTOINC value and do a early return, skipping validation. Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/classes/kernel-yocto.bbclass |7 +++ .../kern-tools/kern-tools-native_git.bb|2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 818a07e..536434f 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -136,6 +136,13 @@ do_validate_branches() { return fi + # nothing to do if SRCREV=${AUTOREV} + if [ ${SRCREV_machine} = AUTOINC ]; then + # restore the branch for builds + git checkout -f ${KBRANCH} + return + fi + branch_head=`git show-ref -s --heads ${KBRANCH}` meta_head=`git show-ref -s --heads ${KMETA}` target_branch_head=${SRCREV_machine} diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 829d105..f7600ca 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8 DEPENDS = git-native guilt-native -SRCREV = ecbdf3cdf6705a63dcb3c50bb24c311046f0b35c +SRCREV = f8eb067b023d590b6cd8deddf6f96d6a820997af PR = r10 PV = 0.1+git${SRCPV} -- 1.7.1.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 01/14] task-core-nfs: fix a bitbake error
From: Nitin A Kamble nitin.a.kam...@intel.com THis fixes following issue: NOTE: Runtime target 'glibc-utilsglibc-utils' is unbuildable, removing... Missing or unbuildable dependency chain was: ['glibc-utilsglibc-utils'] NOTE: Runtime target 'task-core-nfs-server' is unbuildable, removing... Missing or unbuildable dependency chain was: ['task-core-nfs-server', 'glibc-utilsglibc-utils'] [sgw: moved space to _append line] Signed-off-by: Nitin A Kamble nitin.a.kam...@intel.com Signed-off-by: Saul Wold s...@linux.intel.com --- meta/recipes-core/tasks/task-core-nfs.bb |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/tasks/task-core-nfs.bb b/meta/recipes-core/tasks/task-core-nfs.bb index d5d8291..20e042b 100644 --- a/meta/recipes-core/tasks/task-core-nfs.bb +++ b/meta/recipes-core/tasks/task-core-nfs.bb @@ -22,5 +22,5 @@ RDEPENDS_task-core-nfs-server = \ # rpcinfo can be useful but only with glibc images GLIBC_DEPENDENCIES = glibc-utils -RRECOMMENDS_task-core-nfs-server_append_linux = ${GLIBC_DEPENDENCIES} -RRECOMMENDS_task-core-nfs-server_append_linux-gnueabi = ${GLIBC_DEPENDENCIES} +RRECOMMENDS_task-core-nfs-server_append_linux = ${GLIBC_DEPENDENCIES} +RRECOMMENDS_task-core-nfs-server_append_linux-gnueabi = ${GLIBC_DEPENDENCIES} -- 1.7.1.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 13/14] perl-native: create_wrapper on perl${PV} too
From: Tom Rini tom_r...@mentor.com perl${PV} becomes hostperl when building for the target so we need a wrapper on that too. This is 1e255fbd296e95ff178d66c4a1fe4875a988d7e1 in OE. Signed-off-by: Tom Rini tom_r...@mentor.com --- meta/recipes-devtools/perl/perl-native_5.12.3.bb |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/meta/recipes-devtools/perl/perl-native_5.12.3.bb b/meta/recipes-devtools/perl/perl-native_5.12.3.bb index f477679..cbb4e78 100644 --- a/meta/recipes-devtools/perl/perl-native_5.12.3.bb +++ b/meta/recipes-devtools/perl/perl-native_5.12.3.bb @@ -97,4 +97,5 @@ do_install () { done create_wrapper ${D}${bindir}/perl PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl/' + create_wrapper ${D}${bindir}/perl${PV} PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl/' } -- 1.7.1.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 14/14] linux-yocto: update meta SRCREV
From: Bruce Ashfield bruce.ashfi...@windriver.com Updating the meta branch to pickup two recent commits for BSP support: [ commit 79669230fd82a3e7e254cf8b596a2388a4333e62 Author: Tom Zanussi tom.zanu...@intel.com Date: Fri Apr 22 15:55:12 2011 -0500 bsp/crownbay: merge emgd branch Add scc commands to merge the yocto/emgd branch into the crownbay BSP. Signed-off-by: Tom Zanussi tom.zanu...@intel.com :100644 100644 89a0725... 0d02b98... M meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc commit ceb1744ec55408cb637929a3f154379e42642890 Author: Tom Zanussi tom.zanu...@intel.com Date: Mon Apr 25 18:15:14 2011 -0500 meta/romley: create initial BSP infrastructure Signed-off-by: Tom Zanussi tom.zanu...@intel.com :00 100644 000... 54ec614... A meta/cfg/kernel-cache/bsp/romley/romley-standard.scc :00 100644 000... 61e5506... A meta/cfg/kernel-cache/bsp/romley/romley.cfg :00 100644 000... 1c4a657... A meta/cfg/kernel-cache/bsp/romley/romley.scc commit ecab1e2bc12a8b0c4d064a00acc3260f6e8528c5 ] Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/recipes-kernel/linux/linux-yocto_git.bb |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto_git.bb b/meta/recipes-kernel/linux/linux-yocto_git.bb index f54033d..3e828c2 100644 --- a/meta/recipes-kernel/linux/linux-yocto_git.bb +++ b/meta/recipes-kernel/linux/linux-yocto_git.bb @@ -20,7 +20,7 @@ SRCREV_machine_qemuppc = 7eb6c68d977d9039a2b5a734172b064a9d19cdc1 SRCREV_machine_qemux86 = ad62d1aab734513cd96c8f4517f816420a218e77 SRCREV_machine_qemux86-64 = b906f358fd404a1e74a961f25079274e0d933ee1 SRCREV_machine = b906f358fd404a1e74a961f25079274e0d933ee1 -SRCREV_meta = ecab1e2bc12a8b0c4d064a00acc3260f6e8528c5 +SRCREV_meta = 79669230fd82a3e7e254cf8b596a2388a4333e62 PR = r18 PV = ${LINUX_VERSION}+git${SRCPV} -- 1.7.1.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 03/14] e2fsprogs_1.41.14.bb: Package libraries into separate packages
From: Khem Raj raj.k...@gmail.com add libcomerr libss libe2p libext2fs packages helps in reducing the root file system size Signed-off-by: Khem Raj raj.k...@gmail.com --- .../e2fsprogs/e2fsprogs_1.41.14.bb |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb index d493f6f..91a783d 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb @@ -39,11 +39,17 @@ do_install () { RDEPENDS_e2fsprogs = e2fsprogs-blkid e2fsprogs-badblocks PACKAGES =+ e2fsprogs-blkid e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks +PACKAGES =+ libcomerr libss libe2p libext2fs + FILES_e2fsprogs-blkid = ${base_sbindir}/blkid FILES_e2fsprogs-fsck = ${base_sbindir}/fsck FILES_e2fsprogs-e2fsck = ${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext* FILES_e2fsprogs-mke2fs = ${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext* FILES_e2fsprogs-tune2fs = ${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs FILES_e2fsprogs-badblocks = ${base_sbindir}/badblocks +FILES_libcomerr = ${libdir}/libcom_err.so.* +FILES_libss = ${libdir}/libss.so.* +FILES_libe2p = ${libdir}/libe2p.so.* +FILES_libext2fs = ${libdir}/e2initrd_helper ${libdir}/libext2fs.so.* BBCLASSEXTEND = native -- 1.7.1.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 05/14] mutter: Recipe Update for clutter 1.6 update
From: Saul Wold s...@linux.intel.com set DEFAULT_PREFERENCE to -1 for git recipe Update from clutter-1.4 to clutter-1.6 add fix_CGL_TEXTURE_RECTANGLE_ARB.patch Signed-off-by: Saul Wold s...@linux.intel.com --- meta/recipes-graphics/mutter/mutter.inc|2 +- .../mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch | 47 meta/recipes-graphics/mutter/mutter_2.28.1.bb |9 +++- meta/recipes-graphics/mutter/mutter_git.bb |1 + 4 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-graphics/mutter/mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch diff --git a/meta/recipes-graphics/mutter/mutter.inc b/meta/recipes-graphics/mutter/mutter.inc index 60ceed4..d87c30e 100644 --- a/meta/recipes-graphics/mutter/mutter.inc +++ b/meta/recipes-graphics/mutter/mutter.inc @@ -1,7 +1,7 @@ SECTION = x11/wm DESCRIPTION = Metacity is the boring window manager for the adult in you. Mutter is metacity + clutter. LICENSE = GPLv2 -DEPENDS = startup-notification gtk+ gconf clutter-1.4 gdk-pixbuf-native intltool glib-2.0-native +DEPENDS = startup-notification gtk+ gconf clutter-1.6 gdk-pixbuf-native intltool glib-2.0-native # gobject-introspection inherit gnome update-alternatives diff --git a/meta/recipes-graphics/mutter/mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch b/meta/recipes-graphics/mutter/mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch new file mode 100644 index 000..13197e5 --- /dev/null +++ b/meta/recipes-graphics/mutter/mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch @@ -0,0 +1,47 @@ +Update the usage of CGL_TEXTURE_RECTANGLE_ARB to GL_TEXTURE_RECTANGLE_ARB + +Upstream-Status: Pending + +Signed-off-by: Saul Wold s...@linux.intel.com + +Index: mutter-2.28.1_0.0/src/compositor/mutter-shaped-texture.c +=== +--- mutter-2.28.1_0.0.orig/src/compositor/mutter-shaped-texture.c mutter-2.28.1_0.0/src/compositor/mutter-shaped-texture.c +@@ -151,7 +151,7 @@ mutter_shaped_texture_dirty_mask (Mutter + cogl_texture_get_gl_texture (priv-mask_texture, +mask_gl_tex, mask_gl_target); + +- if (mask_gl_target == CGL_TEXTURE_RECTANGLE_ARB) ++ if (mask_gl_target == GL_TEXTURE_RECTANGLE_ARB) + glDeleteTextures (1, mask_gl_tex); + + cogl_texture_unref (priv-mask_texture); +@@ -214,23 +214,23 @@ mutter_shaped_texture_ensure_mask (Mutte + + cogl_texture_get_gl_texture (paint_tex, NULL, paint_gl_target); + +- if (paint_gl_target == CGL_TEXTURE_RECTANGLE_ARB) ++ if (paint_gl_target == GL_TEXTURE_RECTANGLE_ARB) + { + GLuint tex; + + glGenTextures (1, tex); +- glBindTexture (CGL_TEXTURE_RECTANGLE_ARB, tex); ++ glBindTexture (GL_TEXTURE_RECTANGLE_ARB, tex); + glPixelStorei (GL_UNPACK_ROW_LENGTH, tex_width); + glPixelStorei (GL_UNPACK_ALIGNMENT, 1); + glPixelStorei (GL_UNPACK_SKIP_ROWS, 0); + glPixelStorei (GL_UNPACK_SKIP_PIXELS, 0); +- glTexImage2D (CGL_TEXTURE_RECTANGLE_ARB, 0, ++ glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, + GL_ALPHA, tex_width, tex_height, + 0, GL_ALPHA, GL_UNSIGNED_BYTE, mask_data); + + priv-mask_texture + = cogl_texture_new_from_foreign (tex, +- CGL_TEXTURE_RECTANGLE_ARB, ++ GL_TEXTURE_RECTANGLE_ARB, + tex_width, tex_height, + 0, 0, + COGL_PIXEL_FORMAT_A_8); diff --git a/meta/recipes-graphics/mutter/mutter_2.28.1.bb b/meta/recipes-graphics/mutter/mutter_2.28.1.bb index e4c185a..50f2647 100644 --- a/meta/recipes-graphics/mutter/mutter_2.28.1.bb +++ b/meta/recipes-graphics/mutter/mutter_2.28.1.bb @@ -1,11 +1,14 @@ require mutter.inc +PR = r1 + LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f SRC_URI = http://download.moblin.org/sources/mutter/2.28/mutter-2.28.1_0.0.tar.bz2 \ - file://nodocs.patch;patch=1 \ - file://nozenity.patch;patch=1 \ - file://fix_pkgconfig.patch;patch=1 \ + file://nodocs.patch \ + file://nozenity.patch \ + file://fix_pkgconfig.patch \ + file://fix_CGL_TEXTURE_RECTANGLE_ARB.patch \ S = ${WORKDIR}/mutter-2.28.1_0.0 diff --git a/meta/recipes-graphics/mutter/mutter_git.bb b/meta/recipes-graphics/mutter/mutter_git.bb index 8d308f1..c3ba32e 100644 --- a/meta/recipes-graphics/mutter/mutter_git.bb +++ b/meta/recipes-graphics/mutter/mutter_git.bb @@ -18,3 +18,4 @@ SRC_URI = git://git.moblin.org/mutter.git;protocol=git;branch=master \ S = ${WORKDIR}/git +DEFAULT_PREFERENCE = -1 -- 1.7.1.1 ___ Openembedded-core mailing
[OE-core] [PATCH 0/1] updated bibake error fix
From: Nitin A Kamble nitin.a.kam...@intel.com This commit is updated as per Richard's feedback. Pull URL: git://git.pokylinux.org/poky-contrib.git Branch: nitin/misc Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/misc Thanks, Nitin A Kamble nitin.a.kam...@intel.com --- Nitin A Kamble (1): task-core-nfs: fix a bitbake error meta/recipes-core/tasks/task-core-nfs.bb |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] task-core-nfs: fix a bitbake error
From: Nitin A Kamble nitin.a.kam...@intel.com THis fixes following issue: NOTE: Runtime target 'glibc-utilsglibc-utils' is unbuildable, removing... Missing or unbuildable dependency chain was: ['glibc-utilsglibc-utils'] NOTE: Runtime target 'task-core-nfs-server' is unbuildable, removing... Missing or unbuildable dependency chain was: ['task-core-nfs-server', 'glibc-utilsglibc-utils'] Signed-off-by: Nitin A Kamble nitin.a.kam...@intel.com --- meta/recipes-core/tasks/task-core-nfs.bb |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/tasks/task-core-nfs.bb b/meta/recipes-core/tasks/task-core-nfs.bb index d5d8291..20e042b 100644 --- a/meta/recipes-core/tasks/task-core-nfs.bb +++ b/meta/recipes-core/tasks/task-core-nfs.bb @@ -22,5 +22,5 @@ RDEPENDS_task-core-nfs-server = \ # rpcinfo can be useful but only with glibc images GLIBC_DEPENDENCIES = glibc-utils -RRECOMMENDS_task-core-nfs-server_append_linux = ${GLIBC_DEPENDENCIES} -RRECOMMENDS_task-core-nfs-server_append_linux-gnueabi = ${GLIBC_DEPENDENCIES} +RRECOMMENDS_task-core-nfs-server_append_linux = ${GLIBC_DEPENDENCIES} +RRECOMMENDS_task-core-nfs-server_append_linux-gnueabi = ${GLIBC_DEPENDENCIES} -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/14] recipes: Add Upstream-Status to various recipe patches
From: Scott Garman scott.a.gar...@intel.com Add Upstream-Status tag to patches for the following recipes: openssh dbus-glib expat opensp sgml-common at cpio (GPLv3 version) libpam icu Signed-off-by: Scott Garman scott.a.gar...@intel.com --- .../openssh/openssh-5.6p1/nostrip.patch|9 ++--- .../dbus/dbus-glib-0.92/no-examples.patch |9 ++--- .../recipes-core/expat/expat-2.0.1/autotools.patch | 10 +++--- .../opensp/opensp/attributevalue.patch |3 +++ .../opensp/opensp/fix-docdir.patch |3 +++ meta/recipes-devtools/opensp/opensp/m4.patch |3 +++ .../opensp/opensp/rangmap-fix.patch|3 +++ .../sgml-common/sgml-common-0.6.3/autohell.patch |3 +++ .../sgml-common/sgml-common-0.6.3/license.patch|3 +++ meta/recipes-extended/at/at-3.1.12/configure.patch |8 ++-- .../at/at-3.1.12/fix_parallel_build_error.patch|4 meta/recipes-extended/cpio/cpio-2.11/statdef.patch |8 ++-- .../pam/libpam/pam-no-innetgr.patch|5 + meta/recipes-extended/sudo/files/libtool.patch | 10 +++--- meta/recipes-support/icu/files/gccfix.patch|6 ++ meta/recipes-support/icu/files/noldlibpath.patch |5 + .../icu/files/use-g++-for-linking.patch|7 +++ 17 files changed, 83 insertions(+), 16 deletions(-) diff --git a/meta/recipes-connectivity/openssh/openssh-5.6p1/nostrip.patch b/meta/recipes-connectivity/openssh/openssh-5.6p1/nostrip.patch index a88e18e..7970b6d 100644 --- a/meta/recipes-connectivity/openssh/openssh-5.6p1/nostrip.patch +++ b/meta/recipes-connectivity/openssh/openssh-5.6p1/nostrip.patch @@ -1,6 +1,9 @@ -# Disable stripping binaries during make install. -# -# Signed-off-by: Scott Garman scott.a.gar...@intel.com +Disable stripping binaries during make install. + +Upstream-Status: Inappropriate [Other] +Build system specific. + +Signed-off-by: Scott Garman scott.a.gar...@intel.com diff -ur openssh-5.6p1.orig/Makefile.in openssh-5.6p1/Makefile.in --- openssh-5.6p1.orig/Makefile.in 2010-05-11 23:51:39.0 -0700 diff --git a/meta/recipes-core/dbus/dbus-glib-0.92/no-examples.patch b/meta/recipes-core/dbus/dbus-glib-0.92/no-examples.patch index 32609b9..fbb4967 100644 --- a/meta/recipes-core/dbus/dbus-glib-0.92/no-examples.patch +++ b/meta/recipes-core/dbus/dbus-glib-0.92/no-examples.patch @@ -1,6 +1,9 @@ -# disable compiling examples -# -# comment added by Kevin Tian kevin.t...@intel.com, 2010-07-10 +Disable compiling examples + +Upstream-Status: Inappropriate [disable feature] + +Signed-off-by: Kevin Tian kevin.t...@intel.com +Signed-off-by: Scott Garman scott.a.gar...@intel.com --- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.0 +0200 +++ dbus-glib-0.70/dbus/Makefile.am2006-07-23 16:04:52.0 +0200 diff --git a/meta/recipes-core/expat/expat-2.0.1/autotools.patch b/meta/recipes-core/expat/expat-2.0.1/autotools.patch index ff1578f..c0ac10b 100644 --- a/meta/recipes-core/expat/expat-2.0.1/autotools.patch +++ b/meta/recipes-core/expat/expat-2.0.1/autotools.patch @@ -1,6 +1,10 @@ -# avoid to use expat's own *.m4 -# -# comment added by Kevin Tian kevin.t...@intel.com, 2010-07-07 +Avoid using expat's m4 files + +Upstream-Status: Inappropriate [Other] +Workaround specific to our build system. + +Signed-off-by: Kevin Tian kevin.t...@intel.com +Signed-off-by: Scott Garman scott.a.gar...@intel.com diff -bur expat-2.0.0~orig/configure.in expat-2.0.0/configure.in --- expat-2.0.0~orig/configure.in 2006-01-10 19:10:46.0 -0600 diff --git a/meta/recipes-devtools/opensp/opensp/attributevalue.patch b/meta/recipes-devtools/opensp/opensp/attributevalue.patch index 4f3507e..92f5898 100644 --- a/meta/recipes-devtools/opensp/opensp/attributevalue.patch +++ b/meta/recipes-devtools/opensp/opensp/attributevalue.patch @@ -1,6 +1,9 @@ Patch obtained from OpenEmbedded. +Upstream-Status: Pending + Signed-off-by: Scott Garman scott.a.gar...@intel.com + --- OpenSP-1.5/include/Attribute.h~attributevalue 2000-03-09 13:30:56.0 -0500 +++ OpenSP-1.5/include/Attribute.h 2004-01-20 14:11:36.0 -0500 @@ -31,6 +31,28 @@ diff --git a/meta/recipes-devtools/opensp/opensp/fix-docdir.patch b/meta/recipes-devtools/opensp/opensp/fix-docdir.patch index 5e2fc8b..c78b9ad 100644 --- a/meta/recipes-devtools/opensp/opensp/fix-docdir.patch +++ b/meta/recipes-devtools/opensp/opensp/fix-docdir.patch @@ -1,6 +1,9 @@ Patch obtained from OpenEmbedded. +Upstream-Status: Pending + Signed-off-by: Scott Garman scott.a.gar...@intel.com + Index: OpenSP-1.5/doc/Makefile.am === --- OpenSP-1.5.orig/doc/Makefile.am2000-05-06 09:10:32.0 +1000 diff --git a/meta/recipes-devtools/opensp/opensp/m4.patch b/meta/recipes-devtools/opensp/opensp/m4.patch index a8504c5..96a782c 100644 ---
Re: [OE-core] [poky] [PATCH 1/1] task-core-nfs: fix a bitbake error
Op 16 mei 2011, om 23:50 heeft Nitin A Kamble het volgende geschreven: From: Nitin A Kamble nitin.a.kam...@intel.com THis fixes following issue: NOTE: Runtime target 'glibc-utilsglibc-utils' is unbuildable, removing... Missing or unbuildable dependency chain was: ['glibc-utilsglibc-utils'] NOTE: Runtime target 'task-core-nfs-server' is unbuildable, removing... Missing or unbuildable dependency chain was: ['task-core-nfs-server', 'glibc-utilsglibc-utils'] Signed-off-by: Nitin A Kamble nitin.a.kam...@intel.com --- meta/recipes-core/tasks/task-core-nfs.bb |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/tasks/task-core-nfs.bb b/meta/recipes-core/tasks/task-core-nfs.bb index d5d8291..20e042b 100644 --- a/meta/recipes-core/tasks/task-core-nfs.bb +++ b/meta/recipes-core/tasks/task-core-nfs.bb @@ -22,5 +22,5 @@ RDEPENDS_task-core-nfs-server = \ # rpcinfo can be useful but only with glibc images GLIBC_DEPENDENCIES = glibc-utils -RRECOMMENDS_task-core-nfs-server_append_linux = ${GLIBC_DEPENDENCIES} -RRECOMMENDS_task-core-nfs-server_append_linux-gnueabi = ${GLIBC_DEPENDENCIES} +RRECOMMENDS_task-core-nfs-server_append_linux = ${GLIBC_DEPENDENCIES} +RRECOMMENDS_task-core-nfs-server_append_linux-gnueabi = ${GLIBC_DEPENDENCIES} Those should use the libc-glibc overrides, otherwise you'll break on ppc+spe builds ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 01/14] task-core-nfs: fix a bitbake error
Op 16 mei 2011, om 23:44 heeft Saul Wold het volgende geschreven: From: Nitin A Kamble nitin.a.kam...@intel.com THis fixes following issue: NOTE: Runtime target 'glibc-utilsglibc-utils' is unbuildable, removing... Missing or unbuildable dependency chain was: ['glibc-utilsglibc-utils'] NOTE: Runtime target 'task-core-nfs-server' is unbuildable, removing... Missing or unbuildable dependency chain was: ['task-core-nfs-server', 'glibc-utilsglibc-utils'] [sgw: moved space to _append line] Signed-off-by: Nitin A Kamble nitin.a.kam...@intel.com Signed-off-by: Saul Wold s...@linux.intel.com --- meta/recipes-core/tasks/task-core-nfs.bb |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/tasks/task-core-nfs.bb b/meta/recipes-core/tasks/task-core-nfs.bb index d5d8291..20e042b 100644 --- a/meta/recipes-core/tasks/task-core-nfs.bb +++ b/meta/recipes-core/tasks/task-core-nfs.bb @@ -22,5 +22,5 @@ RDEPENDS_task-core-nfs-server = \ # rpcinfo can be useful but only with glibc images GLIBC_DEPENDENCIES = glibc-utils -RRECOMMENDS_task-core-nfs-server_append_linux = ${GLIBC_DEPENDENCIES} -RRECOMMENDS_task-core-nfs-server_append_linux-gnueabi = ${GLIBC_DEPENDENCIES} +RRECOMMENDS_task-core-nfs-server_append_linux = ${GLIBC_DEPENDENCIES} +RRECOMMENDS_task-core-nfs-server_append_linux-gnueabi = ${GLIBC_DEPENDENCIES} As said in my other mail, those should use the libc-glibc overrides ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC PATCH v2 00/15] *-pull-request: cleanup and overhaul
After some discussion on the oe-core list regarding the *-pull-request scripts I provided a proposal, received some feedback, and these patches are the result of that discussion. The Cc list varies from patch to patch a bit more wildly than is typical as a final sanity test, although it does reflect who commented and expressed interest in which parts of the overhaul. V2: do REMOTE_REPO regex per remote fix various regex issues fix wget ssl issues add github and oe (untested) REMOTE support simplify git-send-email usage logic, avoid duplicating git confirmation add -c, auto-cc per patch option Please review the following changes for suitability for inclusion. If you have any objections or suggestions for improvement, please respond to the patches. If you agree with the changes, please provide your Acked-by. The following changes since commit c12126ebf07604f998cb35546aa51d806d97af22: create-pull-request: switch URL from git.pokylinux.org/poky-contrib to git.openembedded.org/openembedded-core-contrib (2011-05-13 20:38:20 -0700) are available in the git repository at: git://git.pokylinux.org/poky-contrib dvhart/git-pull-v2-oe http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/git-pull-v2-oe Darren Hart (13): create-pull-request: alphabetize arguments create-pull-request: whitespace cleanup create-pull-request: use git request-pull and arbitrary remotes create-pull-request: rewrite known private URLs to public URLs create-pull-request: provide an RFC mode via -c argument send-pull-request: whitespace cleanup send-pull-request: remove local mta support send-pull-request: fix greedy auto-cc regex send-pull-request: don't send all patches to everyone even with -a send-pull-request: verify git sendemail config create-pull-request: add untested oe repository support send-pull-request: streamline git-send-email usage *pull-request: add copyright, license, and descriptions Otavio Salvador (2): create-pull-request: do not check certificate create-pull-request: add GitHub remote support scripts/create-pull-request | 222 ++- scripts/send-pull-request | 307 --- 2 files changed, 302 insertions(+), 227 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC PATCH v2 03/15] create-pull-request: use git request-pull and arbitrary remotes
Allow for arbitrary remotes via a new -u argument. Remove the hard coded references to the pokylinux repositories. Create the WEB_URL from known remotes. Future patches can add additional WEB_URL mappings for remotes like Git Hub, Gitorious, and kernel.org. Rather than duplicating the git request-pull command ourselves, just use the existing one. Signed-off-by: Darren Hart dvh...@linux.intel.com Acked-by: Joshua Lock j...@linux.intel.com Cc: Tom Rini tom_r...@mentor.com Cc: Martin Jansa martin.ja...@gmail.com Cc: Otavio Salvador ota...@ossystems.com.br Cc: Richard Purdie richard.pur...@linuxfoundation.org Cc: Joshua Lock j...@linux.intel.com --- scripts/create-pull-request | 78 -- 1 files changed, 52 insertions(+), 26 deletions(-) diff --git a/scripts/create-pull-request b/scripts/create-pull-request index b911a64..8f7f767 100755 --- a/scripts/create-pull-request +++ b/scripts/create-pull-request @@ -2,15 +2,13 @@ ODIR=pull-$$ RELATIVE_TO=master COMMIT_ID=HEAD -PULL_URL=git://git.openembedded.org/openembedded-core-contrib -WEB_URL_PREFIX=http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=; PREFIX=PATCH usage() { CMD=$(basename $0) cat EOM -Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s subject] [-r relative_to] [-i commit_id] -b contrib_branch - -b contrib_branch Branch-name in the $PULL_URL +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 -h Display this help message -i commit_idEnding commit (default: HEAD) -m msg_body_fileThe file containing a blurb to be inserted into the summary email @@ -18,20 +16,21 @@ Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s subject] [-r relative_to -p prefix Use [prefix N/M] instead of [PATCH N/M] as the subject prefix -r relative_to Starting commit (default: master) -s subject The subject to be inserted into the summary email + -u remote The git remote where the branch is located Examples: - $CMD -b nitin/basic - $CMD -r distro/master -i nitin/distro -b nitin/distro - $CMD -r master -i misc -b nitin/misc -o pull-misc - $CMD -p RFC PATCH -b nitin/experimental + $CMD -u contrib -b nitin/basic + $CMD -u contrib -r distro/master -i nitin/distro -b nitin/distro + $CMD -u contrib -r master -i misc -b nitin/misc -o pull-misc + $CMD -u contrib -p RFC PATCH -b nitin/experimental EOM } # Parse and validate arguments -while getopts b:hi:m:o:p:r:s: OPT; do +while getopts b:hi:m:o:p:r:s:u: OPT; do case $OPT in b) - CONTRIB_BRANCH=$OPTARG + BRANCH=$OPTARG ;; h) usage @@ -59,23 +58,45 @@ while getopts b:hi:m:o:p:r:s: OPT; do s) SUBJECT=$OPTARG ;; + u) + REMOTE=$OPTARG + REMOTE_URL=$(git config remote.$REMOTE.url) + if [ $? -ne 0 ]; then + echo ERROR: git config failed to find a url for '$REMOTE' + exit 1 + fi + REMOTE_REPO=$(echo $REMOTE_URL | sed s#.*/\(.*\)#\1#) + # The .git suffix is optional in the URL, drop in for the REPO + REMOTE_REPO=${REMOTE_REPO%.git} + ;; esac done -if [ -z $CONTRIB_BRANCH ]; then +if [ -z $BRANCH ] || [ -z $REMOTE_URL ]; then usage exit 1 fi +# Set WEB_URL from known remotes +case $REMOTE_URL in + *git.yoctoproject.org*) + WEB_URL=http://git.yoctoproject.org/cgit.cgi/$REMOTE_REPO/log/?h=$BRANCH; + ;; + *git.pokylinux.org*) + WEB_URL=http://git.pokylinux.org/cgit.cgi/$REMOTE_REPO/log/?h=$BRANCH; + ;; +esac + # Perform a sanity test on the web URL. Issue a warning if it is not # accessible, but do not abort as users may want to run offline. -WEB_URL=$WEB_URL_PREFIX$CONTRIB_BRANCH -wget -q $WEB_URL -O /dev/null -if [ $? -ne 0 ]; then - echo WARNING: Branch '$CONTRIB_BRANCH' was not found on the contrib git tree. - echo Please check your contrib-branch parameter before sending. - echo +if [ -n $WEB_URL ]; then + wget -q $WEB_URL -O /dev/null + if [ $? -ne 0 ]; then + echo WARNING: Branch '$BRANCH' was not found on the contrib git tree. + echo Please check your remote and branch parameter before sending. + echo + fi fi if [ -e $ODIR ]; then @@ -91,18 +112,23 @@ git format-patch -M --subject-prefix=$PREFIX -n -o $ODIR --thread=shallow --co # Customize the cover letter CL=$ODIR/-cover-letter.patch -(cat EOM +PM=$ODIR/pull-msg +git request-pull $RELATIVE_TO $REMOTE_URL $COMMIT_ID $PM +if [ $? -ne 0 ]; then + echo ERROR: git
[OE-core] [RFC PATCH v2 05/15] create-pull-request: provide an RFC mode via -c argument
Currently it is difficult to know if a pull request is being sent for review or just to be pulled. Add a -c argument to add RFC to the subject prefix and a blurb requesting review to the cover letter. Signed-off-by: Darren Hart dvh...@linux.intel.com Cc: Richard Purdie richard.pur...@linuxfoundation.org Cc: Saul Wold s...@linux.intel.com Cc: Paul Eggleton paul.eggle...@intel.com Cc: Joshua Lock j...@linux.intel.com --- scripts/create-pull-request | 24 ++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/scripts/create-pull-request b/scripts/create-pull-request index 429421b..202d99d 100755 --- a/scripts/create-pull-request +++ b/scripts/create-pull-request @@ -3,12 +3,14 @@ ODIR=pull-$$ RELATIVE_TO=master COMMIT_ID=HEAD PREFIX=PATCH +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 + -c Create an RFC (Request for Comment) patch series -h Display this help message -i commit_idEnding commit (default: HEAD) -m msg_body_fileThe file containing a blurb to be inserted into the summary email @@ -27,11 +29,14 @@ EOM } # Parse and validate arguments -while getopts b:hi:m:o:p:r:s:u: OPT; do +while getopts b:chi:m:o:p:r:s:u: OPT; do case $OPT in b) BRANCH=$OPTARG ;; + c) + RFC=1 + ;; h) usage exit 0 @@ -89,6 +94,10 @@ if [ -z $BRANCH ] || [ -z $REMOTE_URL ]; then exit 1 fi +if [ $RFC -eq 1 ]; then + PREFIX=RFC $PREFIX +fi + # Set WEB_URL from known remotes case $REMOTE_URL in @@ -125,7 +134,7 @@ git format-patch -M --subject-prefix=$PREFIX -n -o $ODIR --thread=shallow --co # Customize the cover letter CL=$ODIR/-cover-letter.patch PM=$ODIR/pull-msg -git request-pull $RELATIVE_TO $REMOTE_URL $COMMIT_ID $PM +git request-pull $RELATIVE_TO $REMOTE_URL $COMMIT_ID $PM if [ $? -ne 0 ]; then echo ERROR: git request-pull reported an error exit 1 @@ -136,6 +145,17 @@ fi sed -n 0,\#$REMOTE_URL# p $PM | sed -i /BLURB HERE/ r /dev/stdin $CL rm $PM +# If this is an RFC, make that clear in the cover letter +if [ $RFC -eq 1 ]; then +(cat EOM +Please review the following changes for suitability for inclusion. If you have +any objections or suggestions for improvement, please respond to the patches. If +you agree with the changes, please provide your Acked-by. + +EOM +) | sed -i /BLURB HERE/ r /dev/stdin $CL +fi + # Insert the WEB_URL if there is one if [ -n $WEB_URL ]; then echo $WEB_URL | sed -i \#$REMOTE_URL# r /dev/stdin $CL -- 1.7.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC PATCH v2 10/15] send-pull-request: verify git sendemail config
Perform a quick sanity check to be able to direct users to configure git.sendemail if they haven't yet. Signed-off-by: Darren Hart dvh...@linux.intel.com --- scripts/send-pull-request | 15 +++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/scripts/send-pull-request b/scripts/send-pull-request index 5a11d1f..21eb302 100755 --- a/scripts/send-pull-request +++ b/scripts/send-pull-request @@ -41,6 +41,18 @@ harvest_recipients() unset IFS } +check_git_sendemail_config() +{ + GIT_SMTP=$(git config sendemail.smtpserver) + GIT_FROM=$(git config sendemail.from) + if [ -z $GIT_SMTP ] || [ -z $GIT_FROM ]; then + echo ERROR: git sendemail is not configured. + echo Please read GIT-SEND-EMAIL(1) and configure: + echo sendemail.smtpserver + echo sendemail.from + exit 1 + fi +} # Parse and verify arguments while getopts achp:t: OPT; do @@ -74,6 +86,9 @@ while getopts achp:t: OPT; do esac done +# Abort early if git-send-email is not properly configured +check_git_sendemail_config + if [ -z $PDIR ]; then echo ERROR: you must specify a pull-dir. usage -- 1.7.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC PATCH v2 11/15] create-pull-request: do not check certificate
From: Otavio Salvador ota...@ossystems.com.br Some remotes can use HTTPS and we don't need to check the certificate of the host so wget call is changed to avoid it. Signed-off-by: Otavio Salvador ota...@ossystems.com.br Signed-off-by: Darren Hart dvh...@linux.intel.com --- scripts/create-pull-request |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/create-pull-request b/scripts/create-pull-request index 202d99d..9dbd55a 100755 --- a/scripts/create-pull-request +++ b/scripts/create-pull-request @@ -112,7 +112,7 @@ esac # Perform a sanity test on the web URL. Issue a warning if it is not # accessible, but do not abort as users may want to run offline. if [ -n $WEB_URL ]; then - wget -q $WEB_URL -O /dev/null + wget --no-check-certificate -q $WEB_URL -O /dev/null if [ $? -ne 0 ]; then echo WARNING: Branch '$BRANCH' was not found on the contrib git tree. echo Please check your remote and branch parameter before sending. -- 1.7.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC PATCH v2 09/15] send-pull-request: don't send all patches to everyone even with -a
Rather than sending every patch to every recipient of the entire series when -a is used, only send the cover letter to everyone and use git's --signed-off-by-cc feature to generate an auto cc list for the individual patches. Add a -c option to use --signed-off-by-cc to auto cc recipeients at the individual patch level. This is implied by -a. Using git to harvest the Cc list means only collecting Signed-off-by and Cc lines, rather than the more generic *-by lines previously. This is a fair trade-off for significantly reduced complexity. If users want to add Acked-by and Tested-by lines and want to use the -a feature, they should include those recipients as Cc lines as well. Now that we rely on git for auto-cc for the individual patches, make sure the user is prompted before sending each patch by forcing --confirm=always. Signed-off-by: Darren Hart dvh...@linux.intel.com Cc: Khem Raj raj.k...@gmail.com Cc: Koen Kooi k...@dominion.thruhere.net --- scripts/send-pull-request | 75 - 1 files changed, 47 insertions(+), 28 deletions(-) diff --git a/scripts/send-pull-request b/scripts/send-pull-request index b294d35..5a11d1f 100755 --- a/scripts/send-pull-request +++ b/scripts/send-pull-request @@ -1,36 +1,40 @@ #!/bin/bash AUTO=0 +AUTO_CL=0 # Prevent environment leakage to these vars. unset TO unset CC +unset AUTO_CC usage() { cat EOM -Usage: $(basename $0) [-h] [-a] [[-t email]...] -p pull-dir - -t email Explicitly add email to the recipients - -a Automatically harvest recipients from *-by: email lines - in the patches in the pull-dir +Usage: $(basename $0) [-h] [-a] [-c] [[-t email]...] -p pull-dir + -a Send the cover letter to every recipient listed in Cc and + Signed-off-by lines found in the cover letter and the patches. + This option implies -c. + -c Expand the Cc list for the individual patches using the Cc and + Signed-off-by lines from the same patch. -p pull-dir Directory containing summary and patch files + -t email Explicitly add email to the recipients EOM } -# Collect To and CC addresses from the patch files if they exist -# $1: Which header to add the recipients to, TO or CC -# $2: The regex to match and strip from the line with email addresses +# Collect addresses from a patch into AUTO_CC +# $1: a patch file harvest_recipients() { - TO_CC=$1 - REGX=$2 + PATCH=$1 export IFS=$',\n' - for PATCH in $PDIR/*.patch; do - # Grab To addresses + for REGX in ^[Cc][Cc]: * ^[Ss]igned-[Oo]ff-[Bb]y: *; do for EMAIL in $(sed '/^---$/q' $PATCH | grep -e $REGX | sed s/$REGX//); do - if [ $TO_CC == TO ] [ ${TO/$EMAIL/} == $TO ] [ -n $EMAIL ]; then - if [ -z $TO ]; then TO=$EMAIL; else TO=$TO,$EMAIL; fi - elif [ $TO_CC == CC ] [ ${CC/$EMAIL/} == $CC ] [ -n $EMAIL ]; then - if [ -z $CC ]; then CC=$EMAIL; else CC=$CC,$EMAIL; fi + if [ ${AUTO_CC/$EMAIL/} == $AUTO_CC ] [ -n $EMAIL ]; then + if [ -z $AUTO_CC ]; then + AUTO_CC=$EMAIL; + else + AUTO_CC=$AUTO_CC,$EMAIL; + fi fi done done @@ -39,9 +43,13 @@ harvest_recipients() # Parse and verify arguments -while getopts ahp:t: OPT; do +while getopts achp:t: OPT; do case $OPT in a) + AUTO_CL=1 + AUTO=1 + ;; + c) AUTO=1 ;; h) @@ -84,13 +92,11 @@ for TOKEN in SUBJECT BLURB; do done -# Harvest emails from the generated patches and populate the TO and CC variables -# In addition to To and CC headers/lines, the common Signed-off-by, Tested-by, -# etc. (*-by) will be added to CC. -if [ $AUTO -eq 1 ]; then - harvest_recipients TO ^[Tt][Oo]: * - harvest_recipients CC ^[Cc][Cc]: * - harvest_recipients CC ^[A-Z][A-Za-z-]*-[Bb][Yy]: * +# Harvest emails from the generated patches and populate AUTO_CC. +if [ $AUTO_CL -eq 1 ]; then + for PATCH in $PDIR/*.patch; do + harvest_recipients $PATCH + done fi AUTO_TO=$(git config sendemail.to) @@ -102,7 +108,7 @@ if [ -n $AUTO_TO ]; then fi fi -if [ -z $TO ] [ -z $CC ]; then +if [ -z $TO ] [ -z $AUTO_CC ]; then echo ERROR: you have not specified any recipients. usage exit 1 @@ -114,7 +120,8 @@ cat EOM The following patches: $(for PATCH in $PDIR/*.patch; do echo $PATCH; done) -will now be sent via the git send-email command. +will now be sent via the git send-email command. Git will prompt you before +sending any email. EOM echo Continue? [y/N] @@ -124,11
[OE-core] [RFC PATCH v2 08/15] send-pull-request: fix greedy auto-cc regex
A greedy regular expression caused emails to be harvested from patches that were quoted in the commit message. Ensure only tags that start at the beginning of the line are considered for harvesting. NOTE: users are still responsible for verifying the recipients list and to ensure they do not spam people! Signed-off-by: Darren Hart dvh...@linux.intel.com Acked-by: Bruce Ashfield bruce.ashfi...@windriver.com Cc: Richard Purdie richard.pur...@linuxfoundation.org Cc: Saul Wold s...@linux.intel.com Cc: Bruce Ashfield bruce.ashfi...@windriver.com --- scripts/send-pull-request |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/send-pull-request b/scripts/send-pull-request index d265c47..b294d35 100755 --- a/scripts/send-pull-request +++ b/scripts/send-pull-request @@ -90,7 +90,7 @@ done if [ $AUTO -eq 1 ]; then harvest_recipients TO ^[Tt][Oo]: * harvest_recipients CC ^[Cc][Cc]: * - harvest_recipients CC ^.*-[Bb][Yy]: * + harvest_recipients CC ^[A-Z][A-Za-z-]*-[Bb][Yy]: * fi AUTO_TO=$(git config sendemail.to) -- 1.7.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC PATCH v2 01/15] create-pull-request: alphabetize arguments
Some initial cleanup prior to a significant overhaul. Signed-off-by: Darren Hart dvh...@linux.intel.com --- scripts/create-pull-request | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/create-pull-request b/scripts/create-pull-request index 784b48c..658b9c2 100755 --- a/scripts/create-pull-request +++ b/scripts/create-pull-request @@ -10,14 +10,14 @@ usage() { CMD=$(basename $0) cat EOM Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s subject] [-r relative_to] [-i commit_id] -b contrib_branch + -b contrib_branch Branch-name in the $PULL_URL -h Display this help message - -o output_dir Specify the output directory for the messages (default: pull-PID) + -i commit_idEnding commit (default: HEAD) -m msg_body_fileThe file containing a blurb to be inserted into the summary email + -o output_dir Specify the output directory for the messages (default: pull-PID) + -p prefix Use [prefix N/M] instead of [PATCH N/M] as the subject prefix -r relative_to Starting commit (default: master) - -i commit_idEnding commit (default: HEAD) - -b contrib_branch Branch-name in the $PULL_URL -s subject The subject to be inserted into the summary email - -p prefix Use [prefix N/M] instead of [PATCH N/M] as the subject prefix Examples: $CMD -b nitin/basic @@ -28,7 +28,7 @@ EOM } # Parse and validate arguments -while getopts b:hi:m:o:r:s:p: OPT; do +while getopts b:hi:m:o:p:r:s: OPT; do case $OPT in b) CONTRIB_BRANCH=$OPTARG -- 1.7.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC PATCH v2 12/15] create-pull-request: add GitHub remote support
From: Otavio Salvador ota...@ossystems.com.br Signed-off-by: Otavio Salvador ota...@ossystems.com.br Signed-off-by: Darren Hart dvh...@linux.intel.com --- scripts/create-pull-request |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/scripts/create-pull-request b/scripts/create-pull-request index 9dbd55a..a9cf6f9 100755 --- a/scripts/create-pull-request +++ b/scripts/create-pull-request @@ -82,6 +82,10 @@ while getopts b:chi:m:o:p:r:s:u: OPT; do REMOTE_REPO=$(echo $REMOTE_URL | sed s#.*/\(.*\)#\1#) REMOTE_URL=${REMOTE_URL/ssh://git@/git://} ;; + g...@github.com:*) + REMOTE_REPO=$(echo $REMOTE_URL | sed 's#.*:\(.*\)\(\.git\)$#\1#') + REMOTE_URL=${REMOTE_URL/g...@github.com:/git://github.com/} + ;; esac # The .git suffix is optional in the URL, drop in for the REPO REMOTE_REPO=${REMOTE_REPO%.git} @@ -107,6 +111,9 @@ case $REMOTE_URL in *git.pokylinux.org*) WEB_URL=http://git.pokylinux.org/cgit.cgi/$REMOTE_REPO/log/?h=$BRANCH; ;; + *github.com*) + WEB_URL=https://github.com/$REMOTE_REPO/tree/$BRANCH; + ;; esac # Perform a sanity test on the web URL. Issue a warning if it is not -- 1.7.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC PATCH v2 14/15] send-pull-request: streamline git-send-email usage
The script was sending one patch at a time, which defeats the internal confirmation mechanism of git-send-email (which would otherwise allow the user to send all patches or abort immediately). Rework the sending logic to use no more than two commands. Use two commands when the cover letter is to be sent to all recipients with the -a argument. Otherwise, send all patches via the same command. The script duplicates git's send confirmation, eliminate that. Signed-off-by: Darren Hart dvh...@linux.intel.com Reported-by: Khem Raj raj.k...@gmail.com Cc: Khem Raj raj.k...@gmail.com Cc: Joshua Lock j...@linux.intel.com --- scripts/send-pull-request | 68 +--- 1 files changed, 26 insertions(+), 42 deletions(-) diff --git a/scripts/send-pull-request b/scripts/send-pull-request index 21eb302..8d0bd34 100755 --- a/scripts/send-pull-request +++ b/scripts/send-pull-request @@ -1,6 +1,7 @@ #!/bin/bash AUTO=0 AUTO_CL=0 +GITSOBCC= # Prevent environment leakage to these vars. unset TO @@ -59,10 +60,11 @@ while getopts achp:t: OPT; do case $OPT in a) AUTO_CL=1 - AUTO=1 - ;; + # Fall through to include -c + ; c) AUTO=1 + GITSOBCC=--signed-off-by-cc ;; h) usage @@ -130,48 +132,30 @@ if [ -z $TO ] [ -z $AUTO_CC ]; then fi -# Generate report for the user and require confirmation before sending -cat EOM -The following patches: -$(for PATCH in $PDIR/*.patch; do echo $PATCH; done) +# Convert the collected addresses into git-send-email argument strings +export IFS=$',' +GIT_TO=$(for R in $TO; do echo -n --to='$R' ; done) +GIT_CC=$(for R in $AUTO_CC; do echo -n --cc='$R' ; done) +unset IFS -will now be sent via the git send-email command. Git will prompt you before -sending any email. -EOM -echo Continue? [y/N] -read cont - -if [ $cont == y ] || [ $cont == Y ]; then - ERROR=0 - export IFS=$',' - GIT_TO=$(for R in $TO; do echo -n --to='$R' ; done) - GIT_CC=$(for R in $AUTO_CC; do echo -n --cc='$R' ; done) - unset IFS - for PATCH in $PDIR/*patch; do - if [ $AUTO -eq 1 ]; then - if [ $PATCH == $CL ] [ $AUTO_CL -eq 1 ]; then - # Send the cover letter to every recipient, both - # specified as well as harvested. - eval git send-email $GIT_TO $GIT_CC --confirm=always --no-chain-reply-to --suppress-cc=all $PATCH - else - # Send the patch to the specified recipients and - # those git finds in this specific patch. - eval git send-email $GIT_TO --confirm=always --no-chain-reply-to --signed-off-by-cc $PATCH - fi - else - # Only send to the explicitly specified recipients - eval git send-email $GIT_TO --confirm=always --no-chain-reply-to --suppress-cc=all $PATCH - fi - if [ $? -eq 1 ]; then - ERROR=1 - fi - done - - if [ $ERROR -eq 1 ]; then - echo ERROR: Failed to send one or more messages. +# Handoff to git-send-email. It will perform the send confirmation. +PATCHES=$(echo $PDIR/*.patch) +if [ $AUTO_CL -eq 1 ]; then + # Send the cover letter to every recipient, both specified as well as + # harvested. Then remove it from the patches list. + eval git send-email $GIT_TO $GIT_CC --confirm=always --no-chain-reply-to --suppress-cc=all $CL + if [ $? -eq 1 ]; then + echo ERROR: failed to send cover-letter with automatic recipients. + exit 1 fi -else - echo Send aborted. + PATCHES=${PATCHES/$CL/} fi +# Send the patch to the specified recipients and, if -c was specified, those git +# finds in this specific patch. +eval git send-email $GIT_TO --confirm=always --no-chain-reply-to $GITSOBCC $PATCHES +if [ $? -eq 1 ]; then + echo ERROR: failed to send patches. + exit 1 +fi -- 1.7.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC PATCH v2 13/15] create-pull-request: add untested oe repository support
Signed-off-by: Darren Hart dvh...@linux.intel.com --- scripts/create-pull-request |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/scripts/create-pull-request b/scripts/create-pull-request index a9cf6f9..634a289 100755 --- a/scripts/create-pull-request +++ b/scripts/create-pull-request @@ -82,6 +82,10 @@ while getopts b:chi:m:o:p:r:s:u: OPT; do REMOTE_REPO=$(echo $REMOTE_URL | sed s#.*/\(.*\)#\1#) REMOTE_URL=${REMOTE_URL/ssh://git@/git://} ;; + *ssh://g...@git.openembedded.org*) + REMOTE_REPO=$(echo $REMOTE_URL | sed s#.*/\(.*\)#\1#) + REMOTE_URL=${REMOTE_URL/ssh://git@/git://} + ;; g...@github.com:*) REMOTE_REPO=$(echo $REMOTE_URL | sed 's#.*:\(.*\)\(\.git\)$#\1#') REMOTE_URL=${REMOTE_URL/g...@github.com:/git://github.com/} @@ -111,6 +115,9 @@ case $REMOTE_URL in *git.pokylinux.org*) WEB_URL=http://git.pokylinux.org/cgit.cgi/$REMOTE_REPO/log/?h=$BRANCH; ;; + *git.openembedded.org*) + WEB_URL=http://cgit.openembedded.org/cgit.cgi/$REMOTE_REPO/log/?h=$BRANCH; + ;; *github.com*) WEB_URL=https://github.com/$REMOTE_REPO/tree/$BRANCH; ;; -- 1.7.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC PATCH v2 15/15] *pull-request: add copyright, license, and descriptions
Signed-off-by: Darren Hart dvh...@linux.intel.com --- scripts/create-pull-request | 26 ++ scripts/send-pull-request | 25 + 2 files changed, 51 insertions(+), 0 deletions(-) diff --git a/scripts/create-pull-request b/scripts/create-pull-request index 634a289..b808146 100755 --- a/scripts/create-pull-request +++ b/scripts/create-pull-request @@ -1,4 +1,30 @@ #!/bin/bash +# +# Copyright (c) 2010-2011, Intel Corporation. +# All Rights Reserved +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See +# the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +# +# This script is intended to be used to prepare a series of patches +# and a cover letter in an appropriate and consistent format for +# submission to Open Embedded and The Yocto Project, as well as to +# related projects and layers. +# + ODIR=pull-$$ RELATIVE_TO=master COMMIT_ID=HEAD diff --git a/scripts/send-pull-request b/scripts/send-pull-request index 8d0bd34..cee9253 100755 --- a/scripts/send-pull-request +++ b/scripts/send-pull-request @@ -1,4 +1,29 @@ #!/bin/bash +# +# Copyright (c) 2010-2011, Intel Corporation. +# All Rights Reserved +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See +# the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +# +# This script is intended to be used to send a patch series prepared by the +# create-pull-request script to Open Embedded and The Yocto Project, as well +# as to related projects and layers. +# + AUTO=0 AUTO_CL=0 GITSOBCC= -- 1.7.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC PATCH v2 06/15] send-pull-request: whitespace cleanup
Indent with tabs, not spaces, for consistency with other bash scripts. Signed-off-by: Darren Hart dvh...@linux.intel.com --- scripts/send-pull-request | 250 ++-- 1 files changed, 125 insertions(+), 125 deletions(-) diff --git a/scripts/send-pull-request b/scripts/send-pull-request index 3af2a9f..76dd7a2 100755 --- a/scripts/send-pull-request +++ b/scripts/send-pull-request @@ -31,72 +31,72 @@ EOM # $2: The regex to match and strip from the line with email addresses harvest_recipients() { -TO_CC=$1 -REGX=$2 -export IFS=$',\n' -for PATCH in $PDIR/*.patch; do -# Grab To addresses -for EMAIL in $(sed '/^---$/q' $PATCH | grep -e $REGX | sed s/$REGX//); do -if [ $TO_CC == TO ] [ ${TO/$EMAIL/} == $TO ] [ -n $EMAIL ]; then -if [ -z $TO ]; then TO=$EMAIL; else TO=$TO,$EMAIL; fi -elif [ $TO_CC == CC ] [ ${CC/$EMAIL/} == $CC ] [ -n $EMAIL ]; then -if [ -z $CC ]; then CC=$EMAIL; else CC=$CC,$EMAIL; fi -fi -done -done -unset IFS + TO_CC=$1 + REGX=$2 + export IFS=$',\n' + for PATCH in $PDIR/*.patch; do + # Grab To addresses + for EMAIL in $(sed '/^---$/q' $PATCH | grep -e $REGX | sed s/$REGX//); do + if [ $TO_CC == TO ] [ ${TO/$EMAIL/} == $TO ] [ -n $EMAIL ]; then + if [ -z $TO ]; then TO=$EMAIL; else TO=$TO,$EMAIL; fi + elif [ $TO_CC == CC ] [ ${CC/$EMAIL/} == $CC ] [ -n $EMAIL ]; then + if [ -z $CC ]; then CC=$EMAIL; else CC=$CC,$EMAIL; fi + fi + done + done + unset IFS } # Parse and verify arguments while getopts af:ghp:t: OPT; do -case $OPT in -a) -AUTO=1 -;; -f) -FROM=$OPTARG -;; -g) -PULL_MTA=git -;; -h) -usage -exit 0 -;; -p) -PDIR=${OPTARG%/} -if [ ! -d $PDIR ]; then -echo ERROR: pull-dir \$PDIR\ does not exist. -usage -exit 1 -fi -;; -t) -if [ -n $TO ]; then -TO=$TO,$OPTARG -else -TO=$OPTARG -fi -;; -esac + case $OPT in + a) + AUTO=1 + ;; + f) + FROM=$OPTARG + ;; + g) + PULL_MTA=git + ;; + h) + usage + exit 0 + ;; + p) + PDIR=${OPTARG%/} + if [ ! -d $PDIR ]; then + echo ERROR: pull-dir \$PDIR\ does not exist. + usage + exit 1 + fi + ;; + t) + if [ -n $TO ]; then + TO=$TO,$OPTARG + else + TO=$OPTARG + fi + ;; + esac done if [ -z $PDIR ]; then -echo ERROR: you must specify a pull-dir. -usage -exit 1 + echo ERROR: you must specify a pull-dir. + usage + exit 1 fi # Verify the cover letter is complete and free of tokens CL=$PDIR/-cover-letter.patch for TOKEN in SUBJECT BLURB; do -grep -q *** $TOKEN HERE *** $CL -if [ $? -eq 0 ]; then -echo ERROR: Please edit $CL and try again (Look for '*** $TOKEN HERE ***'). -exit 1 -fi + grep -q *** $TOKEN HERE *** $CL + if [ $? -eq 0 ]; then + echo ERROR: Please edit $CL and try again (Look for '*** $TOKEN HERE ***'). + exit 1 + fi done @@ -104,39 +104,39 @@ done # In addition to To and CC headers/lines, the common Signed-off-by, Tested-by, # etc. (*-by) will be added to CC. if [ $AUTO -eq 1 ]; then -harvest_recipients TO ^[Tt][Oo]: * -harvest_recipients CC ^[Cc][Cc]: * -harvest_recipients CC ^.*-[Bb][Yy]: * + harvest_recipients TO ^[Tt][Oo]: * + harvest_recipients CC ^[Cc][Cc]: * + harvest_recipients CC ^.*-[Bb][Yy]: * fi case $PULL_MTA in -git) -FROM=$(git config sendemail.from) +git) + FROM=$(git config sendemail.from) AUTO_TO=$(git config sendemail.to) if [ -n $AUTO_TO ]; then - if [ -n $TO ]; then - TO=$TO,$AUTO_TO - else - TO=$AUTO_TO - fi + if [ -n $TO ]; then + TO=$TO,$AUTO_TO + else + TO=$AUTO_TO + fi + fi + ;; +sendmail) + if [ -z $FROM ]; then + FROM=$(git config user.name) $(git config user.email) + if [ -z $FROM ]; then + echo ERROR: unable to determine a
Re: [OE-core] [PATCH 04/14] xserver-kdrive: upgrade from 1.7.99.2 to 1.10.1
On Mon, 2011-05-16 at 14:44 -0700, Saul Wold wrote: From: Yu Ke ke...@intel.com - remove the patches * xserver-kdrive-1.3.0.0/*: no longer used * disable-xf86-dga-xorgcfg.patch: no longer used * nodolt.patch: already in upstream * enable-xcalibrate.patch: it is invalid now, because XCALIBRATE extension has been removed since commit edcceedb Er, has anyone actually tried touchscreens with these changes, particularly trying to calibrate a touchscreen under X with xtscal? As far as I can tell, we can throw away xtscal, libxcalibrate, and calibrateproto after that change since they need that X extension. Its a good example of why changes need to get upstream as if the build fix was there, they'd have had less reason to remove it. We probably are going to need to rewrite xtscal to use XI2 at this point :/. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC PATCH v2 05/15] create-pull-request: provide an RFC mode via -c argument
On Mon, 2011-05-16 at 15:26 -0700, Darren Hart wrote: Currently it is difficult to know if a pull request is being sent for review or just to be pulled. Add a -c argument to add RFC to the subject prefix and a blurb requesting review to the cover letter. Signed-off-by: Darren Hart dvh...@linux.intel.com Acked-by: Joshua Lock j...@linux.intel.com Cc: Richard Purdie richard.pur...@linuxfoundation.org Cc: Saul Wold s...@linux.intel.com Cc: Paul Eggleton paul.eggle...@intel.com Cc: Joshua Lock j...@linux.intel.com --- scripts/create-pull-request | 24 ++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/scripts/create-pull-request b/scripts/create-pull-request index 429421b..202d99d 100755 --- a/scripts/create-pull-request +++ b/scripts/create-pull-request @@ -3,12 +3,14 @@ ODIR=pull-$$ RELATIVE_TO=master COMMIT_ID=HEAD PREFIX=PATCH +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 + -c Create an RFC (Request for Comment) patch series -h Display this help message -i commit_idEnding commit (default: HEAD) -m msg_body_fileThe file containing a blurb to be inserted into the summary email @@ -27,11 +29,14 @@ EOM } # Parse and validate arguments -while getopts b:hi:m:o:p:r:s:u: OPT; do +while getopts b:chi:m:o:p:r:s:u: OPT; do case $OPT in b) BRANCH=$OPTARG ;; + c) + RFC=1 + ;; h) usage exit 0 @@ -89,6 +94,10 @@ if [ -z $BRANCH ] || [ -z $REMOTE_URL ]; then exit 1 fi +if [ $RFC -eq 1 ]; then + PREFIX=RFC $PREFIX +fi + # Set WEB_URL from known remotes case $REMOTE_URL in @@ -125,7 +134,7 @@ git format-patch -M --subject-prefix=$PREFIX -n -o $ODIR --thread=shallow --co # Customize the cover letter CL=$ODIR/-cover-letter.patch PM=$ODIR/pull-msg -git request-pull $RELATIVE_TO $REMOTE_URL $COMMIT_ID $PM +git request-pull $RELATIVE_TO $REMOTE_URL $COMMIT_ID $PM if [ $? -ne 0 ]; then echo ERROR: git request-pull reported an error exit 1 @@ -136,6 +145,17 @@ fi sed -n 0,\#$REMOTE_URL# p $PM | sed -i /BLURB HERE/ r /dev/stdin $CL rm $PM +# If this is an RFC, make that clear in the cover letter +if [ $RFC -eq 1 ]; then +(cat EOM +Please review the following changes for suitability for inclusion. If you have +any objections or suggestions for improvement, please respond to the patches. If +you agree with the changes, please provide your Acked-by. + +EOM +) | sed -i /BLURB HERE/ r /dev/stdin $CL +fi + # Insert the WEB_URL if there is one if [ -n $WEB_URL ]; then echo $WEB_URL | sed -i \#$REMOTE_URL# r /dev/stdin $CL -- Joshua Lock Yocto Project Build Monkey Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC PATCH v2 04/15] create-pull-request: rewrite known private URLs to public URLs
On Mon, 2011-05-16 at 15:26 -0700, Darren Hart wrote: Rather than requiring users to have public remotes and private remotes when their development remotes are ssh based (and therefor unsuitable for a pull request URL), rewrite the ones we know about from ssh://git@ to git://. As the remote url vary from remote to remote, do the REMOTE_REPO regex per remote. With this infrastructure in place, future patches can augment the list of known remotes for things like Git Hub, Gitorious, kernel.org, etc. Signed-off-by: Darren Hart dvh...@linux.intel.com Acked-by: Joshua Lock j...@linux.intel.com Cc: Tom Rini tom_r...@mentor.com Cc: Martin Jansa martin.ja...@gmail.com Cc: Otavio Salvador ota...@ossystems.com.br Cc: Richard Purdie richard.pur...@linuxfoundation.org --- scripts/create-pull-request | 14 +- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/scripts/create-pull-request b/scripts/create-pull-request index 8f7f767..429421b 100755 --- a/scripts/create-pull-request +++ b/scripts/create-pull-request @@ -65,7 +65,19 @@ while getopts b:hi:m:o:p:r:s:u: OPT; do echo ERROR: git config failed to find a url for '$REMOTE' exit 1 fi - REMOTE_REPO=$(echo $REMOTE_URL | sed s#.*/\(.*\)#\1#) + + # Rewrite known private URLs to public URLs + # Determine the repository name for use in the WEB_URL later + case $REMOTE_URL in + ssh://g...@git.pokylinux.org*) + REMOTE_REPO=$(echo $REMOTE_URL | sed s#.*/\(.*\)#\1#) + REMOTE_URL=${REMOTE_URL/'ssh://git@'/'git://'} + ;; + ssh://g...@git.yoctoproject.org*) + REMOTE_REPO=$(echo $REMOTE_URL | sed s#.*/\(.*\)#\1#) + REMOTE_URL=${REMOTE_URL/ssh://git@/git://} + ;; + esac # The .git suffix is optional in the URL, drop in for the REPO REMOTE_REPO=${REMOTE_REPO%.git} ;; -- Joshua Lock Yocto Project Build Monkey Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC PATCH v2 14/15] send-pull-request: streamline git-send-email usage
On Mon, 2011-05-16 at 15:26 -0700, Darren Hart wrote: The script was sending one patch at a time, which defeats the internal confirmation mechanism of git-send-email (which would otherwise allow the user to send all patches or abort immediately). Rework the sending logic to use no more than two commands. Use two commands when the cover letter is to be sent to all recipients with the -a argument. Otherwise, send all patches via the same command. The script duplicates git's send confirmation, eliminate that. Signed-off-by: Darren Hart dvh...@linux.intel.com Reported-by: Khem Raj raj.k...@gmail.com Acked-by: Joshua Lock j...@linux.intel.com Cc: Khem Raj raj.k...@gmail.com Cc: Joshua Lock j...@linux.intel.com --- scripts/send-pull-request | 68 +--- 1 files changed, 26 insertions(+), 42 deletions(-) diff --git a/scripts/send-pull-request b/scripts/send-pull-request index 21eb302..8d0bd34 100755 --- a/scripts/send-pull-request +++ b/scripts/send-pull-request @@ -1,6 +1,7 @@ #!/bin/bash AUTO=0 AUTO_CL=0 +GITSOBCC= # Prevent environment leakage to these vars. unset TO @@ -59,10 +60,11 @@ while getopts achp:t: OPT; do case $OPT in a) AUTO_CL=1 - AUTO=1 - ;; + # Fall through to include -c + ; c) AUTO=1 + GITSOBCC=--signed-off-by-cc ;; h) usage @@ -130,48 +132,30 @@ if [ -z $TO ] [ -z $AUTO_CC ]; then fi -# Generate report for the user and require confirmation before sending -cat EOM -The following patches: -$(for PATCH in $PDIR/*.patch; do echo $PATCH; done) +# Convert the collected addresses into git-send-email argument strings +export IFS=$',' +GIT_TO=$(for R in $TO; do echo -n --to='$R' ; done) +GIT_CC=$(for R in $AUTO_CC; do echo -n --cc='$R' ; done) +unset IFS -will now be sent via the git send-email command. Git will prompt you before -sending any email. -EOM -echo Continue? [y/N] -read cont - -if [ $cont == y ] || [ $cont == Y ]; then - ERROR=0 - export IFS=$',' - GIT_TO=$(for R in $TO; do echo -n --to='$R' ; done) - GIT_CC=$(for R in $AUTO_CC; do echo -n --cc='$R' ; done) - unset IFS - for PATCH in $PDIR/*patch; do - if [ $AUTO -eq 1 ]; then - if [ $PATCH == $CL ] [ $AUTO_CL -eq 1 ]; then - # Send the cover letter to every recipient, both - # specified as well as harvested. - eval git send-email $GIT_TO $GIT_CC --confirm=always --no-chain-reply-to --suppress-cc=all $PATCH - else - # Send the patch to the specified recipients and - # those git finds in this specific patch. - eval git send-email $GIT_TO --confirm=always --no-chain-reply-to --signed-off-by-cc $PATCH - fi - else - # Only send to the explicitly specified recipients - eval git send-email $GIT_TO --confirm=always --no-chain-reply-to --suppress-cc=all $PATCH - fi - if [ $? -eq 1 ]; then - ERROR=1 - fi - done - - if [ $ERROR -eq 1 ]; then - echo ERROR: Failed to send one or more messages. +# Handoff to git-send-email. It will perform the send confirmation. +PATCHES=$(echo $PDIR/*.patch) +if [ $AUTO_CL -eq 1 ]; then + # Send the cover letter to every recipient, both specified as well as + # harvested. Then remove it from the patches list. + eval git send-email $GIT_TO $GIT_CC --confirm=always --no-chain-reply-to --suppress-cc=all $CL + if [ $? -eq 1 ]; then + echo ERROR: failed to send cover-letter with automatic recipients. + exit 1 fi -else - echo Send aborted. + PATCHES=${PATCHES/$CL/} fi +# Send the patch to the specified recipients and, if -c was specified, those git +# finds in this specific patch. +eval git send-email $GIT_TO --confirm=always --no-chain-reply-to $GITSOBCC $PATCHES +if [ $? -eq 1 ]; then + echo ERROR: failed to send patches. + exit 1 +fi -- Joshua Lock Yocto Project Build Monkey Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] gitpkgv stopped working
Hello, I noticed today that gitpkgv is not working for some recipes. I could reproduce the problem using freerdp recipe today. It seems GITPKGVTAG is expanded but bitbake doesn't notice it. Does someone has any idea about the reason behind it? Cheers, -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] SlugOS layers on top of openembedded-core/meta-openembedded available
Hi, I have ported over the slugos distributon as collection of layers on top of oe-core and meta-oe. There are two new layers created namely meta-sluos the distro layer and meta-nslu2 the machine layer for nslu2. There is a third repo which is the master project which contains the makefile and supporting scripts to do the layering and setup. Right now its able to build slugos-images for nslu2be based on both uclibc and eglibc If you are interested to play around please give it a shot. The procedure is Clone the slugos-setup repo $ git clone git://github.com/kraj/slugos-setup.git $ cd slugos-setup $ make and see the magic unfold I would be interested in problem reports anybody runs into. The layer repositories are currently hosted on github.com until they find another place Enjoy -Khem ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core