Re: [OE-core] [PATCH 1/1] attr: enable ptest support
On 01/13/2014 11:58 PM, Saul Wold wrote:
On 01/09/2014 02:02 AM, Chong Lu wrote:
Install attr test suite and run it as ptest.
Signed-off-by: Chong Lu
---
meta/recipes-support/attr/attr.inc | 15 +++-
.../attr/files/attr-make-ptest-pass.patch | 82
++
meta/recipes-support/attr/files/run-ptest | 5 ++
3 files changed, 101 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-support/attr/files/attr-make-ptest-pass.patch
create mode 100644 meta/recipes-support/attr/files/run-ptest
diff --git a/meta/recipes-support/attr/attr.inc
b/meta/recipes-support/attr/attr.inc
index 4961ba7..8cb08e4 100644
--- a/meta/recipes-support/attr/attr.inc
+++ b/meta/recipes-support/attr/attr.inc
@@ -11,7 +11,10 @@ LIC_FILES_CHKSUM =
"file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \
file://attr/attr.c;endline=17;md5=be0403261f0847e5f43ed5b08d19593c \
file://libattr/libattr.c;endline=17;md5=7970f77049f8fa1199fff62a7ab724fb"
-SRC_URI =
"http://download.savannah.gnu.org/releases/attr/${BP}.src.tar.gz";
+SRC_URI =
"http://download.savannah.gnu.org/releases/attr/${BP}.src.tar.gz \
+ file://attr-make-ptest-pass.patch \
+ file://run-ptest \
+"
require ea-acl.inc
@@ -20,3 +23,13 @@ do_install_append() {
sed -i ${D}${libdir}/libattr.la -e \
s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\',
}
+
+inherit ptest
+
+do_install_ptest() {
+cp -r ${S}/test ${D}${PTEST_PATH}
+mkdir ${D}${PTEST_PATH}/include
+cp ${S}/include/builddefs ${S}/include/buildmacros
${S}/include/buildrules ${D}${PTEST_PATH}/include/
+}
+
+RDEPENDS_${PN}-ptest = "coreutils perl-module-filehandle
perl-module-getopt-std perl-module-posix"
diff --git
a/meta/recipes-support/attr/files/attr-make-ptest-pass.patch
b/meta/recipes-support/attr/files/attr-make-ptest-pass.patch
new file mode 100644
index 000..e2da8b0
--- /dev/null
+++ b/meta/recipes-support/attr/files/attr-make-ptest-pass.patch
@@ -0,0 +1,82 @@
+attr: make ptest pass
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Delete the second '@' character of the same row in test/Makefile, else
+we would get the error as below:
+@echo: command not found
+In fs.test file, the result of `ls -s' is incorrect. Change it to make
+ext-tests pass.
+
Can you please verify that these tests are actually wrong, it seems
incorrect to be changing the test results to make the test pass.
Are we missing a setting (like the acl) or something else?
Sau!
Saul,
I tested attr from upstream tar package on some distributions.(Ubuntu
Desktop 12.04 and Fedora 20)
test/ext/fs.test is actually wrong.
In target, I have already added acl setting. My test likes following:(in
target)
root@qemuarm:/usr/lib/attr/ptest# ./run-ptest
make: Entering directory '/usr/lib/attr/ptest/test'
..
PASS: $ rm f
PASS: $ touch f g h
PASS: $ setfattr -n user.novalue f g h
PASS: $ ls -s f g h
PASS: $ setfattr -n user.name -v value f
PASS: $ ls -s f g h
PASS: $ getfattr -d f g h
PASS: $ setfattr -n user.name -v value g
PASS: $ ls -s f g h
PASS: $ setfattr -x user.novalue h
PASS: $ ls -s f g h
PASS: $ setfattr -n user.name -v other-value g
PASS: $ setfattr -n user.name -v value g
PASS: $ setfattr -x user.name f g
PASS: $ setfattr -x user.novalue f g
PASS: $ ls -s f g h
PASS: $ rm f g h
20 commands (20 passed, 0 failed)
make: Leaving directory '/usr/lib/attr/ptest/test'
root@qemuarm:/usr/lib/attr/ptest# mount
rootfs on / type rootfs (rw)
/dev/root on / type ext3
(rw,relatime,errors=continue,user_xattr,acl,barrier=1,data=ordered)
devtmpfs on /dev type devtmpfs
(rw,relatime,size=60172k,nr_inodes=15043,mode=755)
proc on /proc type proc (rw,relatime)
tmpfs on /mnt/.psplash type tmpfs (rw,relatime,size=40k)
sysfs on /sys type sysfs (rw,relatime)
debugfs on /sys/kernel/debug type debugfs (rw,relatime)
tmpfs on /run type tmpfs (rw,nosuid,nodev,mode=755)
tmpfs on /var/volatile type tmpfs (rw,relatime)
devpts on /dev/pts type devpts (rw,relatime,gid=5,mode=620)
nfsd on /proc/fs/nfsd type nfsd (rw,relatime)
Best Regards
Chong
+Signed-off-by: Chong Lu
+---
+ test/Makefile|4 ++--
+ test/ext/fs.test | 22 +++---
+ 2 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/test/Makefile b/test/Makefile
+index b7bd8db..d916bf4 100644
+--- a/test/Makefile
b/test/Makefile
+@@ -40,10 +40,10 @@ $(TEST):
+ @echo "*** $@ ***"; perl run $@
+
+ $(EXT):
+-@echo "EXT specific tests"; @echo "*** $@ ***"; perl run $@
++@echo "EXT specific tests"; echo "*** $@ ***"; perl run $@
+
+ $(ROOT):
+-@echo "Note: Tests must run as root"; @echo "*** $@ ***"; perl
run $@
++@echo "Note: Tests must run as root"; echo "*** $@ ***"; perl
run $@
+
+ .PHONY: $(TEST) $(EXT) $(ROOT)
+ .NOTPARALLEL:
+diff --git a/test/ext/fs.test b/test/
[OE-core] [PATCH 1/1] alsa-tools: fix the AUTOMAKE_DIR
There should be only one automake under the STAGING_DATADIR_NATIVE in
theory, but der_ste...@gmx.de has reported an odd problem which seemed
like that there are more than one. However, the "automake
--print-libdir" is the regular way to locate automake libdir.
[YOCTO #5706]
Reported-by: der_ste...@gmx.de
Signed-off-by: Robert Yang
---
meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb
b/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb
index c3b97a3..5b0f6ae 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb
+++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb
@@ -32,7 +32,7 @@ do_configure () {
do_compile_prepend () {
#Automake dir is not correctly detected in cross compilation case
-export AUTOMAKE_DIR=${STAGING_DATADIR_NATIVE}/$(ls
${STAGING_DATADIR_NATIVE} | grep automake)
+export AUTOMAKE_DIR="$(automake --print-libdir)"
export ACLOCAL_FLAGS="--system-acdir=${ACLOCALDIR}/"
}
--
1.8.3.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] alsa-tools: fix the AUTOMAKE_DIR
The following changes since commit 1b636173ca88e5ccca1992f9a12367a1189fa674: bitbake: toaster: Toaster GUI, generic search, filter and order (2014-01-10 15:20:26 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib rbt/at http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=rbt/at Robert Yang (1): alsa-tools: fix the AUTOMAKE_DIR meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.8.3.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/5] refactor the archive*.bbcalss
On 01/13/2014 07:58 PM, Martin Jansa wrote:
On Mon, Jan 13, 2014 at 12:52:49PM +0100, Henning Heinold wrote:
On Mon, Jan 13, 2014 at 06:47:39PM +0800, Robert Yang wrote:
On 01/13/2014 06:21 PM, Martin Jansa wrote:
On Tue, Jan 14, 2014 at 12:20:14AM +0800, Robert Yang wrote:
* The archive*.bbclass didn't work, and there were a few problems, for
example:
1) There were a few duplicated code
2) There was no src_dir.org (or orig), but the diff command still use
it, and it is not easy to fix this issue if we don't change a lot
of the code.
3) It didn't archive the source for the native or gcc
4) The work flow is not very well
5) The "subprocess.call('fakeroot cp '" should be removed
6) And others ...
* So that we have to refactor it, the benefits are:
1) Fix the problems and make it work well.
2) Reduce more than 400 lines in total.
3) Make it easy to use.
Have you seen
http://lists.openembedded.org/pipermail/openembedded-core/2013-December/087729.html
?
Could you review it/integrate changes from it?
I've looked at it just now, I think the problems that you mentioned have been
fixed during the refactor. It won't install/remove the files manually any more,
they will be installed/removed by the sstate. And the usage become easier, just
this would be OK by default:
INHERIT += "archiver"
And we can easily add other functions when needed.
// Robert
Hi Robert,
does the whole thread means it is broken in dora too? Are there plans to
backport the patches?
AFAIK it's broken everywhere, I would like to have it backported to
dylan as well (after testing that it indeed fixes source files being
removed)
Yes, Martin is right, but I'm not sure whether we should backport them
since we have change a lot of the code, and there should be bugs, usually,
though, I've done as many testing as I can.
BTW., I've updated the code a little in the PULL:
Use "1" or "0" rather than "yes" or "no", which seems more popular in oe,
for example:
ARCHIVER_MODE[dumpdata] = "1" (it was "yes" before).
// Robert
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] systemd-compat-units: make run-postinsts.service work correctly on target
On 01/14/2014 01:01 AM, Burton, Ross wrote: On 13 January 2014 07:38, Chen Qi wrote: +ExecStart=-/etc/rcS.d/S98run-postinsts ; -/etc/rcS.d/S99run-postinsts Can we just make opkg and run-postinsts write that file using the same number? Also, that service file needs to move directly into run-postinsts. There's a start in poky-contrib:ross/postinsts if you want to finish it off. :) Ross Hi Ross, As you have started working on this problem, I think I'll just drop this patch. After looking at your branch, I think there's only one thing to look out for. When we're using ipk/dpkg as the package back-end, and 'package-management' is in IMAGE_FEATURES, there would be no /etc/*-postinsts. Best Regards, Chen Qi ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] kernel.bbclass: Fix empty modules directory QA issue
If a kernel is built without any external modules (aka no CONFIG_*=m),
then during a modules_install of the kernel an empty directory is
created at /lib/modules/${KERNEL_VERIONS}/kernel. This is behaviour of
the kernel infrastructure, the directory would normally be populated
with the modules that were built.
However because of the expectations of kernel-modules-split, no packages
are created when there are no modules and an empty directory lingers.
This raises QA issues as warning or errors (depending on the distro).
The following patch changes the kernel_do_install task to check if the
directory is empty and if so removes it.
Signed-off-by: Nathan Rossi
---
meta/classes/kernel.bbclass |2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 5fef446..f4dcba5 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -183,6 +183,8 @@ kernel_do_install() {
oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
rm "${D}/lib/modules/${KERNEL_VERSION}/build"
rm "${D}/lib/modules/${KERNEL_VERSION}/source"
+ # If the kernel/ directory is empty remove it to prevent QA
issues
+ rmdir --ignore-fail-on-non-empty
"${D}/lib/modules/${KERNEL_VERSION}/kernel"
else
bbnote "no modules to install"
fi
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] cmake: respect ${S} and ${B}
On 01/13/2014 02:06 PM, Saul Wold wrote:
On 01/10/2014 09:54 AM, Ross Burton wrote:
Instead of the class-specific variables OECMAKE_BUILDPATH and
OECMAKE_SOURCEPATH, just use ${B} and ${S}.
If these two paths are different, delete any existing ${B} before
running a
build so that previous builds don't taint the current build.
Note that OECMAKE_SOURCEPATH and OECMAKE_BUILDPATH are not respected,
so recipes
that manually set these in the past will need to be updated to either use
something along the lines of separatebuilddir.inc or set B
themselves. If the
old variables are set, a warning is displayed.
Signed-off-by: Ross Burton
---
meta/classes/cmake.bbclass | 35 +++
1 file changed, 11 insertions(+), 24 deletions(-)
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 30c1792..1dc406d2 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -6,15 +6,6 @@ CCACHE = ""
# We want the staging and installing functions from autotools
inherit autotools
-# Use in-tree builds by default but allow this to be changed
-# since some packages do not support them (e.g. llvm 2.5).
-OECMAKE_SOURCEPATH ?= "."
-
-# If declaring this, make sure you also set EXTRA_OEMAKE to
-# "-C ${OECMAKE_BUILDPATH}". So it will run the right makefiles.
-OECMAKE_BUILDPATH ?= ""
-B="${S}"
-
# C/C++ Compiler (without cpu arch/tune arguments)
OECMAKE_C_COMPILER ?= "`echo ${CC} | sed 's/^\([^ ]*\).*/\1/'`"
OECMAKE_CXX_COMPILER ?= "`echo ${CXX} | sed 's/^\([^ ]*\).*/\1/'`"
@@ -73,10 +64,14 @@ EOF
addtask generate_toolchain_file after do_patch before do_configure
cmake_do_configure() {
-if [ ${OECMAKE_BUILDPATH} ]
-then
-mkdir -p ${OECMAKE_BUILDPATH}
-cd ${OECMAKE_BUILDPATH}
+if [ "${OECMAKE_BUILDPATH}" -o "${OECMAKE_SOURCEPATH}" ]; then
+bbnote "cmake.bbclass no longer uses OECMAKE_SOURCEPATH and
OECMAKE_BUILDPATH. This recipe now will do in-tree builds, to do
out-of-tree builds set S and B."
+fi
+
+if [ "${S}" != "${B}" ]; then
+rm -rf ${B}
+mkdir -p ${B}
+cd ${B}
fi
# Just like autotools cmake can use a site file to cache result
that need generated binaries to run
@@ -88,7 +83,7 @@ cmake_do_configure() {
cmake \
${OECMAKE_SITEFILE} \
- ${OECMAKE_SOURCEPATH} \
+ ${S} \
-DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
-DCMAKE_INSTALL_SO_NO_EXE=0 \
-DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
@@ -98,20 +93,12 @@ cmake_do_configure() {
}
cmake_do_compile() {
-if [ ${OECMAKE_BUILDPATH} ]
-then
-cd ${OECMAKE_BUILDPATH}
-fi
-
+cd ${B}
base_do_compile
}
cmake_do_install() {
-if [ ${OECMAKE_BUILDPATH} ];
-then
-cd ${OECMAKE_BUILDPATH}
-fi
-
+cd ${B}
autotools_do_install
This seems to cause a problem:
ERROR: Logfile of failure stored in:
/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/cmake/2.8.12.1-r0/temp/log.do_install.5697
Log data follows:
| DEBUG: SITE files ['endian-big', 'bit-32', 'powerpc-common',
'common-linux', 'common-glibc', 'powerpc32-linux', 'powerpc-linux',
'common']
| DEBUG: Executing shell function do_install
| NOTE: make -j 16
DESTDIR=/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/cmake/2.8.12.1-r0/image
install
| make: *** No rule to make target `install'. Stop.
| ERROR: oe_runmake failed
| WARNING:
/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/cmake/2.8.12.1-r0/temp/run.do_install.5697:1
exit 1 from
| exit 1
| ERROR: Function failed: do_install (log file is located at
/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/cmake/2.8.12.1-r0/temp/log.do_install.5697)
ERROR: Task 7891
(/srv/hdd/poky/meta/recipes-devtools/cmake/cmake_2.8.12.1.bb,
do_install) failed with exit code '1'
Oops, sorry spoke to soon, needed to have a clean WORKDIR, I was
building in a pre existing tmp.
Sorry for the noise.
Sau!
Sau!
}
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] cmake: respect ${S} and ${B}
On 01/10/2014 09:54 AM, Ross Burton wrote:
Instead of the class-specific variables OECMAKE_BUILDPATH and
OECMAKE_SOURCEPATH, just use ${B} and ${S}.
If these two paths are different, delete any existing ${B} before running a
build so that previous builds don't taint the current build.
Note that OECMAKE_SOURCEPATH and OECMAKE_BUILDPATH are not respected, so recipes
that manually set these in the past will need to be updated to either use
something along the lines of separatebuilddir.inc or set B themselves. If the
old variables are set, a warning is displayed.
Signed-off-by: Ross Burton
---
meta/classes/cmake.bbclass | 35 +++
1 file changed, 11 insertions(+), 24 deletions(-)
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 30c1792..1dc406d2 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -6,15 +6,6 @@ CCACHE = ""
# We want the staging and installing functions from autotools
inherit autotools
-# Use in-tree builds by default but allow this to be changed
-# since some packages do not support them (e.g. llvm 2.5).
-OECMAKE_SOURCEPATH ?= "."
-
-# If declaring this, make sure you also set EXTRA_OEMAKE to
-# "-C ${OECMAKE_BUILDPATH}". So it will run the right makefiles.
-OECMAKE_BUILDPATH ?= ""
-B="${S}"
-
# C/C++ Compiler (without cpu arch/tune arguments)
OECMAKE_C_COMPILER ?= "`echo ${CC} | sed 's/^\([^ ]*\).*/\1/'`"
OECMAKE_CXX_COMPILER ?= "`echo ${CXX} | sed 's/^\([^ ]*\).*/\1/'`"
@@ -73,10 +64,14 @@ EOF
addtask generate_toolchain_file after do_patch before do_configure
cmake_do_configure() {
- if [ ${OECMAKE_BUILDPATH} ]
- then
- mkdir -p ${OECMAKE_BUILDPATH}
- cd ${OECMAKE_BUILDPATH}
+ if [ "${OECMAKE_BUILDPATH}" -o "${OECMAKE_SOURCEPATH}" ]; then
+ bbnote "cmake.bbclass no longer uses OECMAKE_SOURCEPATH and
OECMAKE_BUILDPATH. This recipe now will do in-tree builds, to do out-of-tree builds set S
and B."
+ fi
+
+ if [ "${S}" != "${B}" ]; then
+ rm -rf ${B}
+ mkdir -p ${B}
+ cd ${B}
fi
# Just like autotools cmake can use a site file to cache result that
need generated binaries to run
@@ -88,7 +83,7 @@ cmake_do_configure() {
cmake \
${OECMAKE_SITEFILE} \
- ${OECMAKE_SOURCEPATH} \
+ ${S} \
-DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
-DCMAKE_INSTALL_SO_NO_EXE=0 \
-DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
@@ -98,20 +93,12 @@ cmake_do_configure() {
}
cmake_do_compile() {
- if [ ${OECMAKE_BUILDPATH} ]
- then
- cd ${OECMAKE_BUILDPATH}
- fi
-
+ cd ${B}
base_do_compile
}
cmake_do_install() {
- if [ ${OECMAKE_BUILDPATH} ];
- then
- cd ${OECMAKE_BUILDPATH}
- fi
-
+ cd ${B}
autotools_do_install
This seems to cause a problem:
ERROR: Logfile of failure stored in:
/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/cmake/2.8.12.1-r0/temp/log.do_install.5697
Log data follows:
| DEBUG: SITE files ['endian-big', 'bit-32', 'powerpc-common',
'common-linux', 'common-glibc', 'powerpc32-linux', 'powerpc-linux',
'common']
| DEBUG: Executing shell function do_install
| NOTE: make -j 16
DESTDIR=/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/cmake/2.8.12.1-r0/image
install
| make: *** No rule to make target `install'. Stop.
| ERROR: oe_runmake failed
| WARNING:
/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/cmake/2.8.12.1-r0/temp/run.do_install.5697:1
exit 1 from
| exit 1
| ERROR: Function failed: do_install (log file is located at
/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/cmake/2.8.12.1-r0/temp/log.do_install.5697)
ERROR: Task 7891
(/srv/hdd/poky/meta/recipes-devtools/cmake/cmake_2.8.12.1.bb,
do_install) failed with exit code '1'
Sau!
}
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC PATCH 0/2] RFC: Implement deterministic uid/gid
On 1/9/14, 5:19 PM, Martin Jansa wrote: On Thu, Jan 09, 2014 at 01:49:28PM -0600, Mark Hatle wrote: I have updated the git://git.yoctoproject.org/poky-contrib mhatle/uidgid to the latest oe-core master. I haven't seen any comments on this RFC yet. Does anyone have any opinion either way on the code referenced here? I wanted to do more tests and find some smaller reproducer, but I'm interested in this series. What I'm seeing in our builds is that when you compare files-in-image.txt report from independent (not reusing sstate-cache) builds with exactly the same metadata, group owners aren't deterministic. Yes, this is partially to address that. The issue is that the package install order itself is not deterministic. The only thing that is, is the resulting set of files, modes, owner and group -names-. Since the order the scripts are run is determines the effective uid/gid, the non-deterministic ordering causes these issues. This patch set deals with that by allowing the user to specify -the- one and true deterministic set which is then reused. Random files in image getting owned by "messagebus" group etc., these issues went away when useradd class creating these ad-hoc groups had parameter for fixed gid or when I've added these groups directly to base-passwd group.master. Is this the same problem you're addressing in this patchset? I have never seen a problem where specific files uname/gname are wrong. It might be a related problem, but that shouldn't be happening in any case. The -names- should always be right compared to the contents of the passwd/group files located within the constructed image. I know there is an open bug where there were a few cases (in the sysroot) where things used a uname/gname from the default passwd/group file, but it had not yet been written. So it fell back to the host's passwd/group file which had different numbers. This is certainly incorrect behavior, and I think it's fixed by either inheriting the adduser class in those cases (even if they don't add users) or requiring the base-passwd in those specific package depends... but I've been looking for a reproducer to work though that. --Mark I'm confident patch 01/02 should be added to master. The patch 02/02 works properly in all of my testing and does implement support for 'deterministic uid/gid' with dynamic passwd/group file construction during package install. The code is only activated if USERADD_REWRITE_PARAMS is set to '1', so it's low risk -- but it does add a fairly large chunk of code to be maintained over time. --Mark On 12/10/13, 12:31 PM, Mark Hatle wrote: The following series implements the deterministic uid/gid setting for a distribution. Currently when a filesystem is generated the uid/gid values are generally set at install time, so the install order determines what the actual uid/gid values become. In order to create a deterministic uid/gid set, that still dynamically constructs the passwd/group file, we add an option to read a special passwd/group file to allow the system to determine the values. It uses the existing parameters, and the values from the special passwd/group files to reconstruct the parameter set to ensure these items are fully defined with static values. The first patch (01/02) is generally applicable. It fixes a real bug in the way the user/group adds occur today within the system. Patch 02/02 implements the new functionality. The following changes since commit 8505f0fa48cc79d51616b923c6e2c778c4b46a44: libmatchbox: use PACKAGECONFIG (2013-12-10 14:13:01 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib mhatle/uidgid http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=mhatle/uidgid Mark Hatle (2): useradd.bbclass: Fix build time install issues useradd.bbclass: Add ability to select a static uid/gid automatically meta/classes/useradd.bbclass | 247 ++- meta/conf/local.conf.sample.extended | 24 2 files changed, 265 insertions(+), 6 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/2] Cortex M3 tune fixes
Op 13 jan. 2014, om 20:34 heeft Trevor Woerner het volgende geschreven: > On 01/13/14 13:25, Phil Blundell wrote: >> On Mon, 2014-01-13 at 13:16 -0500, Trevor Woerner wrote: >>> Since OE is generally used to build Linux distributions, I'm rather >>> curious to know why OE would include tunes for CortexM3? >> Well, Cortex-M can run uClinux. > > Is there an OE layer that adds support for building u-boot and uClinux > for Cortex-M3/4 [1]? I've been searching, and seem to be coming up empty. You don't need a layer to build u-boot, it's in oe-core already. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/2] Cortex M3 tune fixes
On 01/13/14 13:25, Phil Blundell wrote: > On Mon, 2014-01-13 at 13:16 -0500, Trevor Woerner wrote: >> Since OE is generally used to build Linux distributions, I'm rather >> curious to know why OE would include tunes for CortexM3? > Well, Cortex-M can run uClinux. Is there an OE layer that adds support for building u-boot and uClinux for Cortex-M3/4 [1]? I've been searching, and seem to be coming up empty. If there isn't, then I'm back to my original question :-) [1] https://github.com/EmcraftSystems ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] OE Changelog since 2014-01-05 until 2014-01-12
Changelog since 2014-01-05 until 2014-01-12. Projects included in this report: bitbake: git://git.openembedded.org/bitbake openembedded-core: git://git.openembedded.org/openembedded-core meta-openembedded: git://git.openembedded.org/meta-openembedded meta-angstrom: git://github.com/Angstrom-distribution/meta-angstrom.git meta-arago: git://arago-project.org/git/meta-arago.git meta-beagleboard: git://github.com/beagleboard/meta-beagleboard.git meta-browser: git://github.com/OSSystems/meta-browser.git meta-bug: git://github.com/buglabs/meta-bug.git meta-chicken: git://github.com/OSSystems/meta-chicken meta-efikamx: git://github.com/kraj/meta-efikamx.git meta-ettus: http://github.com/koenkooi/meta-ettus.git meta-fsl-arm: git://git.yoctoproject.org/meta-fsl-arm meta-fsl-arm-extra: git://github.com/Freescale/meta-fsl-arm-extra.git meta-fsl-ppc: git://git.yoctoproject.org/meta-fsl-ppc meta-guacamayo: git://github.com/Guacamayo/meta-guacamayo.git meta-gumstix: git://github.com/gumstix/meta-gumstix.git meta-gumstix-community: git://gitorious.org/schnitzeltony-oe-meta/meta-gumstix-community.git meta-handheld: git://git.openembedded.org/meta-handheld meta-igep: http://github.com/ebutera/meta-igep.git meta-intel: git://git.yoctoproject.org/meta-intel meta-ivi: git://git.yoctoproject.org/meta-ivi meta-java: git://github.com/woglinde/meta-java meta-kde: git://gitorious.org/openembedded-core-layers/meta-kde.git meta-micro: git://git.openembedded.org/meta-micro meta-mono: git://git.yoctoproject.org/meta-mono.git meta-netbookpro: git://github.com/tworaz/meta-netbookpro meta-nslu2: git://github.com/kraj/meta-nslu2 meta-opie: git://git.openembedded.org/meta-opie meta-qt3: git://git.yoctoproject.org/meta-qt3 meta-qt5: git://github.com/meta-qt5/meta-qt5.git meta-slugos: git://github.com/kraj/meta-slugos meta-systemd: git://git.yoctoproject.org/meta-systemd meta-raspberrypi: git://github.com/djwillis/meta-raspberrypi.git meta-smartphone: http://git.shr-project.org/repo/meta-smartphone.git meta-ti: git://git.yoctoproject.org/meta-ti meta-webos: git://github.com/openwebos/meta-webos.git meta-xilinx: git://git.yoctoproject.org/meta-xilinx meta-yocto: git://git.yoctoproject.org/meta-yocto openembedded: git://git.openembedded.org/openembedded Changelog for bitbake: Alexandru DAMIAN (6): toaster: add two-stage commit startup logic toaster: clone Simple UI as base for Toaster GUI toaster: update static media for Toaster GUI toaster: Create the base page navigation structure toaster: Build dashboard implementation toaster: Toaster GUI, generic search, filter and order Otavio Salvador (1): bitbake: gitannex.py: Add Git Annex support Richard Purdie (2): gitannex: Add missing file from previous commit fetch2/gitannex: Fix function arguments to match bitbake master Robert Yang (2): bitbake: usermanual.xml: fix a typo bitbake/lib/bb/build.py: fix the task flags cleandirs Zhenhua Luo (2): bitbake: fetch2/git: add nobranch option for SRC_URI to skip SHA validating bitbake: fetch2/git: add description for nobranch Changelog for openembedded-core: Anders Darander (1): terminal.bbclass: do not export PS1 Andreas Müller (1): shadow: set correct entries for pseudo terminals in /etc/securetty Chen Qi (6): image.bbclass: add ability to set systemd default target coreutils: upgrade to 8.22 initscripts: split the functions script into a separate package Add missing RDEPENDS of initscripts-functions grep: upgrade to 2.16 busybox: enable SEAMLESS_XZ by default Chong Lu (4): libpcre: upgrade to 8.34 quilt: enable ptest support tcl: enable ptest support beecrypt: add ptest support Christopher Larson (1): base.bbclass: pull in file-native for src.rpm Corneliu Stoicescu (1): oe-selftest: New tests for sstate related operations Cristian Iorga (10): gstreamer1.0-plugins-bad: upgrade to 1.2.2 gstreamer1.0-plugins-ugly: upgrade to 1.2.2 gstreamer1.0-libav: upgrade to 1.2.2 ofono: upgrade to 1.14 bluez5: upgrade to 5.13 gstreamer1.0: upgrade to 1.2.2 gstreamer1.0-plugins-base: upgrade to 1.2.2 gstreamer1.0-plugins-good: upgrade to 1.2.2 netbase: upgrade to 5.2 qemu: upgrade to 1.7.0 Cristiana Voicu (2): curl: upgrade to 7.34.0 kmod: Update to Rev 16 via git Irina Patru (2): libtasn1: upgrade to 3.4 libsoup-2.4: upgrade to 2.45.3 Jackie Huang (2): kconfig-frontends: fix the incorrect depends on gperf guile: fix the depends for target recipes Kevin Baker (1): screen: update debian patchset to version 4.0.3-14 Koen Kooi (2): grub: add git version xf86-video-modesetting: update to 0.8.1 Martin Jansa (1): python: explicitly disable bluetooth.h check Mike Crowe (1): valgrind: rrecommend libc6-dbg on all architectures Ming Liu (5): libpthread-stubs: should set ALLOW_EMPTY sstate: Add optimizing logic for crosssdk setscene dependencies ssta
Re: [OE-core] [oe-commits] Upgrade Helper : base-passwd: upgrade to 3.5.29
On 01/13/2014 04:48 AM, Phil Blundell wrote: The new version introduced by this patch doesn't seem to actually exist at the SRC_URI. (ftp.debian.org currently has 3.5.28, 3.5.30 and 3.5.31 but not 3.5.29.) Seems they did a quick succession of updates and removed the .29 version. I am working on the .31 update Also, as far as I can tell, this patch wasn't ever posted to the list for review and the alleged author's email address of "u...@not.set" doesn't sound entirely plausible. My mistake, I did the update built it locally and it was included as part of a MUT / C-Pull. Sau! Module: openembedded-core.git Branch: master Commit: 7c79e70d3a803f2ccb9b9c6ed2134019631672fd URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=7c79e70d3a803f2ccb9b9c6ed2134019631672fd Author: Upgrade Helper Date: Sat Jan 4 11:44:14 2014 +0200 base-passwd: upgrade to 3.5.29 Signed-off-by: Saul Wold ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/2] Cortex M3 tune fixes
On Mon, 2014-01-13 at 13:16 -0500, Trevor Woerner wrote: > Since OE is generally used to build Linux distributions, I'm rather > curious to know why OE would include tunes for CortexM3? Well, Cortex-M can run uClinux. And "generally" != "exclusively". p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/2] Cortex M3 tune fixes
Since OE is generally used to build Linux distributions, I'm rather curious to know why OE would include tunes for CortexM3? ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] systemd-compat-units: do not mask available services
On 13 Jan 2014 18:02, "Burton, Ross" wrote:
>
> If dnsmasq doesn't need to be manually masked, then why not just
> remove it from the list?
Hm, good question... I guess I have to claim temporary stupidity.
I'll send a patch to remove dnsmasq from the list.
Though, I still think that we should check for service files insert
systemd_unitdir and not only check /etc/systemd/system... So I think I'll claim
that the patch is correct anyway, though.
Cheers,
Anders
> Ross
>
> On 10 January 2014 07:15, Anders Darander wrote:
> > Do also check systemd_unitdir/system/ for available unit files.
> >
> > This was hiding dnsmasq.service for us, as /etc/systemd/system has
> > priority over systemd_unitdir/system...
> >
> > Signed-off-by: Anders Darander
> > ---
> > meta/recipes-core/systemd/systemd-compat-units.bb | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb
> > b/meta/recipes-core/systemd/systemd-compat-units.bb
> > index 9f28283..e32ad79 100644
> > --- a/meta/recipes-core/systemd/systemd-compat-units.bb
> > +++ b/meta/recipes-core/systemd/systemd-compat-units.bb
> > @@ -42,7 +42,7 @@ pkg_postinst_${PN} () {
> > fi
> >
> > for i in ${SYSTEMD_DISABLED_SYSV_SERVICES} ; do
> > - if [ \( -e $i -o $i.sh \) -a ! -e
> > $D${sysconfdir}/systemd/system/$i.service ] ; then
> > + if [ \( -e $i -o $i.sh \) -a ! \( -e
> > $D${sysconfdir}/systemd/system/$i.service -o -e
> > $D${systemd_unitdir}/system/$i.service \) ] ; then
> > echo -n "$i: " ; systemctl ${OPTS} mask $i.service
> > fi
> > done ; echo
> > --
> > 1.8.5.2
> >
> > ___
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] grub-efi: remove configure patch, simply seed the cache
grub-2.00-disable-help2man patches configure.ac to disable the help2man check
because we don't need the man pages. It also then patches configure itself so
that autogen.sh doesn't have to be called for performance reasons. However,
do_configure causes a full autoreconf so this optimisation is moot, and can
cause patch failures when an existing build tree is re-used.
Instead, simply use CACHED_CONFIGUREVARS to tell configure that it can't find
help2man.
Signed-off-by: Ross Burton
---
.../grub/files/grub-2.00-disable-help2man.patch| 148
meta/recipes-bsp/grub/grub-efi_2.00.bb |2 +-
2 files changed, 1 insertion(+), 149 deletions(-)
delete mode 100644 meta/recipes-bsp/grub/files/grub-2.00-disable-help2man.patch
diff --git a/meta/recipes-bsp/grub/files/grub-2.00-disable-help2man.patch
b/meta/recipes-bsp/grub/files/grub-2.00-disable-help2man.patch
deleted file mode 100644
index a2e42c2..000
--- a/meta/recipes-bsp/grub/files/grub-2.00-disable-help2man.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-Upstream-Status: Inappropriate (Bitbake build environment)
-
-We do not need the man pages when building just the EFI payload for the target,
-all the tools are built for the host. This does not trigger GRUB's built-in
-cross-compilation check, so force it. After the change to configure.ac,
-autogen.sh was run in devshell and the resulting configure was used to generate
-the configure diff. The configure diff was included to avoid having to add
-autogen.sh to a do_configure_prepend() routine which would slow down the build
-unnecessarily.
-
-Signed-off-by: Darren Hart
-
-Index: grub-2.00/configure.ac
-===
grub-2.00.orig/configure.ac
-+++ grub-2.00/configure.ac
-@@ -310,11 +310,12 @@ if test x$USE_NLS = xno; then
- HOST_CFLAGS="$HOST_CFLAGS -fno-builtin-gettext"
- fi
-
--if test "x$cross_compiling" = xyes; then
-- AC_MSG_WARN([cannot generate manual pages while cross compiling])
--else
-- AC_PATH_PROG(HELP2MAN, help2man)
--fi
-+# Force behaving as though we are cross-compiling with respect to HELP2MAN
-+#if test "x$cross_compiling" = xyes; then
-+AC_MSG_WARN([cannot generate manual pages while cross compiling])
-+#else
-+# AC_PATH_PROG(HELP2MAN, help2man)
-+#fi
-
- # Check for functions and headers.
- AC_CHECK_FUNCS(posix_memalign memalign asprintf vasprintf getextmntent)
-Index: grub-2.00/configure
-===
grub-2.00.orig/configure
-+++ grub-2.00/configure
-@@ -1215,7 +1215,6 @@ GL_COND_LIBTOOL_FALSE
- GL_COND_LIBTOOL_TRUE
- BUILD_CC
- LIBUTIL
--HELP2MAN
- POSUB
- LTLIBINTL
- LIBINTL
-@@ -3069,7 +3068,6 @@ _ACEOF
- # Let the site file select an alternate cache file if it wants to.
- # Prefer an explicitly selected file to automatically selected ones.
- ac_site_file1=NONE
--ac_site_file2=NONE
- if test -n "$CONFIG_SITE"; then
- # We do not want a PATH search for config.site.
- case $CONFIG_SITE in #((
-@@ -3077,14 +3075,8 @@ if test -n "$CONFIG_SITE"; then
- */*) ac_site_file1=$CONFIG_SITE;;
- *) ac_site_file1=./$CONFIG_SITE;;
- esac
--elif test "x$prefix" != xNONE; then
-- ac_site_file1=$prefix/share/config.site
-- ac_site_file2=$prefix/etc/config.site
--else
-- ac_site_file1=$ac_default_prefix/share/config.site
-- ac_site_file2=$ac_default_prefix/etc/config.site
- fi
--for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-+for ac_site_file in $ac_site_file1
- do
- test "x$ac_site_file" = xNONE && continue
- if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-@@ -3371,8 +3363,9 @@ case $target_os in *\ *) target_os=`echo
- # The aliases save the names the user supplied, while $host etc.
- # will get canonicalized.
- test -n "$target_alias" &&
-- test "$program_prefix$program_suffix$program_transform_name" = \
--NONENONEs,x,x, &&
-+ test "$target_alias" != "$host_alias" &&
-+test "$program_prefix$program_suffix$program_transform_name" = \
-+ NONENONEs,x,x, &&
- program_prefix=${target_alias}-
-
- am__api_version='1.11'
-@@ -9633,51 +9626,13 @@ if test x$USE_NLS = xno; then
- HOST_CFLAGS="$HOST_CFLAGS -fno-builtin-gettext"
- fi
-
--if test "x$cross_compiling" = xyes; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot generate manual
pages while cross compiling" >&5
-+# Force behaving as though we are cross-compiling with respect to HELP2MAN
-+#if test "x$cross_compiling" = xyes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot generate manual
pages while cross compiling" >&5
- $as_echo "$as_me: WARNING: cannot generate manual pages while cross
compiling" >&2;}
--else
-- # Extract the first word of "help2man", so it can be a program name with
args.
--set dummy help2man; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_path_HELP2MAN+:} false; then
Re: [OE-core] [PATCH 1/1] systemd-compat-units: do not mask available services
If dnsmasq doesn't need to be manually masked, then why not just
remove it from the list?
Ross
On 10 January 2014 07:15, Anders Darander wrote:
> Do also check systemd_unitdir/system/ for available unit files.
>
> This was hiding dnsmasq.service for us, as /etc/systemd/system has
> priority over systemd_unitdir/system...
>
> Signed-off-by: Anders Darander
> ---
> meta/recipes-core/systemd/systemd-compat-units.bb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb
> b/meta/recipes-core/systemd/systemd-compat-units.bb
> index 9f28283..e32ad79 100644
> --- a/meta/recipes-core/systemd/systemd-compat-units.bb
> +++ b/meta/recipes-core/systemd/systemd-compat-units.bb
> @@ -42,7 +42,7 @@ pkg_postinst_${PN} () {
> fi
>
> for i in ${SYSTEMD_DISABLED_SYSV_SERVICES} ; do
> - if [ \( -e $i -o $i.sh \) -a ! -e
> $D${sysconfdir}/systemd/system/$i.service ] ; then
> + if [ \( -e $i -o $i.sh \) -a ! \( -e
> $D${sysconfdir}/systemd/system/$i.service -o -e
> $D${systemd_unitdir}/system/$i.service \) ] ; then
> echo -n "$i: " ; systemctl ${OPTS} mask $i.service
> fi
> done ; echo
> --
> 1.8.5.2
>
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] systemd-compat-units: make run-postinsts.service work correctly on target
On 13 January 2014 07:38, Chen Qi wrote: > +ExecStart=-/etc/rcS.d/S98run-postinsts ; -/etc/rcS.d/S99run-postinsts Can we just make opkg and run-postinsts write that file using the same number? Also, that service file needs to move directly into run-postinsts. There's a start in poky-contrib:ross/postinsts if you want to finish it off. :) Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] attr: enable ptest support
On 01/09/2014 02:02 AM, Chong Lu wrote:
Install attr test suite and run it as ptest.
Signed-off-by: Chong Lu
---
meta/recipes-support/attr/attr.inc | 15 +++-
.../attr/files/attr-make-ptest-pass.patch | 82 ++
meta/recipes-support/attr/files/run-ptest | 5 ++
3 files changed, 101 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-support/attr/files/attr-make-ptest-pass.patch
create mode 100644 meta/recipes-support/attr/files/run-ptest
diff --git a/meta/recipes-support/attr/attr.inc
b/meta/recipes-support/attr/attr.inc
index 4961ba7..8cb08e4 100644
--- a/meta/recipes-support/attr/attr.inc
+++ b/meta/recipes-support/attr/attr.inc
@@ -11,7 +11,10 @@ LIC_FILES_CHKSUM =
"file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \
file://attr/attr.c;endline=17;md5=be0403261f0847e5f43ed5b08d19593c \
file://libattr/libattr.c;endline=17;md5=7970f77049f8fa1199fff62a7ab724fb"
-SRC_URI = "http://download.savannah.gnu.org/releases/attr/${BP}.src.tar.gz";
+SRC_URI = "http://download.savannah.gnu.org/releases/attr/${BP}.src.tar.gz \
+ file://attr-make-ptest-pass.patch \
+ file://run-ptest \
+"
require ea-acl.inc
@@ -20,3 +23,13 @@ do_install_append() {
sed -i ${D}${libdir}/libattr.la -e \
s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\',
}
+
+inherit ptest
+
+do_install_ptest() {
+ cp -r ${S}/test ${D}${PTEST_PATH}
+ mkdir ${D}${PTEST_PATH}/include
+ cp ${S}/include/builddefs ${S}/include/buildmacros
${S}/include/buildrules ${D}${PTEST_PATH}/include/
+}
+
+RDEPENDS_${PN}-ptest = "coreutils perl-module-filehandle perl-module-getopt-std
perl-module-posix"
diff --git a/meta/recipes-support/attr/files/attr-make-ptest-pass.patch
b/meta/recipes-support/attr/files/attr-make-ptest-pass.patch
new file mode 100644
index 000..e2da8b0
--- /dev/null
+++ b/meta/recipes-support/attr/files/attr-make-ptest-pass.patch
@@ -0,0 +1,82 @@
+attr: make ptest pass
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Delete the second '@' character of the same row in test/Makefile, else
+we would get the error as below:
+@echo: command not found
+In fs.test file, the result of `ls -s' is incorrect. Change it to make
+ext-tests pass.
+
Can you please verify that these tests are actually wrong, it seems
incorrect to be changing the test results to make the test pass.
Are we missing a setting (like the acl) or something else?
Sau!
+Signed-off-by: Chong Lu
+---
+ test/Makefile|4 ++--
+ test/ext/fs.test | 22 +++---
+ 2 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/test/Makefile b/test/Makefile
+index b7bd8db..d916bf4 100644
+--- a/test/Makefile
b/test/Makefile
+@@ -40,10 +40,10 @@ $(TEST):
+ @echo "*** $@ ***"; perl run $@
+
+ $(EXT):
+- @echo "EXT specific tests"; @echo "*** $@ ***"; perl run $@
++ @echo "EXT specific tests"; echo "*** $@ ***"; perl run $@
+
+ $(ROOT):
+- @echo "Note: Tests must run as root"; @echo "*** $@ ***"; perl run $@
++ @echo "Note: Tests must run as root"; echo "*** $@ ***"; perl run $@
+
+ .PHONY: $(TEST) $(EXT) $(ROOT)
+ .NOTPARALLEL:
+diff --git a/test/ext/fs.test b/test/ext/fs.test
+index cc28fec..381d54b 100644
+--- a/test/ext/fs.test
b/test/ext/fs.test
+@@ -19,15 +19,15 @@ Test extended attribute block sharing
+ $ touch f g h
+ $ setfattr -n user.novalue f g h
+ $ ls -s f g h
+- > 4 f
+- > 4 g
+- > 4 h
++ > 0 f
++ > 0 g
++ > 0 h
+
+ $ setfattr -n user.name -v value f
+ $ ls -s f g h
+- > 4 f
+- > 4 g
+- > 4 h
++ > 0 f
++ > 0 g
++ > 0 h
+
+ $ getfattr -d f g h
+ > # file: f
+@@ -43,14 +43,14 @@ Test extended attribute block sharing
+
+ $ setfattr -n user.name -v value g
+ $ ls -s f g h
+- > 4 f
+- > 4 g
+- > 4 h
++ > 0 f
++ > 0 g
++ > 0 h
+
+ $ setfattr -x user.novalue h
+ $ ls -s f g h
+- > 4 f
+- > 4 g
++ > 0 f
++ > 0 g
+ > 0 h
+
+ $ setfattr -n user.name -v other-value g
+--
+1.7.9.5
+
diff --git a/meta/recipes-support/attr/files/run-ptest
b/meta/recipes-support/attr/files/run-ptest
new file mode 100644
index 000..f0bd9fc
--- /dev/null
+++ b/meta/recipes-support/attr/files/run-ptest
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+make -C test -k tests root-tests ext-tests |sed \
+ -e 's|^\[.*\] \(.*\) -- ok$|PASS: \1|' \
+ -e 's|^\[.*\] \(.*\) -- failed|FAIL: \1|'
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][V2 3/5] waffle: add (from meta-oe)
Waffle is needed for Piglit. This recipe is taken directly frome meta-oe.
Signed-off-by: Ross Burton
---
meta/recipes-graphics/waffle/files/cflags.patch | 27 ++
meta/recipes-graphics/waffle/waffle_1.2.2.bb| 34 +++
2 files changed, 61 insertions(+)
create mode 100644 meta/recipes-graphics/waffle/files/cflags.patch
create mode 100644 meta/recipes-graphics/waffle/waffle_1.2.2.bb
diff --git a/meta/recipes-graphics/waffle/files/cflags.patch
b/meta/recipes-graphics/waffle/files/cflags.patch
new file mode 100644
index 000..3819756
--- /dev/null
+++ b/meta/recipes-graphics/waffle/files/cflags.patch
@@ -0,0 +1,27 @@
+Upstream-Status: Backport
+Signed-off-by: Ross Burton
+
+From 2abec1cb3c17fa5ec8d945d79acd74a39c38293a Mon Sep 17 00:00:00 2001
+From: Ross Burton
+Date: Wed, 12 Dec 2012 12:57:18 +
+Subject: cmake: respect existing CMAKE_C_FLAGS
+
+When cross-compiling it's not unusual to need specific arguments passed to gcc
+such as --sysroot. Ensure that these are passed on from the toolchain file by
+appending to CMAKE_C_FLAGS instead of overwriting it.
+
+Signed-off-by: Ross Burton
+
+Index: waffle-1.2.2/CMakeLists.txt
+===
+--- waffle-1.2.2.orig/CMakeLists.txt 2012-11-28 00:43:40.0 +
waffle-1.2.2/CMakeLists.txt2013-02-13 11:34:02.476188233 +
+@@ -212,7 +212,7 @@
+ #
--
+
+ # FIXME: Only enable c99 if compiler supports it.
+-set(CMAKE_C_FLAGS "--std=c99 -Wall -Werror=implicit-function-declaration")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --std=c99 -Wall
-Werror=implicit-function-declaration")
+ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+ # On MacOS, the SSE2 headers trigger this error.
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=missing-prototypes")
diff --git a/meta/recipes-graphics/waffle/waffle_1.2.2.bb
b/meta/recipes-graphics/waffle/waffle_1.2.2.bb
new file mode 100644
index 000..4f80191
--- /dev/null
+++ b/meta/recipes-graphics/waffle/waffle_1.2.2.bb
@@ -0,0 +1,34 @@
+SUMMARY = "cross-platform C library to defer selection of GL API and of window
system"
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \
+
file://include/waffle/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf"
+
+SRC_URI =
"http://people.freedesktop.org/~chadversary/waffle/files/release/${BPN}-${PV}/${BPN}-${PV}.tar.xz
\
+ file://cflags.patch"
+
+SRC_URI[md5sum] = "fdd07cea7709422fbf72418ee63a285d"
+SRC_URI[sha256sum] =
"7e342c859b58d4e051b347ef3d7740ed2f3b6c506b93daec272724afe7dd1311"
+
+inherit cmake
+
+# This should be overridden per-machine to reflect the capabilities of the GL
+# stack.
+PACKAGECONFIG ??= "glx"
+
+# I say virtual/libgl, actually wants gl.pc
+PACKAGECONFIG[glx] = "-Dwaffle_has_glx=1,,virtual/libgl libx11"
+
+# I say virtual/libgl, actually wants wayland-egl.pc, egl.pc, and the wayland
+# DISTRO_FEATURE.
+PACKAGECONFIG[wayland] = "-Dwaffle_has_wayland=1,,virtual/libgl wayland"
+
+# I say virtual/libgl, actually wants gbm.pc egl.pc
+PACKAGECONFIG[gbm] = "-Dwaffle_has_wayland=1,,virtual/libgl udev"
+
+# I say virtual/libgl, actually wants egl.pc
+PACKAGECONFIG[x11-egl] = "-Dwaffle_has_x11_egl=1,,virtual/libgl libxcb"
+
+# Take the flags added by PACKAGECONFIG and pass them to cmake.
+EXTRA_OECMAKE = "${EXTRA_OECONF}"
+
+FILES_${PN}-dev += "${datadir}/cmake/Modules/FindWaffle.cmake"
--
1.7.10.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][V2 5/5] packagegroup-core-tools-testapps: add Piglit
Respect the OpenGL distro feature and if it's enabled, pull in piglit and
mesa-tools.
Signed-off-by: Ross Burton
---
.../packagegroups/packagegroup-core-tools-testapps.bb |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git
a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
index 1861ebe..4b8f99b 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
@@ -24,10 +24,14 @@ KEXECTOOLS_powerpc ?= ""
KEXECTOOLS_e5500-64b ?= ""
KEXECTOOLS_aarch64 ?= ""
+GLTOOLS = "\
+mesa-demos \
+piglit \
+"
+
X11TOOLS = "\
fstests \
owl-video \
-mesa-demos \
x11perf \
xrestop \
xwininfo \
@@ -48,4 +52,5 @@ RDEPENDS_${PN} = "\
ltp \
connman-client \
${@base_contains('DISTRO_FEATURES', 'x11', "${X11TOOLS}", "", d)} \
+${@base_contains('DISTRO_FEATURES', 'opengl', "${GLTOOLS}", "", d)} \
"
--
1.7.10.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][V2 4/5] piglit: add (from meta-oe)
Piglit is an OpenGL testing tool. This recipe is taken directly from meta-oe.
Signed-off-by: Ross Burton
---
meta/recipes-graphics/piglit/piglit_git.bb | 48
1 file changed, 48 insertions(+)
create mode 100644 meta/recipes-graphics/piglit/piglit_git.bb
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb
b/meta/recipes-graphics/piglit/piglit_git.bb
new file mode 100644
index 000..8616764
--- /dev/null
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -0,0 +1,48 @@
+SUMMARY = "OpenGL driver testing framework"
+LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
+
+SRC_URI = "git://anongit.freedesktop.org/piglit"
+
+# From 2012/12/30.
+SRCREV = "bbeff5d21b06d37338ad28e42d88f499bef13268"
+# (when PV goes above 1.0 remove the trailing r)
+PV = "1.0+gitr${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "virtual/libx11 waffle virtual/libgl libglu python-mako-native
python-numpy-native"
+
+inherit cmake pythonnative
+
+# As piglit doesn't install, enforce in-tree builds so that we can easily copy
+# contents out of $S and $B.
+B="${S}"
+
+# CMake sets the rpath at build time with the source tree, and will reset it at
+# install time. As we don't install this doesn't happen, so force the rpath to
+# what we need.
+EXTRA_OECMAKE = "-DCMAKE_BUILD_WITH_INSTALL_RPATH=1
-DCMAKE_INSTALL_RPATH=${libdir}/piglit/lib"
+
+do_install() {
+ install -d ${D}${bindir}
+ install -m 0755 piglit-*.py ${D}${bindir}
+
+ install -d ${D}${libdir}/piglit/
+
+ install -d ${D}${libdir}/piglit/bin
+ install -m 755 ${S}/bin/* ${D}${libdir}/piglit/bin
+
+ cp -a lib/ ${D}${libdir}/piglit/
+ cp -a framework/ ${D}${libdir}/piglit/
+ cp -a generated_tests/ ${D}${libdir}/piglit/
+ cp -a tests/ ${D}${libdir}/piglit/
+ cp -a templates/ ${D}${libdir}/piglit/
+
+ sed -i -e 's|sys.path.append(.*)|sys.path.append("${libdir}/piglit")|'
${D}${bindir}/piglit-*.py
+ sed -i -e 's|^templatedir = .*$|templatedir =
"${libdir}/piglit/templates"|' ${D}${bindir}/piglit-summary-html.py
+}
+
+FILES_${PN}-dbg += "${libdir}/piglit/*/.debug/"
+
+RDEPENDS_${PN} = "python waffle python-json python-subprocess
python-multiprocessing python-textutils python-netserver python-shell
mesa-demos"
--
1.7.10.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][V2 1/5] python-numpy: add (from meta-oe)
python-numpy is needed for Piglit. This recipe is taken directly from meta-oe.
Signed-off-by: Ross Burton
---
.../python/python-numpy/aarch64/_numpyconfig.h | 30 +
.../python/python-numpy/aarch64/config.h | 139
.../python/python-numpy/arm/config.h | 21 +++
.../python/python-numpy/arm/numpyconfig.h | 17 +++
.../python/python-numpy/armeb/config.h | 21 +++
.../python/python-numpy/armeb/numpyconfig.h| 17 +++
.../python/python-numpy/i586/config.h | 108 +++
.../python/python-numpy/i586/numpyconfig.h | 24
.../python/python-numpy/mipsel/config.h| 21 +++
.../python/python-numpy/mipsel/numpyconfig.h | 17 +++
.../python/python-numpy/trycompile.diff| 33 +
.../python/python-numpy/unbreak-assumptions.diff | 16 +++
.../python/python-numpy/x86-64/_numpyconfig.h | 30 +
.../python/python-numpy/x86-64/config.h| 139
meta/recipes-devtools/python/python-numpy_1.7.0.bb | 78 +++
15 files changed, 711 insertions(+)
create mode 100644
meta/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h
create mode 100644 meta/recipes-devtools/python/python-numpy/aarch64/config.h
create mode 100644 meta/recipes-devtools/python/python-numpy/arm/config.h
create mode 100644 meta/recipes-devtools/python/python-numpy/arm/numpyconfig.h
create mode 100644 meta/recipes-devtools/python/python-numpy/armeb/config.h
create mode 100644
meta/recipes-devtools/python/python-numpy/armeb/numpyconfig.h
create mode 100644 meta/recipes-devtools/python/python-numpy/i586/config.h
create mode 100644 meta/recipes-devtools/python/python-numpy/i586/numpyconfig.h
create mode 100644 meta/recipes-devtools/python/python-numpy/mipsel/config.h
create mode 100644
meta/recipes-devtools/python/python-numpy/mipsel/numpyconfig.h
create mode 100644 meta/recipes-devtools/python/python-numpy/trycompile.diff
create mode 100644
meta/recipes-devtools/python/python-numpy/unbreak-assumptions.diff
create mode 100644
meta/recipes-devtools/python/python-numpy/x86-64/_numpyconfig.h
create mode 100644 meta/recipes-devtools/python/python-numpy/x86-64/config.h
create mode 100644 meta/recipes-devtools/python/python-numpy_1.7.0.bb
diff --git a/meta/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h
b/meta/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h
new file mode 100644
index 000..be57ac2
--- /dev/null
+++ b/meta/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h
@@ -0,0 +1,30 @@
+#define NPY_HAVE_ENDIAN_H 1
+#define NPY_SIZEOF_SHORT SIZEOF_SHORT
+#define NPY_SIZEOF_INT SIZEOF_INT
+#define NPY_SIZEOF_LONG SIZEOF_LONG
+#define NPY_SIZEOF_FLOAT 4
+#define NPY_SIZEOF_COMPLEX_FLOAT 8
+#define NPY_SIZEOF_DOUBLE 8
+#define NPY_SIZEOF_COMPLEX_DOUBLE 16
+#define NPY_SIZEOF_LONGDOUBLE 16
+#define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32
+#define NPY_SIZEOF_PY_INTPTR_T 8
+#define NPY_SIZEOF_PY_LONG_LONG 8
+#define NPY_SIZEOF_LONGLONG 8
+#define NPY_NO_SMP 0
+#define NPY_HAVE_DECL_ISNAN
+#define NPY_HAVE_DECL_ISINF
+#define NPY_HAVE_DECL_ISFINITE
+#define NPY_HAVE_DECL_SIGNBIT
+#define NPY_USE_C99_COMPLEX 1
+#define NPY_HAVE_COMPLEX_DOUBLE 1
+#define NPY_HAVE_COMPLEX_FLOAT 1
+#define NPY_HAVE_COMPLEX_LONG_DOUBLE 1
+#define NPY_USE_C99_FORMATS 1
+#define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden")))
+#define NPY_ABI_VERSION 0x0109
+#define NPY_API_VERSION 0x0007
+
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS 1
+#endif
diff --git a/meta/recipes-devtools/python/python-numpy/aarch64/config.h
b/meta/recipes-devtools/python/python-numpy/aarch64/config.h
new file mode 100644
index 000..c30b868
--- /dev/null
+++ b/meta/recipes-devtools/python/python-numpy/aarch64/config.h
@@ -0,0 +1,139 @@
+#define HAVE_ENDIAN_H 1
+#define SIZEOF_PY_INTPTR_T 8
+#define SIZEOF_PY_LONG_LONG 8
+#define MATHLIB m
+#define HAVE_SIN 1
+#define HAVE_COS 1
+#define HAVE_TAN 1
+#define HAVE_SINH 1
+#define HAVE_COSH 1
+#define HAVE_TANH 1
+#define HAVE_FABS 1
+#define HAVE_FLOOR 1
+#define HAVE_CEIL 1
+#define HAVE_SQRT 1
+#define HAVE_LOG10 1
+#define HAVE_LOG 1
+#define HAVE_EXP 1
+#define HAVE_ASIN 1
+#define HAVE_ACOS 1
+#define HAVE_ATAN 1
+#define HAVE_FMOD 1
+#define HAVE_MODF 1
+#define HAVE_FREXP 1
+#define HAVE_LDEXP 1
+#define HAVE_RINT 1
+#define HAVE_TRUNC 1
+#define HAVE_EXP2 1
+#define HAVE_LOG2 1
+#define HAVE_ATAN2 1
+#define HAVE_POW 1
+#define HAVE_NEXTAFTER 1
+#define HAVE_SINF 1
+#define HAVE_COSF 1
+#define HAVE_TANF 1
+#define HAVE_SINHF 1
+#define HAVE_COSHF 1
+#define HAVE_TANHF 1
+#define HAVE_FABSF 1
+#define HAVE_FLOORF 1
+#define HAVE_CEILF 1
+#define HAVE_RINTF 1
+#define HAVE_TRUNCF 1
+#define HAVE_SQRTF 1
+#define HAVE_LOG10F 1
+#define HAVE_LOGF 1
+#define HAVE_LOG1PF 1
+#define HAVE_EXPF 1
+#define HAVE_EXPM1F 1
+#define HAVE_ASINF 1
+#define HAVE_ACOSF 1
+#defin
[OE-core] [PATCH][V2 2/5] python-mako: add (from meta-oe)
python-mako is needed for Piglit. This recipe is taken from meta-oe, and
upgraded to the latest upstream version.
Checksums updated as the upstream LICENSE file contains the copyright dates.
Signed-off-by: Ross Burton
---
meta/recipes-devtools/python/python-mako_0.9.1.bb | 20
1 file changed, 20 insertions(+)
create mode 100644 meta/recipes-devtools/python/python-mako_0.9.1.bb
diff --git a/meta/recipes-devtools/python/python-mako_0.9.1.bb
b/meta/recipes-devtools/python/python-mako_0.9.1.bb
new file mode 100644
index 000..84071c8
--- /dev/null
+++ b/meta/recipes-devtools/python/python-mako_0.9.1.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Templating library for Python"
+SECTION = "devel/python"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=da2a9d126b93cab0996a8287dacc480b"
+
+SRC_URI = "https://pypi.python.org/packages/source/M/Mako/Mako-${PV}.tar.gz";
+SRC_URI[md5sum] = "fe3f394ef714776d09ec6133923736a7"
+SRC_URI[sha256sum] =
"ed74d72b720a97a51590dfa839f2048ceeb76cc80d1d9ea5731a5262384316ae"
+
+S = "${WORKDIR}/Mako-${PV}"
+
+inherit setuptools
+
+RDEPENDS_${PN} = "python-threading \
+ python-netclient \
+ python-html \
+"
+RDEPENDS_${PN}_class-native = ""
+
+BBCLASSEXTEND = "native nativesdk"
--
1.7.10.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH][V2 2/5] python-mako: add (from meta-oe)
On 10 January 2014 23:16, Saul Wold wrote: > Seems like they might have moved or lost these files since you tested, the > upstream is at 0.9.1 and has moved these files to > https://pypi.python.org/packages/source/M/Mako/Mako-0.7.2.tar.gz Yep, V2 incoming. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/4] Recipe upgrades
The following changes since commit a5e6926cd409140d16391c72316da00ffbfe5429:
terminal.bbclass: do not export PS1 (2014-01-10 15:15:47 +)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/upgrades
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/upgrades
Paul Eggleton (4):
dropbear: upgrade to 2013.62
chrpath: upgrade to 0.15
cdrtools-native: upgrade to 3.01a20
libsdl2: upgrade to 2.0.1
meta/recipes-core/dropbear/dropbear.inc | 4 ++--
.../0001-urandom-xauth-changes-to-options.h.patch | 0
.../{dropbear-2013.60 => dropbear}/0002-static_build_fix.patch | 0
.../dropbear/{dropbear-2013.60 => dropbear}/0003-configure.patch| 0
.../dropbear/{dropbear-2013.60 => dropbear}/0004-fix-2kb-keys.patch | 0
.../{dropbear-2013.60 => dropbear}/0005-dropbear-enable-pam.patch | 0
.../0006-dropbear-configuration-file.patch | 0
.../0007-dropbear-fix-for-x32-abi.patch | 0
meta/recipes-core/dropbear/dropbear_2013.60.bb | 4
meta/recipes-core/dropbear/dropbear_2013.62.bb | 4
.../{cdrtools-native_3.01a17.bb => cdrtools-native_3.01a20.bb} | 4 ++--
meta/recipes-devtools/chrpath/{chrpath_0.14.bb => chrpath_0.15.bb} | 6 +++---
.../recipes-graphics/libsdl2/{libsdl2_2.0.0.bb => libsdl2_2.0.1.bb} | 4 ++--
13 files changed, 13 insertions(+), 13 deletions(-)
rename meta/recipes-core/dropbear/{dropbear-2013.60 =>
dropbear}/0001-urandom-xauth-changes-to-options.h.patch (100%)
rename meta/recipes-core/dropbear/{dropbear-2013.60 =>
dropbear}/0002-static_build_fix.patch (100%)
rename meta/recipes-core/dropbear/{dropbear-2013.60 =>
dropbear}/0003-configure.patch (100%)
rename meta/recipes-core/dropbear/{dropbear-2013.60 =>
dropbear}/0004-fix-2kb-keys.patch (100%)
rename meta/recipes-core/dropbear/{dropbear-2013.60 =>
dropbear}/0005-dropbear-enable-pam.patch (100%)
rename meta/recipes-core/dropbear/{dropbear-2013.60 =>
dropbear}/0006-dropbear-configuration-file.patch (100%)
rename meta/recipes-core/dropbear/{dropbear-2013.60 =>
dropbear}/0007-dropbear-fix-for-x32-abi.patch (100%)
delete mode 100644 meta/recipes-core/dropbear/dropbear_2013.60.bb
create mode 100644 meta/recipes-core/dropbear/dropbear_2013.62.bb
rename meta/recipes-devtools/cdrtools/{cdrtools-native_3.01a17.bb =>
cdrtools-native_3.01a20.bb} (81%)
rename meta/recipes-devtools/chrpath/{chrpath_0.14.bb => chrpath_0.15.bb} (80%)
rename meta/recipes-graphics/libsdl2/{libsdl2_2.0.0.bb => libsdl2_2.0.1.bb}
(94%)
--
1.8.1.2
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] libsdl2: upgrade to 2.0.1
Signed-off-by: Paul Eggleton
---
meta/recipes-graphics/libsdl2/{libsdl2_2.0.0.bb => libsdl2_2.0.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/libsdl2/{libsdl2_2.0.0.bb => libsdl2_2.0.1.bb}
(94%)
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.0.bb
b/meta/recipes-graphics/libsdl2/libsdl2_2.0.1.bb
similarity index 94%
rename from meta/recipes-graphics/libsdl2/libsdl2_2.0.0.bb
rename to meta/recipes-graphics/libsdl2/libsdl2_2.0.1.bb
index f393e33..7958f7b 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.0.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.1.bb
@@ -23,8 +23,8 @@ SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
S = "${WORKDIR}/SDL2-${PV}"
-SRC_URI[md5sum] = "beec89afb6edcc6f0abc4114f2e6bcf7"
-SRC_URI[sha256sum] =
"6f6ac8153d90e06a118474d5400624ae82b3d3e080915505db27cebc52b27178"
+SRC_URI[md5sum] = "0eb97039488bf463e775295f7b18b227"
+SRC_URI[sha256sum] =
"0ae7e902a26777614a011fe7053ca7e8b14843db3c42ca117564d208cf6732f0"
inherit autotools lib_package binconfig pkgconfig
--
1.8.1.2
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] chrpath: upgrade to 0.15
Signed-off-by: Paul Eggleton
---
meta/recipes-devtools/chrpath/{chrpath_0.14.bb => chrpath_0.15.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/chrpath/{chrpath_0.14.bb => chrpath_0.15.bb} (80%)
diff --git a/meta/recipes-devtools/chrpath/chrpath_0.14.bb
b/meta/recipes-devtools/chrpath/chrpath_0.15.bb
similarity index 80%
rename from meta/recipes-devtools/chrpath/chrpath_0.14.bb
rename to meta/recipes-devtools/chrpath/chrpath_0.15.bb
index 27b75b4..461710e 100644
--- a/meta/recipes-devtools/chrpath/chrpath_0.14.bb
+++ b/meta/recipes-devtools/chrpath/chrpath_0.15.bb
@@ -7,11 +7,11 @@ BUGTRACKER =
"http://alioth.debian.org/tracker/?atid=412807&group_id=31052";
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-SRC_URI =
"http://alioth.debian.org/frs/download.php/file/3648/chrpath-${PV}.tar.gz \
+SRC_URI =
"http://alioth.debian.org/frs/download.php/file/3968/chrpath-${PV}.tar.gz \
file://standarddoc.patch"
-SRC_URI[md5sum] = "ea6b212b23393bf58b0ef9bcf6491b86"
-SRC_URI[sha256sum] =
"a1bc9abc42d2b97efc3a0ced7c5dbed37d5debff600386193750315fa5823eaa"
+SRC_URI[md5sum] = "2d2dc80e25e17425d8af849baae60654"
+SRC_URI[sha256sum] =
"f1125f5dd0f7c7eaa4d0b64bf17c5b9cb4ee828722246970e201a18a77e18879"
inherit autotools
--
1.8.1.2
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] dropbear: upgrade to 2013.62
LIC_FILES_CHKSUM has changed with the introduction of a BSD-3-Clause
algorithm (curve25519-donna); this has prompted a re-evaluation of the
LICENSE value which should now reflect the licenses declared in the
upstream documentation. Thanks to Beth Flanagan for helping with this.
Signed-off-by: Paul Eggleton
---
meta/recipes-core/dropbear/dropbear.inc | 4 ++--
.../0001-urandom-xauth-changes-to-options.h.patch | 0
.../{dropbear-2013.60 => dropbear}/0002-static_build_fix.patch| 0
.../dropbear/{dropbear-2013.60 => dropbear}/0003-configure.patch | 0
.../dropbear/{dropbear-2013.60 => dropbear}/0004-fix-2kb-keys.patch | 0
.../{dropbear-2013.60 => dropbear}/0005-dropbear-enable-pam.patch | 0
.../0006-dropbear-configuration-file.patch| 0
.../0007-dropbear-fix-for-x32-abi.patch | 0
meta/recipes-core/dropbear/dropbear_2013.60.bb| 4
meta/recipes-core/dropbear/dropbear_2013.62.bb| 4
10 files changed, 6 insertions(+), 6 deletions(-)
rename meta/recipes-core/dropbear/{dropbear-2013.60 =>
dropbear}/0001-urandom-xauth-changes-to-options.h.patch (100%)
rename meta/recipes-core/dropbear/{dropbear-2013.60 =>
dropbear}/0002-static_build_fix.patch (100%)
rename meta/recipes-core/dropbear/{dropbear-2013.60 =>
dropbear}/0003-configure.patch (100%)
rename meta/recipes-core/dropbear/{dropbear-2013.60 =>
dropbear}/0004-fix-2kb-keys.patch (100%)
rename meta/recipes-core/dropbear/{dropbear-2013.60 =>
dropbear}/0005-dropbear-enable-pam.patch (100%)
rename meta/recipes-core/dropbear/{dropbear-2013.60 =>
dropbear}/0006-dropbear-configuration-file.patch (100%)
rename meta/recipes-core/dropbear/{dropbear-2013.60 =>
dropbear}/0007-dropbear-fix-for-x32-abi.patch (100%)
delete mode 100644 meta/recipes-core/dropbear/dropbear_2013.60.bb
create mode 100644 meta/recipes-core/dropbear/dropbear_2013.62.bb
diff --git a/meta/recipes-core/dropbear/dropbear.inc
b/meta/recipes-core/dropbear/dropbear.inc
index 4262b1d..e85a9e6 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -4,8 +4,8 @@ SECTION = "console/network"
# some files are from other projects and have others license terms:
# public domain, OpenSSH 3.5p1, OpenSSH3.6.1p2, PuTTY
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=de74413ba7e05b7a37c4722e75f436cd"
+LICENSE = "MIT & BSD-3-Clause & BSD-2-Clause & PD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4d290ce0ac102c828dfc9ce836784688"
DEPENDS = "zlib"
RPROVIDES_${PN} = "ssh sshd"
diff --git
a/meta/recipes-core/dropbear/dropbear-2013.60/0001-urandom-xauth-changes-to-options.h.patch
b/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch
similarity index 100%
rename from
meta/recipes-core/dropbear/dropbear-2013.60/0001-urandom-xauth-changes-to-options.h.patch
rename to
meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch
diff --git
a/meta/recipes-core/dropbear/dropbear-2013.60/0002-static_build_fix.patch
b/meta/recipes-core/dropbear/dropbear/0002-static_build_fix.patch
similarity index 100%
rename from
meta/recipes-core/dropbear/dropbear-2013.60/0002-static_build_fix.patch
rename to meta/recipes-core/dropbear/dropbear/0002-static_build_fix.patch
diff --git a/meta/recipes-core/dropbear/dropbear-2013.60/0003-configure.patch
b/meta/recipes-core/dropbear/dropbear/0003-configure.patch
similarity index 100%
rename from meta/recipes-core/dropbear/dropbear-2013.60/0003-configure.patch
rename to meta/recipes-core/dropbear/dropbear/0003-configure.patch
diff --git
a/meta/recipes-core/dropbear/dropbear-2013.60/0004-fix-2kb-keys.patch
b/meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch
similarity index 100%
rename from meta/recipes-core/dropbear/dropbear-2013.60/0004-fix-2kb-keys.patch
rename to meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch
diff --git
a/meta/recipes-core/dropbear/dropbear-2013.60/0005-dropbear-enable-pam.patch
b/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch
similarity index 100%
rename from
meta/recipes-core/dropbear/dropbear-2013.60/0005-dropbear-enable-pam.patch
rename to meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch
diff --git
a/meta/recipes-core/dropbear/dropbear-2013.60/0006-dropbear-configuration-file.patch
b/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch
similarity index 100%
rename from
meta/recipes-core/dropbear/dropbear-2013.60/0006-dropbear-configuration-file.patch
rename to
meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch
diff --git
a/meta/recipes-core/dropbear/dropbear-2013.60/0007-dropbear-fix-for-x32-abi.patch
b/meta/recipes-core/dropbear/dropbear/0007-dropbear-fix-for-x32-abi.patch
similarity index 100%
rename from
meta/recipes-core/dropbear/dropbear-2013.
[OE-core] [PATCH 3/4] cdrtools-native: upgrade to 3.01a20
Signed-off-by: Paul Eggleton
---
.../{cdrtools-native_3.01a17.bb => cdrtools-native_3.01a20.bb}| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/cdrtools/{cdrtools-native_3.01a17.bb =>
cdrtools-native_3.01a20.bb} (81%)
diff --git a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01a17.bb
b/meta/recipes-devtools/cdrtools/cdrtools-native_3.01a20.bb
similarity index 81%
rename from meta/recipes-devtools/cdrtools/cdrtools-native_3.01a17.bb
rename to meta/recipes-devtools/cdrtools/cdrtools-native_3.01a20.bb
index 71b86aa..01f9e6e 100644
--- a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01a17.bb
+++ b/meta/recipes-devtools/cdrtools/cdrtools-native_3.01a20.bb
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=32f68170be424c2cd64804337726b312"
SRC_URI = "ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-${PV}.tar.bz2";
-SRC_URI[md5sum] = "4cef9db0cf15a770c52d65b00bbee2db"
-SRC_URI[sha256sum] =
"3d613965b213ad83e4be0ba2535e784901839ea4d11a20a2beb6765f0eb76dfa"
+SRC_URI[md5sum] = "f8c6f0fdcba7df0606095498d10315a7"
+SRC_URI[sha256sum] =
"e399ea964b8048793721b71461271e46d81f242bd2feefb8dbd259c30e75a5a9"
S = "${WORKDIR}/cdrtools-3.01"
--
1.8.1.2
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] GCC bugfix backport into Dora
Hello Robert, On Mon, Jan 13, 2014 at 12:12 AM, Robert Yang wrote: > > I think that we need fix it in dora since gcc 4.8.1 is affected. > Do you have a patch for this already? -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] libsdl: Add support for libsdl-native
On Friday 03 January 2014 16:58:10 Andrei Gherzan wrote:
> On Tue, Dec 17, 2013 at 7:01 PM, Andrei Gherzan wrote:
> > On Tue, Dec 17, 2013 at 6:53 PM, Paul Eggleton <
> >
> > paul.eggle...@linux.intel.com> wrote:
> >> On Tuesday 17 December 2013 18:51:08 Andrei Gherzan wrote:
> >> > On Tue, Dec 17, 2013 at 6:47 PM, Paul Eggleton <
> >> >
> >> > paul.eggle...@linux.intel.com> wrote:
> >> > > On Tuesday 17 December 2013 18:33:51 Andrei Gherzan wrote:
> >> > > > From: Alexandru Niculita
> >> > > >
> >> > > > Change-Id: I4fb1e623c7bbb1f35ae3001c839cd7e16ce1bd65
> >> > > > Signed-off-by: Alexandru Niculita
> >> > > > ---
> >> > > >
> >> > > > meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 3 ++-
> >> > > > 1 file changed, 2 insertions(+), 1 deletion(-)
> >> > > >
> >> > > > diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
> >> > > > b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb index
> >>
> >> 4b4ff63..84d3ad6
> >>
> >> > > > 100644
> >> > > > --- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
> >> > > > +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
> >> > > > @@ -17,6 +17,7 @@ DEPENDS = "${@base_contains('DISTRO_FEATURES',
> >> > >
> >> > > 'directfb',
> >> > >
> >> > > > 'directfb', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'x11',
> >> > > > 'virtual/libx11 libxext libxrandr libxrender', '', d)} \ tslib"
> >> > > >
> >> > > > DEPENDS_class-nativesdk = "${@base_contains('DISTRO_FEATURES',
> >>
> >> 'x11',
> >>
> >> > > > 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender
> >> > > > nativesdk-libxext', '', d)}" +DEPENDS_class-native =
> >> > > > "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11-native
> >> > >
> >> > > libxrandr-native
> >> > >
> >> > > > libxrender-native libxext-native', '', d)}"
> >> > > >
> >> > > > PR = "r2"
> >> > > >
> >> > > > @@ -63,4 +64,4 @@ do_configure_prepend() {
> >> > > >
> >> > > > export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
> >> > > >
> >> > > > }
> >> > > >
> >> > > > -BBCLASSEXTEND = "nativesdk"
> >> > > > +BBCLASSEXTEND = "nativesdk native"
> >> > >
> >> > > Why do you want to do this? Usually, it's better to rely on the host
> >> > > distro providing SDL for native because building libsdl-native can
> >>
> >> lead to
> >>
> >> > > problems linking against a specific host OpenGL implementation.
> >> >
> >> > xbmc needs sdl-native - this is why I made this change.
> >>
> >> Why does it need it though?
> >
> > Actually xbmc has a tool called texturepacker which uses libsdl-image -
> > which needs libsdl. That's the chain.
>
> Any advice on this? Paul, do you see another option on this?
To be honest I'm just not sure what the correct solution is here. The problem
is if we just enable libsdl-native and take no other mitigating steps, it will
almost certainly lead to problems building qemu-native because we'll be
linking against our version of SDL and not the host's one.
What does texturepacker actually do, i.e. what are its inputs and outputs? Is
there a way of avoiding the need to build/use it?
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] grub git: update to latest git
Drop the 2 patches since the functionality is upstream now.
Also sync PACKAGECONFIG with grub 2.00 recipe.
The debugedit problem for 64 bit machines in do_package is still present,
though:
ERROR: debugedit failed with exit code 256 (cmd was
'/build/linaro/build/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/rpm/bin/debugedit'
-b '/build/linaro/build/build/tmp-eglibc/work/aarch64-oe-linux' -d
'/usr/src/debug' -i -l
'/build/linaro/build/build/tmp-eglibc/work/aarch64-oe-linux/grub/2.00+AUTOINC+0776112c53-r0/debugsources.list'
'/build/linaro/build/build/tmp-eglibc/work/aarch64-oe-linux/grub/2.00+AUTOINC+0776112c53-r0/package/usr/lib/grub/arm64-efi/cpio_be.module'):
/build/linaro/build/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/rpm/bin/debugedit:
/build/linaro/build/build/tmp-eglibc/work/aarch64-oe-linux/grub/2.00+AUTOINC+0776112c53-r0/package/usr/lib/grub/arm64-efi/cpio_be.module:
Unhandled relocation 258 in .debug_info section
ERROR: Function failed: split_and_strip_files
ERROR: Logfile of failure stored in:
/build/linaro/build/build/tmp-eglibc/work/aarch64-oe-linux/grub/2.00+AUTOINC+0776112c53-r0/temp/log.do_package.29234
ERROR: Task 10
(/build/linaro/build/openembedded-core/meta/recipes-bsp/grub/grub_git.bb,
do_package) failed with exit code '1'
Signed-off-by: Koen Kooi
---
...t-add-grub_fdt_create_empty_tree-function.patch | 73 ---
.../grub/0002-arm64-add-EFI-Linux-loader.patch | 653 -
meta/recipes-bsp/grub/grub_git.bb | 5 +-
3 files changed, 2 insertions(+), 729 deletions(-)
delete mode 100644
meta/recipes-bsp/grub/grub/0001-fdt-add-grub_fdt_create_empty_tree-function.patch
delete mode 100644
meta/recipes-bsp/grub/grub/0002-arm64-add-EFI-Linux-loader.patch
diff --git
a/meta/recipes-bsp/grub/grub/0001-fdt-add-grub_fdt_create_empty_tree-function.patch
b/meta/recipes-bsp/grub/grub/0001-fdt-add-grub_fdt_create_empty_tree-function.patch
deleted file mode 100644
index 3414574..000
---
a/meta/recipes-bsp/grub/grub/0001-fdt-add-grub_fdt_create_empty_tree-function.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From b3417ec69ff7d52379a8f2cb291dbecccdab684f Mon Sep 17 00:00:00 2001
-From: Leif Lindholm
-Date: Wed, 4 Dec 2013 13:09:21 +
-Subject: [PATCH 1/2] fdt: add grub_fdt_create_empty_tree() function
-
-Signed-off-by: Leif Lindholm
- grub-core/lib/fdt.c | 39 +++
- include/grub/fdt.h | 1 +
- 2 files changed, 40 insertions(+)
-
-diff --git a/grub-core/lib/fdt.c b/grub-core/lib/fdt.c
-index 9f34dc7..581a118 100644
a/grub-core/lib/fdt.c
-+++ b/grub-core/lib/fdt.c
-@@ -423,3 +423,42 @@ int grub_fdt_set_prop (void *fdt, unsigned int
nodeoffset, const char *name,
- grub_memcpy (prop + 3, val, len);
- return 0;
- }
-+
-+struct empty_tree {
-+ grub_fdt_header_t header;
-+ grub_uint64_t empty_rsvmap[2];
-+ struct {
-+grub_uint32_t prop_start;
-+grub_uint8_t name[1];
-+grub_uint32_t prop_end;
-+grub_uint32_t node_end;
-+ } empty_node;
-+};
-+
-+int
-+grub_fdt_create_empty_tree (void *fdt, unsigned int size)
-+{
-+ struct empty_tree *et;
-+
-+ if (size < sizeof (struct empty_tree))
-+return -1;
-+
-+ grub_memset (fdt, 0, size);
-+ et = fdt;
-+
-+ et->empty_node.node_end = grub_cpu_to_be32 (FDT_END);
-+ et->empty_node.prop_end = grub_cpu_to_be32 (FDT_END_NODE);
-+ et->empty_node.prop_start = grub_cpu_to_be32 (FDT_BEGIN_NODE);
-+ ((struct empty_tree *) fdt)->header.off_mem_rsvmap =
-+grub_cpu_to_be32 (ALIGN_UP (sizeof (grub_fdt_header_t), 8));
-+
-+ grub_fdt_set_off_dt_strings (fdt, sizeof (struct empty_tree));
-+ grub_fdt_set_off_dt_struct (fdt, sizeof (grub_fdt_header_t) + 16);
-+ grub_fdt_set_version (fdt, FDT_SUPPORTED_VERSION);
-+ grub_fdt_set_last_comp_version (fdt, FDT_SUPPORTED_VERSION);
-+ grub_fdt_set_size_dt_struct (fdt, sizeof (et->empty_node));
-+ grub_fdt_set_totalsize (fdt, size);
-+ grub_fdt_set_magic (fdt, FDT_MAGIC);
-+
-+ return 0;
-+}
-diff --git a/include/grub/fdt.h b/include/grub/fdt.h
-index 2ad0536..06eec19 100644
a/include/grub/fdt.h
-+++ b/include/grub/fdt.h
-@@ -82,6 +82,7 @@ typedef struct {
- #define grub_fdt_set_size_dt_struct(fdt, value) \
- grub_fdt_set_header(fdt, size_dt_struct, value)
-
-+int grub_fdt_create_empty_tree (void *fdt, unsigned int size);
- int grub_fdt_check_header (void *fdt, unsigned int size);
- int grub_fdt_find_subnode (const void *fdt, unsigned int parentoffset,
- const char *name);
---
-1.8.4.2
-
diff --git a/meta/recipes-bsp/grub/grub/0002-arm64-add-EFI-Linux-loader.patch
b/meta/recipes-bsp/grub/grub/0002-arm64-add-EFI-Linux-loader.patch
deleted file mode 100644
index 4e9df62..000
--- a/meta/recipes-bsp/grub/grub/0002-arm64-add-EFI-Linux-loader.patch
+++ /dev/null
@@ -1,653 +0,0 @@
-From 55cbddc471b6caf27355ce93d1534d894e6ed0bb Mon Sep 17 00:00:00 2001
-From: Leif Lindholm
-Date: Wed, 4 Dec 2013 15:21:16 +
-Subject: [PATCH 2/2] arm64: add EFI Lin
Re: [OE-core] [oe-commits] Upgrade Helper : base-passwd: upgrade to 3.5.29
The new version introduced by this patch doesn't seem to actually exist at the SRC_URI. (ftp.debian.org currently has 3.5.28, 3.5.30 and 3.5.31 but not 3.5.29.) Also, as far as I can tell, this patch wasn't ever posted to the list for review and the alleged author's email address of "u...@not.set" doesn't sound entirely plausible. p. >Module: openembedded-core.git >Branch: master >Commit: 7c79e70d3a803f2ccb9b9c6ed2134019631672fd >URL: >http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=7c79e70d3a803f2ccb9b9c6ed2134019631672fd > >Author: Upgrade Helper >Date: Sat Jan 4 11:44:14 2014 +0200 > >base-passwd: upgrade to 3.5.29 > >Signed-off-by: Saul Wold ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Revert "cross-canadian: Handle powerpc linux verses linux-gnuspe"
On Mon, 2014-01-13 at 13:37 +0100, David Nyström wrote: > Just to clarify bug 5354: > If I understand the bug correctly, this would arise when first building > the nativesdk tarball on a MACHINE with ABI linux, > and then building the nativesdk for another MACHINE(with the same the > same TUNE) after altering ABIEXTENSION to linux-gnuspe ? > > If I understand bug 5354 correctly, perhaps the tmp/sdk/tarball.here > can be ABI specific ? The idea behind the changes to cross-canadian were to have just a single gcc/binutils which generated all of the appropriate targets for a given architecture. I understood this to be possible but it looks like we may need to tweak things a bit. > i.e. a generic rule that all nativesdk builds are invalidated if the > ABI changes. I guess that would mean: > cross-canadian.bbclass: TARGET_ARCH[vardeps] += "ABIEXTENSION" > + Adding ABIEXTENSION to the nativesdk tarball name. > > PPC '=mabi=spe' seems to be one-way compatible, I could not get the > non-SPE configured compiler > to work with the SPE sysroot. > Another possible solution would be to always configure the compiler to > SPE, and use compile time flags in the > environment file to do the selects. + symlinks for the compiler paths. Can we configure the compiler to include SPE support without changing the paths/OS string? > However, even if we fix it this way for powerpc, we will still have > this issue with thumb f.ex. Keep in mind the target sysroot still varies for each different target. The thing we're trying to keep in common is the gcc/bintuils and only have one copy for each target architecture. Is that possible in this case if we somehow enable SPE support in gcc-cross-canadian? Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libproxy: Update to 0.4.11
Delete patches that have been applied upstream or are no longer necessary.
Update LIC_FILES_CHKSUM to match new COPYING (whitespace changes only).
Signed-off-by: Phil Blundell
---
.../libproxy/libproxy/g++-namepace.patch | 22
.../libproxy/libproxy-0.4.7-CVE-2012-4504.patch| 29 -
.../libproxy/libproxy_fix_for_gcc4.7.patch | 30 --
.../{libproxy_0.4.7.bb => libproxy_0.4.11.bb} | 11 +++-
4 files changed, 3 insertions(+), 89 deletions(-)
delete mode 100644 meta/recipes-support/libproxy/libproxy/g++-namepace.patch
delete mode 100644
meta/recipes-support/libproxy/libproxy/libproxy-0.4.7-CVE-2012-4504.patch
delete mode 100644
meta/recipes-support/libproxy/libproxy/libproxy_fix_for_gcc4.7.patch
rename meta/recipes-support/libproxy/{libproxy_0.4.7.bb => libproxy_0.4.11.bb}
(77%)
diff --git a/meta/recipes-support/libproxy/libproxy/g++-namepace.patch
b/meta/recipes-support/libproxy/libproxy/g++-namepace.patch
deleted file mode 100644
index cb90ab7..000
--- a/meta/recipes-support/libproxy/libproxy/g++-namepace.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-include unistd.h to get prototypes of close() and read()
-otherwise g++ complains
-
-libproxy/url.cpp:439:13: error: 'close' was not declared in this scope
-libproxy/url.cpp:398:37: error: 'read' was not declared in this scope
-
-Signed-off-by: Khem Raj
-
-Upstream-Status: Pending
-
-Index: libproxy-0.4.7/libproxy/url.cpp
-===
libproxy-0.4.7.orig/libproxy/url.cpp 2012-03-01 09:51:11.254156247
-0800
-+++ libproxy-0.4.7/libproxy/url.cpp2012-03-01 09:56:12.058171256 -0800
-@@ -33,6 +33,7 @@
- #include // For atoi()
- #include // For stat()
- #include // For transform()
-+#include // For close(), read()
-
- #ifdef WIN32
- #include
diff --git
a/meta/recipes-support/libproxy/libproxy/libproxy-0.4.7-CVE-2012-4504.patch
b/meta/recipes-support/libproxy/libproxy/libproxy-0.4.7-CVE-2012-4504.patch
deleted file mode 100644
index 7f2d93a..000
--- a/meta/recipes-support/libproxy/libproxy/libproxy-0.4.7-CVE-2012-4504.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Upstream-Status: Backport
-
-libproxy - CVE-2012-4504:
-
-Reference:https://code.google.com/p/libproxy/source/detail?r=853
-
-Stack-based buffer overflow in the url::get_pac function in url.cpp
-in libproxy 0.4.x before 0.4.9 allows remote servers to have an
-unspecified impact via a large proxy.pac file.
-
-http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-4504
-
-Signed-off-by: yanjun.zhu
-
-diff -urpN a/libproxy/url.cpp b/libproxy/url.cpp
a/libproxy/url.cpp 2012-11-26 10:08:47.0 +0800
-+++ b/libproxy/url.cpp 2012-11-26 10:05:54.0 +0800
-@@ -472,9 +472,10 @@ char* url::get_pac() {
- // Add this chunk to our content length,
- // ensuring that we aren't over our max size
- content_length += chunk_length;
-- if (content_length >= PAC_MAX_SIZE) break;
- }
-
-+ if (content_length >= PAC_MAX_SIZE) break;
-+
- while (recvd != content_length) {
- int r = recv(sock, buffer + recvd,
content_length - recvd, 0);
- if (r < 0) break;
diff --git
a/meta/recipes-support/libproxy/libproxy/libproxy_fix_for_gcc4.7.patch
b/meta/recipes-support/libproxy/libproxy/libproxy_fix_for_gcc4.7.patch
deleted file mode 100644
index a772f09..000
--- a/meta/recipes-support/libproxy/libproxy/libproxy_fix_for_gcc4.7.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Upstream-Status: Pending
-
-Signed-Off-By: Nitin A Kamble
-2012/04/20
-Fixes this issue with gcc 4.7
-
-| cd /srv/home/nitin/builds/bERROR: Function failed: do_compile (see
/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/temp/log.do_compile.7514
for further information)
-|
uild-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/libproxy-0.4.7/libproxy
&&
/srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/bin/x86_64-poky-linux/x86_64-poky-linux-g++
-Dlibproxy_EXPORTS -D_POSIX_C_SOURCE=1 -DLIBEXECDIR=\"/usr/libexec\"
-DMM_MODULE_BUILTIN=config_sysconfig -fvisibility=hidden-m64
--sysroot=/srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86-64 -O2 -pipe
-g -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden
-fpermissive -O2 -g -fPIC
-I/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/libproxy-0.4.7
-I/srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86-64/usr/include/glib-2.0
-I/srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86-64/usr/lib/glib-2.0/include
-o CMakeFiles/libproxy.dir/modules/config_sysconfig.cpp.o -c
/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/libproxy-0.4.7/libproxy/m
Re: [OE-core] [PATCH] Revert "cross-canadian: Handle powerpc linux verses linux-gnuspe"
On fre 10 jan 2014 16:15:08, Richard Purdie wrote: On Fri, 2014-01-10 at 15:48 +0100, David Nyström wrote: The reverted commit seems to introduce some problems for the toolchain tarball for powerpc. I see this both in master and on dora. 1. Looks like the relocation scripts fails for environments: ~/tests/poky [master] $ cat /opt/oel/2014-01-01/environment-setup-ppce500v2-oel-linux | grep "#" export SDKTARGETSYSROOT=##SDKTARGETSYSROOT## ~/tests/poky [master] $ cat /opt/oel/2014-01-01/environment-setup-ppce500v2-oel-linux-gnuspe | grep "#" 2. nativeSDK gnuspe compiler does not allow -mabi=spe ABIEXTENSION is zeroed both for linux-gnuspe and linux 3. Compiler can't create executables. I think this is due to libgcc_s.so from the SDK target sysroot is in mabi=spe. 4. -mspe is included in CC var for both linux and gnuspe. cat /opt/oel/2014-01-01/environment-setup-ppce500v2-oel-linux | grep mabi export CC="powerpc-oel-linux-gcc -m32 -mcpu=8548 -mabi=spe -mspe export CXX="powerpc-oel-linux-g++ -m32 -mcpu=8548 -mabi=spe -mspe export CPP="powerpc-oel-linux-gcc -E -m32 -mcpu=8548 -mabi=spe -mspe With the commit reverted, I can successfully build target code with the canadian compiler from the SDK tarball. Only the gnuspe environment file is generated. Ok, so how do you propose we fix the issues the patch was added to address? Cheers, Richard Just to clarify bug 5354: If I understand the bug correctly, this would arise when first building the nativesdk tarball on a MACHINE with ABI linux, and then building the nativesdk for another MACHINE(with the same the same TUNE) after altering ABIEXTENSION to linux-gnuspe ? If I understand bug 5354 correctly, perhaps the tmp/sdk/tarball.here can be ABI specific ? i.e. a generic rule that all nativesdk builds are invalidated if the ABI changes. I guess that would mean: cross-canadian.bbclass: TARGET_ARCH[vardeps] += "ABIEXTENSION" + Adding ABIEXTENSION to the nativesdk tarball name. PPC '=mabi=spe' seems to be one-way compatible, I could not get the non-SPE configured compiler to work with the SPE sysroot. Another possible solution would be to always configure the compiler to SPE, and use compile time flags in the environment file to do the selects. + symlinks for the compiler paths. However, even if we fix it this way for powerpc, we will still have this issue with thumb f.ex. It would be good if the Freescale folks could chime in here. Br, David ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/5] refactor the archive*.bbcalss
On Mon, Jan 13, 2014 at 12:52:49PM +0100, Henning Heinold wrote:
> On Mon, Jan 13, 2014 at 06:47:39PM +0800, Robert Yang wrote:
> >
> > On 01/13/2014 06:21 PM, Martin Jansa wrote:
> > >On Tue, Jan 14, 2014 at 12:20:14AM +0800, Robert Yang wrote:
> > >>* The archive*.bbclass didn't work, and there were a few problems, for
> > >> example:
> > >> 1) There were a few duplicated code
> > >> 2) There was no src_dir.org (or orig), but the diff command still use
> > >> it, and it is not easy to fix this issue if we don't change a lot
> > >> of the code.
> > >> 3) It didn't archive the source for the native or gcc
> > >> 4) The work flow is not very well
> > >> 5) The "subprocess.call('fakeroot cp '" should be removed
> > >> 6) And others ...
> > >>
> > >>* So that we have to refactor it, the benefits are:
> > >> 1) Fix the problems and make it work well.
> > >> 2) Reduce more than 400 lines in total.
> > >> 3) Make it easy to use.
> > >
> > >Have you seen
> > >http://lists.openembedded.org/pipermail/openembedded-core/2013-December/087729.html
> > >?
> > >
> > >Could you review it/integrate changes from it?
> >
> > I've looked at it just now, I think the problems that you mentioned have
> > been
> > fixed during the refactor. It won't install/remove the files manually any
> > more,
> > they will be installed/removed by the sstate. And the usage become easier,
> > just
> > this would be OK by default:
> >
> > INHERIT += "archiver"
> >
> > And we can easily add other functions when needed.
> >
> > // Robert
> >
>
> Hi Robert,
>
> does the whole thread means it is broken in dora too? Are there plans to
> backport the patches?
AFAIK it's broken everywhere, I would like to have it backported to
dylan as well (after testing that it indeed fixes source files being
removed)
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libacpi: Fix GNU_HASH problem
From: Yasir-Khan
Fixes GNU_HASH problem by adding LDFLAGS to TARGET_CC_ARCH
Signed-off-by: Yasir-Khan
---
meta/recipes-bsp/libacpi/libacpi_0.2.bb |2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-bsp/libacpi/libacpi_0.2.bb
b/meta/recipes-bsp/libacpi/libacpi_0.2.bb
index f4c323d..2d222e7 100644
--- a/meta/recipes-bsp/libacpi/libacpi_0.2.bb
+++ b/meta/recipes-bsp/libacpi/libacpi_0.2.bb
@@ -23,6 +23,8 @@ COMPATIBLE_HOST = '(x86_64|i.86).*-(linux|freebsd.*)'
CFLAGS += "-fPIC"
EXTRA_OEMAKE += 'STRIP="echo"'
+TARGET_CC_ARCH += "${LDFLAGS}"
+
do_install() {
oe_runmake install DESTDIR=${D} PREFIX=${exec_prefix}
}
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/5] refactor the archive*.bbcalss
On Mon, Jan 13, 2014 at 06:47:39PM +0800, Robert Yang wrote:
>
> On 01/13/2014 06:21 PM, Martin Jansa wrote:
> >On Tue, Jan 14, 2014 at 12:20:14AM +0800, Robert Yang wrote:
> >>* The archive*.bbclass didn't work, and there were a few problems, for
> >> example:
> >> 1) There were a few duplicated code
> >> 2) There was no src_dir.org (or orig), but the diff command still use
> >> it, and it is not easy to fix this issue if we don't change a lot
> >> of the code.
> >> 3) It didn't archive the source for the native or gcc
> >> 4) The work flow is not very well
> >> 5) The "subprocess.call('fakeroot cp '" should be removed
> >> 6) And others ...
> >>
> >>* So that we have to refactor it, the benefits are:
> >> 1) Fix the problems and make it work well.
> >> 2) Reduce more than 400 lines in total.
> >> 3) Make it easy to use.
> >
> >Have you seen
> >http://lists.openembedded.org/pipermail/openembedded-core/2013-December/087729.html
> >?
> >
> >Could you review it/integrate changes from it?
>
> I've looked at it just now, I think the problems that you mentioned have been
> fixed during the refactor. It won't install/remove the files manually any
> more,
> they will be installed/removed by the sstate. And the usage become easier,
> just
> this would be OK by default:
>
> INHERIT += "archiver"
>
> And we can easily add other functions when needed.
>
> // Robert
>
Hi Robert,
does the whole thread means it is broken in dora too? Are there plans to
backport the patches?
Bye Henning
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/5] refactor the archive*.bbcalss
On 01/13/2014 06:21 PM, Martin Jansa wrote:
On Tue, Jan 14, 2014 at 12:20:14AM +0800, Robert Yang wrote:
* The archive*.bbclass didn't work, and there were a few problems, for
example:
1) There were a few duplicated code
2) There was no src_dir.org (or orig), but the diff command still use
it, and it is not easy to fix this issue if we don't change a lot
of the code.
3) It didn't archive the source for the native or gcc
4) The work flow is not very well
5) The "subprocess.call('fakeroot cp '" should be removed
6) And others ...
* So that we have to refactor it, the benefits are:
1) Fix the problems and make it work well.
2) Reduce more than 400 lines in total.
3) Make it easy to use.
Have you seen
http://lists.openembedded.org/pipermail/openembedded-core/2013-December/087729.html
?
Could you review it/integrate changes from it?
I've looked at it just now, I think the problems that you mentioned have been
fixed during the refactor. It won't install/remove the files manually any more,
they will be installed/removed by the sstate. And the usage become easier, just
this would be OK by default:
INHERIT += "archiver"
And we can easily add other functions when needed.
// Robert
// Robert
The following changes since commit 1b636173ca88e5ccca1992f9a12367a1189fa674:
bitbake: toaster: Toaster GUI, generic search, filter and order (2014-01-10
15:20:26 +)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib rbt/archiver
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=rbt/archiver
Robert Yang (5):
classes/archive*.bbclass: remove archive-*-source.bbclass
archiver.bbclass: refactor it
package_rpm.bbclass: archive the source to srpm package
archiver.bbclass: move a few code to copyleft_compliance.bbclass
local.conf.sample.extended: update for the archiver
meta-yocto/conf/local.conf.sample.extended | 72 +--
meta/classes/archive-configured-source.bbclass | 65 ---
meta/classes/archive-original-source.bbclass | 65 ---
meta/classes/archive-patched-source.bbclass| 65 ---
meta/classes/archiver.bbclass | 723 -
meta/classes/copyleft_compliance.bbclass | 55 +-
meta/classes/package_rpm.bbclass | 31 +-
7 files changed, 316 insertions(+), 760 deletions(-)
delete mode 100644 meta/classes/archive-configured-source.bbclass
delete mode 100644 meta/classes/archive-original-source.bbclass
delete mode 100644 meta/classes/archive-patched-source.bbclass
--
1.8.3.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/5] refactor the archive*.bbcalss
On Tue, Jan 14, 2014 at 12:20:14AM +0800, Robert Yang wrote:
> * The archive*.bbclass didn't work, and there were a few problems, for
> example:
> 1) There were a few duplicated code
> 2) There was no src_dir.org (or orig), but the diff command still use
> it, and it is not easy to fix this issue if we don't change a lot
> of the code.
> 3) It didn't archive the source for the native or gcc
> 4) The work flow is not very well
> 5) The "subprocess.call('fakeroot cp '" should be removed
> 6) And others ...
>
> * So that we have to refactor it, the benefits are:
> 1) Fix the problems and make it work well.
> 2) Reduce more than 400 lines in total.
> 3) Make it easy to use.
Have you seen
http://lists.openembedded.org/pipermail/openembedded-core/2013-December/087729.html
?
Could you review it/integrate changes from it?
>
> // Robert
>
> The following changes since commit 1b636173ca88e5ccca1992f9a12367a1189fa674:
>
> bitbake: toaster: Toaster GUI, generic search, filter and order (2014-01-10
> 15:20:26 +)
>
> are available in the git repository at:
>
> git://git.pokylinux.org/poky-contrib rbt/archiver
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=rbt/archiver
>
> Robert Yang (5):
> classes/archive*.bbclass: remove archive-*-source.bbclass
> archiver.bbclass: refactor it
> package_rpm.bbclass: archive the source to srpm package
> archiver.bbclass: move a few code to copyleft_compliance.bbclass
> local.conf.sample.extended: update for the archiver
>
> meta-yocto/conf/local.conf.sample.extended | 72 +--
> meta/classes/archive-configured-source.bbclass | 65 ---
> meta/classes/archive-original-source.bbclass | 65 ---
> meta/classes/archive-patched-source.bbclass| 65 ---
> meta/classes/archiver.bbclass | 723
> -
> meta/classes/copyleft_compliance.bbclass | 55 +-
> meta/classes/package_rpm.bbclass | 31 +-
> 7 files changed, 316 insertions(+), 760 deletions(-)
> delete mode 100644 meta/classes/archive-configured-source.bbclass
> delete mode 100644 meta/classes/archive-original-source.bbclass
> delete mode 100644 meta/classes/archive-patched-source.bbclass
>
> --
> 1.8.3.1
>
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-commits] Cristian Iorga : glib-2.0: upgrade to 2.38.2
On 11 January 2014 20:48, Martin Jansa wrote: > WARNING: QA Issue: glib-2.0: Files/directories were installed but not shipped > /usr/lib/glib-2.0/ptest > WARNING: QA Issue: glib-2.0-dbg: found library in wrong location: > /usr/share/gdb/auto-load/usr/lib64/libglib-2.0.so.0.3800.2-gdb.py Fixed by "ptest.bblass: Fix package QA issues when disabled". > glib-2.0-dbg: found library in wrong location: > /usr/share/gdb/auto-load/usr/lib64/libgobject-2.0.so.0.3800.2-gdb.py It's not a library! That sanity check should probably check with file that a potential library is actually a library before warning. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] libsdl and opengl DISTRO_FEATURE
hi there,
it has been brought to the list already, at least in [1], but libsdl recipe
implicitely assumes that 'opengl' distro feature means GL/GLX support.
the recipe does this:
${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl',
'--disable-video-opengl', d)} \
and the configure checks for GL/gl.h, GL/glx.h and GL/glu.h.
this is quite an issue on ARM platforms with no such support. Based on
previous discussions i understand that nobody should assume that 'opengl'
in distro feature means GL or GLES, so I am tempted to conclude that this
is a bug in the SDL recipe. is that correct?
if we make it a PACKAGECONFIG instead, would that be considered the right
fix for this bug?
thanks
[1] http://comments.gmane.org/gmane.comp.handhelds.openembedded.core/42830
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libidn: disable C# directly
Disable C# building with --disable-csharp instead of remove
useless binary files.
Signed-off-by: Zhang Xiao
---
meta/recipes-extended/libidn/libidn_1.28.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/libidn/libidn_1.28.bb
b/meta/recipes-extended/libidn/libidn_1.28.bb
index 5daff43..effd5ea 100644
--- a/meta/recipes-extended/libidn/libidn_1.28.bb
+++ b/meta/recipes-extended/libidn/libidn_1.28.bb
@@ -27,7 +27,8 @@ SRC_URI[sha256sum] =
"dd357a968449abc97c7e5fa088a4a384de57cb36564f9d4e0d898ecc63
PACKAGES =+ "idn"
FILES_idn = "${bindir}/*"
+EXTRA_OECONF = "--disable-csharp"
+
do_install_append() {
- rm -rf ${D}${libdir}/Libidn.dll
rm -rf ${D}${datadir}/emacs
}
--
1.8.1.2
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kernel.bbclass: Fix empty modules directory QA issue
On 01/13/2014 04:33 PM, Nathan Rossi wrote:
If a kernel is built without any external modules (aka no CONFIG_*=m),
then during a modules_install of the kernel an empty directory is
created at /lib/modules/${KERNEL_VERIONS}/kernel. This is behaviour of
the kernel infrastructure, the directory would normally be populated
with the modules that were built.
However because of the expectations of kernel-modules-split, no packages
are created when there are no modules and an empty directory lingers.
This raises QA issues as warning or errors (depending on the distro).
The following patch changes the kernel_do_install task to check if the
directory is empty and if so removes it.
Signed-off-by: Nathan Rossi
---
meta/classes/kernel.bbclass |4
1 file changed, 4 insertions(+)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 5fef446..6b4e992 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -183,6 +183,10 @@ kernel_do_install() {
oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
rm "${D}/lib/modules/${KERNEL_VERSION}/build"
rm "${D}/lib/modules/${KERNEL_VERSION}/source"
+ # If the kernel/ directory is empty remove it to prevent QA
issues
How about:
rmdir --ignore-fail-on-non-empty ${D}/lib/modules/${KERNEL_VERSION}/kernel
// Robert
+ if [ ! "$(ls -A "${D}/lib/modules/${KERNEL_VERSION}/kernel")"
]; then
+ rm -r "${D}/lib/modules/${KERNEL_VERSION}/kernel"
+ fi
else
bbnote "no modules to install"
fi
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] kernel.bbclass: Fix empty modules directory QA issue
If a kernel is built without any external modules (aka no CONFIG_*=m),
then during a modules_install of the kernel an empty directory is
created at /lib/modules/${KERNEL_VERIONS}/kernel. This is behaviour of
the kernel infrastructure, the directory would normally be populated
with the modules that were built.
However because of the expectations of kernel-modules-split, no packages
are created when there are no modules and an empty directory lingers.
This raises QA issues as warning or errors (depending on the distro).
The following patch changes the kernel_do_install task to check if the
directory is empty and if so removes it.
Signed-off-by: Nathan Rossi
---
meta/classes/kernel.bbclass |4
1 file changed, 4 insertions(+)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 5fef446..6b4e992 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -183,6 +183,10 @@ kernel_do_install() {
oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
rm "${D}/lib/modules/${KERNEL_VERSION}/build"
rm "${D}/lib/modules/${KERNEL_VERSION}/source"
+ # If the kernel/ directory is empty remove it to prevent QA
issues
+ if [ ! "$(ls -A "${D}/lib/modules/${KERNEL_VERSION}/kernel")"
]; then
+ rm -r "${D}/lib/modules/${KERNEL_VERSION}/kernel"
+ fi
else
bbnote "no modules to install"
fi
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 1/1] acl: enable ptest support
Install acl test suite and run it as ptest.
nfs test cases need depend on nfs service. So exclude them order to
make ptest all pass.
Signed-off-by: Chong Lu
---
meta/recipes-support/attr/acl.inc | 15 +-
.../attr/acl/acl-make-ptest-pass.patch | 272 +
meta/recipes-support/attr/acl/run-ptest| 5 +
3 files changed, 291 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-support/attr/acl/acl-make-ptest-pass.patch
create mode 100644 meta/recipes-support/attr/acl/run-ptest
diff --git a/meta/recipes-support/attr/acl.inc
b/meta/recipes-support/attr/acl.inc
index a461232..18d630c 100644
--- a/meta/recipes-support/attr/acl.inc
+++ b/meta/recipes-support/attr/acl.inc
@@ -9,7 +9,10 @@ LIC_FILES_CHKSUM =
"file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \
file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764"
DEPENDS = "attr"
-SRC_URI = "http://download.savannah.gnu.org/releases/acl/${BP}.src.tar.gz";
+SRC_URI = "http://download.savannah.gnu.org/releases/acl/${BP}.src.tar.gz \
+ file://run-ptest \
+ file://acl-make-ptest-pass.patch \
+"
require ea-acl.inc
@@ -24,3 +27,13 @@ do_install_append() {
sed -i ${D}${libdir}/libacl.la -e \
s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\',
}
+
+inherit ptest
+
+do_install_ptest() {
+ tar -cf - test/ --exclude nfs | ( cd ${D}${PTEST_PATH} && tar -xf - )
+ mkdir ${D}${PTEST_PATH}/include
+ cp ${S}/include/builddefs ${S}/include/buildmacros
${S}/include/buildrules ${D}${PTEST_PATH}/include/
+}
+
+RDEPENDS_${PN}-ptest = "coreutils perl-module-filehandle
perl-module-getopt-std perl-module-posix"
diff --git a/meta/recipes-support/attr/acl/acl-make-ptest-pass.patch
b/meta/recipes-support/attr/acl/acl-make-ptest-pass.patch
new file mode 100644
index 000..36f01d1
--- /dev/null
+++ b/meta/recipes-support/attr/acl/acl-make-ptest-pass.patch
@@ -0,0 +1,272 @@
+acl: make ptest pass
+
+Upstream-Status: Inappropriate [embedded specific]
+
+The daemon user must be a member in the bin group, else permissions.test
+will fail. So add daemon user to bin group.
+Delete `sed' filter of `ls -l' and modify entries of `getfacl', else we
+would get nonmatched result.
+
+Signed-off-by: Chong Lu
+---
+ test/Makefile |2 +-
+ test/cp.test|2 +-
+ test/misc.test | 44 ++--
+ test/sbits-restore.test |6 +++---
+ 4 files changed, 27 insertions(+), 27 deletions(-)
+
+diff --git a/test/Makefile b/test/Makefile
+index d2baac8..6063a56 100644
+--- a/test/Makefile
b/test/Makefile
+@@ -42,7 +42,7 @@ $(NFS):
+ @echo "NFS specific tests"; echo "*** $@ ***"; perl run $@
+
+ $(ROOT):
+- @echo "Note: Tests must run as root"; echo "*** $@ ***"; perl run $@
++ @echo "Note: Tests must run as root"; echo "*** $@ ***"; usermod -G bin
daemon; perl run $@
+
+ .PHONY: $(TESTS) $(NFS) $(ROOT)
+ .NOTPARALLEL:
+diff --git a/test/cp.test b/test/cp.test
+index 0867f63..a888c04 100644
+--- a/test/cp.test
b/test/cp.test
+@@ -9,7 +9,7 @@ The cp utility should only copy ACLs if `-p' is given.
+ > -rw-rw-r--+
+
+ $ cp f g
+- $ ls -l g | awk -- '{ print $1 }' | sed 's/\.$//g'
++ $ ls -l g | awk -- '{ print $1 }'
+ > -rw-r--r--
+
+ $ rm g
+diff --git a/test/misc.test b/test/misc.test
+index 6e98053..6754be3 100644
+--- a/test/misc.test
b/test/misc.test
+@@ -79,8 +79,8 @@ Multiple users
+
+ $ getfacl --omit-header f
+ > user::rw-
+- > user:bin:rw-
+ > user:daemon:r--
++ > user:bin:rw-
+ > group::r--
+ > mask::rw-
+ > other::r--
+@@ -94,8 +94,8 @@ Multiple groups
+
+ $ getfacl --omit-header f
+ > user::rw-
+- > user:bin:rw-
+ > user:daemon:r--
++ > user:bin:rw-
+ > group::r--
+ > group:daemon:r--
+ > group:users:rw-
+@@ -111,8 +111,8 @@ Remove one group
+
+ $ getfacl --omit-header f
+ > user::rw-
+- > user:bin:rw-
+ > user:daemon:r--
++ > user:bin:rw-
+ > group::r--
+ > group:daemon:r--
+ > mask::rw-
+@@ -146,8 +146,8 @@ Default ACL
+
+ $ getfacl --omit-header d
+ > user::rwx
+- > user:bin:rwx
+ > user:daemon:rw-
++ > user:bin:rwx
+ > group::r-x
+ > mask::rwx
+ > other::---
+@@ -236,16 +236,16 @@ Add some users and groups
+
+ $ getfacl --omit-header d/d
+ > user::rwx
+- > user:bin:rwx #effective:r-x
+ > user:daemon:r-x
++ > user:bin:rwx #effective:r-x
+ > group::r-x
+ > group:daemon:rwx #effective:r-x
+ > group:users:r-x
+ > mask::r-x
+ > other::---
+ > default:user::rwx
+- > default:user:bin:rwx #effective:r-x
+ > default:user:daemon:r-x
++ > default:user:bin:rwx #effective:r-x
+ > default:group::r-x
+ > de
[OE-core] [PATCH V2 0/1] acl: enable ptest support
Changes since V2: Delete incorrect patch about the result of `ls -l'. The following changes since commit 1b636173ca88e5ccca1992f9a12367a1189fa674: bitbake: toaster: Toaster GUI, generic search, filter and order (2014-01-10 15:20:26 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib chonglu/acl http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=chonglu/acl Chong Lu (1): acl: enable ptest support meta/recipes-support/attr/acl.inc | 15 +- .../attr/acl/acl-make-ptest-pass.patch | 272 + meta/recipes-support/attr/acl/run-ptest| 5 + 3 files changed, 291 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/attr/acl/acl-make-ptest-pass.patch create mode 100644 meta/recipes-support/attr/acl/run-ptest -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] local.conf.sample.extended: update for the archiver
Updated it since we have refactored the archiver.bbclass.
[YOCTO #5113]
Signed-off-by: Robert Yang
---
meta-yocto/conf/local.conf.sample.extended | 72 --
1 file changed, 38 insertions(+), 34 deletions(-)
diff --git a/meta-yocto/conf/local.conf.sample.extended
b/meta-yocto/conf/local.conf.sample.extended
index c7c4f40..c0a98ee 100644
--- a/meta-yocto/conf/local.conf.sample.extended
+++ b/meta-yocto/conf/local.conf.sample.extended
@@ -188,40 +188,44 @@
# when the disk space reduces 50M (or the amount of inode reduces 5k).
#BB_DISKMON_WARNINTERVAL = "50M,5K"
-# Archiving source code, configure what kind of sources will be archived
-# and the output format. The output files will be put in
-# ${DEPLOY_DIR}/sources/.
-#
-# You can add the following 3 lines to the conf file to get a quick
-# usage:
-#ARCHIVER_MODE ?= "original"
-#ARCHIVER_CLASS = "${@'archive-${ARCHIVER_MODE}-source' if ARCHIVER_MODE !=
'none' else ''}"
-#INHERIT += "${ARCHIVER_CLASS}"
-#
-# Detailed configuration:
-# What kind of sources will be archived, the ARCHIVER_MODE could be:
-# original: the ${S} after do_unpack
-# patched : the ${S} after do_patch
-# configured: the ${S} after do_configure
-#ARCHIVER_MODE ?= "original"
-#
-# The output format type, tar or srpm, the default is "tar".
-#ARCHIVER_MODE[type] ?= "tar"
-#
-# Whether include the log file under ${T} and the recipe (.bb and .inc),
-# the default is "logs_with_scripts".
-#ARCHIVER_MODE[log_type] ?= "logs_with_scripts"
-#
-# license filter:
-# yes: Only the COPYLEFT_LICENSE_INCLUDE recipe will be archived
-# no: All kinds of license will be archived
-# The default is "no"
-#ARCHIVER_MODE[filter] ?= "no"
-#
-# The following lines should be added to your conf file verbatim
-# (uncommented though of course):
-#ARCHIVER_CLASS = "${@'archive-${ARCHIVER_MODE}-source' if ARCHIVER_MODE !=
'none' else ''}"
-#INHERIT += "${ARCHIVER_CLASS}"
+# Archive the source and put them to ${DEPLOY_DIR}/sources/.
+#
+#INHERIT += "archiver"
+#
+# The tarball for the configured source, the diff between do_unpack and
+# do_patch will be archived by default, and you can configure the
+# archiver when needed:
+#
+#The output format:
+# 1) tar: (default)
+#ARCHIVER_MODE[type] = "tar"
+# 2) srpm: (when PACKAGES != "")
+#ARCHIVER_MODE[type] = "srpm",
+# NOTE: The logs can't be packed into the srpm package because they are
+# incompleted until the rpm package has been built.
+#
+# Archive the source:
+# 1) before do_patch:
+#ARCHIVER_MODE[src] = "prepatch"
+# 2) after do_patch:
+#ARCHIVER_MODE[src] = "patched"
+# 3) after do_configure: (default)
+#ARCHIVER_MODE[src] = "configured"
+#
+# 4) the patches between do_unpack and do_patch:
+#ARCHIVER_MODE[diff] = "yes"
+# set the files that you'd like to exclude from the diff:
+#ARCHIVER_MODE[diff-exclude] ?= ".pc autom4te.cache patches"
+#
+# 5) the environment data, similar to 'bitbake -e recipe':
+#ARCHIVER_MODE[dumpdata] = "yes"
+#
+# 6) the recipe (.bb and .inc):
+#ARCHIVER_MODE[recipe] = "yes"
+#
+# 7) the log.* and run.* files under ${T}
+#ARCHIVER_MODE[log] = "yes"
+#
# Remove the old image before the new one generated to save disk space
#RM_OLD_IMAGE = "1"
--
1.8.3.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] archiver.bbclass: move a few code to copyleft_compliance.bbclass
Move the code which is only used by copyleft_compliance.bbclass from
archiver.bbclassc, and remove the "inherit archiver" from
copyleft_compliance.bbclass.
The archiver.bbclass is used for archiving various types of sources, but
the copyleft_compliance.bbclass is used for analysing the license, they
don't have much relationships.
[YOCTO #4986]
[YOCTO #5113]
Signed-off-by: Robert Yang
---
meta/classes/archiver.bbclass| 53 --
meta/classes/copyleft_compliance.bbclass | 55 ++--
2 files changed, 53 insertions(+), 55 deletions(-)
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index f2d7184..c3e5bbf 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -35,25 +35,6 @@ ARCHIVER_OUTDIR = "${AR_TOPDIR}/${TARGET_SYS}/${PF}"
# This is a convenience for the shell script to use it
AR_EXCLUDE ?= "${@d.getVarFlag('ARCHIVER_MODE', 'diff-exclude', True)}"
-COPYLEFT_LICENSE_INCLUDE ?= 'GPL* LGPL*'
-COPYLEFT_LICENSE_INCLUDE[type] = 'list'
-COPYLEFT_LICENSE_INCLUDE[doc] = 'Space separated list of globs which include
licenses'
-
-COPYLEFT_LICENSE_EXCLUDE ?= 'CLOSED Proprietary'
-COPYLEFT_LICENSE_EXCLUDE[type] = 'list'
-COPYLEFT_LICENSE_EXCLUDE[doc] = 'Space separated list of globs which exclude
licenses'
-
-COPYLEFT_RECIPE_TYPE ?= '${@copyleft_recipe_type(d)}'
-COPYLEFT_RECIPE_TYPE[doc] = 'The "type" of the current recipe (e.g. target,
native, cross)'
-
-COPYLEFT_RECIPE_TYPES ?= 'target'
-COPYLEFT_RECIPE_TYPES[type] = 'list'
-COPYLEFT_RECIPE_TYPES[doc] = 'Space separated list of recipe types to include'
-
-COPYLEFT_AVAILABLE_RECIPE_TYPES = 'target native nativesdk cross crosssdk
cross-canadian'
-COPYLEFT_AVAILABLE_RECIPE_TYPES[type] = 'list'
-COPYLEFT_AVAILABLE_RECIPE_TYPES[doc] = 'Space separated list of available
recipe types'
-
python () {
pn = d.getVar('PN', True)
packaging = d.getVar('IMAGE_PKGTYPE', True)
@@ -117,40 +98,6 @@ python () {
d.appendVarFlag('do_build', 'depends', build_deps)
}
-def copyleft_recipe_type(d):
-for recipe_type in oe.data.typed_value('COPYLEFT_AVAILABLE_RECIPE_TYPES',
d):
-if oe.utils.inherits(d, recipe_type):
-return recipe_type
-return 'target'
-
-def copyleft_should_include(d):
-"""
-Determine if this recipe's sources should be deployed for compliance
-"""
-import ast
-import oe.license
-from fnmatch import fnmatchcase as fnmatch
-
-recipe_type = d.getVar('COPYLEFT_RECIPE_TYPE', True)
-if recipe_type not in oe.data.typed_value('COPYLEFT_RECIPE_TYPES', d):
-return False, 'recipe type "%s" is excluded' % recipe_type
-
-include = oe.data.typed_value('COPYLEFT_LICENSE_INCLUDE', d)
-exclude = oe.data.typed_value('COPYLEFT_LICENSE_EXCLUDE', d)
-
-try:
-is_included, reason = oe.license.is_included(d.getVar('LICENSE',
True), include, exclude)
-except oe.license.LicenseError as exc:
-bb.fatal('%s: %s' % (d.getVar('PF', True), exc))
-else:
-if is_included:
-if reason:
-return True, 'recipe has included licenses: %s' % ',
'.join(reason)
-else:
-return False, 'recipe does not include a copyleft license'
-else:
-return False, 'recipe has excluded licenses: %s' % ',
'.join(reason)
-
def create_tarball(d, srcdir, suffix):
"""
create the tarball from srcdir
diff --git a/meta/classes/copyleft_compliance.bbclass
b/meta/classes/copyleft_compliance.bbclass
index 32aa757..b47c2c9 100644
--- a/meta/classes/copyleft_compliance.bbclass
+++ b/meta/classes/copyleft_compliance.bbclass
@@ -6,11 +6,62 @@
#
# vi:sts=4:sw=4:et
-# Need the copyleft_should_include
-inherit archiver
+COPYLEFT_LICENSE_INCLUDE ?= 'GPL* LGPL*'
+COPYLEFT_LICENSE_INCLUDE[type] = 'list'
+COPYLEFT_LICENSE_INCLUDE[doc] = 'Space separated list of globs which include
licenses'
+
+COPYLEFT_LICENSE_EXCLUDE ?= 'CLOSED Proprietary'
+COPYLEFT_LICENSE_EXCLUDE[type] = 'list'
+COPYLEFT_LICENSE_EXCLUDE[doc] = 'Space separated list of globs which exclude
licenses'
+
+COPYLEFT_RECIPE_TYPE ?= '${@copyleft_recipe_type(d)}'
+COPYLEFT_RECIPE_TYPE[doc] = 'The "type" of the current recipe (e.g. target,
native, cross)'
+
+COPYLEFT_RECIPE_TYPES ?= 'target'
+COPYLEFT_RECIPE_TYPES[type] = 'list'
+COPYLEFT_RECIPE_TYPES[doc] = 'Space separated list of recipe types to include'
+
+COPYLEFT_AVAILABLE_RECIPE_TYPES = 'target native nativesdk cross crosssdk
cross-canadian'
+COPYLEFT_AVAILABLE_RECIPE_TYPES[type] = 'list'
+COPYLEFT_AVAILABLE_RECIPE_TYPES[doc] = 'Space separated list of available
recipe types'
COPYLEFT_SOURCES_DIR ?= '${DEPLOY_DIR}/copyleft_sources'
+def copyleft_recipe_type(d):
+for recipe_type in oe.data.typed_value('COPYLEFT_AVAILABLE_RECIPE_TYPES',
d):
+if oe.utils.inherits(d, recipe_type):
+return recipe_type
+return 'target'
+
+def copyleft_should_include(d):
+
[OE-core] [PATCH 0/5] refactor the archive*.bbcalss
* The archive*.bbclass didn't work, and there were a few problems, for
example:
1) There were a few duplicated code
2) There was no src_dir.org (or orig), but the diff command still use
it, and it is not easy to fix this issue if we don't change a lot
of the code.
3) It didn't archive the source for the native or gcc
4) The work flow is not very well
5) The "subprocess.call('fakeroot cp '" should be removed
6) And others ...
* So that we have to refactor it, the benefits are:
1) Fix the problems and make it work well.
2) Reduce more than 400 lines in total.
3) Make it easy to use.
// Robert
The following changes since commit 1b636173ca88e5ccca1992f9a12367a1189fa674:
bitbake: toaster: Toaster GUI, generic search, filter and order (2014-01-10
15:20:26 +)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib rbt/archiver
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=rbt/archiver
Robert Yang (5):
classes/archive*.bbclass: remove archive-*-source.bbclass
archiver.bbclass: refactor it
package_rpm.bbclass: archive the source to srpm package
archiver.bbclass: move a few code to copyleft_compliance.bbclass
local.conf.sample.extended: update for the archiver
meta-yocto/conf/local.conf.sample.extended | 72 +--
meta/classes/archive-configured-source.bbclass | 65 ---
meta/classes/archive-original-source.bbclass | 65 ---
meta/classes/archive-patched-source.bbclass| 65 ---
meta/classes/archiver.bbclass | 723 -
meta/classes/copyleft_compliance.bbclass | 55 +-
meta/classes/package_rpm.bbclass | 31 +-
7 files changed, 316 insertions(+), 760 deletions(-)
delete mode 100644 meta/classes/archive-configured-source.bbclass
delete mode 100644 meta/classes/archive-original-source.bbclass
delete mode 100644 meta/classes/archive-patched-source.bbclass
--
1.8.3.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/5] archiver.bbclass: refactor it
The archiver didn't work, and there were a few problems, for example:
1) There was no src_dir.org (or orig), but the diff command still use it
2) There were a few duplicated code
3) It didn't archive the source for the native or gcc
4) The work flow is not very well
5) The "subprocess.call('fakeroot cp '" should be removed
6) And others ...
So that we have to refactor it, the benefits are:
1) Fix the problems and make it work well.
2) Reduce more than 300 lines
3) Make it easy to use.
Hre are the explanation about the bbclass:
The bbclass is used for creating the tarball from:
1) prepatch source: ARCHIVER_MODE[src] = "prepatch"
2) patched source: ARCHIVER_MODE[src] = "patched"
3) configured source: ARCHIVER_MODE[src] = "configured"
4) The patches between do_unpack and do_patch:
ARCHIVER_MODE[diff] = "yes"
And set the files that will be excluded from diff:
ARCHIVER_MODE[diff-exclude] ?= ".pc autom4te.cache patches"
5) The environment data, similar to 'bitbake -e recipe':
ARCHIVER_MODE[dumpdata] = "yes"
6) The recipe (.bb and .inc): ARCHIVER_MODE[recipe] = "yes"
7) The log.* and run.* files under ${T}
ARCHIVER_MODE[log] = "yes"
All of the above can be packed into a .src.rpm package: (when PACKAGES != "")
ARCHIVER_MODE[type] = "srpm",
except the seventh, because the logs are not completed until the rpm
package has been built: ARCHIVER_MODE[type] = "srpm"
[YOCTO #4986]
[YOCTO #5113]
Signed-off-by: Robert Yang
---
meta/classes/archiver.bbclass | 709 --
1 file changed, 202 insertions(+), 507 deletions(-)
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 43373ae..f2d7184 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -1,21 +1,39 @@
# ex:ts=4:sw=4:sts=4:et
# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
#
-# This file is used for archiving sources, patches, and logs to a
-# tarball. It also output building environment to xxx.dump.data and
-# create xxx.diff.gz to record all content in ${S} to a diff file.
+# This bbclass is used for creating the tarball from:
+# 1) prepatch source: ARCHIVER_MODE[src] = "prepatch"
+# 2) patched source: ARCHIVER_MODE[src] = "patched"
+# 3) configured source: ARCHIVER_MODE[src] = "configured"
+# 4) The patches between do_unpack and do_patch:
+#ARCHIVER_MODE[diff] = "yes"
+#And you can set the one that you'd like to exclude from the diff:
+#AR_EXCLUDE ?= "${@d.getVarFlag('ARCHIVER_MODE', 'diff-exclude', True)}
+# 5) The environment data, similar to 'bitbake -e recipe':
+#ARCHIVER_MODE[dumpdata] = "yes"
+# 6) The recipe (.bb and .inc): ARCHIVER_MODE[recipe] = "yes"
+# 7) The log.* and run.* files under ${T}
+#ARCHIVER_MODE[log] = "yes"
#
-
-ARCHIVE_EXCLUDE_FROM ?= ".pc autom4te.cache"
-ARCHIVE_TYPE ?= "tar srpm"
-PATCHES_ARCHIVE_WITH_SERIES = 'yes'
-SOURCE_ARCHIVE_LOG_WITH_SCRIPTS ?= '${@d.getVarFlag('ARCHIVER_MODE',
'log_type') \
-if d.getVarFlag('ARCHIVER_MODE', 'log_type') != 'none' else
'logs_with_scripts'}'
-SOURCE_ARCHIVE_PACKAGE_TYPE ?= '${@d.getVarFlag('ARCHIVER_MODE', 'type') \
-if d.getVarFlag('ARCHIVER_MODE', 'log_type') != 'none' else 'tar'}'
-FILTER ?= '${@d.getVarFlag('ARCHIVER_MODE', 'filter') \
-if d.getVarFlag('ARCHIVER_MODE', 'filter')!= 'none' else 'no'}'
-
+# All of the above can be packed into a .src.rpm package: (when PACKAGES != "")
+# ARCHIVER_MODE[type] = "srpm",
+# except the seventh, because the logs are not completed until the rpm
+# package has been built: ARCHIVER_MODE[type] = "srpm"
+
+ARCHIVER_MODE[type] ?= "tar"
+ARCHIVER_MODE[src] ?= "configured"
+ARCHIVER_MODE[diff] ?= "yes"
+ARCHIVER_MODE[diff-exclude] ?= ".pc autom4te.cache patches"
+ARCHIVER_MODE[dumpdata] ?= "no"
+ARCHIVER_MODE[log] ?= "no"
+ARCHIVER_MODE[recipe] ?= "no"
+
+DEPLOY_DIR_SRC ?= "${DEPLOY_DIR}/sources"
+AR_TOPDIR = "${WORKDIR}/deploy-sources"
+ARCHIVER_OUTDIR = "${AR_TOPDIR}/${TARGET_SYS}/${PF}"
+
+# This is a convenience for the shell script to use it
+AR_EXCLUDE ?= "${@d.getVarFlag('ARCHIVER_MODE', 'diff-exclude', True)}"
COPYLEFT_LICENSE_INCLUDE ?= 'GPL* LGPL*'
COPYLEFT_LICENSE_INCLUDE[type] = 'list'
@@ -23,7 +41,7 @@ COPYLEFT_LICENSE_INCLUDE[doc] = 'Space separated list of
globs which include lic
COPYLEFT_LICENSE_EXCLUDE ?= 'CLOSED Proprietary'
COPYLEFT_LICENSE_EXCLUDE[type] = 'list'
-COPYLEFT_LICENSE_INCLUDE[doc] = 'Space separated list of globs which exclude
licenses'
+COPYLEFT_LICENSE_EXCLUDE[doc] = 'Space separated list of globs which exclude
licenses'
COPYLEFT_RECIPE_TYPE ?= '${@copyleft_recipe_type(d)}'
COPYLEFT_RECIPE_TYPE[doc] = 'The "type" of the current recipe (e.g. target,
native, cross)'
@@ -40,22 +58,58 @@ python () {
pn = d.getVar('PN', True)
packaging = d.getVar('IMAGE_PKGTYPE', True)
-if tar_filter(d):
-return
-
-if d.getVar('PACKAGES', True) != '':
-d.appendVarFlag('do_dumpdata_create_diff_gz', 'depends', '
%s:do_package_writ
[OE-core] [PATCH 3/5] package_rpm.bbclass: archive the source to srpm package
The archiver.bbclass will put the sources to ARCHIVER_OUTDIR according
to configuration, then the rpmbuild -bs will create the srpm.
[YOCTO #4986]
[YOCTO #5113]
Signed-off-by: Robert Yang
---
meta/classes/package_rpm.bbclass | 31 ---
1 file changed, 12 insertions(+), 19 deletions(-)
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index fcde73e..2da2b44 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -6,7 +6,6 @@ RPM="rpm"
RPMBUILD="rpmbuild"
PKGWRITEDIRRPM = "${WORKDIR}/deploy-rpms"
-PKGWRITEDIRSRPM = "${DEPLOY_DIR}/sources/deploy-srpm"
# Maintaining the perfile dependencies has singificant overhead when writing
the
# packages. When set, this value merges them for efficiency.
@@ -559,23 +558,26 @@ python write_specfile () {
# append information for logs and patches to %prep
def add_prep(d,spec_files_bottom):
-if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) == 'srpm':
+if d.getVarFlag('ARCHIVER_MODE', 'type', True) == 'srpm':
spec_files_bottom.append('%%prep -n %s' % d.getVar('PN', True) )
spec_files_bottom.append('%s' % "echo \"include logs and patches,
Please check them in SOURCES\"")
spec_files_bottom.append('')
# append the name of tarball to key word 'SOURCE' in xxx.spec.
def tail_source(d):
-if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) == 'srpm':
-source_list = get_package(d)
+if d.getVarFlag('ARCHIVER_MODE', 'type', True) == 'srpm':
+ar_dir = d.getVar('ARCHIVER_OUTDIR', True)
+if not os.path.exists(ar_dir):
+return
+source_list = os.listdir(ar_dir)
source_number = 0
-workdir = d.getVar('WORKDIR', True)
for source in source_list:
# The rpmbuild doesn't need the root permission, but it needs
# to know the file's user and group name, the only user and
# group in fakeroot is "root" when working in fakeroot.
-os.chown("%s/%s" % (workdir, source), 0, 0)
-spec_preamble_top.append('Source' + str(source_number) + ':
%s' % source)
+f = os.path.join(ar_dir, source)
+os.chown(f, 0, 0)
+spec_preamble_top.append('Source%s: %s' % (source_number,
source))
source_number += 1
# We need a simple way to remove the MLPREFIX from the package name,
# and dependency information...
@@ -1070,15 +1072,6 @@ python write_specfile () {
}
python do_package_rpm () {
-def creat_srpm_dir(d):
-if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) == 'srpm':
-clean_licenses = get_licenses(d)
-pkgwritesrpmdir =
bb.data.expand('${PKGWRITEDIRSRPM}/${PACKAGE_ARCH_EXTEND}', d)
-pkgwritesrpmdir = pkgwritesrpmdir + '/' + clean_licenses
-bb.utils.mkdirhier(pkgwritesrpmdir)
-os.chmod(pkgwritesrpmdir, 0755)
-return pkgwritesrpmdir
-
# We need a simple way to remove the MLPREFIX from the package name,
# and dependency information...
def strip_multilib(name, d):
@@ -1146,9 +1139,9 @@ python do_package_rpm () {
cmd = cmd + " --define 'debug_package %{nil}'"
cmd = cmd + " --define '_rpmfc_magic_path " + magicfile + "'"
cmd = cmd + " --define '_tmppath " + workdir + "'"
-if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) == 'srpm':
-cmd = cmd + " --define '_sourcedir " + workdir + "'"
-cmdsrpm = cmd + " --define '_srcrpmdir " + creat_srpm_dir(d) + "'"
+if d.getVarFlag('ARCHIVER_MODE', 'type', True) == 'srpm':
+cmd = cmd + " --define '_sourcedir " + d.getVar('ARCHIVER_OUTDIR',
True) + "'"
+cmdsrpm = cmd + " --define '_srcrpmdir " + d.getVar('ARCHIVER_OUTDIR',
True) + "'"
cmdsrpm = cmdsrpm + " -bs " + outspecfile
# Build the .src.rpm
d.setVar('SBUILDSPEC', cmdsrpm + "\n")
--
1.8.3.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] classes/archive*.bbclass: remove archive-*-source.bbclass
Nearly all of the codes in the following 3 files are the same, we can
move the code to archiver.bbclass and remove them:
archive-configured-source.bbclass
archive-original-source.bbclass
archive-patched-source.bbclass
[YOCTO #5113]
Signed-off-by: Robert Yang
---
meta/classes/archive-configured-source.bbclass | 65 --
meta/classes/archive-original-source.bbclass | 65 --
meta/classes/archive-patched-source.bbclass| 65 --
meta/classes/archiver.bbclass | 63 -
4 files changed, 62 insertions(+), 196 deletions(-)
delete mode 100644 meta/classes/archive-configured-source.bbclass
delete mode 100644 meta/classes/archive-original-source.bbclass
delete mode 100644 meta/classes/archive-patched-source.bbclass
diff --git a/meta/classes/archive-configured-source.bbclass
b/meta/classes/archive-configured-source.bbclass
deleted file mode 100644
index 961a532..000
--- a/meta/classes/archive-configured-source.bbclass
+++ /dev/null
@@ -1,65 +0,0 @@
-# This file is for getting archiving packages with configured
-# sources(archive ${S} after configure stage), logs(archive 'temp' after
-# package_write_rpm), dump data and creating diff file(get all
-# environment variables and functions in building and mapping all
-# content in ${S} including patches to xxx.diff.gz. All archived
-# packages will be deployed in ${DEPLOY_DIR}/sources
-
-inherit archiver
-
-# Get archiving package with configured sources including patches
-addtask do_archive_configured_sources after do_configure
-
-# Get archiving package with temp(logs) and scripts(.bb and inc files)
-addtask do_archive_scripts_logs
-
-# Get dump date and create diff file
-addtask do_dumpdata_create_diff_gz
-
-python () {
-pn = d.getVar('PN', True)
-packaging = d.getVar('IMAGE_PKGTYPE', True)
-
-if tar_filter(d):
-return
-
-d.appendVarFlag('do_dumpdata_create_diff_gz', 'depends', '
%s:do_package_write_' %pn + packaging)
-build_deps = ' %s:do_dumpdata_create_diff_gz' %pn
-
-if d.getVar('SOURCE_ARCHIVE_LOG_WITH_SCRIPTS', True) ==
'logs_with_scripts':
-d.appendVarFlag('do_archive_scripts_logs', 'depends', '
%s:do_package_write_' %pn + packaging)
-build_deps += ' %s:do_archive_scripts_logs' %pn
-
-if not not_tarball(d):
-d.appendVarFlag('do_compile', 'depends', '
%s:do_archive_configured_sources' %pn)
-build_deps += ' %s:do_archive_configured_sources' %pn
-
-if bb.data.inherits_class('image', d):
-d.appendVarFlag('do_rootfs', 'depends', build_deps)
-else:
-d.appendVarFlag('do_build', 'depends', build_deps)
-}
-
-ARCHIVE_SSTATE_OUTDIR = "${DEPLOY_DIR}/sources/"
-ARCHIVE_SSTATE_SCRIPTS_LOGS_INDIR = "${WORKDIR}/script-logs/"
-ARCHIVE_SSTATE_DIFFGZ_ENVDATA_INDIR = "${WORKDIR}/diffgz-envdata/"
-
-SSTATETASKS += "do_archive_scripts_logs"
-do_archive_scripts_logs[sstate-inputdirs] =
"${ARCHIVE_SSTATE_SCRIPTS_LOGS_INDIR}"
-do_archive_scripts_logs[sstate-outputdirs] = "${ARCHIVE_SSTATE_OUTDIR}"
-
-python do_archive_scripts_logs_setscene () {
-sstate_setscene(d)
-}
-
-addtask do_archive_scripts_logs_setscene
-
-SSTATETASKS += "do_dumpdata_create_diff_gz"
-do_dumpdata_create_diff_gz[sstate-inputdirs] =
"${ARCHIVE_SSTATE_DIFFGZ_ENVDATA_INDIR}"
-do_dumpdata_create_diff_gz[sstate-outputdirs] = "${ARCHIVE_SSTATE_OUTDIR}"
-
-python do_dumpdata_create_diff_gz_setscene () {
-sstate_setscene(d)
-}
-
-addtask do_dumpdata_create_diff_gz_setscene
diff --git a/meta/classes/archive-original-source.bbclass
b/meta/classes/archive-original-source.bbclass
deleted file mode 100644
index e271a08..000
--- a/meta/classes/archive-original-source.bbclass
+++ /dev/null
@@ -1,65 +0,0 @@
-# This file is for getting archiving packages with original
-# sources(archive ${S} after unpack stage), patches, logs(archive 'temp'
-# after package_write_rpm), dump data and creating diff file(get all
-# environment variables and functions in building and mapping all
-# content in ${S} including patches to xxx.diff.gz. All archived packages
-# will be deployed in ${DEPLOY_DIR}/sources
-
-inherit archiver
-
-# Get original sources archiving package with patches
-addtask do_archive_original_sources_patches after do_unpack
-
-# Get archiving package with temp(logs) and scripts(.bb and inc files)
-addtask do_archive_scripts_logs
-
-# Get dump date and create diff file
-addtask do_dumpdata_create_diff_gz
-
-python () {
-pn = d.getVar('PN', True)
-packaging = d.getVar('IMAGE_PKGTYPE', True)
-
-if tar_filter(d):
-return
-
-d.appendVarFlag('do_dumpdata_create_diff_gz', 'depends', '
%s:do_package_write_' %pn + packaging)
-build_deps = ' %s:do_dumpdata_create_diff_gz' %pn
-
-if d.getVar('SOURCE_ARCHIVE_LOG_WITH_SCRIPTS', True) ==
'logs_with_scripts':
-d.appendVarFlag('do_archive_scripts_logs', 'depends', '
%s:do_package_write_' %pn + packaging)
-
