[OE-core] [PATCH] bash: define NON_INTERACTIVE_LOGIN_SHELLS
From: Li Wang
Allow login shells to read the startup files, even if they are not
interactive.
The patch comes from:
* bash-3.2-30.fc10.src.rpm - bash-2.03-profile.patch
Signed-off-by: Li Wang
---
.../bash/bash/bash-2.03-profile.patch | 24 ++
meta/recipes-extended/bash/bash_4.3.bb | 1 +
2 files changed, 25 insertions(+)
create mode 100644 meta/recipes-extended/bash/bash/bash-2.03-profile.patch
diff --git a/meta/recipes-extended/bash/bash/bash-2.03-profile.patch
b/meta/recipes-extended/bash/bash/bash-2.03-profile.patch
new file mode 100644
index 000..a7d5fe8
--- /dev/null
+++ b/meta/recipes-extended/bash/bash/bash-2.03-profile.patch
@@ -0,0 +1,24 @@
+bash: define NON_INTERACTIVE_LOGIN_SHELLS
+
+Allow login shells to read the startup files, even if they are not
+interactive.
+
+The patch comes from:
+* bash-3.2-30.fc10.src.rpm - bash-2.03-profile.patch
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Li Wang
+---
+diff -up bash-3.2/config-top.h.profile bash-3.2/config-top.h
+--- bash-3.2/config-top.h.profile 2008-07-17 13:35:39.0 +0200
bash-3.2/config-top.h 2008-07-17 13:42:18.0 +0200
+@@ -26,6 +26,8 @@
+what POSIX.2 specifies. */
+ #define CONTINUE_AFTER_KILL_ERROR
+
++#define NON_INTERACTIVE_LOGIN_SHELLS
++
+ /* Define BREAK_COMPLAINS if you want the non-standard, but useful
+error messages about `break' and `continue' out of context. */
+ #define BREAK_COMPLAINS
diff --git a/meta/recipes-extended/bash/bash_4.3.bb
b/meta/recipes-extended/bash/bash_4.3.bb
index 23d3197..622058a 100644
--- a/meta/recipes-extended/bash/bash_4.3.bb
+++ b/meta/recipes-extended/bash/bash_4.3.bb
@@ -41,6 +41,7 @@ SRC_URI =
"${GNU_MIRROR}/bash/${BPN}-${PV}.tar.gz;name=tarball \
file://mkbuiltins_have_stringize.patch \
file://build-tests.patch \
file://test-output.patch \
+ file://bash-2.03-profile.patch \
file://run-ptest \
"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] nettle: update package to 3.1.1 version.
* Paul Eggleton [150706 15:58]: > On Monday 06 July 2015 14:04:46 Burton, Ross wrote: > > On 4 July 2015 at 12:38, Paul Eggleton > > wrote: > > > Well, at minimum for our purposes LGPLv3 (or LGPLv3+?) needs to be > > > added to LICENSE in the nettle recipe (with &). Whether or not > > > someone chooses to exclude that license in their configuration > > > through INCOMPATIBLE_LICENSE is a completely separate matter (and > > > that is, as you allude to, a distinct license from GPLv3). > > FWIW the YP documentation states to mark GPL LGPL and AGPL v3 in > > INCOMPATIBLE_LICENSE to build a GPLv3 image, on the rationale that the > > usual clauses that upset people are not specific to the GPL variation. The > > autobuilder just excludes GPL right now, but there's a bug to fix this. Good. I had assumed that it was changed after the discussion that lead to the additional mentioning of LGPL-3.0 and AGPL-3.0 in the YP Manual. > > Of course IANAL and the opinion of someone who actually does use > > INCOMPATIBLE_LICENSE to remove GPLv3 software would be appreciated! Well, I guess that it's the opinion of someone who uses that, and has been running that through lawyers that's needed. Maybe one of the commercial distributors can chim in on that. Otherwise I guess that a lot of people using INCOMPATIBLE_LICENSE are doing that on a layman's basis, just like me... > I'm also not a lawyer, but for that exact reason I don't think we want to get > into any question of license equivalence or similarity - > INCOMPATIBLE_LICENSE, > if used, needs to list all of the licenses you wish to exclude, so if you > want > LGPLv3 excluded then you need to state that in addition to GPLv3 (and > naturally any recipe that builds LGPLv3-licensed source needs to state as > such > in the LICENSE value). Yes, we certainly don't want to state that everything except for a short list of licenses is OK. In the end, that's up to each and every company making products to decide. Though, in the YP documentation, we state as an example on how to get GPLv3-free builds, that you should set INCOMPATIBLE_LICENSE to "GPL-3.0 LGPL-3.0 AGPL-3.0", per an e-mail thread from last year (if I remember correctly. I know that at least Mark Hatle was involved in that thread, as well as I). Cheers, Anders -- Anders Darander ChargeStorm AB / eStorm AB -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] nettle: update package to 3.1.1 version.
* akuster808 [150702 19:05]: > The current version of nettle 2.7 has one file that is GPL v3. > mini-gmp.* > so the license for 2.7 should be updated IMHO. So wont that put us in the > same boat as the upgrade? Well, after looking a little bit at the repo in question, my understanding is that all files (well, those few I looked at, including mini-gmp.*) is dual licensed LGPLv3 /or/ GPLv2+, in the current master branch. It looks like this was done 2014-04-12, in 12 commits. So could you double check the 3.1.1 release, and verify whether it only consists of LGPLv3 | GPLv2+ licensed files, or if there actually are any files having the GPLv3(+) restriction? At least the commits from 2014-04-12 suggests that the whole nettle repo was clarified to be dual-licensed as LGPLv3 | GPLv2+ (though there's of course a risk that some files are left untouched). Though, it also suggests that upstream is willing to ensure that GPLv2 compatibility remains as an option. Cheers, Anders -- Anders Darander ChargeStorm AB / eStorm AB -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] cross-localedef-native_2.20.bb: fix for gcc5
Message-ID: <87wpycy88v@weregild.amer.corp.natinst.com>
MIME-Version: 1.0
Content-Type: text/plain
--text follows this line--
The build of cross-localedef-native is observed to fail under gcc5 hosts
with multiple definition errors, e.g.:
argp-help.o: In function `argp_fmtstream_write':
argp-help.c:(.text+0x1da0): multiple definition of `argp_fmtstream_write'
argp-fmtstream.o:argp-fmtstream.c:(.text+0x7a0): first defined here
The problem is the change of the default C standard from gnu89 to gnu11
which changes the semantics of 'inline'. The issue is described in the
Porting guide at https://gcc.gnu.org/gcc-5/porting_to.html. Adding the
'-fgnu89-inline' option fixes the issue.
(This fix, including the above explanation, was shamelessly copied from
http://git.vahanus.net/?p=csc/ptxdist-kp.git;a=commit;h=2f04a3587bd33c74ccc9be6e115a8b1fde620841.)
Signed-off-by: Richard Tollerton
---
meta/recipes-core/glibc/cross-localedef-native_2.20.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.20.bb
b/meta/recipes-core/glibc/cross-localedef-native_2.20.bb
index ccf56a9..38f2af4 100644
--- a/meta/recipes-core/glibc/cross-localedef-native_2.20.bb
+++ b/meta/recipes-core/glibc/cross-localedef-native_2.20.bb
@@ -39,7 +39,7 @@ SRCREV_localedef = "c833367348d39dad7ba018990bfdaffaec8e9ed3"
S = "${WORKDIR}/git"
EXTRA_OECONF = "--with-glibc=${S}"
-CFLAGS += "-DNOT_IN_libc=1"
+CFLAGS += "-DNOT_IN_libc=1 -fgnu89-inline"
do_configure () {
${S}/localedef/configure ${EXTRA_OECONF}
--
2.4.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
Hello,
Can non-GPLv3 parted be added into oe-core? I think not everybody wants to use
the GPLv3 version.
Cheers
Lei
> -Original Message-
> From: openembedded-devel-boun...@lists.openembedded.org
> [mailto:openembedded-devel-boun...@lists.openembedded.org] On Behalf Of Andre
> McCurdy
> Sent: Tuesday, July 07, 2015 6:23 AM
> To: openembedded-de...@lists.openembedded.org
> Subject: Re: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
>
> On Sun, Jul 5, 2015 at 6:51 PM, Lei Maohui wrote:
> > In oe-core,the parted is GPLv3,so add parted-1.8.6 which is not GPLv3.
>
> Thanks, it's good to have a non-GPLv3 recipe for parted.
>
> However, if the GPLv3 recipe is in oe-core then the non-GPLv3 version should
> be in
> oe-core as well, not in in meta-oe.
>
> The reason is that recipes in meta-oe have a higher priority (BBFILE_PRIORITY
> == 6) than
> those in oe-core (BBFILE_PRIORITY == 5).
> Therefore if you add a parted recipe to meta-oe then it will be used by
> default, which will
> be wrong for anyone who wants to continue to use the GPLv3 version in oe-core.
>
>
> http://www.yoctoproject.org/docs/current/mega-manual/mega-manual.html#var-BBFILE_
> PRIORITY
>
>
> > Signed-off-by: Lei Maohui
> > ---
> > .../parted-1.8.6/1000parted-1.8.6-warnings1.patch | 11
> > .../1001parted-1.8.6-notransname1.patch| 39 ++
> > .../1002parted-1.8.6-off-by-one1.patch | 25 +
> > .../1003parted-1.8.6-primary-boundary1.patch | 12 +
> > .../parted-1.8.6/1004parted-1.8.6-xvd1.patch | 50 +
> > .../1005parted-1.8.6-devmapper-header1.patch | 13 +
> > .../parted/parted-1.8.6/7000no_effect_macro1.patch | 11
> > .../parted/parted-1.8.6/ui.c-fix-build-error.patch | 26 +
> > meta-oe/recipes-extended/parted/parted_1.8.6.bb| 62
> ++
> > 9 files changed, 249 insertions(+)
> > create mode 100644
> > meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings
> > 1.patch create mode 100644
> > meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransn
> > ame1.patch create mode 100644
> > meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-o
> > ne1.patch create mode 100644
> > meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-
> > boundary1.patch create mode 100644
> > meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.pat
> > ch create mode 100644
> > meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmappe
> > r-header1.patch create mode 100644
> > meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patc
> > h create mode 100644
> > meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patc
> > h create mode 100644 meta-oe/recipes-extended/parted/parted_1.8.6.bb
> >
> > diff --git
> > a/meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnin
> > gs1.patch
> > b/meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnin
> > gs1.patch
> > new file mode 100644
> > index 000..c8b2e7d
> > --- /dev/null
> > +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-wa
> > +++ rnings1.patch
> > @@ -0,0 +1,11 @@
> > +--- parted-1.8.6/libparted/fs/linux_swap/linux_swap.c.warnings
> > +2007-03-20 13:22:36.0 -0400
> > parted-1.8.6/libparted/fs/linux_swap/linux_swap.c 2007-03-20
> > 13:59:11.0 -0400
> > +@@ -123,7 +123,7 @@
> > +
> > + error_close_fs:
> > + swap_close (fs);
> > +-error:
> > ++
> > + return 0;
> > + }
> > + #endif /* !DISCOVER_ONLY */
> > diff --git
> > a/meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notran
> > sname1.patch
> > b/meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notran
> > sname1.patch
> > new file mode 100644
> > index 000..5fdf10b
> > --- /dev/null
> > +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-no
> > +++ transname1.patch
> > @@ -0,0 +1,39 @@
> > +--- parted-1.8.6/parted/parted.c.notransname 2007-03-13
> > 13:01:09.0 -0400
> > parted-1.8.6/parted/parted.c 2007-03-21 10:50:35.0 -0400
> > +@@ -1429,7 +1429,7 @@
> > + part->fs_type->name :
> > +"");
> > +
> > + if (has_name) {
> > +-name = _(ped_partition_get_name
> > (part));
> > ++name = ped_partition_get_name
> > ++ (part);
> > + str_list_append (row, name);
> > + }
> > +
> > +--- parted-1.8.6/parted/table.c.notransname2007-03-13
> > 13:01:09.0 -0400
> > parted-1.8.6/parted/table.c2007-03-21 10:51:31.0 -0400
> > +@@ -191,7 +191,8 @@
> > + len += wcslen(COLSUFFIX);
> > +
> > + newsize = (wcslen(*s) + len + 1) * sizeof(wchar_t);
> > +-*s = realloc (*s, n
[OE-core] [PATCH 1/1] coreutils: upgrade to 8.24
Signed-off-by: Chen Qi
---
.../0001-Unset-need_charset_alias-when-building-for-musl.patch| 0
.../{coreutils-8.23 => coreutils-8.24}/fix-selinux-flask.patch| 0
.../man-decouple-manpages-from-build.patch| 0
.../remove-usr-local-lib-from-m4.patch| 0
.../coreutils/{coreutils_8.23.bb => coreutils_8.24.bb}| 8
5 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-core/coreutils/{coreutils-8.23 =>
coreutils-8.24}/0001-Unset-need_charset_alias-when-building-for-musl.patch
(100%)
rename meta/recipes-core/coreutils/{coreutils-8.23 =>
coreutils-8.24}/fix-selinux-flask.patch (100%)
rename meta/recipes-core/coreutils/{coreutils-8.23 =>
coreutils-8.24}/man-decouple-manpages-from-build.patch (100%)
rename meta/recipes-core/coreutils/{coreutils-8.23 =>
coreutils-8.24}/remove-usr-local-lib-from-m4.patch (100%)
rename meta/recipes-core/coreutils/{coreutils_8.23.bb => coreutils_8.24.bb}
(94%)
diff --git
a/meta/recipes-core/coreutils/coreutils-8.23/0001-Unset-need_charset_alias-when-building-for-musl.patch
b/meta/recipes-core/coreutils/coreutils-8.24/0001-Unset-need_charset_alias-when-building-for-musl.patch
similarity index 100%
rename from
meta/recipes-core/coreutils/coreutils-8.23/0001-Unset-need_charset_alias-when-building-for-musl.patch
rename to
meta/recipes-core/coreutils/coreutils-8.24/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/meta/recipes-core/coreutils/coreutils-8.23/fix-selinux-flask.patch
b/meta/recipes-core/coreutils/coreutils-8.24/fix-selinux-flask.patch
similarity index 100%
rename from meta/recipes-core/coreutils/coreutils-8.23/fix-selinux-flask.patch
rename to meta/recipes-core/coreutils/coreutils-8.24/fix-selinux-flask.patch
diff --git
a/meta/recipes-core/coreutils/coreutils-8.23/man-decouple-manpages-from-build.patch
b/meta/recipes-core/coreutils/coreutils-8.24/man-decouple-manpages-from-build.patch
similarity index 100%
rename from
meta/recipes-core/coreutils/coreutils-8.23/man-decouple-manpages-from-build.patch
rename to
meta/recipes-core/coreutils/coreutils-8.24/man-decouple-manpages-from-build.patch
diff --git
a/meta/recipes-core/coreutils/coreutils-8.23/remove-usr-local-lib-from-m4.patch
b/meta/recipes-core/coreutils/coreutils-8.24/remove-usr-local-lib-from-m4.patch
similarity index 100%
rename from
meta/recipes-core/coreutils/coreutils-8.23/remove-usr-local-lib-from-m4.patch
rename to
meta/recipes-core/coreutils/coreutils-8.24/remove-usr-local-lib-from-m4.patch
diff --git a/meta/recipes-core/coreutils/coreutils_8.23.bb
b/meta/recipes-core/coreutils/coreutils_8.24.bb
similarity index 94%
rename from meta/recipes-core/coreutils/coreutils_8.23.bb
rename to meta/recipes-core/coreutils/coreutils_8.24.bb
index 70c04a5..eb7500b 100644
--- a/meta/recipes-core/coreutils/coreutils_8.23.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.24.bb
@@ -20,10 +20,10 @@ SRC_URI =
"${GNU_MIRROR}/coreutils/${BP}.tar.xz;name=tarball \
file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
"
-SRC_URI[tarball.md5sum] = "abed135279f87ad6762ce57ff6d89c41"
-SRC_URI[tarball.sha256sum] =
"ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d"
-SRC_URI[manpages.md5sum] = "ce49bc8360e16afe67581d136606efc7"
-SRC_URI[manpages.sha256sum] =
"d1b16e74b3dba4f313aeebae2c69da205f7d2e6e1c2aa8d39026c860d314ecca"
+SRC_URI[tarball.md5sum] = "40efdbce865d2458d8da0a9dcee7c16c"
+SRC_URI[tarball.sha256sum] =
"a2d75286a4b9ef3a13039c2da3868a61be4ee9f17d8ae380a35a97e506972170"
+SRC_URI[manpages.md5sum] = "728a91a5c1095a33cffb9959bb891963"
+SRC_URI[manpages.sha256sum] =
"cf0333b5f134a331e0b46e2ddf90666f8bdc3281c1ca2c7ccbb75b437589ce37"
EXTRA_OECONF_class-native = "--without-gmp"
EXTRA_OECONF_class-target = "--enable-install-program=arch
--libexecdir=${libdir}"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] coreutils: upgrade to 8.24
The following changes since commit dd09fab685de2eaf04aa5ab60f8220b89c1deae9:
tune-core2.inc: set X86ARCH32 to i686 (instead of i586) (2015-07-02 23:08:27
+0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib ChenQi/coreutils-8.24
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/coreutils-8.24
Chen Qi (1):
coreutils: upgrade to 8.24
.../0001-Unset-need_charset_alias-when-building-for-musl.patch| 0
.../{coreutils-8.23 => coreutils-8.24}/fix-selinux-flask.patch| 0
.../man-decouple-manpages-from-build.patch| 0
.../remove-usr-local-lib-from-m4.patch| 0
.../coreutils/{coreutils_8.23.bb => coreutils_8.24.bb}| 8
5 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-core/coreutils/{coreutils-8.23 =>
coreutils-8.24}/0001-Unset-need_charset_alias-when-building-for-musl.patch
(100%)
rename meta/recipes-core/coreutils/{coreutils-8.23 =>
coreutils-8.24}/fix-selinux-flask.patch (100%)
rename meta/recipes-core/coreutils/{coreutils-8.23 =>
coreutils-8.24}/man-decouple-manpages-from-build.patch (100%)
rename meta/recipes-core/coreutils/{coreutils-8.23 =>
coreutils-8.24}/remove-usr-local-lib-from-m4.patch (100%)
rename meta/recipes-core/coreutils/{coreutils_8.23.bb => coreutils_8.24.bb}
(94%)
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] opkg-build: Ignore tar error due to hardlinks issue when creating ipk files
On Mon, 2015-07-06 at 18:20 -0300, Otavio Salvador wrote: > Hello, > > On Mon, Jul 6, 2015 at 6:16 PM, Gary Thomas wrote: > > On 2015-07-06 15:10, Alejandro Hernandez wrote: > >> > >> On 06/07/15 15:10, Martin Jansa wrote: > >>> > >>> On Mon, Jul 06, 2015 at 10:17:19AM +, Alejandro Hernandez wrote: > >>> > >>> + > >>> +This a similar behavior to the one on dpkg: > >>> > >>> +http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=40731942515ec8d80c727ad561174986d4f05818 > >>> + > >>> +Upsteam-Status: Inappropriate > >>> Typo and why is it inappropriate? Looks like bugfix to me, even for > >>> issue which usually happens in OE way of using opkg-build. > >> > >> > >> It seemed inappropriate to me, since this behavior is not expected (number > >> of hardlinks changing), we can't say for sure that this error will be > >> caused > >> by this reason on when using > >> opkg on another environment > >>> > >>> -SRC_URI = "git://git.yoctoproject.org/opkg-utils" > >>> +SRC_URI = "git://git.yoctoproject.org/opkg-utils " > >>> + > >>> +SRC_URI_append_class-native = "file://tar_ignore_error.patch" > >>> Add leading space in append not in original SRC_URI variable. > >>> > >>> Why is it applied only for native anyway? > >> > >> > >> Same argument as before, modifying the number of hardlinks while the tar > >> is created happens when building using bitbake, which should not happen on > >> target, if files changed when > >> creating an ipk for any other reason it shouldn't be ignored; space was a > >> typo > > > > > > Why is it happening when using bitbake? This seems like an > > error to me - one should not be generating the tarball (i.e. > > packing up the final results) if the set of files being packaged > > is changing in any way. > > > > Note: I'm pretty sure that error can also happen if the inode > > changes in many different ways, not just the number of links > > changing. > > I fully agree with Gary; this also makes unreproducible the number of > shared hard links in a final rootfs which is also important. > > This (and dpkg related patch) seems to be covering the real bug. > > (Adding Richard so he can also comment on this and to bring his > attention to the concerns exposed here) The issue here is some of the attempts to decrease disk usage and increase the build speed. To do that we hardlink files in the package directories rather than create individual copies in packages/ and package-split/. There are cases where other parts of the build (e.g. populate-sysroot) can create or remote copies of the hardlinked file which changes the link count. The files themselves do not change, only the link does and then only rarely. We fixed dpkg a while ago for this issue, this is the same fix being applied to opkg-build. The resulting packages will be the same since the hardlink count is internal to the tarball and not related to the number of original file copies. Since we control the build env, it is safe to do what we're doing here, however I would agree with Alejandro that it isn't something upstream would want to do. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] opkg-build: Ignore tar error due to hardlinks issue when creating ipk files
Hello, On Mon, Jul 6, 2015 at 6:16 PM, Gary Thomas wrote: > On 2015-07-06 15:10, Alejandro Hernandez wrote: >> >> On 06/07/15 15:10, Martin Jansa wrote: >>> >>> On Mon, Jul 06, 2015 at 10:17:19AM +, Alejandro Hernandez wrote: >>> >>> + >>> +This a similar behavior to the one on dpkg: >>> >>> +http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=40731942515ec8d80c727ad561174986d4f05818 >>> + >>> +Upsteam-Status: Inappropriate >>> Typo and why is it inappropriate? Looks like bugfix to me, even for >>> issue which usually happens in OE way of using opkg-build. >> >> >> It seemed inappropriate to me, since this behavior is not expected (number >> of hardlinks changing), we can't say for sure that this error will be caused >> by this reason on when using >> opkg on another environment >>> >>> -SRC_URI = "git://git.yoctoproject.org/opkg-utils" >>> +SRC_URI = "git://git.yoctoproject.org/opkg-utils " >>> + >>> +SRC_URI_append_class-native = "file://tar_ignore_error.patch" >>> Add leading space in append not in original SRC_URI variable. >>> >>> Why is it applied only for native anyway? >> >> >> Same argument as before, modifying the number of hardlinks while the tar >> is created happens when building using bitbake, which should not happen on >> target, if files changed when >> creating an ipk for any other reason it shouldn't be ignored; space was a >> typo > > > Why is it happening when using bitbake? This seems like an > error to me - one should not be generating the tarball (i.e. > packing up the final results) if the set of files being packaged > is changing in any way. > > Note: I'm pretty sure that error can also happen if the inode > changes in many different ways, not just the number of links > changing. I fully agree with Gary; this also makes unreproducible the number of shared hard links in a final rootfs which is also important. This (and dpkg related patch) seems to be covering the real bug. (Adding Richard so he can also comment on this and to bring his attention to the concerns exposed here) -- 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] opkg-build: Ignore tar error due to hardlinks issue when creating ipk files
On 2015-07-06 15:10, Alejandro Hernandez wrote: On 06/07/15 15:10, Martin Jansa wrote: On Mon, Jul 06, 2015 at 10:17:19AM +, Alejandro Hernandez wrote: + +This a similar behavior to the one on dpkg: +http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=40731942515ec8d80c727ad561174986d4f05818 + +Upsteam-Status: Inappropriate Typo and why is it inappropriate? Looks like bugfix to me, even for issue which usually happens in OE way of using opkg-build. It seemed inappropriate to me, since this behavior is not expected (number of hardlinks changing), we can't say for sure that this error will be caused by this reason on when using opkg on another environment -SRC_URI = "git://git.yoctoproject.org/opkg-utils" +SRC_URI = "git://git.yoctoproject.org/opkg-utils " + +SRC_URI_append_class-native = "file://tar_ignore_error.patch" Add leading space in append not in original SRC_URI variable. Why is it applied only for native anyway? Same argument as before, modifying the number of hardlinks while the tar is created happens when building using bitbake, which should not happen on target, if files changed when creating an ipk for any other reason it shouldn't be ignored; space was a typo Why is it happening when using bitbake? This seems like an error to me - one should not be generating the tarball (i.e. packing up the final results) if the set of files being packaged is changing in any way. Note: I'm pretty sure that error can also happen if the inode changes in many different ways, not just the number of links changing. -- Gary Thomas | Consulting for the MLB Associates |Embedded world -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] opkg-build: Ignore tar error due to hardlinks issue when creating ipk files
On 06/07/15 15:10, Martin Jansa wrote: On Mon, Jul 06, 2015 at 10:17:19AM +, Alejandro Hernandez wrote: + +This a similar behavior to the one on dpkg: +http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=40731942515ec8d80c727ad561174986d4f05818 + +Upsteam-Status: Inappropriate Typo and why is it inappropriate? Looks like bugfix to me, even for issue which usually happens in OE way of using opkg-build. It seemed inappropriate to me, since this behavior is not expected (number of hardlinks changing), we can't say for sure that this error will be caused by this reason on when using opkg on another environment -SRC_URI = "git://git.yoctoproject.org/opkg-utils" +SRC_URI = "git://git.yoctoproject.org/opkg-utils " + +SRC_URI_append_class-native = "file://tar_ignore_error.patch" Add leading space in append not in original SRC_URI variable. Why is it applied only for native anyway? Same argument as before, modifying the number of hardlinks while the tar is created happens when building using bitbake, which should not happen on target, if files changed when creating an ipk for any other reason it shouldn't be ignored; space was a typo -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 13/13] libffi: fix typo in fix-libffi.la-location.patch
Signed-off-by: Andre McCurdy --- meta/recipes-gnome/libffi/libffi/fix-libffi.la-location.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-gnome/libffi/libffi/fix-libffi.la-location.patch b/meta/recipes-gnome/libffi/libffi/fix-libffi.la-location.patch index 0a49ab5..775bffc 100644 --- a/meta/recipes-gnome/libffi/libffi/fix-libffi.la-location.patch +++ b/meta/recipes-gnome/libffi/libffi/fix-libffi.la-location.patch @@ -1,5 +1,5 @@ -Upstream-Status: Inaproppriate +Upstream-Status: Inappropriate Signed-off-by: Saul Wold -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 03/13] base-passwd: fix typo in add_shutdown.patch
Signed-off-by: Andre McCurdy --- meta/recipes-core/base-passwd/base-passwd/add_shutdown.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/base-passwd/base-passwd/add_shutdown.patch b/meta/recipes-core/base-passwd/base-passwd/add_shutdown.patch index eb75559..5f357d8 100644 --- a/meta/recipes-core/base-passwd/base-passwd/add_shutdown.patch +++ b/meta/recipes-core/base-passwd/base-passwd/add_shutdown.patch @@ -3,7 +3,7 @@ We need to have a shutdown group to allow the shutdown icon to work correctly. Any users that want to use shutdown like the xuser should be added to this group. -Upstream-Status: Inapporpriate [Embedded] +Upstream-Status: Inappropriate [Embedded] Signed-off-by: Saul Wold Index: base-passwd-3.5.26/group.master -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 01/13] distrodata.bbclass: fix typo, Upsteam -> Upstream
Signed-off-by: Andre McCurdy
---
meta/classes/distrodata.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index 39d5508..a228242 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -10,7 +10,7 @@ python distro_eventhandler() {
with open(logfile, "a") as f:
writer = csv.writer(f)
writer.writerow(['Package', 'Description', 'Owner', 'License',
-'VerMatch', 'Version', 'Upsteam', 'Reason', 'Recipe Status',
+'VerMatch', 'Version', 'Upstream', 'Reason', 'Recipe Status',
'Distro 1', 'Distro 2', 'Distro 3'])
f.close()
bb.utils.unlockfile(lf)
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 07/13] pkgconfig: fix typo in fix-glib-configure-libtool-usage.patch
Signed-off-by: Andre McCurdy --- .../pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch b/meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch index 9bee438..01c6247 100644 --- a/meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch +++ b/meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch @@ -1,5 +1,5 @@ -Upstream-Status: Inapropriate [embedded specific] +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Saul Wold -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 00/13] fix 'Upstream-Status: Inappropriate' typos
Upsteam -> Upstream Various variations on Inappropriate -> Inappropriate Andre McCurdy (13): distrodata.bbclass: fix typo, Upsteam -> Upstream dpkg: fix typo in tar-error-code.patch, Upsteam -> Upstream base-passwd: fix typo in add_shutdown.patch glibc: fix typo in add_resource_h_to_wait_h.patch dosfstools: fix typo in nofat32_autoselect.patch flex: fix typo in do_not_create_pdf_doc.patch pkgconfig: fix typo in fix-glib-configure-libtool-usage.patch python-numpy: fix typo in no-host-paths.patch rpm: fix typo in rpm-realpath.patch rpm: fix typo in rpm-reloc-macros.patch valgrind: fix typo in valgrind-remove-rpath.patch texinfo: fix typo in dont-depend-on-help2man.patch libffi: fix typo in fix-libffi.la-location.patch meta/classes/distrodata.bbclass | 2 +- meta/recipes-core/base-passwd/base-passwd/add_shutdown.patch| 2 +- meta/recipes-core/glibc/glibc/add_resource_h_to_wait_h.patch| 2 +- meta/recipes-devtools/dosfstools/dosfstools/nofat32_autoselect.patch| 2 +- meta/recipes-devtools/dpkg/dpkg/tar-error-code.patch| 2 +- meta/recipes-devtools/flex/files/do_not_create_pdf_doc.patch| 2 +- .../pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch | 2 +- meta/recipes-devtools/python/python-numpy/no-host-paths.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-realpath.patch| 2 +- meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch| 2 +- meta/recipes-devtools/valgrind/valgrind/valgrind-remove-rpath.patch | 2 +- meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch | 2 +- meta/recipes-gnome/libffi/libffi/fix-libffi.la-location.patch | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 05/13] dosfstools: fix typo in nofat32_autoselect.patch
Signed-off-by: Andre McCurdy --- meta/recipes-devtools/dosfstools/dosfstools/nofat32_autoselect.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/dosfstools/dosfstools/nofat32_autoselect.patch b/meta/recipes-devtools/dosfstools/dosfstools/nofat32_autoselect.patch index 6ee3f7f..848a76b 100644 --- a/meta/recipes-devtools/dosfstools/dosfstools/nofat32_autoselect.patch +++ b/meta/recipes-devtools/dosfstools/dosfstools/nofat32_autoselect.patch @@ -4,7 +4,7 @@ broken images with the -d option. It can still be enabled on the commandline at the users own risk. This changes us back to the 2.10 version's behaviour which was known to work well even with large images. -Upstream-Status: Inapproriate [depends on other patches we apply] +Upstream-Status: Inappropriate [depends on other patches we apply] RP 2011/12/13 -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 09/13] rpm: fix typo in rpm-realpath.patch
Signed-off-by: Andre McCurdy --- meta/recipes-devtools/rpm/rpm/rpm-realpath.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/rpm/rpm/rpm-realpath.patch b/meta/recipes-devtools/rpm/rpm/rpm-realpath.patch index d2d9b09..a810123 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-realpath.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-realpath.patch @@ -4,7 +4,7 @@ _usr turned out to be a relative path to support dyanmic config, but it's being used somewhere as a indicator to locate substrings, so we must get the real path of it in advance. -Upstream-Status: Inapproriate (OpenEmbedded specific) +Upstream-Status: Inappropriate (OpenEmbedded specific) Signed-off-by: Ming Liu -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/13] flex: fix typo in do_not_create_pdf_doc.patch
Signed-off-by: Andre McCurdy --- meta/recipes-devtools/flex/files/do_not_create_pdf_doc.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/flex/files/do_not_create_pdf_doc.patch b/meta/recipes-devtools/flex/files/do_not_create_pdf_doc.patch index 02ececb..032833ae 100644 --- a/meta/recipes-devtools/flex/files/do_not_create_pdf_doc.patch +++ b/meta/recipes-devtools/flex/files/do_not_create_pdf_doc.patch @@ -1,4 +1,4 @@ -Upstream-Status: Inapropriate (embedded specific) +Upstream-Status: Inappropriate (embedded specific) Signed-off-by: Laurentiu Palcu -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/13] glibc: fix typo in add_resource_h_to_wait_h.patch
Signed-off-by: Andre McCurdy --- meta/recipes-core/glibc/glibc/add_resource_h_to_wait_h.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/glibc/glibc/add_resource_h_to_wait_h.patch b/meta/recipes-core/glibc/glibc/add_resource_h_to_wait_h.patch index 4559de7..70f57c4 100644 --- a/meta/recipes-core/glibc/glibc/add_resource_h_to_wait_h.patch +++ b/meta/recipes-core/glibc/glibc/add_resource_h_to_wait_h.patch @@ -2,7 +2,7 @@ The older versions of perf still require sys/resource.h to be present in this header, the newer version of perf in 3.2 and beyond directly include sys/resource.h -Upstream-Status: Inapproriate [older kernel/perf specific] +Upstream-Status: Inappropriate [older kernel/perf specific] Signed-off-by: Saul Wold -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 11/13] valgrind: fix typo in valgrind-remove-rpath.patch
Signed-off-by: Andre McCurdy --- meta/recipes-devtools/valgrind/valgrind/valgrind-remove-rpath.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/valgrind/valgrind/valgrind-remove-rpath.patch b/meta/recipes-devtools/valgrind/valgrind/valgrind-remove-rpath.patch index 07a2726..f72e9ca 100644 --- a/meta/recipes-devtools/valgrind/valgrind/valgrind-remove-rpath.patch +++ b/meta/recipes-devtools/valgrind/valgrind/valgrind-remove-rpath.patch @@ -1,5 +1,5 @@ -Upstream-Status: Inapporpiate [embedded config] +Upstream-Status: Inappropriate [embedded config] Signed-off-by: Saul Wold Index: valgrind-3.10.0/none/tests/Makefile.am -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 12/13] texinfo: fix typo in dont-depend-on-help2man.patch
Signed-off-by: Andre McCurdy --- meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch b/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch index 6e216da..876e0d0 100644 --- a/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch +++ b/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch @@ -1,4 +1,4 @@ -Upstream-Status: Inappropŕiate +Upstream-Status: Inappropriate Signed-off-by: Marko Lindqvist diff -Nurd texinfo-5.1/doc/Makefile.am texinfo-5.1/doc/Makefile.am -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/13] rpm: fix typo in rpm-reloc-macros.patch
Signed-off-by: Andre McCurdy --- meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch b/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch index 0a5f5a4..59fe524 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch @@ -4,7 +4,7 @@ When the dynamic, runtime relocation is enables we need to make sure that the RPM macro file does not override the dynamic settings. Fix this by forcing the dynamic version to be used in all cases. -Upstream-Status: Inapproriate (OpenEmbedded specific) +Upstream-Status: Inappropriate (OpenEmbedded specific) Signed-off-by: Mark Hatle -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/13] python-numpy: fix typo in no-host-paths.patch
Signed-off-by: Andre McCurdy --- meta/recipes-devtools/python/python-numpy/no-host-paths.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python-numpy/no-host-paths.patch b/meta/recipes-devtools/python/python-numpy/no-host-paths.patch index 0efb01a..d745036 100644 --- a/meta/recipes-devtools/python/python-numpy/no-host-paths.patch +++ b/meta/recipes-devtools/python/python-numpy/no-host-paths.patch @@ -1,6 +1,6 @@ Don't search /usr and so on for libraries by default to avoid host contamination. -Upstream-Status: Inapproprite (As the code stands, this is a hack) +Upstream-Status: Inappropriate (As the code stands, this is a hack) Signed-off-by: Ross Burton diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/13] dpkg: fix typo in tar-error-code.patch, Upsteam -> Upstream
Signed-off-by: Andre McCurdy --- meta/recipes-devtools/dpkg/dpkg/tar-error-code.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/dpkg/dpkg/tar-error-code.patch b/meta/recipes-devtools/dpkg/dpkg/tar-error-code.patch index 7be2090..dcde508 100644 --- a/meta/recipes-devtools/dpkg/dpkg/tar-error-code.patch +++ b/meta/recipes-devtools/dpkg/dpkg/tar-error-code.patch @@ -13,7 +13,7 @@ in other error cases. We tweak dpkg-deb here so that it ignores an exit code of 1 from tar. The files don't really change (and we have locking in place to avoid that kind of issue). -Upsteam-Status: Inappropriate +Upstream-Status: Inappropriate RP 2015/3/27 Index: dpkg-1.17.21/dpkg-deb/build.c -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] opkg-build: Ignore tar error due to hardlinks issue when creating ipk files
On Mon, Jul 06, 2015 at 10:17:19AM +, Alejandro Hernandez wrote:
> If a the number of hard links decreases or increases while creating
> the tar files used for an ipk package, tar fails with error code 1,
> if this is the case we ignore the error and continue to create the ipk file
>
> [YOCTO #7933]
>
> Signed-off-by: Alejandro Hernandez
> ---
> .../opkg-utils/opkg-utils/tar_ignore_error.patch | 47
> ++
> meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 4 +-
> 2 files changed, 50 insertions(+), 1 deletion(-)
> create mode 100644
> meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
>
> diff --git
> a/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
> b/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
> new file mode 100644
> index 000..4bcae4954
> --- /dev/null
> +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
> @@ -0,0 +1,47 @@
> +If a the number of hard links decreases or increases while creating
> +the tar files used for an ipk package, tar fails with error code 1:
> +
> +| DEBUG: Executing python function do_package_ipk
> +| tar: ./usr/src/debug/gperf/3.0.4-r0/gperf-3.0.4/src/main.cc: file changed
> as we read it
> +NOTE: recipe gperf-3.0.4-r0: task do_package_write_ipk: Failed
> +ERROR: Task 6539 (recipes-extended/gperf/gperf_3.0.4.bb,
> do_package_write_ipk) failed with exit code '1'
> +
> +
> +We detect if the error code produced by tar is 1 and in this case ignore it.
> +
> +This a similar behavior to the one on dpkg:
> +http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=40731942515ec8d80c727ad561174986d4f05818
> +
> +Upsteam-Status: Inappropriate
Typo and why is it inappropriate? Looks like bugfix to me, even for
issue which usually happens in OE way of using opkg-build.
> +
> +Signed-off-by: Alejandro Hernandez
> +
> +
> +Index: git/opkg-build
> +===
> +--- git.orig/opkg-build
> git/opkg-build
> +@@ -250,8 +250,21 @@ tmp_dir=$dest_dir/IPKG_BUILD.$$
> + mkdir $tmp_dir
> +
> + echo $CONTROL > $tmp_dir/tarX
> +-( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -cz $tarformat -f
> $tmp_dir/data.tar.gz . )
> +-( cd $pkg_dir/$CONTROL && tar $ogargs -cz $tarformat -f
> $tmp_dir/control.tar.gz . )
> ++
> ++
> ++# Ignore error code 1, caused by modifying the number of hard links while
> creating the tar file
> ++rc=0
> ++( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -cz $tarformat -f
> $tmp_dir/data.tar.gz . ) || rc=$?
> ++if [[ $rc -ne 1 ]] && [[ $rc -ne 0 ]] ;then
> ++exit $rc
> ++fi
> ++
> ++rc=0
> ++( cd $pkg_dir/$CONTROL && tar $ogargs -cz $tarformat -f
> $tmp_dir/control.tar.gz . ) || rc=$?
> ++if [[ $rc -ne 1 ]] && [[ $rc -ne 0 ]] ;then
> ++exit $rc
> ++fi
> ++
> + rm $tmp_dir/tarX
> +
> + echo "2.0" > $tmp_dir/debian-binary
> diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> index 2800a5d..74b974d 100644
> --- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> @@ -10,7 +10,9 @@ PROVIDES += "virtual/update-alternatives"
> SRCREV = "53274f087565fd45d8452c5367997ba6a682a37a"
> PV = "0.1.8+git${SRCPV}"
>
> -SRC_URI = "git://git.yoctoproject.org/opkg-utils"
> +SRC_URI = "git://git.yoctoproject.org/opkg-utils "
> +
> +SRC_URI_append_class-native = "file://tar_ignore_error.patch"
Add leading space in append not in original SRC_URI variable.
Why is it applied only for native anyway?
>
> S = "${WORKDIR}/git"
>
> --
> 1.8.4.5
>
> --
> ___
> 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
[OE-core] [PATCH 1/1] opkg-build: Ignore tar error due to hardlinks issue when creating ipk files
If a the number of hard links decreases or increases while creating
the tar files used for an ipk package, tar fails with error code 1,
if this is the case we ignore the error and continue to create the ipk file
[YOCTO #7933]
Signed-off-by: Alejandro Hernandez
---
.../opkg-utils/opkg-utils/tar_ignore_error.patch | 47 ++
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 4 +-
2 files changed, 50 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
b/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
new file mode 100644
index 000..4bcae4954
--- /dev/null
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
@@ -0,0 +1,47 @@
+If a the number of hard links decreases or increases while creating
+the tar files used for an ipk package, tar fails with error code 1:
+
+| DEBUG: Executing python function do_package_ipk
+| tar: ./usr/src/debug/gperf/3.0.4-r0/gperf-3.0.4/src/main.cc: file changed as
we read it
+NOTE: recipe gperf-3.0.4-r0: task do_package_write_ipk: Failed
+ERROR: Task 6539 (recipes-extended/gperf/gperf_3.0.4.bb, do_package_write_ipk)
failed with exit code '1'
+
+
+We detect if the error code produced by tar is 1 and in this case ignore it.
+
+This a similar behavior to the one on dpkg:
+http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=40731942515ec8d80c727ad561174986d4f05818
+
+Upsteam-Status: Inappropriate
+
+Signed-off-by: Alejandro Hernandez
+
+
+Index: git/opkg-build
+===
+--- git.orig/opkg-build
git/opkg-build
+@@ -250,8 +250,21 @@ tmp_dir=$dest_dir/IPKG_BUILD.$$
+ mkdir $tmp_dir
+
+ echo $CONTROL > $tmp_dir/tarX
+-( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -cz $tarformat -f
$tmp_dir/data.tar.gz . )
+-( cd $pkg_dir/$CONTROL && tar $ogargs -cz $tarformat -f
$tmp_dir/control.tar.gz . )
++
++
++# Ignore error code 1, caused by modifying the number of hard links while
creating the tar file
++rc=0
++( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -cz $tarformat -f
$tmp_dir/data.tar.gz . ) || rc=$?
++if [[ $rc -ne 1 ]] && [[ $rc -ne 0 ]] ;then
++exit $rc
++fi
++
++rc=0
++( cd $pkg_dir/$CONTROL && tar $ogargs -cz $tarformat -f
$tmp_dir/control.tar.gz . ) || rc=$?
++if [[ $rc -ne 1 ]] && [[ $rc -ne 0 ]] ;then
++exit $rc
++fi
++
+ rm $tmp_dir/tarX
+
+ echo "2.0" > $tmp_dir/debian-binary
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index 2800a5d..74b974d 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
@@ -10,7 +10,9 @@ PROVIDES += "virtual/update-alternatives"
SRCREV = "53274f087565fd45d8452c5367997ba6a682a37a"
PV = "0.1.8+git${SRCPV}"
-SRC_URI = "git://git.yoctoproject.org/opkg-utils"
+SRC_URI = "git://git.yoctoproject.org/opkg-utils "
+
+SRC_URI_append_class-native = "file://tar_ignore_error.patch"
S = "${WORKDIR}/git"
--
1.8.4.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] SDK extract errors on master
On 06/07/15 16:56, Jack Mitchell wrote:
On 06/07/15 13:30, Jack Mitchell wrote:
On 06/07/15 12:35, Jack Mitchell wrote:
On 03/07/15 15:56, Jack Mitchell wrote:
Built an SDK today on 7eb0abc5f4d971d9a511c93cfb2eb52b72e6f228 and
when I tried to install it I got the following error:
Setting it up...ls: cannot access
/home/jack/Work/build/openembedded/sdk/1/x86_64/environment-setup-*: No
such file or directory
I have been messing about with the SDK install path and at one
point it did spew out a load of files installed vs shipped warnings
I assume due to a change of path and it getting upset about it, but
since then I deleted the tmp directory and rebuilt a new SDK
without warnings. However, both acted in the same way.
The SDK then sits without installing, seemingly stuck on: grep
OECORE_NATIVE_SYSROOT, which I assume means it's looking for the
(non-existant) nvironment file.
Any clues? Is this broken for anyone else?
Cheers,
Jack.
Ok, I figured out how I broke it; I used a relative path in SDKPATH.
i.e.
SDKPATH=/path/to/sdk/../rel-sdk
So, first off; should this be supported? Secondly, the use-case I
was trying to get at was to position an SDK relative to the build
dir, i.e.
SDKPATH=${TOPDIR}/../sdk
Is there a better way to do this. I guess this problem could be
solved somewhere in an SDK class by changing the relative path to an
absolute path. Ideas?
Cheers,
Jack.
I found an ugly work-around but it would be nice for this to be
supported in the future, or at least error on a relative path.
SDKPATH := "${@os.path.abspath(d.getVar('TOPDIR',
True)+"/../sdk/"+d.getVar('SDK_VERSION',
True)+"/"+d.getVar('SDK_ARCH', True))}"
Cheers,
The saga continues... so, using a relative path is what causes bitbake
to spew the 'installed vs shipped' warnings; which I thought were the
root cause of the SDK failing to install, but apparently not. I'm
appending a custom recipe like this:
TOOLCHAIN_HOST_TASK += "nativesdk-fastboot"
Which seems to be the root cause of the SDK failing to install. I have
grepped the output of bitbake -e image -c populate_sdk and I get:
TOOLCHAIN_HOST_TASK="nativesdk-packagegroup-sdk-host
packagegroup-cross-canadian-diffusion nativesdk-fastboot"
Which looks perfectly reasonable to me; the fastboot recipe also
builds without issue and the resulting package looks sane. So, why is
this breaking the SDK and causing other packages not to be installed,
it looks specifically like it nullifies the
packagegroup-cross-canadian-diffusion as that is what brings in
meta-environment and as such environment-setup-* which is what is
claimed to be missing on SDK extract.
I'm totally out of my depth now as on the surface everything looks OK.
Any input would be much appreciated.
Cheers,
Turns out it's one of the magic variables that requires an _append
rather than just a +=.
The example above turns out to be from my tests using _append and I
didn't realise it was different with just a plain +=.
To conclude, TOOLCHAIN_HOST_TASK += "nativesdk-package" will overwrite
TOOLCHAIN_HOST_TASK to just hold nativesdk-package, as such
nativesdk-packagegroup-sdk-host and
packagegroup-cross-canadian-diffusion won't be present anymore which
makes a whole lot of sense now. Using append, like so:
TOOLCHAIN_HOST_TASK_append += "nativesdk-fastboot"
Will give you the whole list and result in:
TOOLCHAIN_HOST_TASK="nativesdk-packagegroup-sdk-host
packagegroup-cross-canadian-diffusion nativesdk-fastboot"
Which is correct. Sorry for the noise; but just a heads up that I now
feel strongly that this should be in the Yocto Docs somewhere, there is
no mention of extending the SDK at all from what I could see and current
examples found online specify just a plain += is fine to use, which it
isn't.
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] SDK extract errors on master
On 06/07/15 13:30, Jack Mitchell wrote:
On 06/07/15 12:35, Jack Mitchell wrote:
On 03/07/15 15:56, Jack Mitchell wrote:
Built an SDK today on 7eb0abc5f4d971d9a511c93cfb2eb52b72e6f228 and
when I tried to install it I got the following error:
Setting it up...ls: cannot access
/home/jack/Work/build/openembedded/sdk/1/x86_64/environment-setup-*:
No such file or directory
I have been messing about with the SDK install path and at one point
it did spew out a load of files installed vs shipped warnings I
assume due to a change of path and it getting upset about it, but
since then I deleted the tmp directory and rebuilt a new SDK without
warnings. However, both acted in the same way.
The SDK then sits without installing, seemingly stuck on: grep
OECORE_NATIVE_SYSROOT, which I assume means it's looking for the
(non-existant) nvironment file.
Any clues? Is this broken for anyone else?
Cheers,
Jack.
Ok, I figured out how I broke it; I used a relative path in SDKPATH.
i.e.
SDKPATH=/path/to/sdk/../rel-sdk
So, first off; should this be supported? Secondly, the use-case I was
trying to get at was to position an SDK relative to the build dir, i.e.
SDKPATH=${TOPDIR}/../sdk
Is there a better way to do this. I guess this problem could be
solved somewhere in an SDK class by changing the relative path to an
absolute path. Ideas?
Cheers,
Jack.
I found an ugly work-around but it would be nice for this to be
supported in the future, or at least error on a relative path.
SDKPATH := "${@os.path.abspath(d.getVar('TOPDIR',
True)+"/../sdk/"+d.getVar('SDK_VERSION',
True)+"/"+d.getVar('SDK_ARCH', True))}"
Cheers,
The saga continues... so, using a relative path is what causes bitbake
to spew the 'installed vs shipped' warnings; which I thought were the
root cause of the SDK failing to install, but apparently not. I'm
appending a custom recipe like this:
TOOLCHAIN_HOST_TASK += "nativesdk-fastboot"
Which seems to be the root cause of the SDK failing to install. I have
grepped the output of bitbake -e image -c populate_sdk and I get:
TOOLCHAIN_HOST_TASK="nativesdk-packagegroup-sdk-host
packagegroup-cross-canadian-diffusion nativesdk-fastboot"
Which looks perfectly reasonable to me; the fastboot recipe also builds
without issue and the resulting package looks sane. So, why is this
breaking the SDK and causing other packages not to be installed, it
looks specifically like it nullifies the
packagegroup-cross-canadian-diffusion as that is what brings in
meta-environment and as such environment-setup-* which is what is
claimed to be missing on SDK extract.
I'm totally out of my depth now as on the surface everything looks OK.
Any input would be much appreciated.
Cheers,
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] speex, speexdsp: 1.2rc1 -> 1.2rc2/1.2rc3
These patches update speex to 1.2rc2 and speexdsp to 1.2rc3. speexdsp
was previously included in speex, but now it's in a separate source
tree, so a new recipe is needed.
The following changes since commit dd09fab685de2eaf04aa5ab60f8220b89c1deae9:
tune-core2.inc: set X86ARCH32 to i686 (instead of i586) (2015-07-02 23:08:27
+0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib tanuk/speex
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=tanuk/speex
Tanu Kaskinen (3):
speexdsp: initial recipe
speex: 1.2rc1 -> 1.2rc2
alsa-plugins, pulseaudio: depend on speexdsp, not speex
.../recipes-multimedia/alsa/alsa-plugins_1.0.29.bb | 4 +-
meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +-
meta/recipes-multimedia/speex/speex-fpu.inc| 4 --
.../speex/{speex_1.2rc1.bb => speex_1.2rc2.bb} | 18 +++
...ely-on-HAVE_STDINT_H-et-al.-being-defined.patch | 63 ++
meta/recipes-multimedia/speex/speexdsp_1.2rc3.bb | 39 ++
6 files changed, 112 insertions(+), 18 deletions(-)
delete mode 100644 meta/recipes-multimedia/speex/speex-fpu.inc
rename meta/recipes-multimedia/speex/{speex_1.2rc1.bb => speex_1.2rc2.bb} (51%)
create mode 100644
meta/recipes-multimedia/speex/speexdsp/0001-Don-t-rely-on-HAVE_STDINT_H-et-al.-being-defined.patch
create mode 100644 meta/recipes-multimedia/speex/speexdsp_1.2rc3.bb
--
1.9.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] alsa-plugins, pulseaudio: depend on speexdsp, not speex
Speexdsp was split off from speex, and alsa-plugins and pulseaudio
only depend on the speexdsp library.
Signed-off-by: Tanu Kaskinen
---
meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb | 4 ++--
meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb
b/meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb
index 85df8bf..3395031 100644
--- a/meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb
+++ b/meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb
@@ -29,7 +29,7 @@ inherit autotools pkgconfig
PACKAGECONFIG ??= "\
samplerate \
-speex \
+speexdsp \
${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio',
'', d)} \
"
PACKAGECONFIG[avcodec] = "--enable-avcodec,--disable-avcodec,libav"
@@ -38,7 +38,7 @@ PACKAGECONFIG[maemo-plugin] =
"--enable-maemo-plugin,--disable-maemo-plugin"
PACKAGECONFIG[maemo-resource-manager] =
"--enable-maemo-resource-manager,--disable-maemo-resource-manager,dbus"
PACKAGECONFIG[pulseaudio] =
"--enable-pulseaudio,--disable-pulseaudio,pulseaudio"
PACKAGECONFIG[samplerate] =
"--enable-samplerate,--disable-samplerate,libsamplerate0"
-PACKAGECONFIG[speex] = "--with-speex=lib,--with-speex=no,speex"
+PACKAGECONFIG[speexdsp] = "--with-speex=lib,--with-speex=no,speexdsp"
PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio',
'alsa-plugins-pulseaudio-conf', '', d)}"
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 30fe221..b309d26 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM =
"file://GPL;md5=4325afd396febcb659c36b49533135d4 \
DEPENDS = "libatomics-ops liboil libsndfile1 libtool"
# optional
DEPENDS += "udev alsa-lib glib-2.0 dbus gconf"
-DEPENDS += "json-c gdbm speex libxml-parser-perl-native libcap"
+DEPENDS += "json-c gdbm speexdsp libxml-parser-perl-native libcap"
inherit autotools pkgconfig useradd gettext perlnative bluetooth systemd
--
1.9.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] speexdsp: initial recipe
speexdsp was split off from speex in 1.2rc2, so we need a separate
recipe for speexdsp when before we can upgrade speex.
The speex recipe has so far used the --enable-fixed-point configure
option unconditionally, but I believe that was a mistake, so I
dropped that. The option is still enabled if TARGET_FPU is set to
"soft". Commit e8f707f16a38d85535593a32efff6dcbf4ddb203 added the
TARGET_FPU check, and I think that commit should have removed
--enable-fixed-point from the static configure options, like it
removed --disable-float-api.
The NEON code caused a build failure on qemuarm64. As a workaround,
I disabled NEON optimizations when building for aarch64.
I added a patch that fixes a build failure in alsa-plugins. Compiling
alsa-plugins against the new speexdsp version without the patch
resulted in this error:
In file included from .../usr/include/speex/speexdsp_types.h:122:0,
from .../usr/include/speex/speex_preprocess.h:46,
from .../alsa-plugins-1.0.29/speex/pcm_speex.c:23:
.../usr/include/speex/speexdsp_config_types.h:13:9: error: unknown type name
'uint16_t'
typedef uint16_t spx_uint16_t;
^
Signed-off-by: Tanu Kaskinen
---
...ely-on-HAVE_STDINT_H-et-al.-being-defined.patch | 63 ++
meta/recipes-multimedia/speex/speexdsp_1.2rc3.bb | 39 ++
2 files changed, 102 insertions(+)
create mode 100644
meta/recipes-multimedia/speex/speexdsp/0001-Don-t-rely-on-HAVE_STDINT_H-et-al.-being-defined.patch
create mode 100644 meta/recipes-multimedia/speex/speexdsp_1.2rc3.bb
diff --git
a/meta/recipes-multimedia/speex/speexdsp/0001-Don-t-rely-on-HAVE_STDINT_H-et-al.-being-defined.patch
b/meta/recipes-multimedia/speex/speexdsp/0001-Don-t-rely-on-HAVE_STDINT_H-et-al.-being-defined.patch
new file mode 100644
index 000..c7067da
--- /dev/null
+++
b/meta/recipes-multimedia/speex/speexdsp/0001-Don-t-rely-on-HAVE_STDINT_H-et-al.-being-defined.patch
@@ -0,0 +1,63 @@
+From c73370ceafd138becee8ca3c688ba75756830bfe Mon Sep 17 00:00:00 2001
+From: Tanu Kaskinen
+Date: Sun, 5 Jul 2015 17:48:16 +0300
+Subject: [PATCH] Don't rely on HAVE_STDINT_H et al. being defined
+
+Not everyone who includes speexdsp_config_types.h will have a test
+which defines those, and if we've chosen to use the stdint types at
+configure time then we know exactly which header(s) are available, so
+just choose the best one then and generate the header to use it.
+
+This patch, including the above text, is copied from a commit in the
+speex repository[1]. The original commit for speex was made by Ron
+.
+
+[1]
https://git.xiph.org/?p=speex.git;a=commitdiff;h=774c87d6cb7dd8dabdd17677fc6da753ecf4aa87
+
+Upstream-Status: Backport
+
+Signed-off-by: Tanu Kaskinen
+---
+ configure.ac | 6 ++
+ include/speex/speexdsp_config_types.h.in | 8 +---
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2cd2d1e..1de0c23 100644
+--- a/configure.ac
b/configure.ac
+@@ -334,6 +334,12 @@ AC_SUBST([USIZE16])
+ AC_SUBST([SIZE32])
+ AC_SUBST([USIZE32])
+
++AS_IF([test "$ac_cv_header_stdint_h" = "yes"],[INCLUDE_STDINT="#include
"],
++ [test "$ac_cv_header_inttypes_h" = "yes"], [INCLUDE_STDINT="#include
"],
++ [test "$ac_cv_header_sys_types_h" = "yes"], [INCLUDE_STDINT="#include
"])
++
++AC_SUBST([INCLUDE_STDINT])
++
+ AC_CONFIG_FILES([
+Makefile libspeexdsp/Makefile doc/Makefile SpeexDSP.spec
+include/Makefile include/speex/Makefile speexdsp.pc
+diff --git a/include/speex/speexdsp_config_types.h.in
b/include/speex/speexdsp_config_types.h.in
+index 02b82fd..5ea7b55 100644
+--- a/include/speex/speexdsp_config_types.h.in
b/include/speex/speexdsp_config_types.h.in
+@@ -1,13 +1,7 @@
+ #ifndef __SPEEX_TYPES_H__
+ #define __SPEEX_TYPES_H__
+
+-#if defined HAVE_STDINT_H
+-# include
+-#elif defined HAVE_INTTYPES_H
+-# include
+-#elif defined HAVE_SYS_TYPES_H
+-# include
+-#endif
++@INCLUDE_STDINT@
+
+ typedef @SIZE16@ spx_int16_t;
+ typedef @USIZE16@ spx_uint16_t;
+--
+1.9.3
+
diff --git a/meta/recipes-multimedia/speex/speexdsp_1.2rc3.bb
b/meta/recipes-multimedia/speex/speexdsp_1.2rc3.bb
new file mode 100644
index 000..6b1aced
--- /dev/null
+++ b/meta/recipes-multimedia/speex/speexdsp_1.2rc3.bb
@@ -0,0 +1,39 @@
+SUMMARY = "A patent-free DSP library"
+DESCRIPTION = "SpeexDSP is a patent-free, Open Source/Free Software DSP
library."
+HOMEPAGE = "http://www.speex.org";
+SECTION = "libs"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=314649d8ba9dd7045dfb6683f298d0a8"
+
+SRC_URI = "http://downloads.xiph.org/releases/speex/speexdsp-${PV}.tar.gz \
+ file://0001-Don-t-rely-on-HAVE_STDINT_H-et-al.-being-defined.patch"
+
+SRC_URI[md5sum] = "70d9d31184f7eb761192fd1ef0b7"
+SRC_URI[sha256sum] =
"4ae688600039f5d224bdf2e222d2fbde65608447e4c2f681585e4dca6df692f1"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "\
+--disable-exam
[OE-core] [PATCH 2/3] speex: 1.2rc1 -> 1.2rc2
Dropped speex-fpu.inc, since it's simpler to put the logic directly in
the .bb file.
LIC_FILES_CHKSUM changed due to whitespace changes only.
Dropped PR.
Added a dependency on speexdsp. The speexdsp functionality used to be
included in speex, but upstream split the speexdsp package off into a
separate source tree. speexdsp could otherwise be an optional
dependency, but the upstream configure script doesn't support
disabling it explicitly, and relying on automatic detection would
make builds nondeterministic, so it's better to always enable it.
--enable-fixed-point was previously included in the configure options
unconditionally, but the option should be used only when TARGET_FPU is
set to "soft".
--with-ogg-libraries, --with-ogg-includes and --disable-oggtest aren't
supported anymore, since speex now uses pkg-config to find libogg.
Signed-off-by: Tanu Kaskinen
---
meta/recipes-multimedia/speex/speex-fpu.inc| 4
.../speex/{speex_1.2rc1.bb => speex_1.2rc2.bb} | 18 +++---
2 files changed, 7 insertions(+), 15 deletions(-)
delete mode 100644 meta/recipes-multimedia/speex/speex-fpu.inc
rename meta/recipes-multimedia/speex/{speex_1.2rc1.bb => speex_1.2rc2.bb} (51%)
diff --git a/meta/recipes-multimedia/speex/speex-fpu.inc
b/meta/recipes-multimedia/speex/speex-fpu.inc
deleted file mode 100644
index 2571d32..000
--- a/meta/recipes-multimedia/speex/speex-fpu.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-def get_speex_fpu_setting(bb, d):
- if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
- return "--enable-fixed-point --disable-float-api --disable-vbr"
- return ""
diff --git a/meta/recipes-multimedia/speex/speex_1.2rc1.bb
b/meta/recipes-multimedia/speex/speex_1.2rc2.bb
similarity index 51%
rename from meta/recipes-multimedia/speex/speex_1.2rc1.bb
rename to meta/recipes-multimedia/speex/speex_1.2rc2.bb
index 5ff50b7..f7d23db 100644
--- a/meta/recipes-multimedia/speex/speex_1.2rc1.bb
+++ b/meta/recipes-multimedia/speex/speex_1.2rc2.bb
@@ -4,20 +4,16 @@ HOMEPAGE = "http://www.speex.org";
SECTION = "libs"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=314649d8ba9dd7045dfb6683f298d0a8 \
-
file://include/speex/speex.h;beginline=1;endline=34;md5=a68129f78d7fe66e07163f73aba143b3"
-DEPENDS = "libogg"
-
-PR = "r2"
+
file://include/speex/speex.h;beginline=1;endline=34;md5=ef8c8ea4f7198d71cf3509c6ed05ea50"
+DEPENDS = "libogg speexdsp"
SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-${PV}.tar.gz";
-SRC_URI[md5sum] = "c4438b22c08e5811ff10e2b06ee9b9ae"
-SRC_URI[sha256sum] =
"342f30dc57bd4a6dad41398365baaa690429660b10d866b7d508e8f1179cb7a6"
+SRC_URI[md5sum] = "6ae7db3bab01e1d4b86bacfa8ca33e81"
+SRC_URI[sha256sum] =
"caa27c7247ff15c8521c2ae0ea21987c9e9710a8f2d3448e8b79da9806bce891"
inherit autotools pkgconfig lib_package
-EXTRA_OECONF = " --enable-fixed-point --with-ogg-libraries=${STAGING_LIBDIR} \
- --with-ogg-includes=${STAGING_INCDIR} --disable-oggtest"
-
-require speex-fpu.inc
-EXTRA_OECONF += "${@get_speex_fpu_setting(bb, d)}"
+EXTRA_OECONF = "\
+${@bb.utils.contains('TARGET_FPU', 'soft', '--enable-fixed-point
--disable-float-api --disable-vbr', '', d)} \
+"
--
1.9.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] ca-certificates: remove Debianism in run-parts invocation
ca-certificates comes from Debian but not all distros (i.e. Fedora) have a leaner run-parts that doesn't support the -- separator between options and paths, which causes this error: | Running hooks in [...]/rootfs/etc/ca-certificates/update.d... | [...]/usr/sbin/update-ca-certificates: line 194: Not: command not found Signed-off-by: Ross Burton --- ...ertificates-don-t-use-Debianisms-in-run-p.patch | 33 ++ .../ca-certificates/ca-certificates_20141019.bb| 1 + 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch diff --git a/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch b/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch new file mode 100644 index 000..d7d487e --- /dev/null +++ b/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch @@ -0,0 +1,33 @@ +ca-certificates is a package from Debian, but some host distros such as Fedora +have a leaner run-parts provided by cron which doesn't support --verbose or the + -- separator between arguments and paths. + +This solves errors such as + +| Running hooks in [...]/rootfs/etc/ca-certificates/update.d... +| [...]/usr/sbin/update-ca-certificates: line 194: Not: command not found + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton +--- + sbin/update-ca-certificates | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates +index fed9c25..29ecc69 100755 +--- a/sbin/update-ca-certificates b/sbin/update-ca-certificates +@@ -186,9 +186,7 @@ echo "$ADDED_CNT added, $REMOVED_CNT removed; done." + + HOOKSDIR=$SYSROOT/etc/ca-certificates/update.d + echo -n "Running hooks in $HOOKSDIR" +-VERBOSE_ARG= +-[ "$verbose" = 0 ] || VERBOSE_ARG=--verbose +-eval run-parts $VERBOSE_ARG --test -- $HOOKSDIR | while read hook ++eval run-parts --test $HOOKSDIR | while read hook + do + ( cat $ADDED + cat $REMOVED ) | $hook || echo E: $hook exited with code $?. +-- +2.1.4 + diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20141019.bb b/meta/recipes-support/ca-certificates/ca-certificates_20141019.bb index 421b87e..cc58e4d 100644 --- a/meta/recipes-support/ca-certificates/ca-certificates_20141019.bb +++ b/meta/recipes-support/ca-certificates/ca-certificates_20141019.bb @@ -17,6 +17,7 @@ SRCREV = "2b8a047c78aadbecd90bf8e49ccf68898a211610" SRC_URI = "git://anonscm.debian.org/collab-maint/ca-certificates.git \ file://0001-update-ca-certificates-remove-c-rehash.patch \ file://0002-update-ca-certificates-use-SYSROOT.patch \ + file://0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch \ file://default-sysroot.patch \ file://sbindir.patch" -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] nettle: update package to 3.1.1 version.
On Monday 06 July 2015 14:04:46 Burton, Ross wrote: > On 4 July 2015 at 12:38, Paul Eggleton > > wrote: > > Well, at minimum for our purposes LGPLv3 (or LGPLv3+?) needs to be added > > to > > LICENSE in the nettle recipe (with &). Whether or not someone chooses to > > exclude that license in their configuration through INCOMPATIBLE_LICENSE > > is a > > completely separate matter (and that is, as you allude to, a distinct > > license > > from GPLv3). > > FWIW the YP documentation states to mark GPL LGPL and AGPL v3 in > INCOMPATIBLE_LICENSE to build a GPLv3 image, on the rationale that the > usual clauses that upset people are not specific to the GPL variation. The > autobuilder just excludes GPL right now, but there's a bug to fix this. > > Of course IANAL and the opinion of someone who actually does use > INCOMPATIBLE_LICENSE to remove GPLv3 software would be appreciated! I'm also not a lawyer, but for that exact reason I don't think we want to get into any question of license equivalence or similarity - INCOMPATIBLE_LICENSE, if used, needs to list all of the licenses you wish to exclude, so if you want LGPLv3 excluded then you need to state that in addition to GPLv3 (and naturally any recipe that builds LGPLv3-licensed source needs to state as such in the LICENSE value). 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
Re: [OE-core] [PATCH 1/2] nettle: update package to 3.1.1 version.
On 4 July 2015 at 12:38, Paul Eggleton wrote: > Well, at minimum for our purposes LGPLv3 (or LGPLv3+?) needs to be added to > LICENSE in the nettle recipe (with &). Whether or not someone chooses to > exclude that license in their configuration through INCOMPATIBLE_LICENSE > is a > completely separate matter (and that is, as you allude to, a distinct > license > from GPLv3). > FWIW the YP documentation states to mark GPL LGPL and AGPL v3 in INCOMPATIBLE_LICENSE to build a GPLv3 image, on the rationale that the usual clauses that upset people are not specific to the GPL variation. The autobuilder just excludes GPL right now, but there's a bug to fix this. Of course IANAL and the opinion of someone who actually does use INCOMPATIBLE_LICENSE to remove GPLv3 software would be appreciated! Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] SDK extract errors on master
On 06/07/15 12:35, Jack Mitchell wrote:
On 03/07/15 15:56, Jack Mitchell wrote:
Built an SDK today on 7eb0abc5f4d971d9a511c93cfb2eb52b72e6f228 and
when I tried to install it I got the following error:
Setting it up...ls: cannot access
/home/jack/Work/build/openembedded/sdk/1/x86_64/environment-setup-*:
No such file or directory
I have been messing about with the SDK install path and at one point
it did spew out a load of files installed vs shipped warnings I
assume due to a change of path and it getting upset about it, but
since then I deleted the tmp directory and rebuilt a new SDK without
warnings. However, both acted in the same way.
The SDK then sits without installing, seemingly stuck on: grep
OECORE_NATIVE_SYSROOT, which I assume means it's looking for the
(non-existant) environment file.
Any clues? Is this broken for anyone else?
Cheers,
Jack.
Ok, I figured out how I broke it; I used a relative path in SDKPATH. i.e.
SDKPATH=/path/to/sdk/../rel-sdk
So, first off; should this be supported? Secondly, the use-case I was
trying to get at was to position an SDK relative to the build dir, i.e.
SDKPATH=${TOPDIR}/../sdk
Is there a better way to do this. I guess this problem could be solved
somewhere in an SDK class by changing the relative path to an absolute
path. Ideas?
Cheers,
Jack.
I found an ugly work-around but it would be nice for this to be
supported in the future, or at least error on a relative path.
SDKPATH := "${@os.path.abspath(d.getVar('TOPDIR',
True)+"/../sdk/"+d.getVar('SDK_VERSION', True)+"/"+d.getVar('SDK_ARCH',
True))}"
Cheers,
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 7/7] midori: Depend on Adwaita, not gnome-icon-theme
Adwaita is the current GNOME icon theme.
Signed-off-by: Jussi Kukkonen
---
meta/recipes-sato/midori/midori_0.5.8.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-sato/midori/midori_0.5.8.bb
b/meta/recipes-sato/midori/midori_0.5.8.bb
index aa1b395..1c027fe4 100644
--- a/meta/recipes-sato/midori/midori_0.5.8.bb
+++ b/meta/recipes-sato/midori/midori_0.5.8.bb
@@ -26,6 +26,6 @@ EXTRA_OECMAKE = " \
TARGET_CC_ARCH += "${LDFLAGS}"
-RRECOMMENDS_${PN} += "glib-networking ca-certificates gnome-icon-theme"
+RRECOMMENDS_${PN} += "glib-networking ca-certificates adwaita-icon-theme"
FILES_${PN} += "${datadir}/appdata"
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 2/7] gtk-icon-utils: Rename, upgrade, add binary
* Rename from gtk-update-icon-cache to gtk-icon-utils to better
reflect the content. Fix references in other recipes and classes
* Upgrade to GTK+ 3.16.4
* Add gtk-encode-symbolic-svg binary: it is used by icon themes
(e.g. Adwaita) to generate png versions of svg icons.
* Depend on librsvg-native for gtk-encode-symbolic-svg
* Add a patch that removes Gdk dependency from gtk-encode-symbolic-svg:
this way the native build stays slim.
Signed-off-by: Jussi Kukkonen
---
meta-yocto/conf/distro/include/distro_alias.inc| 2 +-
meta-yocto/conf/distro/include/maintainers.inc | 2 +-
meta/classes/gtk-icon-cache.bbclass| 2 +-
meta/classes/sstate.bbclass| 2 +-
.../gtk+/gtk-icon-utils-native_3.16.4.bb | 63 +
...k-dependency-from-gtk-encode-symbolic-svg.patch | 102 +
.../gtk+/gtk-update-icon-cache-native_3.4.4.bb | 47 --
7 files changed, 169 insertions(+), 51 deletions(-)
create mode 100644 meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.16.4.bb
create mode 100644
meta/recipes-gnome/gtk+/gtk-icon-utils/Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch
delete mode 100644
meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.4.4.bb
diff --git a/meta-yocto/conf/distro/include/distro_alias.inc
b/meta-yocto/conf/distro/include/distro_alias.inc
index 0f8ed55..af35f90 100644
--- a/meta-yocto/conf/distro/include/distro_alias.inc
+++ b/meta-yocto/conf/distro/include/distro_alias.inc
@@ -160,7 +160,7 @@ DISTRO_PN_ALIAS_pn-gtk-doc-stub = "Fedora=gtk-doc
Ubuntu=gtk-doc"
DISTRO_PN_ALIAS_pn-gtk-engines = "Fedora=gtk2-engines OpenSuSE=gtk2-engines
Ubuntu=gtk2-engines Mandriva=gtk-engines2 Debian=gtk2-engines"
DISTRO_PN_ALIAS_pn-gtk-sato-engine = "OpenedHand"
DISTRO_PN_ALIAS_pn-gtk-theme-torturer = "OSPDT
upstream=http://wiki.laptop.org/go/GTK_for_OLPC";
-DISTRO_PN_ALIAS_pn-gtk-update-icon-cache-native = "OSPDT"
+DISTRO_PN_ALIAS_pn-gtk-icon-utils-native = "OSPDT"
DISTRO_PN_ALIAS_pn-gummiboot = "Debian=gummiboot Fedora=gummiboot"
DISTRO_PN_ALIAS_pn-hello-mod = "OE-Core"
DISTRO_PN_ALIAS_pn-hostap-conf = "OE-Core"
diff --git a/meta-yocto/conf/distro/include/maintainers.inc
b/meta-yocto/conf/distro/include/maintainers.inc
index b80f0c9..f3414ce 100644
--- a/meta-yocto/conf/distro/include/maintainers.inc
+++ b/meta-yocto/conf/distro/include/maintainers.inc
@@ -219,7 +219,7 @@ RECIPE_MAINTAINER_pn-gtk-doc = "Jussi Kukkonen
"
RECIPE_MAINTAINER_pn-gtk-engines = "Jussi Kukkonen "
RECIPE_MAINTAINER_pn-gtk-sato-engine = "Jussi Kukkonen
"
RECIPE_MAINTAINER_pn-gtk-theme-torturer = "Jussi Kukkonen
"
-RECIPE_MAINTAINER_pn-gtk-update-icon-cache-native = "Jussi Kukkonen
"
+RECIPE_MAINTAINER_pn-gtk-icon-utils-native = "Jussi Kukkonen
"
RECIPE_MAINTAINER_pn-gtk+ = "Jussi Kukkonen "
RECIPE_MAINTAINER_pn-gtk+3 = "Jussi Kukkonen "
RECIPE_MAINTAINER_pn-guile = "Robert Yang "
diff --git a/meta/classes/gtk-icon-cache.bbclass
b/meta/classes/gtk-icon-cache.bbclass
index 16e31b9..12358e3 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -1,6 +1,6 @@
FILES_${PN} += "${datadir}/icons/hicolor"
-DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']}
gtk-update-icon-cache-native"
+DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']}
gtk-icon-utils-native"
gtk_icon_cache_postinst() {
if [ "x$D" != "x" ]; then
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 1e2d4f6..4986323 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -807,7 +807,7 @@ def setscene_depvalid(task, taskdependees, notneeded, d):
return x.endswith("-native") or "-cross-" in x or "-crosssdk" in x
def isPostInstDep(x):
-if x in ["qemu-native", "gdk-pixbuf-native", "qemuwrapper-cross",
"depmodwrapper-cross", "systemd-systemctl-native",
"gtk-update-icon-cache-native"]:
+if x in ["qemu-native", "gdk-pixbuf-native", "qemuwrapper-cross",
"depmodwrapper-cross", "systemd-systemctl-native", "gtk-icon-utils-native"]:
return True
return False
diff --git a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.16.4.bb
b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.16.4.bb
new file mode 100644
index 000..d433b90
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.16.4.bb
@@ -0,0 +1,63 @@
+SUMMARY = "Native icon utils for GTK+"
+DESCRIPTION = "gtk-update-icon-cache and gtk-encode-symbolic-svg built from
GTK+ natively, for build time and on-host postinst script execution."
+SECTION = "libs"
+
+DEPENDS = "glib-2.0-native gdk-pixbuf-native librsvg-native"
+
+LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+"
+
+MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
+
+SRC_URI =
"http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \
+ file://Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch"
+SRC_URI[md5sum] =
[OE-core] [PATCH v4 4/7] gtk+3: Upgrade to 3.16.4
* Drop --disable-gtk2-dependency and the patch for
gtk/native/Makefile.am: gtk-update-icon-cache is no longer used at
build time and as a result the option was removed.
* Add dependency to libepoxy
* Add dependency to virtual/mesa for wayland-egl
* Package new binaries gtk3-icon-browser and gtk-encode-symbolic-svg
* Add a backported patch that allows server side window decorations
in all cases
* RRECOMMEND adwaita-icon-theme-symbolic: GTK+ widgets expect a
symbolic theme to be installed
Signed-off-by: Jussi Kukkonen
gtk+3: SQUASH
Signed-off-by: Jussi Kukkonen
---
meta/recipes-gnome/gtk+/gtk+3.inc | 17 +--
meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch | 118 +
.../gtk+/gtk+3/fix-flags-for-native.patch | 33 --
.../gtk+/{gtk+3_3.12.2.bb => gtk+3_3.16.4.bb} | 6 +-
4 files changed, 130 insertions(+), 44 deletions(-)
create mode 100644 meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch
delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/fix-flags-for-native.patch
rename meta/recipes-gnome/gtk+/{gtk+3_3.12.2.bb => gtk+3_3.16.4.bb} (75%)
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc
b/meta/recipes-gnome/gtk+/gtk+3.inc
index 3e36676..f29f0d3 100644
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -6,7 +6,7 @@ BUGTRACKER = "https://bugzilla.gnome.org/";
SECTION = "libs"
DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf \
- docbook-utils-native gdk-pixbuf-native"
+ docbook-utils-native gdk-pixbuf-native libepoxy"
LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+"
@@ -22,10 +22,7 @@ do_configure_prepend() {
ln -s ${TARGET_PREFIX}libtool libtool
}
-# Forcibly disable the GTK+ 2 dependency as we don't want to natively build the
-# entire GTK+ stack, or need GTK+ 2 for gtk-update-icon-cache.
EXTRA_OECONF += " \
- --disable-gtk2-dependency \
--disable-glibtest \
--disable-xinerama \
--enable-modules \
@@ -37,7 +34,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES",
"x11", "x11", "", d)}
${@bb.utils.contains("DISTRO_FEATURES", "wayland",
"wayland", "", d)}"
PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk
fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender
libxcomposite libxfixes"
-PACKAGECONFIG[wayland] =
"--enable-wayland-backend,--disable-wayland-backend,wayland libxkbcommon"
+PACKAGECONFIG[wayland] =
"--enable-wayland-backend,--disable-wayland-backend,wayland libxkbcommon
virtual/mesa"
do_install_append() {
mv ${D}${bindir}/gtk-update-icon-cache
${D}${bindir}/gtk-update-icon-cache-3.0
@@ -48,12 +45,14 @@ LIBV = "3.0.0"
FILES_${PN}-demo = "${bindir}/gtk3-demo \
${bindir}/gtk3-demo-application \
+${bindir}/gtk3-icon-browser \
${bindir}/gtk3-widget-factory \
${datadir}/gtk-3.0/demo \
${datadir}/applications/gtk3-demo.desktop \
+${datadir}/applications/gtk3-icon-browser.desktop \
${datadir}/applications/gtk3-widget-factory.desktop \
-${datadir}/icons/hicolor/*/apps/gtk3-demo.png \
-${datadir}/icons/hicolor/*/apps/gtk3-widget-factory.png"
+${datadir}/icons/hicolor/*/apps/gtk3-demo*.png \
+${datadir}/icons/hicolor/*/apps/gtk3-widget-factory*.png"
# The demo uses PNG files and mime type sniffing, so ensure that these
# dependencies are present.
@@ -76,7 +75,8 @@ FILES_${PN}-dev += " \
${libdir}/gtk-3.0/3.0.0/printbackends/*.la \
${libdir}/gtk-3.0/${LIBV}/engines/*.la \
${libdir}/gtk-3.0/modules/*.la \
-${bindir}/gtk-builder-convert"
+${bindir}/gtk-builder-convert \
+${bindir}/gtk-encode-symbolic-svg"
FILES_${PN}-dbg += " \
${libdir}/gtk-3.0/${LIBV}/loaders/.debug \
@@ -85,6 +85,7 @@ FILES_${PN}-dbg += " \
${libdir}/gtk-3.0/${LIBV}/printbackends/.debug \
${libdir}/gtk-3.0/modules/.debug"
+RRECOMMENDS_${PN} = "adwaita-icon-theme-symbolic"
PACKAGES_DYNAMIC += "^gtk3-immodule-.* ^gtk3-printbackend-.*"
diff --git a/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch
b/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch
new file mode 100644
index 000..32d8a84
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch
@@ -0,0 +1,118 @@
+window: Check if we can use CSD before enabling them
+
+Upstream-Status: Backport
+Signed-off-by: Jussi Kukkonen
+
+
+From c5e5ee67490e7e7af56052d8f8beb75db002c2f1 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi
+Date: Wed, 3 Jun 2015 14:07:29 +0100
+Subject: window: Check if we can use CSD before enabling them
+
+The change in 03213b9509fc
[OE-core] [PATCH v4 1/7] intltool: Upgrade 0.50.2 -> 0.51.0
* Remove uclibc.patch as the whole localedir guessing code has been
removed upstream.
Signed-off-by: Jussi Kukkonen
---
.../intltool/intltool-0.50.2/uclibc.patch | 19 ---
.../intltool-nowarn.patch | 0
.../{intltool-0.50.2 => intltool}/noperlcheck.patch | 0
.../remove-xml-check.patch| 0
.../use-nativeperl.patch | 0
.../{intltool_0.50.2.bb => intltool_0.51.0.bb}| 5 ++---
6 files changed, 2 insertions(+), 22 deletions(-)
delete mode 100644 meta/recipes-devtools/intltool/intltool-0.50.2/uclibc.patch
rename meta/recipes-devtools/intltool/{intltool-0.50.2 =>
intltool}/intltool-nowarn.patch (100%)
rename meta/recipes-devtools/intltool/{intltool-0.50.2 =>
intltool}/noperlcheck.patch (100%)
rename meta/recipes-devtools/intltool/{intltool-0.50.2 =>
intltool}/remove-xml-check.patch (100%)
rename meta/recipes-devtools/intltool/{intltool-0.50.2 =>
intltool}/use-nativeperl.patch (100%)
rename meta/recipes-devtools/intltool/{intltool_0.50.2.bb =>
intltool_0.51.0.bb} (76%)
diff --git a/meta/recipes-devtools/intltool/intltool-0.50.2/uclibc.patch
b/meta/recipes-devtools/intltool/intltool-0.50.2/uclibc.patch
deleted file mode 100644
index 145c181..000
--- a/meta/recipes-devtools/intltool/intltool-0.50.2/uclibc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-on uclibc systems localedir should point to /usr/'share' as usual.
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj
-
-Index: intltool-0.50.2/intltool.m4
-===
intltool-0.50.2.orig/intltool.m4 2014-03-15 22:09:01.016627665 -0700
-+++ intltool-0.50.2/intltool.m42014-03-15 22:12:09.732631206 -0700
-@@ -173,6 +173,9 @@
- AC_CHECK_FUNC(bind_textdomain_codeset,
- [DATADIRNAME=share], [DATADIRNAME=lib])
- ;;
-+*-*-*uclibc*)
-+[DATADIRNAME=share]
-+;;
- *)
- [DATADIRNAME=lib]
- ;;
diff --git
a/meta/recipes-devtools/intltool/intltool-0.50.2/intltool-nowarn.patch
b/meta/recipes-devtools/intltool/intltool/intltool-nowarn.patch
similarity index 100%
rename from meta/recipes-devtools/intltool/intltool-0.50.2/intltool-nowarn.patch
rename to meta/recipes-devtools/intltool/intltool/intltool-nowarn.patch
diff --git a/meta/recipes-devtools/intltool/intltool-0.50.2/noperlcheck.patch
b/meta/recipes-devtools/intltool/intltool/noperlcheck.patch
similarity index 100%
rename from meta/recipes-devtools/intltool/intltool-0.50.2/noperlcheck.patch
rename to meta/recipes-devtools/intltool/intltool/noperlcheck.patch
diff --git
a/meta/recipes-devtools/intltool/intltool-0.50.2/remove-xml-check.patch
b/meta/recipes-devtools/intltool/intltool/remove-xml-check.patch
similarity index 100%
rename from
meta/recipes-devtools/intltool/intltool-0.50.2/remove-xml-check.patch
rename to meta/recipes-devtools/intltool/intltool/remove-xml-check.patch
diff --git
a/meta/recipes-devtools/intltool/intltool-0.50.2/use-nativeperl.patch
b/meta/recipes-devtools/intltool/intltool/use-nativeperl.patch
similarity index 100%
rename from meta/recipes-devtools/intltool/intltool-0.50.2/use-nativeperl.patch
rename to meta/recipes-devtools/intltool/intltool/use-nativeperl.patch
diff --git a/meta/recipes-devtools/intltool/intltool_0.50.2.bb
b/meta/recipes-devtools/intltool/intltool_0.51.0.bb
similarity index 76%
rename from meta/recipes-devtools/intltool/intltool_0.50.2.bb
rename to meta/recipes-devtools/intltool/intltool_0.51.0.bb
index 483239d..35293c6 100644
--- a/meta/recipes-devtools/intltool/intltool_0.50.2.bb
+++ b/meta/recipes-devtools/intltool/intltool_0.51.0.bb
@@ -3,7 +3,6 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
SRC_URI += "file://intltool-nowarn.patch \
- file://uclibc.patch \
${NATIVEPATCHES} \
"
@@ -15,5 +14,5 @@ NATIVEPATCHES = "file://noperlcheck.patch \
file://remove-xml-check.patch"
NATIVEPATCHES_class-native = "file://use-nativeperl.patch"
-SRC_URI[md5sum] = "23fbd879118253cb99aeac067da5f591"
-SRC_URI[sha256sum] =
"67f25c5c6fb71d095793a7f895b245e65e829e8bde68c6c8b4c912144ff34406"
+SRC_URI[md5sum] = "12e517cac2b57a0121cda351570f1e63"
+SRC_URI[sha256sum] =
"67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 5/7] matchbox-session-sato: set GTK_CSD env var
Sato practically requires server side decorations as matchbox panel draws on top of the title bar. Setting "GTK_CSD=0" informs GTK+3 that we really want server side decorations even for apps designed for CSD. Signed-off-by: Jussi Kukkonen --- meta/recipes-sato/matchbox-sato/matchbox-session-sato/session | 4 1 file changed, 4 insertions(+) diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session index a3138b6..42ce483 100644 --- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session +++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session @@ -14,6 +14,10 @@ else KEYBOARD_APPLET="keyboard" fi +# Tell GTK+3 we really want server side decorations, even with +# GtkHeaderBar using applications: Without that mb-panel will render +# on top of the client side decorations. +export GTK_CSD=0 matchbox-desktop & -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 6/7] sato-icon-theme: Inherit Adwaita, not gnome-icon-theme
Adwaita is the current GNOME icon theme. Signed-off-by: Jussi Kukkonen --- .../sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch b/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch index fa595dc..2c176ee 100644 --- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch +++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch @@ -22,7 +22,7 @@ index c4b03a7..688fbbf 100644 [Icon Theme] Name=Sato Comment=Sato icon theme -+Inherits=gnome ++Inherits=Adwaita Directories=16x16/apps,16x16/status,16x16/stock,16x16/places,16x16/mimetypes,16x16/devices,16x16/actions,22x22/apps,22x22/status,22x22/stock,22x22/places,22x22/mimetypes,22x22/devices,22x22/actions,32x32/apps,32x32/status,32x32/stock,32x32/places,32x32/mimetypes,32x32/devices,32x32/actions,48x48/apps,48x48/status,48x48/stock,48x48/places,48x48/mimetypes,48x48/devices,48x48/actions,64x64/apps,64x64/status,64x64/stock,64x64/places,64x64/mimetypes,64x64/devices,64x64/actions, -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 3/7] adwaita-icon-theme: Add new icon theme for GTK+
Adwaita is a complete icon theme for GTK+, and the current GNOME icon
theme. Most importantly it includes the symbolic icons used extensively
in GTK+3 widgets.
* Package icons, large icons, symbolic icons and cursors separately
* Backport a build fix for the cursor theme to cut installed size by
11MB.
Signed-off-by: Jussi Kukkonen
---
.../Create-symlinks-when-installing-cursors.patch | 178 +
.../gnome/adwaita-icon-theme_3.16.2.1.bb | 34
2 files changed, 212 insertions(+)
create mode 100644
meta/recipes-gnome/gnome/adwaita-icon-theme/Create-symlinks-when-installing-cursors.patch
create mode 100644 meta/recipes-gnome/gnome/adwaita-icon-theme_3.16.2.1.bb
diff --git
a/meta/recipes-gnome/gnome/adwaita-icon-theme/Create-symlinks-when-installing-cursors.patch
b/meta/recipes-gnome/gnome/adwaita-icon-theme/Create-symlinks-when-installing-cursors.patch
new file mode 100644
index 000..446f9c9
--- /dev/null
+++
b/meta/recipes-gnome/gnome/adwaita-icon-theme/Create-symlinks-when-installing-cursors.patch
@@ -0,0 +1,178 @@
+Create symlinks when installing cursors
+
+This cuts down the installed size by ~11MB.
+
+Upstream-Status: Backport
+Signed-off-by: Jussi Kukkonen
+
+
+From 1e8c0dd0a2de5e1d5ff60ff11f131e88510c7f50 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
+ =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?=
+Date: Sat, 16 May 2015 07:49:19 +
+Subject: [PATCH] Create symlinks when installing cursors
+
+Also support creating symlinks for W32 cursors (including L and XL variants).
+
+https://bugzilla.gnome.org/show_bug.cgi?id=749223
+---
+ Makefile.am | 93
+ configure.ac | 24
+ 2 files changed, 117 insertions(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index fed3972..4d00268 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -6,6 +6,17 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+ cursordir = $(datadir)/icons/Adwaita/cursors
+ cursor_DATA = $(wildcard $(srcdir)/Adwaita/cursors/*)
++if ENABLE_L_XL_VARIANTS
++cursorldir = $(datadir)/icons/Adwaita-Large/cursors
++cursorl_DATA = $(wildcard $(srcdir)/Adwaita-Large/cursors/*)
++cursorxldir = $(datadir)/icons/Adwaita-ExtraLarge/cursors
++cursorxl_DATA = $(wildcard $(srcdir)/Adwaita-ExtraLarge/cursors/*)
++else
++cursorldir =
++cursorl_DATA =
++cursorxldir =
++cursorxl_DATA =
++endif
+
+ theme_in_files = index.theme.in.in
+ theme_DATA = $(theme_in_files:.theme.in.in=.theme)
+@@ -99,6 +110,88 @@ install-data-local:
+ fi
+
+ install-data-hook:
++ cd $(DESTDIR)$(cursordir) && \
++ if test "x$(enable_w32_cursors)" = "xyes"; \
++ then \
++ cur=.cur && \
++ ani=.ani; \
++ else \
++ cur= && \
++ ani= ; \
++ fi; \
++ if test "x$(enable_l_xl_variants)" = "xyes"; \
++ then \
++ themedirs="$(cursordir) $(cursorldir) $(cursorxldir)"; \
++ else \
++ themedirs="$(cursordir)"; \
++ fi; \
++ for d in $$themedirs; \
++ do \
++ cd $(DESTDIR)$$d && \
++ echo Creating symlinks in $(DESTDIR)$$d && \
++ $(LN_S) -f dotbox$$cur draped_box$$cur && \
++ $(LN_S) -f dotbox$$cur icon$$cur && \
++ $(LN_S) -f dotbox$$cur target$$cur && \
++ $(LN_S) -f dotbox$$cur dot_box_mask$$cur && \
++ $(LN_S) -f X_cursor$$cur pirate$$cur && \
++ $(LN_S) -f left_ptr_watch$$ani
08e8e1c95fe2fc01f976f1e063a24ccd$$ani && \
++ $(LN_S) -f left_ptr_watch$$ani
3ecb610c1bf2410f44200f48c40d3599$$ani && \
++ $(LN_S) -f left_ptr$$cur arrow$$cur && \
++ $(LN_S) -f left_ptr$$cur top_left_arrow$$cur && \
++ $(LN_S) -f right_ptr$$cur draft_large$$cur && \
++ $(LN_S) -f right_ptr$$cur draft_small$$cur && \
++ $(LN_S) -f move$$cur
4498f0e0c1937ffe01fd06f973665830$$cur && \
++ $(LN_S) -f move$$cur
9081237383d90e509aa00f00170e968f$$cur && \
++ $(LN_S) -f copy$$cur
1081e37283d983c07f3ef6bf$$cur && \
++ $(LN_S) -f copy$$cur
6407b0e94181790501fd1e167b474872$$cur && \
++ $(LN_S) -f cross$$cur cross_reverse$$cur && \
++ $(LN_S) -f cross$$cur diamond_cross$$cur && \
++ $(LN_S) -f hand1$$cur grab$$cur && \
++ $(LN_S) -f hand2$$cur
9d800788f1b08800ae810202380a0822$$cur && \
++ $(LN_S) -f hand2$$cur
e29285e634086352946a0e7090d73106$$cur && \
++ $(LN_S) -f hand2$$cur han
[OE-core] [PATCH v4 0/7] GTK+3 upgrade and related changes
Changes since v3:
* Upgrade intltool: intltool.m4 did a compile test on
configure and that prevented adwaita from inheriting "allarch".
intltool 0.51.0 does not have have that problem anymore.
* Bump GTK+3 to 3.16.4 (forgot to do this on v3, apologies).
* adwaita-icon-theme inherits allarch, no longer recommends librsvg-gtk.
Hires icons are packaged separately.
* rename gtk-update-icon-cache-native recipe to gtk-icon-utils-native
to better reflect the contents. This also required changes in
other recipes.
The following changes since commit 7a402301c9c8fa9a5262d6d29b2ea199ff0dc07a:
distro/package_regex.inc: Use GNOME_STABLE rule for vala (2015-07-02 23:08:41
+0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib jku/update-gtk3
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/update-gtk3
Jussi Kukkonen (7):
intltool: Upgrade 0.50.2 -> 0.51.0
gtk-icon-utils: Rename, upgrade, add binary
adwaita-icon-theme: Add new icon theme for GTK+
gtk+3: Upgrade to 3.16.4
matchbox-session-sato: set GTK_CSD env var
sato-icon-theme: Inherit Adwaita, not gnome-icon-theme
midori: Depend on Adwaita, not gnome-icon-theme
meta-yocto/conf/distro/include/distro_alias.inc| 2 +-
meta-yocto/conf/distro/include/maintainers.inc | 2 +-
meta/classes/gtk-icon-cache.bbclass| 2 +-
meta/classes/sstate.bbclass| 2 +-
.../intltool/intltool-0.50.2/uclibc.patch | 19 ---
.../intltool-nowarn.patch | 0
.../noperlcheck.patch | 0
.../remove-xml-check.patch | 0
.../use-nativeperl.patch | 0
.../{intltool_0.50.2.bb => intltool_0.51.0.bb} | 5 +-
.../Create-symlinks-when-installing-cursors.patch | 178 +
.../gnome/adwaita-icon-theme_3.16.2.1.bb | 34
meta/recipes-gnome/gtk+/gtk+3.inc | 17 +-
meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch | 118 ++
.../gtk+/gtk+3/fix-flags-for-native.patch | 33
.../gtk+/{gtk+3_3.12.2.bb => gtk+3_3.16.4.bb} | 6 +-
.../gtk+/gtk-icon-utils-native_3.16.4.bb | 63
...k-dependency-from-gtk-encode-symbolic-svg.patch | 102
.../gtk+/gtk-update-icon-cache-native_3.4.4.bb | 47 --
.../matchbox-sato/matchbox-session-sato/session| 4 +
meta/recipes-sato/midori/midori_0.5.8.bb | 2 +-
.../0001-Inherit-the-GNOME-icon-theme.patch| 2 +-
22 files changed, 519 insertions(+), 119 deletions(-)
delete mode 100644 meta/recipes-devtools/intltool/intltool-0.50.2/uclibc.patch
rename meta/recipes-devtools/intltool/{intltool-0.50.2 =>
intltool}/intltool-nowarn.patch (100%)
rename meta/recipes-devtools/intltool/{intltool-0.50.2 =>
intltool}/noperlcheck.patch (100%)
rename meta/recipes-devtools/intltool/{intltool-0.50.2 =>
intltool}/remove-xml-check.patch (100%)
rename meta/recipes-devtools/intltool/{intltool-0.50.2 =>
intltool}/use-nativeperl.patch (100%)
rename meta/recipes-devtools/intltool/{intltool_0.50.2.bb =>
intltool_0.51.0.bb} (76%)
create mode 100644
meta/recipes-gnome/gnome/adwaita-icon-theme/Create-symlinks-when-installing-cursors.patch
create mode 100644 meta/recipes-gnome/gnome/adwaita-icon-theme_3.16.2.1.bb
create mode 100644 meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch
delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/fix-flags-for-native.patch
rename meta/recipes-gnome/gtk+/{gtk+3_3.12.2.bb => gtk+3_3.16.4.bb} (75%)
create mode 100644 meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.16.4.bb
create mode 100644
meta/recipes-gnome/gtk+/gtk-icon-utils/Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch
delete mode 100644
meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.4.4.bb
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] SDK extract errors on master
On 03/07/15 15:56, Jack Mitchell wrote:
Built an SDK today on 7eb0abc5f4d971d9a511c93cfb2eb52b72e6f228 and
when I tried to install it I got the following error:
Setting it up...ls: cannot access
/home/jack/Work/build/openembedded/sdk/1/x86_64/environment-setup-*:
No such file or directory
I have been messing about with the SDK install path and at one point
it did spew out a load of files installed vs shipped warnings I assume
due to a change of path and it getting upset about it, but since then
I deleted the tmp directory and rebuilt a new SDK without warnings.
However, both acted in the same way.
The SDK then sits without installing, seemingly stuck on: grep
OECORE_NATIVE_SYSROOT, which I assume means it's looking for the
(non-existant) environment file.
Any clues? Is this broken for anyone else?
Cheers,
Jack.
Ok, I figured out how I broke it; I used a relative path in SDKPATH. i.e.
SDKPATH=/path/to/sdk/../rel-sdk
So, first off; should this be supported? Secondly, the use-case I was
trying to get at was to position an SDK relative to the build dir, i.e.
SDKPATH=${TOPDIR}/../sdk
Is there a better way to do this. I guess this problem could be solved
somewhere in an SDK class by changing the relative path to an absolute
path. Ideas?
Cheers,
Jack.
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] gcc-target 5.1: fix for libcc1
Fixed:
* gcc 5 introduces a plugin libcc1.so, which is used by gdb, the target
gcc didn't build it in the past because gcc_cv_objdump is null, and
the error was:
gcc-5.1.0/libcc1/configure: line 14531: -T: command not found
This only happens for tar gcc as the code shows:
if test x$build = x$host; then
export_sym_check="objdump${exeext} -T"
elif test x$host = x$target; then
export_sym_check="$gcc_cv_objdump -T"
else
export_sym_check=
fi
* Install libcc1.so and libcc1plugin.so to
$(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version) as lto-plugin did.
* Use sed command to fix bad RPATH iussue.
[YOCTO #7956]
Signed-off-by: Robert Yang
---
meta/recipes-devtools/gcc/gcc-5.1.inc |1 +
...ibcc1-fix-libcc1-s-install-path-and-rpath.patch | 51
meta/recipes-devtools/gcc/gcc-target.inc |5 ++
meta/recipes-devtools/gcc/gcc_5.1.bb |6 +++
4 files changed, 63 insertions(+)
create mode 100644
meta/recipes-devtools/gcc/gcc-5.1/0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch
diff --git a/meta/recipes-devtools/gcc/gcc-5.1.inc
b/meta/recipes-devtools/gcc/gcc-5.1.inc
index 63669a9..945dc90 100644
--- a/meta/recipes-devtools/gcc/gcc-5.1.inc
+++ b/meta/recipes-devtools/gcc/gcc-5.1.inc
@@ -70,6 +70,7 @@ SRC_URI = "\
file://0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \
file://0037-pr65779.patch \
file://0038-fix-g++-sysroot.patch \
+ file://0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch \
"
#S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${SNAP}"
diff --git
a/meta/recipes-devtools/gcc/gcc-5.1/0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch
b/meta/recipes-devtools/gcc/gcc-5.1/0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch
new file mode 100644
index 000..63d97d9
--- /dev/null
+++
b/meta/recipes-devtools/gcc/gcc-5.1/0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch
@@ -0,0 +1,51 @@
+From acea0df9997a47f8b8224b6ca1618c8c9dfbe6d5 Mon Sep 17 00:00:00 2001
+From: Robert Yang
+Date: Sun, 5 Jul 2015 20:25:18 -0700
+Subject: [PATCH] libcc1: fix libcc1's install path and rpath
+
+* Install libcc1.so and libcc1plugin.so into
+ $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version), as what we
+ had done to lto-plugin.
+* Fix bad RPATH iussue:
+ gcc-5.1.0: package gcc-plugins contains bad RPATH
/patht/to/tmp/sysroots/qemux86-64/usr/lib64/../lib64 in file
+
/path/to/gcc/5.1.0-r0/packages-split/gcc-plugins/usr/lib64/gcc/x86_64-poky-linux/5.1.0/plugin/libcc1plugin.so.0.0.0
+ [rpaths]
+
+Upstream-Status: Inappropriate [OE configuration]
+
+Signed-off-by: Robert Yang
+---
+ libcc1/Makefile.am |4 ++--
+ libcc1/Makefile.in |4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am
+index 7a274b3..db69bea 100644
+--- a/libcc1/Makefile.am
b/libcc1/Makefile.am
+@@ -35,8 +35,8 @@ libiberty = $(if $(wildcard
$(libiberty_noasan)),$(Wc)$(libiberty_noasan), \
+ $(Wc)$(libiberty_normal)))
+ libiberty_dep = $(patsubst $(Wc)%,%,$(libiberty))
+
+-plugindir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/plugin
+-cc1libdir = $(libdir)/$(libsuffix)
++cc1libdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
++plugindir = $(cc1libdir)
+
+ if ENABLE_PLUGIN
+ plugin_LTLIBRARIES = libcc1plugin.la
+diff --git a/libcc1/Makefile.in b/libcc1/Makefile.in
+index 1916134..c8995d2 100644
+--- a/libcc1/Makefile.in
b/libcc1/Makefile.in
+@@ -262,8 +262,8 @@ libiberty = $(if $(wildcard
$(libiberty_noasan)),$(Wc)$(libiberty_noasan), \
+ $(Wc)$(libiberty_normal)))
+
+ libiberty_dep = $(patsubst $(Wc)%,%,$(libiberty))
+-plugindir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/plugin
+-cc1libdir = $(libdir)/$(libsuffix)
++cc1libdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
++plugindir = $(cc1libdir)
+ @ENABLE_PLUGIN_TRUE@plugin_LTLIBRARIES = libcc1plugin.la
+ @ENABLE_PLUGIN_TRUE@cc1lib_LTLIBRARIES = libcc1.la
+ BUILT_SOURCES = compiler-name.h
diff --git a/meta/recipes-devtools/gcc/gcc-target.inc
b/meta/recipes-devtools/gcc/gcc-target.inc
index 5d31446..c362a0f 100644
--- a/meta/recipes-devtools/gcc/gcc-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-target.inc
@@ -10,6 +10,11 @@ EXTRA_OECONF_PATHS = "\
EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu"
+# libcc1 requres gcc_cv_objdump when cross build, but gcc_cv_objdump is
+# set in subdir gcc, so subdir libcc1 can't use it, export it here to
+# fix the problem.
+export gcc_cv_objdump = "${TARGET_PREFIX}objdump"
+
EXTRA_OECONF_GCC_FLOAT = "${@get_gcc_float_setting(bb, d)}"
PACKAGES = "\
diff --git a/meta/recipes-devtools/gcc/gcc_5.1.bb
b/meta/recipes-devtools/gcc/gcc_5.1.bb
index c4827c6..254cd7f 100644
--- a/meta/recipes-devtools/gcc/gcc_5.1.bb
+++ b/meta/recipes-devtools/gcc/gcc_5.1.bb
@@ -5,3 +5,9 @@ require gcc-target.inc
# | gcc-4.8.1-r0/gc
[OE-core] [PATCH 1/2] gcc: remove EXTRA_OECONF_INTERMEDIATE
The gcc-intermediate had been gone, so remove EXTRA_OECONF_INTERMEDIATE.
Signed-off-by: Robert Yang
---
meta/recipes-devtools/gcc/gcc-4.8.inc | 10 --
meta/recipes-devtools/gcc/gcc-4.9.inc | 10 --
meta/recipes-devtools/gcc/gcc-5.1.inc | 10 --
meta/recipes-devtools/gcc/gcc-configure-common.inc |1 -
4 files changed, 31 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc
b/meta/recipes-devtools/gcc/gcc-4.8.inc
index 476aaf9..6a2454d 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.8.inc
@@ -107,16 +107,6 @@ EXTRA_OECONF_INITIAL = "\
--enable-decimal-float=no \
"
-EXTRA_OECONF_INTERMEDIATE = "\
---disable-libmudflap \
---disable-libgomp \
---disable-libquadmath \
---with-system-zlib \
---disable-lto \
---disable-plugin \
---disable-libssp \
-"
-
EXTRA_OECONF_append_libc-uclibc = " --disable-decimal-float "
EXTRA_OECONF_PATHS = "\
diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc
b/meta/recipes-devtools/gcc/gcc-4.9.inc
index 9ed3e09..6f53d1f 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.9.inc
@@ -117,16 +117,6 @@ EXTRA_OECONF_INITIAL = "\
--enable-decimal-float=no \
"
-EXTRA_OECONF_INTERMEDIATE = "\
---disable-libmudflap \
---disable-libgomp \
---disable-libquadmath \
---with-system-zlib \
---disable-lto \
---disable-plugin \
---disable-libssp \
-"
-
EXTRA_OECONF_append_libc-uclibc = " --disable-decimal-float "
EXTRA_OECONF_PATHS = "\
diff --git a/meta/recipes-devtools/gcc/gcc-5.1.inc
b/meta/recipes-devtools/gcc/gcc-5.1.inc
index 1d64f9e..63669a9 100644
--- a/meta/recipes-devtools/gcc/gcc-5.1.inc
+++ b/meta/recipes-devtools/gcc/gcc-5.1.inc
@@ -107,16 +107,6 @@ EXTRA_OECONF_INITIAL = "\
--enable-decimal-float=no \
"
-EXTRA_OECONF_INTERMEDIATE = "\
---disable-libmudflap \
---disable-libgomp \
---disable-libquadmath \
---with-system-zlib \
---disable-lto \
---disable-plugin \
---disable-libssp \
-"
-
EXTRA_OECONF_append_libc-uclibc = " --disable-decimal-float "
EXTRA_OECONF_PATHS = "\
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc
b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index 6c60cf9..a14be73 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -25,7 +25,6 @@ OPTSPACE = '${@bb.utils.contains("SPECIAL_ARCH_LIST",
"${TARGET_ARCH}", "", "--e
EXTRA_OECONF_BASE ?= ""
EXTRA_OECONF_PATHS ?= ""
EXTRA_OECONF_INITIAL ?= ""
-EXTRA_OECONF_INTERMEDIATE ?= ""
GCCMULTILIB ?= "--disable-multilib"
GCCTHREADS ?= "posix"
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] gcc-target 5.1: fix for libcc1
The following changes since commit dd09fab685de2eaf04aa5ab60f8220b89c1deae9: tune-core2.inc: set X86ARCH32 to i686 (instead of i586) (2015-07-02 23:08:27 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/gcc http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/gcc Robert Yang (2): gcc: remove EXTRA_OECONF_INTERMEDIATE gcc-target 5.1: fix for libcc1 meta/recipes-devtools/gcc/gcc-4.8.inc | 10 meta/recipes-devtools/gcc/gcc-4.9.inc | 10 meta/recipes-devtools/gcc/gcc-5.1.inc | 11 + ...ibcc1-fix-libcc1-s-install-path-and-rpath.patch | 51 meta/recipes-devtools/gcc/gcc-configure-common.inc |1 - meta/recipes-devtools/gcc/gcc-target.inc |5 ++ meta/recipes-devtools/gcc/gcc_5.1.bb |6 +++ 7 files changed, 63 insertions(+), 31 deletions(-) create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch -- 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] lighttpd: Bug fix
Ping...
Regards
Li
> -Original Message-
> From: Li, Xin/李 欣
> Sent: Wednesday, June 17, 2015 9:35 AM
> To: openembedded-core@lists.openembedded.org
> Cc: Li, Xin/李 欣
> Subject: [OE-core][PATCH] lighttpd: Bug fix
>
> mod_cgi buffers data without bound,so fix it.
>
> Reference: http://redmine.lighttpd.net/issues/1264
>
> Signed-off-by: Li Xin
> ---
> .../0001-mod_cgi-buffers-data-without-bound.patch | 386
> +
> meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb | 1 +
> 2 files changed, 387 insertions(+)
> create mode 100644
> meta/recipes-extended/lighttpd/lighttpd/0001-mod_cgi-buffers-data-without-boun
> d.patch
>
> diff --git
> a/meta/recipes-extended/lighttpd/lighttpd/0001-mod_cgi-buffers-data-without-bo
> und.patch
> b/meta/recipes-extended/lighttpd/lighttpd/0001-mod_cgi-buffers-data-without-bo
> und.patch
> new file mode 100644
> index 000..e456182
> --- /dev/null
> +++ b/meta/recipes-extended/lighttpd/lighttpd/0001-mod_cgi-buffers-data-
> +++ without-bound.patch
> @@ -0,0 +1,386 @@
> +From e6ccbab5d42b110ac4f6ce1f72cb1e9ccbe4400a Mon Sep 17 00:00:00 2001
> +From: Li xin
> +Date: Tue, 16 Jun 2015 19:02:38 +0900
> +Subject: [PATCH] mod_cgi buffers data without bound so fix it
> +
> +Upstream-Status: pending
> +
> +Signed-off-by: Li Xin
> +---
> + doc/config/lighttpd.conf | 8 ++
> + src/mod_cgi.c| 188
> ---
> + 2 files changed, 186 insertions(+), 10 deletions(-)
> +
> +diff --git a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf index
> +60b0ae1..9c101a7 100644
> +--- a/doc/config/lighttpd.conf
> b/doc/config/lighttpd.conf
> +@@ -375,6 +375,14 @@ server.upload-dirs = ( "/var/tmp" ) ##
> +##
> #
> +
> ++#
> #
> ++#
> ++##
> ++##
> ++## maximum bytes in send_raw before backing off [KByte]
> ++## cgi.high-waterlevel= 10240
> ++## minimum bytes in send_raw to disable backoff [KByte]
> ++## cgi.low-waterlevel = 5120
> ++#
> #
> ++#
> +
> +
> +##
> #
> + ##
> +diff --git a/src/mod_cgi.c b/src/mod_cgi.c index 734ecee..c51f43c
> +100644
> +--- a/src/mod_cgi.c
> b/src/mod_cgi.c
> +@@ -38,6 +38,10 @@
> +
> + #include "version.h"
> +
> ++/* for output logs */
> ++char msgbuf[2048];
> ++
> ++
> + enum {EOL_UNSET, EOL_N, EOL_RN};
> +
> + typedef struct {
> +@@ -53,9 +57,19 @@ typedef struct {
> + size_t size;
> + } buffer_pid_t;
> +
> ++struct handler_ctx;
> ++
> ++typedef struct {
> ++struct handler_ctx **hctx;
> ++size_t used;
> ++size_t size;
> ++} buffer_ctx_t;
> ++
> + typedef struct {
> + array *cgi;
> + unsigned short execute_x_only;
> ++unsigned int high_waterlevel; /* maximum bytes in send_raw before
> backing
> off */
> ++unsigned int low_waterlevel; /* minimum bytes in send_raw to disable
> ++backoff */
> + } plugin_config;
> +
> + typedef struct {
> +@@ -68,9 +82,11 @@ typedef struct {
> + plugin_config **config_storage;
> +
> + plugin_config conf;
> ++
> ++buffer_ctx_t cgi_ctx;
> + } plugin_data;
> +
> +-typedef struct {
> ++typedef struct handler_ctx {
> + pid_t pid;
> + int fd;
> + int fde_ndx; /* index into the fd-event buffer */ @@ -78,11 +94,16 @@
> +typedef struct {
> + connection *remote_conn; /* dumb pointer */
> + plugin_data *plugin_data; /* dumb pointer */
> +
> ++int throttling;/* 1=waiting for send_raw buffer to drain */
> ++off_t high_waterlevel; /* maximum bytes in send_raw before backing off
> */
> ++off_t low_waterlevel; /* minimum bytes in send_raw to disable backoff
> */
> ++off_t bytes_in_buffer;
> ++
> + buffer *response;
> + buffer *response_header;
> + } handler_ctx;
> +
> +-static handler_ctx * cgi_handler_ctx_init(void) {
> ++static handler_ctx * cgi_handler_ctx_init(plugin_data *p) {
> + handler_ctx *hctx = calloc(1, sizeof(*hctx));
> +
> + force_assert(hctx);
> +@@ -90,13 +111,26 @@ static handler_ctx * cgi_handler_ctx_init(void) {
> + hctx->response = buffer_init();
> + hctx->response_header = buffer_init();
> +
> ++hctx->throttling = 0;
> ++hctx->high_waterlevel = (off_t)p->conf.high_waterlevel * 1024;
> ++hctx->low_waterlevel = (off_t)p->conf.low_waterlevel * 1024;
> ++if (hctx->low_waterlevel >= hctx->high_waterlevel) {
> ++hctx->low_waterlevel = hctx->high_waterlevel * 3 / 4; /* 75% */
> ++}
> ++hctx->bytes_in_buffer = 0;
> ++
> + return hctx;
> + }
> +
> +-static void cgi_handler_ctx_free(handler_ctx *hctx) {
> ++static void cgi_handler_ctx_free(server *srv, handler_ctx *hctx) {
> + buffer_free(hctx->response);
> + buffer_free(hctx->response_header);
> +
> ++/* to avoid confusion */
> ++if (hctx->thro
Re: [OE-core] [PATCH] glibc: add systemd support
Hi, Ross
I have sent some patches about "add systemd support and add systemd service
files",
Such as iptables, iputils, sysstat and so on.
So how about those patches? :)
Regards,
Li
> -Original Message-
> From: Li, Xin/李 欣
> Sent: Wednesday, June 24, 2015 11:15 AM
> To: openembedded-core@lists.openembedded.org
> Cc: Li, Xin/李 欣
> Subject: [OE-core][PATCH] glibc: add systemd support
>
> add systemd service files nscd.service and nscd.socket
>
> Signed-off-by: Li Xin
> ---
> meta/recipes-core/glibc/glibc-package.inc | 2 +-
> meta/recipes-core/glibc/glibc.inc | 20 +++-
> meta/recipes-core/glibc/glibc/nscd.service | 16
> meta/recipes-core/glibc/glibc/nscd.socket | 8
> meta/recipes-core/glibc/glibc_2.21.bb | 2 ++
> 5 files changed, 46 insertions(+), 2 deletions(-) create mode 100644
> meta/recipes-core/glibc/glibc/nscd.service
> create mode 100644 meta/recipes-core/glibc/glibc/nscd.socket
>
> diff --git a/meta/recipes-core/glibc/glibc-package.inc
> b/meta/recipes-core/glibc/glibc-package.inc
> index 984362e..4897479 100644
> --- a/meta/recipes-core/glibc/glibc-package.inc
> +++ b/meta/recipes-core/glibc/glibc-package.inc
> @@ -47,7 +47,7 @@ FILES_libsotruss = "${libdir}/audit/sotruss-lib.so"
> FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}"
> FILES_${PN}-dev += "${bindir}/rpcgen ${libdir}/*_nonshared.a
> ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal"
> FILES_${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a"
> -FILES_nscd = "${sbindir}/nscd*"
> +FILES_nscd = "${sbindir}/nscd* ${sysconfdir}/nscd.conf
> ${sysconfdir}/init.d/nscd
> ${localstatedir}/db ${systemd_unitdir}/system/nscd.*"
> FILES_${PN}-mtrace = "${bindir}/mtrace"
> FILES_tzcode = "${bindir}/tzselect ${sbindir}/zic ${sbindir}/zdump"
> FILES_${PN}-utils = "${bindir}/* ${sbindir}/*"
> diff --git a/meta/recipes-core/glibc/glibc.inc
> b/meta/recipes-core/glibc/glibc.inc
> index da56bc9..4c28461 100644
> --- a/meta/recipes-core/glibc/glibc.inc
> +++ b/meta/recipes-core/glibc/glibc.inc
> @@ -41,7 +41,7 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial
> libgcc-initial
> linux-libc-headers #RDEPENDS_${PN} += "${@['','libgcc']['nptl' in
> '${GLIBC_ADDONS}']}"
> PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
> PROVIDES += "virtual/libintl virtual/libiconv"
> -inherit autotools texinfo distro_features_check
> +inherit autotools texinfo distro_features_check systemd
> require glibc-options.inc
>
> # The main purpose of setting this variable is to prevent users from
> accidently
> @@ -95,4 +95,22 @@ do_configure_append() {
> sed -i
> 's/^OPTION_EGLIBC_NSSWITCH_FIXED_\(.*\)="\(.*\)"$/OPTION_EGLIBC_NSSWITC
> H_FIXED_\1=\2/' option-groups.config }
>
> +do_install_append() {
> + install -d ${D}/${sysconfdir}
> + install -m 0644 ${S}/nscd/nscd.conf ${D}/${sysconfdir}/nscd.conf
> + install -d ${D}/${sysconfdir}/init.d
> + install -m 0755 ${S}/nscd/nscd.init ${D}/${sysconfdir}/init.d/nscd
> + install -m 755 -d ${D}/${localstatedir}/db
> + install -m 755 -d ${D}/${localstatedir}/db/nscd
> +
> + install -d ${D}${systemd_unitdir}/system
> + install -m 0644 ${WORKDIR}/nscd.service ${D}${systemd_unitdir}/system/
> + install -m 0644 ${WORKDIR}/nscd.socket ${D}${systemd_unitdir}/system/
> + sed -i -e 's,@localstatedir@,${localstatedir},g'
> ${D}${systemd_unitdir}/system/*
> + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/*
> + sed -i -e 's,@base_bindir@,${base_bindir},g'
> +${D}${systemd_unitdir}/system/* }
> +
> +
> GLIBC_ADDONS ?= "nptl,libidn"
> +
> diff --git a/meta/recipes-core/glibc/glibc/nscd.service
> b/meta/recipes-core/glibc/glibc/nscd.service
> new file mode 100644
> index 000..014103e
> --- /dev/null
> +++ b/meta/recipes-core/glibc/glibc/nscd.service
> @@ -0,0 +1,16 @@
> +[Unit]
> +Description=Name Service Cache Daemon
> +After=syslog.target
> +
> +[Service]
> +Type=forking
> +ExecStartPre=@base_bindir@/mkdir -p @localstatedir@/run/nscd
> +ExecStartPre=@base_bindir@/mkdir -p @localstatedir@/db/nscd
> +ExecStart=@SBINDIR@/nscd ExecStop=@SBINDIR@/nscd --shutdown
> +Restart=always PIDFile=@localstatedir@/run/nscd/nscd.pid
> +
> +[Install]
> +WantedBy=multi-user.target
> +Also=nscd.socket
> diff --git a/meta/recipes-core/glibc/glibc/nscd.socket
> b/meta/recipes-core/glibc/glibc/nscd.socket
> new file mode 100644
> index 000..fc63453
> --- /dev/null
> +++ b/meta/recipes-core/glibc/glibc/nscd.socket
> @@ -0,0 +1,8 @@
> +[Unit]
> +Description=Name Service Cache Daemon Socket
> +
> +[Socket]
> +ListenDatagram=@localstatedir@/run/nscd/socket
> +
> +[Install]
> +WantedBy=sockets.target
> diff --git a/meta/recipes-core/glibc/glibc_2.21.bb
> b/meta/recipes-core/glibc/glibc_2.21.bb
> index 8197c29..4230630 100644
> --- a/meta/recipes-core/glibc/glibc_2.21.bb
> +++ b/meta/recipes-core/glibc/glibc_2.21.bb
> @@ -30,6 +30,8 @@ SRC_URI =
> "git://sourceware.org/
[OE-core] [PATCH 1/1] insane.bbclass: skip dev-deps QA checking for ptest package
The ptest pkg such as perl-ptest may need .h, .so or other files in dev
package to run test cases, so skipping dev-deps checkin for ptest
package.
Signed-off-by: Robert Yang
---
meta/classes/insane.bbclass |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 4537eec..d0eaa6b 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -792,7 +792,8 @@ def package_qa_check_rdepends(pkg, pkgdest, skip, taskdeps,
packages, d):
if "-dbg" in rdepend and "debug-deps" not in skip:
error_msg = "%s rdepends on %s" % (pkg,rdepend)
sane = package_qa_handle_error("debug-deps", error_msg, d)
-if (not "-dev" in pkg and not "-staticdev" in pkg) and
rdepend.endswith("-dev") and "dev-deps" not in skip:
+if (not pkg.endswith('-ptest') and not "-dev" in pkg and not
"-staticdev" in pkg) \
+and rdepend.endswith("-dev") and "dev-deps" not in
skip:
error_msg = "%s rdepends on %s" % (pkg, rdepend)
sane = package_qa_handle_error("dev-deps", error_msg, d)
if rdepend not in packages:
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] insane.bbclass: skip dev-deps QA checking for ptest package
The following changes since commit dd09fab685de2eaf04aa5ab60f8220b89c1deae9: tune-core2.inc: set X86ARCH32 to i686 (instead of i586) (2015-07-02 23:08:27 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/insane http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/insane Robert Yang (1): insane.bbclass: skip dev-deps QA checking for ptest package meta/classes/insane.bbclass |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] file: fix long-options
Backport two patches to fix bug with long options:
* 0001-Fix-bug-with-long-options-and-explicitly-number-them.patch
* 0002-fix-bug-with-5.23-long-options.patch
Signed-off-by: Robert Yang
---
...h-long-options-and-explicitly-number-them.patch | 116
.../file/0002-fix-bug-with-5.23-long-options.patch | 26 +
meta/recipes-devtools/file/file_5.23.bb|2 +
3 files changed, 144 insertions(+)
create mode 100644
meta/recipes-devtools/file/file/0001-Fix-bug-with-long-options-and-explicitly-number-them.patch
create mode 100644
meta/recipes-devtools/file/file/0002-fix-bug-with-5.23-long-options.patch
diff --git
a/meta/recipes-devtools/file/file/0001-Fix-bug-with-long-options-and-explicitly-number-them.patch
b/meta/recipes-devtools/file/file/0001-Fix-bug-with-long-options-and-explicitly-number-them.patch
new file mode 100644
index 000..0a3e27a
--- /dev/null
+++
b/meta/recipes-devtools/file/file/0001-Fix-bug-with-long-options-and-explicitly-number-them.patch
@@ -0,0 +1,116 @@
+From 21f9d5f0e0340ada998f7f9d316368c7167a4afa Mon Sep 17 00:00:00 2001
+From: Christos Zoulas
+Date: Thu, 11 Jun 2015 12:52:32 +
+Subject: [PATCH 1/2] Fix bug with long options and explicitly number them to
+ avoid this in the future.
+
+Upstream-Status: Backport
+
+Signed-off-by: Robert Yang
+
+---
+ src/file.c | 44 +++--
+ src/file_opts.h | 10 +-
+ 2 files changed, 27 insertions(+), 26 deletions(-)
+
+diff --git a/src/file.c b/src/file.c
+index f60dde0..c700f66 100644
+--- a/src/file.c
b/src/file.c
+@@ -89,10 +89,15 @@ private int/* Global command-line options
*/
+
+ private const char *separator = ":"; /* Default field separator */
+ private const struct option long_options[] = {
++#define OPT_HELP 1
++#define OPT_APPLE 2
++#define OPT_EXTENSIONS3
++#define OPT_MIME_TYPE 4
++#define OPT_MIME_ENCODING 5
+ #define OPT(shortname, longname, opt, doc) \
+ {longname, opt, NULL, shortname},
+-#define OPT_LONGONLY(longname, opt, doc)\
+-{longname, opt, NULL, 0},
++#define OPT_LONGONLY(longname, opt, doc, id)\
++{longname, opt, NULL, id},
+ #include "file_opts.h"
+ #undef OPT
+ #undef OPT_LONGONLY
+@@ -182,24 +187,20 @@ main(int argc, char *argv[])
+ while ((c = getopt_long(argc, argv, OPTSTRING, long_options,
+ &longindex)) != -1)
+ switch (c) {
+- case 0 :
+- switch (longindex) {
+- case 0:
+- help();
+- break;
+- case 10:
+- flags |= MAGIC_APPLE;
+- break;
+- case 11:
+- flags |= MAGIC_EXTENSION;
+- break;
+- case 12:
+- flags |= MAGIC_MIME_TYPE;
+- break;
+- case 13:
+- flags |= MAGIC_MIME_ENCODING;
+- break;
+- }
++ case OPT_HELP:
++ help();
++ break;
++ case OPT_APPLE:
++ flags |= MAGIC_APPLE;
++ break;
++ case OPT_EXTENSIONS:
++ flags |= MAGIC_EXTENSION;
++ break;
++ case OPT_MIME_TYPE:
++ flags |= MAGIC_MIME_TYPE;
++ break;
++ case OPT_MIME_ENCODING:
++ flags |= MAGIC_MIME_ENCODING;
+ break;
+ case '0':
+ nulsep = 1;
+@@ -595,7 +596,7 @@ help(void)
+ #define OPT(shortname, longname, opt, doc) \
+ fprintf(stdout, " -%c, --" longname, shortname), \
+ docprint(doc);
+-#define OPT_LONGONLY(longname, opt, doc)\
++#define OPT_LONGONLY(longname, opt, doc, id)\
+ fprintf(stdout, " --" longname), \
+ docprint(doc);
+ #include "file_opts.h"
+diff --git a/src/file_opts.h b/src/file_opts.h
+index 036505f..2e30d06 100644
+--- a/src/file_opts.h
b/src/file_opts.h
+@@ -12,7 +12,7 @@
+ * switch statement!
+ */
+
+-OPT_LONGONLY("help", 0, " display this help and exit\n")
++OPT_LONGONLY("help", 0, " display this help and exit\n",
OPT_HELP)
+ OPT('v', "version", 0, " output version information and exit\n")
+ OPT('m', "magic-file", 1, " LIST use LIST as a colon-separated list of
magic\n"
+ " number files\n")
+@@ -29,10 +29,10 @@ OPT('f', "files-from", 1, " FILE read the filenames
to be examined from FIL
+ OPT('F', "separator", 1, " STRING use string as separator instead of
`:'\n")
+ OPT('i',
[OE-core] [PATCH 0/1] file: fix long-options
The following changes since commit dd09fab685de2eaf04aa5ab60f8220b89c1deae9: tune-core2.inc: set X86ARCH32 to i686 (instead of i586) (2015-07-02 23:08:27 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/file http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/file Robert Yang (1): file: fix long-options ...h-long-options-and-explicitly-number-them.patch | 116 .../file/0002-fix-bug-with-5.23-long-options.patch | 26 + meta/recipes-devtools/file/file_5.23.bb|2 + 3 files changed, 144 insertions(+) create mode 100644 meta/recipes-devtools/file/file/0001-Fix-bug-with-long-options-and-explicitly-number-them.patch create mode 100644 meta/recipes-devtools/file/file/0002-fix-bug-with-5.23-long-options.patch -- 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] perf: Modify SPDX_S directory to avoid do_spdx error.
Ping...
Thanks
Li
> -Original Message-
> From: Li, Xin/李 欣
> Sent: Friday, June 26, 2015 4:01 PM
> To: openembedded-core@lists.openembedded.org
> Cc: Li, Xin/李 欣
> Subject: [OE-core][PATCH] perf: Modify SPDX_S directory to avoid do_spdx
> error.
>
> This is because S = "${STAGING_KERNEL_DIR}".
>
> Signed-off-by: Li Xin
> ---
> meta/recipes-kernel/perf/perf.bb | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/meta/recipes-kernel/perf/perf.bb
> b/meta/recipes-kernel/perf/perf.bb
> index eb27374..52b9404 100644
> --- a/meta/recipes-kernel/perf/perf.bb
> +++ b/meta/recipes-kernel/perf/perf.bb
> @@ -61,6 +61,7 @@ export PERL_ARCHLIB =
> "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version
> inherit kernelsrc
>
> B = "${WORKDIR}/${BPN}-${PV}"
> +SPDX_S = "${S}/tools/perf"
>
> SCRIPTING_DEFINES = "${@perf_feature_enabled('perf-scripting', '',
> 'NO_LIBPERL=1 NO_LIBPYTHON=1',d)}"
> TUI_DEFINES = "${@perf_feature_enabled('perf-tui', '', 'NO_NEWT=1',d)}"
> --
> 1.8.4.2
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] initscripts: add /sbin/sushell for systemd service debug-shell
Add file /sbin/sushell for systemd service debug-shell which starts with
/bin/sushell when SELinux is enabled. Copy and add sushell file from
Fedora 22.
Add runtime dependency bash as well when systemd is enabled to eliminate
QA warning:
WARNING: QA Issue: /sbin/sushell_initscripts contained in package initscripts
requires /bin/bash, but no providers found in its RDEPENDS [file-rdeps]
Signed-off-by: Kai Kang
---
meta/recipes-core/initscripts/initscripts-1.0/sushell | 5 +
meta/recipes-core/initscripts/initscripts_1.0.bb | 10 +-
2 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-core/initscripts/initscripts-1.0/sushell
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/sushell
b/meta/recipes-core/initscripts/initscripts-1.0/sushell
new file mode 100644
index 000..7d96941
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/sushell
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+[ -z "$SUSHELL" ] && SUSHELL=/bin/bash
+
+exec $SUSHELL
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb
b/meta/recipes-core/initscripts/initscripts_1.0.bb
index a086591..c2e815f 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -33,6 +33,7 @@ SRC_URI = "file://functions \
file://GPLv2.patch \
file://dmesg.sh \
file://logrotate-dmesg.conf \
+
${@bb.utils.contains('DISTRO_FEATURES','systemd','file://sushell','',d)} \
"
S = "${WORKDIR}"
@@ -46,7 +47,9 @@ DEPENDS_append = " update-rc.d-native"
DEPENDS_append = "
${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}"
PACKAGES =+ "${PN}-functions"
-RDEPENDS_${PN} = "${PN}-functions"
+RDEPENDS_${PN} = "${PN}-functions \
+
${@bb.utils.contains('DISTRO_FEATURES','systemd','bash','',d)} \
+"
FILES_${PN}-functions = "${sysconfdir}/init.d/functions*"
ALTERNATIVE_PRIORITY_${PN}-functions = "90"
@@ -104,6 +107,11 @@ do_install () {
if [ "${TARGET_ARCH}" = "arm" ]; then
install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d
fi
+
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};
then
+ install -d ${D}/${base_sbindir}
+ install -m 0755 ${WORKDIR}/sushell ${D}/${base_sbindir}
+ fi
#
# Install device dependent scripts
#
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] Add /sbin/sushell when SELinux is enabled
The following changes since commit 8ad9a434c9fd0300cf5c38c368b181b78421e95a: bitbake: tests/data: Add new data tests (2015-07-01 15:40:21 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib kangkai/initscripts http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=kangkai/initscripts Kai Kang (1): initscripts: add /sbin/sushell for systemd service debug-shell meta/recipes-core/initscripts/initscripts-1.0/sushell | 5 + meta/recipes-core/initscripts/initscripts_1.0.bb | 10 +- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/initscripts/initscripts-1.0/sushell -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
