Re: [OE-core] [PATCH] zlib: minor symbolic link issue
Hi Ross,
I didn’t know such a function was existing. You can use it of course, it’s much
better.
I found the (obscure) regexp in libcgroup recipe, it could be updated too.
Is it worth it I send a v2 patch ?
Matthieu
De : Burton, Ross [mailto:ross.bur...@intel.com]
Envoyé : mercredi 20 mai 2015 16:42
À : Matthieu CRAPET
Cc : openembedded-core@lists.openembedded.org
Objet : Re: [OE-core] [PATCH] zlib: minor symbolic link issue
On 20 May 2015 at 10:47, Matthieu CRAPET
matthieu.cra...@ingenico.commailto:matthieu.cra...@ingenico.com wrote:
Just tell me if something is wrong, I can provide a v2 patch.
No, it just slipped through the cracks.
That regex looked a bit obscure, and there's a Python function we provide that
uses the Python standard library to do the same thing, so I ended up with this
locally:
# Move zlib shared libraries for target builds to $base_libdir so the library
# can be used in early boot before $prefix is mounted.
do_install_append_class-target() {
if [ ${base_libdir} != ${libdir} ]
then
mkdir -p ${D}/${base_libdir}
mv ${D}/${libdir}/libz.so.* ${D}/${base_libdir}
libname=`readlink ${D}/${libdir}/libz.so`
ln -sf
${@oe.path.relative(${libdir}mailto:$%7...@oe.path.relative(%22$%7blibdir%7d,
${base_libdir})}/$libname ${D}${libdir}/libz.so
fi
}
Do you have any objections to this form instead? I'm also thinking we should
rationalise the duplicated logic into a single implementation in
meta/classes/utils.bbclass...
Ross
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] zlib: minor symbolic link issue
Hello,
Just tell me if something is wrong, I can provide a v2 patch.
Regards,
Matthieu
-Message d'origine-
De : openembedded-core-boun...@lists.openembedded.org
[mailto:openembedded-core-boun...@lists.openembedded.org] De la part de
Matthieu Crapet
Envoyé : mardi 5 mai 2015 10:14
À : openembedded-core@lists.openembedded.org
Objet : [OE-core] [PATCH] zlib: minor symbolic link issue
libz.so symbolic link created in ${libdir} is ../..//lib/libz.so.1.2.8 Make it
cleaner and generic (idea comes from libcgroup recipe).
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-core/zlib/zlib_1.2.8.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/zlib/zlib_1.2.8.bb
b/meta/recipes-core/zlib/zlib_1.2.8.bb
index ca0ba3f..5e11f23 100644
--- a/meta/recipes-core/zlib/zlib_1.2.8.bb
+++ b/meta/recipes-core/zlib/zlib_1.2.8.bb
@@ -6,7 +6,6 @@ SECTION = libs
LICENSE = Zlib
LIC_FILES_CHKSUM =
file://zlib.h;beginline=4;endline=23;md5=fde612df1e5933c428b73844a0c494fd
-
SRC_URI = http://www.zlib.net/${BPN}-${PV}.tar.xz \
file://remove.ldconfig.call.patch \
file://Makefile-runtests.patch \ @@ -54,7 +53,8 @@
do_install_append_class-target() {
mkdir -p ${D}/${base_libdir}
mv ${D}/${libdir}/libz.so.* ${D}/${base_libdir}
tmp=`readlink ${D}/${libdir}/libz.so`
- ln -sf ../../${base_libdir}/$tmp ${D}/${libdir}/libz.so
+ rel_lib_prefix=`echo ${libdir} | sed 's,\(^/\|\)[^/][^/]*,..,g'`
+ ln -sf ${rel_lib_prefix}${base_libdir}/$tmp
${D}/${libdir}/libz.so
fi
}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] zlib: minor symbolic link issue
libz.so symbolic link created in ${libdir} is ../..//lib/libz.so.1.2.8
Make it cleaner and generic (idea comes from libcgroup recipe).
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-core/zlib/zlib_1.2.8.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/zlib/zlib_1.2.8.bb
b/meta/recipes-core/zlib/zlib_1.2.8.bb
index ca0ba3f..5e11f23 100644
--- a/meta/recipes-core/zlib/zlib_1.2.8.bb
+++ b/meta/recipes-core/zlib/zlib_1.2.8.bb
@@ -6,7 +6,6 @@ SECTION = libs
LICENSE = Zlib
LIC_FILES_CHKSUM =
file://zlib.h;beginline=4;endline=23;md5=fde612df1e5933c428b73844a0c494fd
-
SRC_URI = http://www.zlib.net/${BPN}-${PV}.tar.xz \
file://remove.ldconfig.call.patch \
file://Makefile-runtests.patch \
@@ -54,7 +53,8 @@ do_install_append_class-target() {
mkdir -p ${D}/${base_libdir}
mv ${D}/${libdir}/libz.so.* ${D}/${base_libdir}
tmp=`readlink ${D}/${libdir}/libz.so`
- ln -sf ../../${base_libdir}/$tmp ${D}/${libdir}/libz.so
+ rel_lib_prefix=`echo ${libdir} | sed 's,\(^/\|\)[^/][^/]*,..,g'`
+ ln -sf ${rel_lib_prefix}${base_libdir}/$tmp
${D}/${libdir}/libz.so
fi
}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] util-linux: add lastb.1 and nologin.8 to update-alternatives
/usr/share/man/man1/lastb.1
is also provided by sysvinit recipe.
/usr/share/man/man8/nologin.8
is also provided by shadow recipe.
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-core/util-linux/util-linux.inc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc
b/meta/recipes-core/util-linux/util-linux.inc
index 10b14b3..2d17fa2 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -186,11 +186,13 @@ ALTERNATIVE_LINK_NAME[mkfs.minix] =
${base_sbindir}/mkfs.minix
ALTERNATIVE_LINK_NAME[eject] = ${bindir}/eject
ALTERNATIVE_LINK_NAME[sulogin] = ${base_sbindir}/sulogin
-ALTERNATIVE_${PN}-doc = mountpoint.1 last.1 mesg.1 wall.1 sulogin.8
utmpdump.1 reset.1
+ALTERNATIVE_${PN}-doc = mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8
sulogin.8 utmpdump.1 reset.1
ALTERNATIVE_LINK_NAME[last.1] = ${mandir}/man1/last.1
+ALTERNATIVE_LINK_NAME[lastb.1] = ${mandir}/man1/lastb.1
ALTERNATIVE_LINK_NAME[mesg.1] = ${mandir}/man1/mesg.1
ALTERNATIVE_LINK_NAME[mountpoint.1] = ${mandir}/man1/mountpoint.1
+ALTERNATIVE_LINK_NAME[nologin.8] = ${mandir}/man8/nologin.8
ALTERNATIVE_LINK_NAME[reset.1] = ${mandir}/man1/reset.1
ALTERNATIVE_LINK_NAME[sulogin.8] = ${mandir}/man8/sulogin.8
ALTERNATIVE_LINK_NAME[utmpdump.1] = ${mandir}/man1/utmpdump.1
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] postinst_intercept script: drop pipe
Avoid useless subshell. There's no word splitting in variable assignment. Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com --- scripts/postinst-intercepts/postinst_intercept | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/postinst-intercepts/postinst_intercept b/scripts/postinst-intercepts/postinst_intercept index 27c2568..a257198 100755 --- a/scripts/postinst-intercepts/postinst_intercept +++ b/scripts/postinst-intercepts/postinst_intercept @@ -41,7 +41,7 @@ fi chmod +x $intercept_script -pkgs_line=$(cat $intercept_script|grep ##PKGS:) +pkgs_line=$(grep ##PKGS: $intercept_script) if [ -n $pkgs_line ]; then # line exists, add this package to the list only if it's not already there if [ -z $(echo $pkgs_line | grep $package_name ) ]; then -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] alsa-lib: fix possible missing RDEPENDS for alsa-utils package
From: Matthieu Crapet mcra...@gmail.com
alsa-lib (libasound.so) can be compiled with some disabled features (for
example: midi)
See suggestion here: http://www.alsa-project.org/main/index.php/DevEmbedded
Depending configuration, alsa-utils recipe may not build all programs.
alsa-utils package will RDEPENDS of non existing packages (for example:
alsa-utils-midi).
Minor recipe cleanup:
- Use ${BP}
- Fix do_install shell function with tabs only
Signed-off-by: Matthieu Crapet mcra...@gmail.com
---
meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb | 18 +-
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb
b/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb
index ac5512a..279951d 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb
@@ -11,7 +11,7 @@ PACKAGECONFIG ??= udev
PACKAGECONFIG[udev] = --with-udev-rules-dir=`pkg-config --variable=udevdir
udev`/rules.d,,udev
PACKAGECONFIG[xmlto] = --enable-xmlto, --disable-xmlto, xmlto-native
docbook-xml-dtd4-native docbook-xsl-stylesheets-native
-SRC_URI = ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
+SRC_URI = ftp://ftp.alsa-project.org/pub/utils/${BP}.tar.bz2 \
file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \
file://alsa-utils-aplay-interrupt-signal-handling.patch \
@@ -64,7 +64,6 @@ FILES_alsa-utils-aseqdump= ${bindir}/aseqdump
FILES_alsa-utils-alsaloop= ${bindir}/alsaloop
FILES_alsa-utils-alsaucm = ${bindir}/alsaucm
-
SUMMARY_alsa-utils-aplay= Play (and record) sound files using ALSA
SUMMARY_alsa-utils-amixer = Command-line control for ALSA mixer and
settings
SUMMARY_alsa-utils-alsamixer= ncurses-based control for ALSA mixer and
settings
@@ -90,8 +89,17 @@ do_install() {
rm ${D}${sbindir}/alsaconf
if ${@bb.utils.contains('PACKAGECONFIG', 'udev', 'false', 'true', d)};
then
- # This is where alsa-utils will install its rules if we don't tell
it anything else.
- rm -rf ${D}/lib/udev
- rmdir --ignore-fail-on-non-empty ${D}/lib
+ # This is where alsa-utils will install its rules if we don't
tell it anything else.
+ rm -rf ${D}/lib/udev
+ rmdir --ignore-fail-on-non-empty ${D}/lib
fi
}
+
+python populate_packages_prepend () {
+packages = d.getVar('ALSA_UTILS_PKGS', True)
+pkgd = d.getVar('PKGD', True)
+for pkg in packages.split():
+pkgfiles = d.getVar('FILES_' + pkg, True).split()
+if not os.path.exists(pkgd + pkgfiles[0]):
+d.setVar('ALLOW_EMPTY_' + pkg, 1)
+}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libav: fix PACKAGECONFIG for theora and libvorbis
Switches must not be in EXTRA_OECONF anymore.
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-multimedia/libav/libav.inc | 2 --
1 file changed, 2 deletions(-)
diff --git a/meta/recipes-multimedia/libav/libav.inc
b/meta/recipes-multimedia/libav/libav.inc
index 1d617a2..5c327df 100644
--- a/meta/recipes-multimedia/libav/libav.inc
+++ b/meta/recipes-multimedia/libav/libav.inc
@@ -60,8 +60,6 @@ EXTRA_OECONF = \
--enable-avserver \
--enable-avplay \
--ld=${CCLD} \
---enable-libtheora \
---enable-libvorbis \
--arch=${TARGET_ARCH} \
--target-os=linux \
--enable-cross-compile \
--
2.0.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libav: fix PACKAGECONFIG for theora and libvorbis
Hi, Please take this bugfix patch first, then we could arrange the LICENSE change issue later. Regards, Matthieu -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] autotools.bbclass: Enhance sed regexp to avoid extra subshell
head -n1 can be done using sed.
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/classes/autotools.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 19edc54..afca760 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -195,7 +195,7 @@ autotools_do_configure() {
else
acpaths=${acpaths}
fi
- AUTOV=`automake --version |head -n 1 |sed s/.*
//;s/\.[0-9]\+$//`
+ AUTOV=`automake --version | sed -e '1{s/.*
//;s/\.[0-9]\+$//};q'`
automake --version
echo AUTOV is $AUTOV
if [ -d ${STAGING_DATADIR_NATIVE}/aclocal-$AUTOV ]; then
--
2.0.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC][PATCH v4] libav: set LICENSE according to PACKAGECONFIG options
Experienced users can change license with 'gpl' and 'lic3' PACKAGECONFIG
switches.
fix: drop unwanted --enable-libtheora --enable-libvorbis in EXTRA_OECONF
Reported-by: Andreas Oberritter o...@opendreambox.org
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-multimedia/libav/libav.inc | 35 +
1 file changed, 27 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-multimedia/libav/libav.inc
b/meta/recipes-multimedia/libav/libav.inc
index 1d617a2..de9770b 100644
--- a/meta/recipes-multimedia/libav/libav.inc
+++ b/meta/recipes-multimedia/libav/libav.inc
@@ -7,7 +7,7 @@ DESCRIPTION = Libav is a friendly and community-driven effort
to provide its us
HOMEPAGE = http://libav.org/;
SECTION = libs
-LICENSE = GPLv2+
+LICENSE = LGPLv2.1+
LICENSE_FLAGS = commercial
# Provides ffmpeg compat, see http://libav.org/about.html
@@ -29,7 +29,7 @@ BUILD_OPTIMIZATION = ${FULL_OPTIMIZATION}
EXTRA_FFCONF_armv7a = --cpu=cortex-a8
EXTRA_FFCONF ?=
-PACKAGECONFIG ??= bzip2 x264 theora ${@bb.utils.contains('DISTRO_FEATURES',
'x11', 'x11', '', d)}
+PACKAGECONFIG ??= bzip2 gpl x264 theora
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}
PACKAGECONFIG[bzip2] = --enable-bzlib,--disable-bzlib,bzip2
PACKAGECONFIG[faac] = --enable-libfaac,--disable-libfaac,faac
PACKAGECONFIG[gsm] = --enable-libgsm,--disable-libgsm,libgsm
@@ -44,14 +44,35 @@ PACKAGECONFIG[vpx] =
--enable-libvpx,--disable-libvpx,libvpx
PACKAGECONFIG[x11] = --enable-x11grab,--disable-x11grab,virtual/libx11
libxfixes libxext xproto virtual/libsdl
PACKAGECONFIG[x264] = --enable-libx264,--disable-libx264,x264
-# Check codecs that require --enable-nonfree
-USE_NONFREE = ${@bb.utils.contains_any('PACKAGECONFIG', [ 'faac', 'openssl'
], 'yes', '', d)}
+# Licenses flags: allow to switch licence LGPL/GPL and v2/v3
+PACKAGECONFIG[gpl] = --enable-gpl,--disable-gpl
+PACKAGECONFIG[lic3] = --enable-version3,--disable-version3
+
+# Check codecs and license coherency
+python () {
+ pkgconfig = (d.getVar('PACKAGECONFIG', True) or ).split()
+ nonfree = [ 'faac', 'openssl' ]
+ gpl = [ 'x11', 'x264' ]
+
+ if 'gpl' in pkgconfig:
+ if 'lic3' in pkgconfig:
+ d.setVar('LICENSE', 'GPLv3+')
+ else:
+ d.setVar('LICENSE', 'GPLv2+')
+ elif set(pkgconfig) set(gpl):
+ raise bb.parse.SkipPackage(incompatible license, please add
'gpl' in PACKAGECONFIG)
+ elif 'lic3' in pkgconfig:
+ d.setVar('LICENSE', 'LGPLv3+')
+
+ if set(pkgconfig) set(nonfree):
+ d.setVar('LICENSE', 'Proprietary')
+ bb.note(Change LICENSE to 'Proprietary')
+}
EXTRA_OECONF = \
--enable-shared \
--enable-pthreads \
---enable-gpl \
-${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree', '', d)} \
+${@bb.utils.contains('LICENSE', 'Proprietary', '--enable-nonfree', '', d)}
\
--enable-avfilter \
\
--cross-prefix=${TARGET_PREFIX} \
@@ -60,8 +81,6 @@ EXTRA_OECONF = \
--enable-avserver \
--enable-avplay \
--ld=${CCLD} \
---enable-libtheora \
---enable-libvorbis \
--arch=${TARGET_ARCH} \
--target-os=linux \
--enable-cross-compile \
--
2.0.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC][PATCH v4] libav: set LICENSE according to PACKAGECONFIG options
Hi, One more note. I've tested with 0.8.11 9.13 on OE-Core current git (master). The only weak point is the use of python anonymous function which is called twice each time, is there a better solution ? Regards, Matt -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] libav: set LICENSE and LICENSE_FLAGS according to PACKAGECONFIG options
Hi again, Some optional parts of Libav are licensed under the GNU General Public License version 2 or later (GPL v2+). See the file COPYING.GPLv2 for details. None of these parts are used by default, you have to explicitly pass --enable-gpl to configure to activate them. In this case, Libav's license changes to GPL v2+. I may misunderstood something here. For example: - libavfiler. It contains yadif code which is GPLv2+ and frei0r code is LGPLv2.1+. Libavfiler is clearly contaminated: LICENSE_libavfilter = GPLv2+ - libavutils is 100% LGPL LICENSE_libavutils = LGPLv2.1+ Giving --enable-gpl to configure does not convert pure 100% LGPL licensed library to GPL license. Am I wrong? Do you think it would be feasible to add code which decides whether to set --enable-gpl or not? Because --enable-gpl forbids linking libav for programs with incompatible licenses. Yes it's possible. Regards, M -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] libav: set LICENSE and LICENSE_FLAGS according to PACKAGECONFIG options
However, the libav 'LICENSE' clearly states that it's still the case anyway, but for non-technical reasons. If so, I'll post a v4 patch asap. Regards, M -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] libav: add PACKAGECONFIG for theora, libvorbis, speex and openssl
Hi Andreas,
Thanks for contribution. Your way is simple but user must know internal
dependencies between codecs in licenses.
I think we can drop the GPL v2/v3 case because it is only used with libopencore
libvo that we don't use them in our recipe.
I'll post a v3 patch asap.
Regards,
Matthieu
-Message d'origine-
De : openembedded-core-boun...@lists.openembedded.org
[mailto:openembedded-core-boun...@lists.openembedded.org] De la part de Andreas
Oberritter
Envoyé : vendredi 11 juillet 2014 14:44
À : openembedded-core@lists.openembedded.org
Objet : Re: [OE-core] [PATCH v2] libav: add PACKAGECONFIG for theora,
libvorbis, speex and openssl
Hi Matthieu,
I used a different approach, but could't test with master yet.
http://git.openembedded.org/openembedded-core-contrib/commit/?h=obi/daisyid=1e3c64a768a5aeaf8d904609a14dd29e298821df
While at it, you may also take a look at this commit:
http://git.openembedded.org/openembedded-core-contrib/commit/?h=obi/daisyid=1e39f95927b65c7943c8d6c36203b8b55c9b3cdf
Feel free to modify and submit as you like.
Regards,
Andreas
On 11.07.2014 13:47, Matthieu CRAPET wrote:
Hi Koen,
Something like this (in a small python function) would be acceptable?
d.setVar('LICENSE', 'CLOSED')
Regards,
Matthieu
-Message d'origine-
De : Koen Kooi [mailto:k...@dominion.thruhere.net]
Envoyé : vendredi 11 juillet 2014 08:37 À : Martin Jansa Cc : Matthieu
CRAPET; openembedded-core@lists.openembedded.org
Objet : Re: [OE-core] [PATCH v2] libav: add PACKAGECONFIG for theora,
libvorbis, speex and openssl
[...]
+# Check codecs that require --enable-nonfree USE_NONFREE =
+${@bb.utils.contains_any('PACKAGECONFIG', [ 'faac', 'openssl' ], 'yes',
'', d)}
EXTRA_OECONF = \
--enable-shared \
--enable-pthreads \
--enable-gpl \
+${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree',
+ '', d)} \
cannot you just pass --enable-nonfree in faac and openssl PACKAGECONFIG?
In worse case when both are enabled the option will be added twice.
If you have nonfree enabled, you need to change the license as well, it won't
be GPL anymore.
regards,
Koen
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3] libav: set LICENSE and LICENSE_FLAGS according to PACKAGECONFIG options
+ fix: drop unwanted --enable-libtheora --enable-libvorbis in EXTRA_OECONF
Reported-by: Andreas Oberritter o...@opendreambox.org
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-multimedia/libav/libav.inc | 17 ++---
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-multimedia/libav/libav.inc
b/meta/recipes-multimedia/libav/libav.inc
index 1d617a2..cd5ac5f 100644
--- a/meta/recipes-multimedia/libav/libav.inc
+++ b/meta/recipes-multimedia/libav/libav.inc
@@ -7,8 +7,7 @@ DESCRIPTION = Libav is a friendly and community-driven effort
to provide its us
HOMEPAGE = http://libav.org/;
SECTION = libs
-LICENSE = GPLv2+
-LICENSE_FLAGS = commercial
+LICENSE = GPLv2+ LGPLv2.1+
# Provides ffmpeg compat, see http://libav.org/about.html
PROVIDES = ffmpeg
@@ -44,14 +43,20 @@ PACKAGECONFIG[vpx] =
--enable-libvpx,--disable-libvpx,libvpx
PACKAGECONFIG[x11] = --enable-x11grab,--disable-x11grab,virtual/libx11
libxfixes libxext xproto virtual/libsdl
PACKAGECONFIG[x264] = --enable-libx264,--disable-libx264,x264
-# Check codecs that require --enable-nonfree
-USE_NONFREE = ${@bb.utils.contains_any('PACKAGECONFIG', [ 'faac', 'openssl'
], 'yes', '', d)}
+# Check codecs that trigger nonfree license
+python () {
+ pkgconfig = (d.getVar('PACKAGECONFIG', True) or ).split()
+ nonfree = [ 'faac', 'openssl' ]
+ if set(pkgconfig) set(nonfree):
+ d.setVar('LICENSE', 'Proprietary')
+ d.setVar('LICENSE_FLAGS', 'commercial')
+}
EXTRA_OECONF = \
--enable-shared \
--enable-pthreads \
--enable-gpl \
-${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree', '', d)} \
+${@bb.utils.contains('LICENSE', 'Proprietary', '--enable-nonfree', '', d)}
\
--enable-avfilter \
\
--cross-prefix=${TARGET_PREFIX} \
@@ -60,8 +65,6 @@ EXTRA_OECONF = \
--enable-avserver \
--enable-avplay \
--ld=${CCLD} \
---enable-libtheora \
---enable-libvorbis \
--arch=${TARGET_ARCH} \
--target-os=linux \
--enable-cross-compile \
--
2.0.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] libav: add PACKAGECONFIG for theora, libvorbis, speex and openssl
Hi Koen,
Something like this (in a small python function) would be acceptable?
d.setVar('LICENSE', 'CLOSED')
Regards,
Matthieu
-Message d'origine-
De : Koen Kooi [mailto:k...@dominion.thruhere.net]
Envoyé : vendredi 11 juillet 2014 08:37
À : Martin Jansa
Cc : Matthieu CRAPET; openembedded-core@lists.openembedded.org
Objet : Re: [OE-core] [PATCH v2] libav: add PACKAGECONFIG for theora,
libvorbis, speex and openssl
[...]
+# Check codecs that require --enable-nonfree USE_NONFREE =
+${@bb.utils.contains_any('PACKAGECONFIG', [ 'faac', 'openssl' ], 'yes',
'', d)}
EXTRA_OECONF = \
--enable-shared \
--enable-pthreads \
--enable-gpl \
+${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree',
+ '', d)} \
cannot you just pass --enable-nonfree in faac and openssl PACKAGECONFIG?
In worse case when both are enabled the option will be added twice.
If you have nonfree enabled, you need to change the license as well, it won't
be GPL anymore.
regards,
Koen
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] libav: add PACKAGECONFIG for theora, libvorbis, speex and openssl
Hi,
To summarize the situation:
This v2 patch works fine with an old bitbake (keeping the default
PACKAGECONFIG).
But if user change PACKAGECONFIG and adds faac or openssl (but not both),
the USE_NONFREE test will fail, so there will be a configure error.
Maybe could I add a comment inside the recipe ?
Regards,
M
-Message d'origine-
De : Martin Jansa [mailto:martin.ja...@gmail.com]
Envoyé : lundi 30 juin 2014 18:41
À : Matthieu CRAPET
Cc : openembedded-core@lists.openembedded.org
Objet : Re: [OE-core] [PATCH v2] libav: add PACKAGECONFIG for theora,
libvorbis, speex and openssl
On Mon, Jun 30, 2014 at 04:23:21PM +0200, Matthieu Crapet wrote:
Dropped libvorvis dependency because there is already a (better) builtin
vorbis codec.
Don't confuse codec names: vorbis (builtin) and libvorbis (using external
library).
Changes:
- add --enable-nonfree when faac or openssl are used
- add DESCRIPTION
- sort PACKAGECONFIG entries
Tested with libav-0.8.11 libav-9.13.
Note: Be sure to have a recent version of bitbake (2014-06-11 or better)
including this:
http://cgit.openembedded.org/bitbake/commit/?id=2e742c03e8dfdfa67899e7
f5d579ed14bd87e139 It affects behavior of bb.utils.contains_any
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-multimedia/libav/libav.inc | 30
++
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-multimedia/libav/libav.inc
b/meta/recipes-multimedia/libav/libav.inc
index a05a2a6..1d617a2 100644
--- a/meta/recipes-multimedia/libav/libav.inc
+++ b/meta/recipes-multimedia/libav/libav.inc
@@ -1,6 +1,12 @@
-SUMMARY = A complete, cross-platform solution to record, convert and stream
audio and video
+SUMMARY = Open source audio and video processing tools and librairies
+DESCRIPTION = Libav is a friendly and community-driven effort to provide
its users \
+ with a set of portable, functional and high-performance
libraries for \
+ dealing with multimedia formats of all sorts. It originates
from the \
+ FFmpeg codebase, but goes its own way these days, providing
its users \
+ with reliable releases and a clear vision how to go forward.
HOMEPAGE = http://libav.org/;
SECTION = libs
+
LICENSE = GPLv2+
LICENSE_FLAGS = commercial
@@ -9,7 +15,7 @@ PROVIDES = ffmpeg
ARM_INSTRUCTION_SET = arm
-DEPENDS = zlib libogg libvorbis libtheora yasm-native
+DEPENDS = zlib libogg yasm-native
INC_PR = r8
@@ -23,21 +29,29 @@ BUILD_OPTIMIZATION = ${FULL_OPTIMIZATION}
EXTRA_FFCONF_armv7a = --cpu=cortex-a8
EXTRA_FFCONF ?=
-PACKAGECONFIG ??= bzip2 x264 ${@bb.utils.contains('DISTRO_FEATURES', 'x11',
'x11', '', d)}
-PACKAGECONFIG[jack] = --enable-indev=jack,--disable-indev=jack,jack
+PACKAGECONFIG ??= bzip2 x264 theora ${@bb.utils.contains('DISTRO_FEATURES',
'x11', 'x11', '', d)}
PACKAGECONFIG[bzip2] = --enable-bzlib,--disable-bzlib,bzip2
-PACKAGECONFIG[schroedinger] =
--enable-libschroedinger,--disable-libschroedinger,schroedinger
+PACKAGECONFIG[faac] = --enable-libfaac,--disable-libfaac,faac
PACKAGECONFIG[gsm] = --enable-libgsm,--disable-libgsm,libgsm
-PACKAGECONFIG[x264] = --enable-libx264,--disable-libx264,x264
-PACKAGECONFIG[vpx] = --enable-libvpx,--disable-libvpx,libvpx
+PACKAGECONFIG[jack] = --enable-indev=jack,--disable-indev=jack,jack
+PACKAGECONFIG[libvorbis] = --enable-libvorbis,--disable-libvorbis,libvorbis
PACKAGECONFIG[mp3lame] = --enable-libmp3lame,--disable-libmp3lame,lame
-PACKAGECONFIG[faac] = --enable-libfaac,--disable-libfaac,faac
+PACKAGECONFIG[openssl] = --enable-openssl,--disable-openssl,openssl
+PACKAGECONFIG[schroedinger] =
--enable-libschroedinger,--disable-libschroedinger,schroedinger
+PACKAGECONFIG[speex] = --enable-libspeex,--disable-libspeex,speex
+PACKAGECONFIG[theora] = --enable-libtheora,--disable-libtheora,libtheora
+PACKAGECONFIG[vpx] = --enable-libvpx,--disable-libvpx,libvpx
PACKAGECONFIG[x11] = --enable-x11grab,--disable-x11grab,virtual/libx11
libxfixes libxext xproto virtual/libsdl
+PACKAGECONFIG[x264] = --enable-libx264,--disable-libx264,x264
+
+# Check codecs that require --enable-nonfree USE_NONFREE =
+${@bb.utils.contains_any('PACKAGECONFIG', [ 'faac', 'openssl' ], 'yes', '',
d)}
EXTRA_OECONF = \
--enable-shared \
--enable-pthreads \
--enable-gpl \
+${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree',
+ '', d)} \
cannot you just pass --enable-nonfree in faac and openssl PACKAGECONFIG?
In worse case when both are enabled the option will be added twice.
--enable-avfilter \
\
--cross-prefix=${TARGET_PREFIX} \
--
2.0.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber
[OE-core] [PATCH v2] libav: add PACKAGECONFIG for theora, libvorbis, speex and openssl
Dropped libvorvis dependency because there is already a (better) builtin vorbis
codec.
Don't confuse codec names: vorbis (builtin) and libvorbis (using external
library).
Changes:
- add --enable-nonfree when faac or openssl are used
- add DESCRIPTION
- sort PACKAGECONFIG entries
Tested with libav-0.8.11 libav-9.13.
Note: Be sure to have a recent version of bitbake (2014-06-11 or better)
including this:
http://cgit.openembedded.org/bitbake/commit/?id=2e742c03e8dfdfa67899e7f5d579ed14bd87e139
It affects behavior of bb.utils.contains_any
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-multimedia/libav/libav.inc | 30 ++
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-multimedia/libav/libav.inc
b/meta/recipes-multimedia/libav/libav.inc
index a05a2a6..1d617a2 100644
--- a/meta/recipes-multimedia/libav/libav.inc
+++ b/meta/recipes-multimedia/libav/libav.inc
@@ -1,6 +1,12 @@
-SUMMARY = A complete, cross-platform solution to record, convert and stream
audio and video
+SUMMARY = Open source audio and video processing tools and librairies
+DESCRIPTION = Libav is a friendly and community-driven effort to provide its
users \
+ with a set of portable, functional and high-performance
libraries for \
+ dealing with multimedia formats of all sorts. It originates
from the \
+ FFmpeg codebase, but goes its own way these days, providing its
users \
+ with reliable releases and a clear vision how to go forward.
HOMEPAGE = http://libav.org/;
SECTION = libs
+
LICENSE = GPLv2+
LICENSE_FLAGS = commercial
@@ -9,7 +15,7 @@ PROVIDES = ffmpeg
ARM_INSTRUCTION_SET = arm
-DEPENDS = zlib libogg libvorbis libtheora yasm-native
+DEPENDS = zlib libogg yasm-native
INC_PR = r8
@@ -23,21 +29,29 @@ BUILD_OPTIMIZATION = ${FULL_OPTIMIZATION}
EXTRA_FFCONF_armv7a = --cpu=cortex-a8
EXTRA_FFCONF ?=
-PACKAGECONFIG ??= bzip2 x264 ${@bb.utils.contains('DISTRO_FEATURES', 'x11',
'x11', '', d)}
-PACKAGECONFIG[jack] = --enable-indev=jack,--disable-indev=jack,jack
+PACKAGECONFIG ??= bzip2 x264 theora ${@bb.utils.contains('DISTRO_FEATURES',
'x11', 'x11', '', d)}
PACKAGECONFIG[bzip2] = --enable-bzlib,--disable-bzlib,bzip2
-PACKAGECONFIG[schroedinger] =
--enable-libschroedinger,--disable-libschroedinger,schroedinger
+PACKAGECONFIG[faac] = --enable-libfaac,--disable-libfaac,faac
PACKAGECONFIG[gsm] = --enable-libgsm,--disable-libgsm,libgsm
-PACKAGECONFIG[x264] = --enable-libx264,--disable-libx264,x264
-PACKAGECONFIG[vpx] = --enable-libvpx,--disable-libvpx,libvpx
+PACKAGECONFIG[jack] = --enable-indev=jack,--disable-indev=jack,jack
+PACKAGECONFIG[libvorbis] = --enable-libvorbis,--disable-libvorbis,libvorbis
PACKAGECONFIG[mp3lame] = --enable-libmp3lame,--disable-libmp3lame,lame
-PACKAGECONFIG[faac] = --enable-libfaac,--disable-libfaac,faac
+PACKAGECONFIG[openssl] = --enable-openssl,--disable-openssl,openssl
+PACKAGECONFIG[schroedinger] =
--enable-libschroedinger,--disable-libschroedinger,schroedinger
+PACKAGECONFIG[speex] = --enable-libspeex,--disable-libspeex,speex
+PACKAGECONFIG[theora] = --enable-libtheora,--disable-libtheora,libtheora
+PACKAGECONFIG[vpx] = --enable-libvpx,--disable-libvpx,libvpx
PACKAGECONFIG[x11] = --enable-x11grab,--disable-x11grab,virtual/libx11
libxfixes libxext xproto virtual/libsdl
+PACKAGECONFIG[x264] = --enable-libx264,--disable-libx264,x264
+
+# Check codecs that require --enable-nonfree
+USE_NONFREE = ${@bb.utils.contains_any('PACKAGECONFIG', [ 'faac', 'openssl'
], 'yes', '', d)}
EXTRA_OECONF = \
--enable-shared \
--enable-pthreads \
--enable-gpl \
+${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree', '', d)} \
--enable-avfilter \
\
--cross-prefix=${TARGET_PREFIX} \
--
2.0.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] eglibc (2.19): fix hardcoded /sbin path
Apply for ldconfig and sln packages.
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
.../eglibc/eglibc-2.19/fix_am_rootsbindir.patch| 32 ++
meta/recipes-core/eglibc/eglibc-package.inc| 2 +-
meta/recipes-core/eglibc/eglibc.inc| 13 +
meta/recipes-core/eglibc/eglibc_2.19.bb| 3 +-
4 files changed, 42 insertions(+), 8 deletions(-)
create mode 100644
meta/recipes-core/eglibc/eglibc-2.19/fix_am_rootsbindir.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.19/fix_am_rootsbindir.patch
b/meta/recipes-core/eglibc/eglibc-2.19/fix_am_rootsbindir.patch
new file mode 100644
index 000..ac1e2e8
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.19/fix_am_rootsbindir.patch
@@ -0,0 +1,32 @@
+sysdeps/gnu/configure.ac: handle correctly $libc_cv_rootsbindir
+
+Upstream-Status:Pending
+Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
+
+diff --git a/libc/sysdeps/gnu/configure b/libc/sysdeps/gnu/configure
+index e7f0e43..687beab 100644
+--- a/libc/sysdeps/gnu/configure
b/libc/sysdeps/gnu/configure
+@@ -42,6 +42,6 @@ case $prefix in
+ else
+ libc_cv_localstatedir=$localstatedir
+fi
+- libc_cv_rootsbindir=/sbin
++ test -n $libc_cv_rootsbindir || libc_cv_rootsbindir=/sbin
+ ;;
+ esac
+diff --git a/libc/sysdeps/gnu/configure.ac b/libc/sysdeps/gnu/configure.ac
+index ce251df..57c1e77 100644
+--- a/libc/sysdeps/gnu/configure.ac
b/libc/sysdeps/gnu/configure.ac
+@@ -42,6 +42,6 @@ case $prefix in
+ else
+ libc_cv_localstatedir=$localstatedir
+fi
+- libc_cv_rootsbindir=/sbin
++ test -n $libc_cv_rootsbindir || libc_cv_rootsbindir=/sbin
+ ;;
+ esac
+--
+2.0.0
+
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc
b/meta/recipes-core/eglibc/eglibc-package.inc
index 6721819..d5d407f 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -39,7 +39,7 @@ FILES_libsegfault = ${base_libdir}/libSegFault*
FILES_libcidn = ${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*
FILES_libmemusage = ${base_libdir}/libmemusage.so
FILES_eglibc-extra-nss = ${base_libdir}/libnss_*-*.so
${base_libdir}/libnss_*.so.*
-FILES_sln = /sbin/sln
+FILES_sln = ${base_sbindir}/sln
FILES_${PN}-pic = ${libdir}/*_pic.a ${libdir}/*_pic.map
${libdir}/libc_pic/*.o
FILES_libsotruss = ${libdir}/audit/sotruss-lib.so
FILES_SOLIBSDEV = ${libdir}/lib*${SOLIBSDEV}
diff --git a/meta/recipes-core/eglibc/eglibc.inc
b/meta/recipes-core/eglibc/eglibc.inc
index 3a623bb..68128e9 100644
--- a/meta/recipes-core/eglibc/eglibc.inc
+++ b/meta/recipes-core/eglibc/eglibc.inc
@@ -43,11 +43,14 @@ require eglibc-options.inc
LEAD_SONAME = libc.so
-CACHED_CONFIGUREVARS += ac_cv_path_KSH=${base_bindir}/bash \
- ac_cv_path_BASH_SHELL=${base_bindir}/bash \
- libc_cv_localedir=${localedir} \
- libc_cv_ssp=no \
-
+CACHED_CONFIGUREVARS += \
+ ac_cv_path_KSH=${base_bindir}/bash \
+ ac_cv_path_BASH_SHELL=${base_bindir}/bash \
+ libc_cv_slibdir=${base_libdir} \
+ libc_cv_rootsbindir=${base_sbindir} \
+ libc_cv_localedir=${localedir} \
+ libc_cv_ssp=no \
+
GLIBC_EXTRA_OECONF ?=
GLIBC_EXTRA_OECONF_class-nativesdk =
diff --git a/meta/recipes-core/eglibc/eglibc_2.19.bb
b/meta/recipes-core/eglibc/eglibc_2.19.bb
index 10b4bb1..2d354cb 100644
--- a/meta/recipes-core/eglibc/eglibc_2.19.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.19.bb
@@ -26,6 +26,7 @@ SRC_URI =
http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr25
file://fix-tibetian-locales.patch \
file://ppce6500-32b_slow_ieee754_sqrt.patch \
file://grok_gold.patch \
+ file://fix_am_rootsbindir.patch;striplevel=2 \
SRC_URI[md5sum] = 197836c2ba42fb146e971222647198dd
SRC_URI[sha256sum] =
baaa030531fc308f7820c46acdf8e1b2f8e3c1f40bcd28b6e440d1c95d170d4c
@@ -66,8 +67,6 @@ python __anonymous () {
d.getVar('TARGET_OS', True))
}
-export libc_cv_slibdir = ${base_libdir}
-
EXTRA_OECONF = --enable-kernel=${OLDEST_KERNEL} \
--without-cvs --disable-profile \
--disable-debug --without-gd \
--
2.0.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] native.bbclass: Properly define directories
For most users this commit will have no effect. But if you come across the idea
of giving
different names for paths, you'll get some troubles.
When a recipe inherit native, properly define bindir, sbindir, includedir,
sysconfdir, datadir
(using xxxdir_native definitions from meta/conf/bitbake.conf).
For example, edit
${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}/quilt-native/temp/log.do_configure
and see what are the arguments given by oe_runconf.
Notice that ${docdir}, ${mandir}, ${infodir}, ${localstatedir} have no
associated _native definition.
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/classes/native.bbclass | 7 ++-
meta/conf/bitbake.conf | 3 ++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 31f1c41..9dec318 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -77,7 +77,12 @@ base_prefix = ${STAGING_DIR_NATIVE}
prefix = ${STAGING_DIR_NATIVE}${prefix_native}
exec_prefix = ${STAGING_DIR_NATIVE}${prefix_native}
-libdir = ${STAGING_DIR_NATIVE}${libdir_native}
+bindir = ${STAGING_BINDIR_NATIVE}
+sbindir = ${STAGING_SBINDIR_NATIVE}
+libdir = ${STAGING_LIBDIR_NATIVE}
+includedir = ${STAGING_INCDIR_NATIVE}
+sysconfdir = ${STAGING_ETCDIR_NATIVE}
+datadir = ${STAGING_DATADIR_NATIVE}
baselib = lib
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 1d70d3c..50f5028 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -24,11 +24,11 @@ export base_libdir = ${base_prefix}/${baselib}
export nonarch_base_libdir = ${base_prefix}/lib
# Architecture independent paths
-export datadir = ${prefix}/share
export sysconfdir = ${base_prefix}/etc
export servicedir = ${base_prefix}/srv
export sharedstatedir = ${base_prefix}/com
export localstatedir = ${base_prefix}/var
+export datadir = ${prefix}/share
export infodir = ${datadir}/info
export mandir = ${datadir}/man
export docdir = ${datadir}/doc
@@ -358,6 +358,7 @@ STAGING_BINDIR_TOOLCHAIN =
${STAGING_DIR_NATIVE}${bindir_native}/${TARGET_ARCH}
STAGING_LIBDIR_NATIVE = ${STAGING_DIR_NATIVE}${libdir_native}
STAGING_LIBEXECDIR_NATIVE = ${STAGING_DIR_NATIVE}${libexecdir_native}
STAGING_BASE_LIBDIR_NATIVE = ${STAGING_DIR_NATIVE}${base_libdir_native}
+STAGING_SBINDIR_NATIVE = ${STAGING_DIR_NATIVE}${sbindir_native}
STAGING_INCDIR_NATIVE = ${STAGING_DIR_NATIVE}${includedir_native}
STAGING_ETCDIR_NATIVE = ${STAGING_DIR_NATIVE}${sysconfdir_native}
STAGING_DATADIR_NATIVE = ${STAGING_DIR_NATIVE}${datadir_native}
--
2.0.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/4] libav: add PACKAGECONFIG for theora, libvorbis, speex and openssl
Saul,
bb.utils.contains_any() instead of your contains_one implementation.
It is different, that's why I have added it.
+# Check codecs that require --enable-nonfree
+USE_NONFREE = ${@contains_one('PACKAGECONFIG', [ 'faac', 'openssl' ], d)}
contains_any will not work if PACKAGECONFIG have only one item (faac for
example).
Should it be a possible addition to bitbake ?
Matthieu
-Message d'origine-
De : Saul Wold [mailto:s...@linux.intel.com]
Envoyé : lundi 2 juin 2014 17:31
À : Matthieu CRAPET; openembedded-core@lists.openembedded.org
Objet : Re: [OE-core] [PATCH 1/4] libav: add PACKAGECONFIG for theora,
libvorbis, speex and openssl
On 06/02/2014 12:03 AM, Matthieu CRAPET wrote:
Hi,
Should I rebase/repost this? Aside libav versions/pinning preferences, this
single patch deserves to be commited.
Yes please, but I think you want to consider using
bb.utils.contains_any() instead of your contains_one implementation.
Sau!
Regards,
Matthieu
-Message d'origine-
De : openembedded-core-boun...@lists.openembedded.org
[mailto:openembedded-core-boun...@lists.openembedded.org] De la part
de Matthieu Crapet Envoyé : mercredi 21 mai 2014 13:38 À :
openembedded-core@lists.openembedded.org
Objet : [OE-core] [PATCH 1/4] libav: add PACKAGECONFIG for theora,
libvorbis, speex and openssl
Dropped libvorvis dependency because there is already a (better) builtin
vorbis codec.
Don't confuse codec names: vorbis (builtin) and libvorbis (using external
library).
Changes:
- add --enable-nonfree when faac or openssl are used
- add DESCRIPTION
- sort PACKAGECONFIG entries
Tested with libav-0.8.11 libav-9.13.
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-multimedia/libav/libav.inc | 39
++---
1 file changed, 31 insertions(+), 8 deletions(-)
[...]
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/4] libav: add PACKAGECONFIG for theora, libvorbis, speex and openssl
Hi, Should I rebase/repost this? Aside libav versions/pinning preferences, this single patch deserves to be commited. Regards, Matthieu -Message d'origine- De : openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] De la part de Matthieu Crapet Envoyé : mercredi 21 mai 2014 13:38 À : openembedded-core@lists.openembedded.org Objet : [OE-core] [PATCH 1/4] libav: add PACKAGECONFIG for theora, libvorbis, speex and openssl Dropped libvorvis dependency because there is already a (better) builtin vorbis codec. Don't confuse codec names: vorbis (builtin) and libvorbis (using external library). Changes: - add --enable-nonfree when faac or openssl are used - add DESCRIPTION - sort PACKAGECONFIG entries Tested with libav-0.8.11 libav-9.13. Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com --- meta/recipes-multimedia/libav/libav.inc | 39 ++--- 1 file changed, 31 insertions(+), 8 deletions(-) [...] -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] libav: add PACKAGECONFIG for theora, libvorbis, speex and openssl
Dropped libvorvis dependency because there is already a (better) builtin vorbis
codec.
Don't confuse codec names: vorbis (builtin) and libvorbis (using external
library).
Changes:
- add --enable-nonfree when faac or openssl are used
- add DESCRIPTION
- sort PACKAGECONFIG entries
Tested with libav-0.8.11 libav-9.13.
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-multimedia/libav/libav.inc | 39 ++---
1 file changed, 31 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-multimedia/libav/libav.inc
b/meta/recipes-multimedia/libav/libav.inc
index a05a2a6..0bcdedc 100644
--- a/meta/recipes-multimedia/libav/libav.inc
+++ b/meta/recipes-multimedia/libav/libav.inc
@@ -1,6 +1,12 @@
-SUMMARY = A complete, cross-platform solution to record, convert and stream
audio and video
+SUMMARY = Open source audio and video processing tools and librairies
+DESCRIPTION = Libav is a friendly and community-driven effort to provide its
users \
+ with a set of portable, functional and high-performance
libraries for \
+ dealing with multimedia formats of all sorts. It originates
from the \
+ FFmpeg codebase, but goes its own way these days, providing its
users \
+ with reliable releases and a clear vision how to go forward.
HOMEPAGE = http://libav.org/;
SECTION = libs
+
LICENSE = GPLv2+
LICENSE_FLAGS = commercial
@@ -9,7 +15,7 @@ PROVIDES = ffmpeg
ARM_INSTRUCTION_SET = arm
-DEPENDS = zlib libogg libvorbis libtheora yasm-native
+DEPENDS = zlib libogg yasm-native
INC_PR = r8
@@ -23,21 +29,29 @@ BUILD_OPTIMIZATION = ${FULL_OPTIMIZATION}
EXTRA_FFCONF_armv7a = --cpu=cortex-a8
EXTRA_FFCONF ?=
-PACKAGECONFIG ??= bzip2 x264 ${@bb.utils.contains('DISTRO_FEATURES', 'x11',
'x11', '', d)}
-PACKAGECONFIG[jack] = --enable-indev=jack,--disable-indev=jack,jack
+PACKAGECONFIG ??= bzip2 x264 theora ${@bb.utils.contains('DISTRO_FEATURES',
'x11', 'x11', '', d)}
PACKAGECONFIG[bzip2] = --enable-bzlib,--disable-bzlib,bzip2
-PACKAGECONFIG[schroedinger] =
--enable-libschroedinger,--disable-libschroedinger,schroedinger
+PACKAGECONFIG[faac] = --enable-libfaac,--disable-libfaac,faac
PACKAGECONFIG[gsm] = --enable-libgsm,--disable-libgsm,libgsm
-PACKAGECONFIG[x264] = --enable-libx264,--disable-libx264,x264
-PACKAGECONFIG[vpx] = --enable-libvpx,--disable-libvpx,libvpx
+PACKAGECONFIG[jack] = --enable-indev=jack,--disable-indev=jack,jack
+PACKAGECONFIG[libvorbis] = --enable-libvorbis,--disable-libvorbis,libvorbis
PACKAGECONFIG[mp3lame] = --enable-libmp3lame,--disable-libmp3lame,lame
-PACKAGECONFIG[faac] = --enable-libfaac,--disable-libfaac,faac
+PACKAGECONFIG[openssl] = --enable-openssl,--disable-openssl,openssl
+PACKAGECONFIG[schroedinger] =
--enable-libschroedinger,--disable-libschroedinger,schroedinger
+PACKAGECONFIG[speex] = --enable-libspeex,--disable-libspeex,speex
+PACKAGECONFIG[theora] = --enable-libtheora,--disable-libtheora,libtheora
+PACKAGECONFIG[vpx] = --enable-libvpx,--disable-libvpx,libvpx
PACKAGECONFIG[x11] = --enable-x11grab,--disable-x11grab,virtual/libx11
libxfixes libxext xproto virtual/libsdl
+PACKAGECONFIG[x264] = --enable-libx264,--disable-libx264,x264
+
+# Check codecs that require --enable-nonfree
+USE_NONFREE = ${@contains_one('PACKAGECONFIG', [ 'faac', 'openssl' ], d)}
EXTRA_OECONF = \
--enable-shared \
--enable-pthreads \
--enable-gpl \
+${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree', '', d)} \
--enable-avfilter \
\
--cross-prefix=${TARGET_PREFIX} \
@@ -91,6 +105,15 @@ LEAD_SONAME = libavcodec.so
FILES_${PN}-dev = ${includedir}
+def contains_one(variable, checkvalues, d):
+val = d.getVar(variable, True)
+if not val:
+return ''
+val = set(val.split())
+if val.intersection(checkvalues):
+return 'yes'
+return ''
+
python populate_packages_prepend() {
av_libdir = d.expand('${libdir}')
av_pkgconfig = d.expand('${libdir}/pkgconfig')
--
1.8.1.2
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] libav: add version 10.1
Using common libav.inc
Notice that DEFAULT_PREFERENCE = -1 is not included.
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-multimedia/libav/libav_10.1.bb | 14 ++
1 file changed, 14 insertions(+)
create mode 100644 meta/recipes-multimedia/libav/libav_10.1.bb
diff --git a/meta/recipes-multimedia/libav/libav_10.1.bb
b/meta/recipes-multimedia/libav/libav_10.1.bb
new file mode 100644
index 000..54e4056
--- /dev/null
+++ b/meta/recipes-multimedia/libav/libav_10.1.bb
@@ -0,0 +1,14 @@
+require libav.inc
+
+LIC_FILES_CHKSUM = file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
+
file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
+file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02
+
+SRC_URI = http://libav.org/releases/${BP}.tar.xz;
+
+SRC_URI[md5sum] = 0f751b439b6a5525d4c8a214f0db6aac
+SRC_URI[sha256sum] =
d5e04dc9adf43a467aa628f622425697d587a29cb0b997b45459f59cb00f9e15
+
+# Options for Libav version 10+
+PACKAGECONFIG[webp] = --enable-libwebp,--disable-libwebp,libwebp
--
1.8.1.2
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] libav (0.8.11): cosmetics, move LIC_FILES_CHKSUM before SRC_URI
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-multimedia/libav/libav_0.8.11.bb | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-multimedia/libav/libav_0.8.11.bb
b/meta/recipes-multimedia/libav/libav_0.8.11.bb
index 662d205..dfef680 100644
--- a/meta/recipes-multimedia/libav/libav_0.8.11.bb
+++ b/meta/recipes-multimedia/libav/libav_0.8.11.bb
@@ -1,16 +1,16 @@
require libav.inc
+LIC_FILES_CHKSUM = file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
+
file://COPYING.LGPLv2.1;md5=e344c8fa836c3a41c4cbd79d7bd3a379 \
+file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02
+
SRC_URI = http://libav.org/releases/${BP}.tar.xz \
file://0001-configure-enable-pic-for-AArch64.patch
SRC_URI[md5sum] = cdc9b53c56a375baf73ea38cf7ade4f9
SRC_URI[sha256sum] =
5934e4f0dbf6e0fc4987de86cdd079f1d11a1410ae275e9f46472af17f05155a
-LIC_FILES_CHKSUM = file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
-
file://COPYING.LGPLv2.1;md5=e344c8fa836c3a41c4cbd79d7bd3a379 \
-file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02
-
PROVIDES += libpostproc
EXTRA_OECONF += \
--
1.8.1.2
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] libav (9.13): remove DEFAULT_PREFERENCE
Use PREFERRED_VERSION_libav in your distro definition instead.
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-multimedia/libav/libav_9.13.bb | 2 --
1 file changed, 2 deletions(-)
diff --git a/meta/recipes-multimedia/libav/libav_9.13.bb
b/meta/recipes-multimedia/libav/libav_9.13.bb
index 7bfbc48..bbefde0 100644
--- a/meta/recipes-multimedia/libav/libav_9.13.bb
+++ b/meta/recipes-multimedia/libav/libav_9.13.bb
@@ -9,5 +9,3 @@ SRC_URI = http://libav.org/releases/${BP}.tar.xz;
SRC_URI[md5sum] = 23b9e34bffdaee366710fdf20157a570
SRC_URI[sha256sum] =
2ff05df6cd2259b3bb277eb16c234214f8e0530700d0c774d033eba23edde6ca
-
-DEFAULT_PREFERENCE = -1
--
1.8.1.2
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] libav: add version 10.1
Using common libav.inc
Keep DEFAULT_PREFERENCE because gstreamer 0.10 requires 0.8.x.
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-multimedia/libav/libav_10.1.bb | 16
1 file changed, 16 insertions(+)
create mode 100644 meta/recipes-multimedia/libav/libav_10.1.bb
diff --git a/meta/recipes-multimedia/libav/libav_10.1.bb
b/meta/recipes-multimedia/libav/libav_10.1.bb
new file mode 100644
index 000..a9df3fd
--- /dev/null
+++ b/meta/recipes-multimedia/libav/libav_10.1.bb
@@ -0,0 +1,16 @@
+require libav.inc
+
+LIC_FILES_CHKSUM = file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
+
file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
+file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02
+
+SRC_URI = http://libav.org/releases/${BP}.tar.xz;
+
+SRC_URI[md5sum] = 0f751b439b6a5525d4c8a214f0db6aac
+SRC_URI[sha256sum] =
d5e04dc9adf43a467aa628f622425697d587a29cb0b997b45459f59cb00f9e15
+
+# Options for Libav version 10+
+PACKAGECONFIG[webp] = --enable-libwebp,--disable-libwebp,libwebp
+
+DEFAULT_PREFERENCE = -1
--
1.8.1.2
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] tcl: cleanup
Changes:
- add missing licence file: tcl
- use binconfig to patch tclConfig.sh paths
- avoid subshell in do_configure()
- use ${PV}
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/files/common-licenses/tcl | 40
meta/recipes-devtools/tcltk/tcl_8.6.1.bb | 34 ---
2 files changed, 60 insertions(+), 14 deletions(-)
create mode 100644 meta/files/common-licenses/tcl
diff --git a/meta/files/common-licenses/tcl b/meta/files/common-licenses/tcl
new file mode 100644
index 000..d8049cd
--- /dev/null
+++ b/meta/files/common-licenses/tcl
@@ -0,0 +1,40 @@
+This software is copyrighted by the Regents of the University of
+California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState
+Corporation and other parties. The following terms apply to all files
+associated with the software unless explicitly disclaimed in
+individual files.
+
+The authors hereby grant permission to use, copy, modify, distribute,
+and license this software and its documentation for any purpose, provided
+that existing copyright notices are retained in all copies and that this
+notice is included verbatim in any distributions. No written agreement,
+license, or royalty fee is required for any of the authorized uses.
+Modifications to this software may be copyrighted by their authors
+and need not follow the licensing terms described here, provided that
+the new terms are clearly indicated on the first page of each file where
+they apply.
+
+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE
+IS PROVIDED ON AN AS IS BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+MODIFICATIONS.
+
+GOVERNMENT USE: If you are acquiring this software on behalf of the
+U.S. government, the Government shall have only Restricted Rights
+in the software and related documentation as defined in the Federal
+Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you
+are acquiring the software on behalf of the Department of Defense, the
+software shall be classified as Commercial Computer Software and the
+Government shall have only Restricted Rights as defined in Clause
+252.227-7014 (b) (3) of DFARs. Notwithstanding the foregoing, the
+authors grant the U.S. Government and others acting in its behalf
+permission to use and distribute the software in accordance with the
+terms specified in this license.
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.1.bb
b/meta/recipes-devtools/tcltk/tcl_8.6.1.bb
index 9d35da1..27f73f2 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.1.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.1.bb
@@ -1,19 +1,21 @@
SUMMARY = Tool Command Language
-LICENSE = BSD-3-Clause
-SECTION = devel/tcltk
HOMEPAGE = http://tcl.sourceforge.net;
-DEPENDS = tcl-native zlib
+SECTION = devel/tcltk
+
+# http://www.tcl.tk/software/tcltk/license.html
+LICENSE = tcl BSD-3-Clause
LIC_FILES_CHKSUM =
file://../license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
file://../compat/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
file://../library/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
file://../macosx/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
file://../tests/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
file://../win/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
-
+
-BASE_SRC_URI = ${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
-file://tcl-add-soname.patch
+DEPENDS = tcl-native zlib
+BASE_SRC_URI = ${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \
+file://tcl-add-soname.patch
SRC_URI = ${BASE_SRC_URI} \
file://fix_non_native_build_issue.patch \
file://fix_issue_with_old_distro_glibc.patch \
@@ -21,24 +23,26 @@ SRC_URI = ${BASE_SRC_URI} \
file://tcl-remove-hardcoded-install-path.patch \
file://alter-includedir.patch \
file://run-ptest \
-
+
SRC_URI[md5sum] = aae4b701ee527c6e4e1a6f9c7399882e
SRC_URI[sha256sum] =
16ee769248e64ba1cae6b4834fcc4e4edd7470d881410e8d58f7dd1434343514
SRC_URI_class-native = ${BASE_SRC_URI}
-S = ${WORKDIR}/tcl${PV}/unix
+S = ${WORKDIR}/${BPN}${PV}/unix
-VER = 8.6.1
+VER = ${PV}
-inherit autotools ptest
+inherit autotools ptest binconfig
DEPENDS_class-native = zlib-native
EXTRA_OECONF = --enable-threads --disable-rpath --libdir=${libdir}
do_configure() {
- ( cd ${S}; gnu-configize )
+ cd ${S
[OE-core] [PATCH 2/7] acpid: avoid pipe with sed
Replace:
cat file | sed -e xxx
By:
sed -e xxx file
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-bsp/acpid/acpid.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-bsp/acpid/acpid.inc b/meta/recipes-bsp/acpid/acpid.inc
index 89cb73f..fad7afd 100644
--- a/meta/recipes-bsp/acpid/acpid.inc
+++ b/meta/recipes-bsp/acpid/acpid.inc
@@ -25,7 +25,7 @@ do_install () {
install -d ${D}${bindir}
oe_runmake 'INSTPREFIX=${D}' install
install -d ${D}${sysconfdir}/init.d
- cat ${WORKDIR}/init | sed -e's,/usr/sbin,${sbindir},g'
${D}${sysconfdir}/init.d/acpid
+ sed -e 's,/usr/sbin,${sbindir},g' ${WORKDIR}/init
${D}${sysconfdir}/init.d/acpid
chmod 755 ${D}${sysconfdir}/init.d/acpid
install -d ${D}${sysconfdir}/acpi
--
1.8.5.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/7] apmd: avoid pipe with sed
Replace:
cat file | sed -e xxx
By:
sed -e xxx file
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-bsp/apmd/apmd_3.2.2-14.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb
b/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb
index 8c4b75e..ab7de65 100644
--- a/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb
+++ b/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb
@@ -65,7 +65,7 @@ do_install() {
oe_libinstall -so libapm ${D}${libdir}
install -m 0644 apm.h ${D}${includedir}
- cat ${WORKDIR}/init | sed -e 's,/usr/sbin,${sbindir},g;
s,/etc,${sysconfdir},g;' ${D}${sysconfdir}/init.d/apmd
+ sed -e 's,/usr/sbin,${sbindir},g; s,/etc,${sysconfdir},g;'
${WORKDIR}/init ${D}${sysconfdir}/init.d/apmd
chmod 755 ${D}${sysconfdir}/init.d/apmd
install -d ${D}${systemd_unitdir}/system
--
1.8.5.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/7] *.bbclass (shell): avoid pipe with sed
Replace:
cat file | sed -e xxx
By:
sed -e xxx file
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/classes/binconfig.bbclass| 2 +-
meta/classes/buildhistory.bbclass | 2 +-
meta/classes/kernel-grub.bbclass | 2 +-
meta/classes/sip.bbclass | 8 +++-
4 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass
index 7158c8c..cbc4173 100644
--- a/meta/classes/binconfig.bbclass
+++ b/meta/classes/binconfig.bbclass
@@ -57,7 +57,7 @@ binconfig_sysroot_preprocess () {
for config in `find ${S} -name '${BINCONFIG_GLOB}'` `find ${B} -name
'${BINCONFIG_GLOB}'`; do
configname=`basename $config`
install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}
- cat $config | sed ${@get_binconfig_mangle(d)}
${SYSROOT_DESTDIR}${bindir_crossscripts}/$configname
+ sed ${@get_binconfig_mangle(d)} $config
${SYSROOT_DESTDIR}${bindir_crossscripts}/$configname
chmod u+x ${SYSROOT_DESTDIR}${bindir_crossscripts}/$configname
done
}
diff --git a/meta/classes/buildhistory.bbclass
b/meta/classes/buildhistory.bbclass
index d75e7e6..20382ce 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -360,7 +360,7 @@ buildhistory_get_installed() {
# Produce dependency graph
# First, quote each name to handle characters that cause issues for dot
- cat ${WORKDIR}/bh_installed_pkgs_deps.txt | sed 's:\([^| ]*\):\1:g'
$1/depends.tmp \
+ sed 's:\([^| ]*\):\1:g' ${WORKDIR}/bh_installed_pkgs_deps.txt
$1/depends.tmp \
rm ${WORKDIR}/bh_installed_pkgs_deps.txt
# Change delimiter from pipe to - and set style for recommend lines
sed -i -e 's:|: - :' -e 's:\[REC\]:[style=dotted]:' -e 's:$:;:'
$1/depends.tmp
diff --git a/meta/classes/kernel-grub.bbclass b/meta/classes/kernel-grub.bbclass
index 85721ff..a63f482 100644
--- a/meta/classes/kernel-grub.bbclass
+++ b/meta/classes/kernel-grub.bbclass
@@ -67,7 +67,7 @@ pkg_postinst_kernel-image_prepend () {
if [ ${grubcfg##*/} = grub.cfg ]; then
cat $grubcfg
elif [ ${grubcfg##*/} = menu.list ]; then
- cat $grubcfg | sed -e '/^default/d' -e '/^timeout/d'
+ sed -e '/^default/d' -e '/^timeout/d' $grubcfg
fi
}
diff --git a/meta/classes/sip.bbclass b/meta/classes/sip.bbclass
index 711f851..6ed2a13 100644
--- a/meta/classes/sip.bbclass
+++ b/meta/classes/sip.bbclass
@@ -42,11 +42,9 @@ sip_do_generate() {
echo calling 'sip4 -I sip -I ${STAGING_SIPDIR} ${SIPTAGS}
${FEATURES} -c ${module} -b ${module}/${module}.pro.in
sip/${module}/${module}mod.sip'
sip4 -I ${STAGING_SIPDIR} -I sip ${SIPTAGS} ${FEATURES} -c
${module} -b ${module}/${module}.sbf \
sip/${module}/${module}mod.sip || die Error calling
sip on ${module}
- cat ${module}/${module}.sbf | sed s,target,TARGET, \
- | sed s,sources,SOURCES, \
- | sed s,headers,HEADERS, \
- | sed s,moc_HEADERS
=,HEADERS +=, \
- ${module}/${module}.pro
+ sed -e 's,target,TARGET,' -e 's,sources,SOURCES,' -e
's,headers,HEADERS,' \
+ ${module}/${module}.sbf | sed s,moc_HEADERS
=,HEADERS +=, \
+ ${module}/${module}.pro
echo TEMPLATE=lib ${module}/${module}.pro
[ ${module} = qt ] echo
${module}/${module}.pro
[ ${module} = qtcanvas ] echo
${module}/${module}.pro
--
1.8.5.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/7] initscripts: avoid pipe with sed
Small optimisation in /etc/init.d/populate-volatile.sh.
Replace:
cat file | sed -e xxx
By:
sed -e xxx file
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
index 6ffe1f2..e707b20 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
@@ -106,7 +106,7 @@ check_requirements() {
TMP_DEFINED=${TMPROOT}/tmpdefined.$$
TMP_COMBINED=${TMPROOT}/tmpcombined.$$
- cat ${ROOT_DIR}/etc/passwd | sed 's@\(^:\)*:.*@\1@' | sort | uniq
${TMP_DEFINED}
+ sed 's@\(^:\)*:.*@\1@' ${ROOT_DIR}/etc/passwd | sort | uniq
${TMP_DEFINED}
cat ${CFGFILE} | grep -v ^# | cut -s -d -f 2 ${TMP_INTERMED}
cat ${TMP_DEFINED} ${TMP_INTERMED} | sort | uniq ${TMP_COMBINED}
NR_DEFINED_USERS=`cat ${TMP_DEFINED} | wc -l`
@@ -120,7 +120,7 @@ check_requirements() {
}
- cat ${ROOT_DIR}/etc/group | sed 's@\(^:\)*:.*@\1@' | sort | uniq
${TMP_DEFINED}
+ sed 's@\(^:\)*:.*@\1@' ${ROOT_DIR}/etc/group | sort | uniq
${TMP_DEFINED}
cat ${CFGFILE} | grep -v ^# | cut -s -d -f 3 ${TMP_INTERMED}
cat ${TMP_DEFINED} ${TMP_INTERMED} | sort | uniq ${TMP_COMBINED}
--
1.8.5.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/7] dropbear: avoid pipe with sed
Replace:
cat file | sed -e xxx
By:
sed -e xxx file
+ fix indentation
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-core/dropbear/dropbear.inc | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/meta/recipes-core/dropbear/dropbear.inc
b/meta/recipes-core/dropbear/dropbear.inc
index 5a7be49..9fec09e 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -46,12 +46,12 @@ CFLAGS +=
-DSFTPSERVER_PATH=\\${libdir}/openssh/sftp-server\\
do_install() {
install -d ${D}${sysconfdir} \
- ${D}${sysconfdir}/init.d \
- ${D}${sysconfdir}/default \
- ${D}${sysconfdir}/dropbear \
- ${D}${bindir} \
- ${D}${sbindir} \
- ${D}${localstatedir}
+ ${D}${sysconfdir}/init.d \
+ ${D}${sysconfdir}/default \
+ ${D}${sysconfdir}/dropbear \
+ ${D}${bindir} \
+ ${D}${sbindir} \
+ ${D}${localstatedir}
install -m 0755 dropbearmulti ${D}${sbindir}/
ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient
@@ -60,11 +60,11 @@ do_install() {
do
ln -s ./dropbearmulti ${D}${sbindir}/$i
done
- cat ${WORKDIR}/init | sed -e 's,/etc,${sysconfdir},g' \
- -e 's,/usr/sbin,${sbindir},g' \
- -e 's,/var,${localstatedir},g' \
- -e 's,/usr/bin,${bindir},g' \
- -e 's,/usr,${prefix},g'
${D}${sysconfdir}/init.d/dropbear
+ sed -e 's,/etc,${sysconfdir},g' \
+ -e 's,/usr/sbin,${sbindir},g' \
+ -e 's,/var,${localstatedir},g' \
+ -e 's,/usr/bin,${bindir},g' \
+ -e 's,/usr,${prefix},g' ${WORKDIR}/init
${D}${sysconfdir}/init.d/dropbear
chmod 755 ${D}${sysconfdir}/init.d/dropbear
if [ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} =
pam ]; then
install -d ${D}${sysconfdir}/pam.d
@@ -77,9 +77,9 @@ do_install() {
install -m 0644 ${WORKDIR}/dropbear@.service
${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/dropbear.socket ${D}${systemd_unitdir}/system
sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
- -e 's,@BINDIR@,${bindir},g' \
- -e 's,@SBINDIR@,${sbindir},g' \
- ${D}${systemd_unitdir}/system/dropbear.socket
${D}${systemd_unitdir}/system/*.service
+ -e 's,@BINDIR@,${bindir},g' \
+ -e 's,@SBINDIR@,${sbindir},g' \
+ ${D}${systemd_unitdir}/system/dropbear.socket
${D}${systemd_unitdir}/system/*.service
}
inherit update-alternatives
--
1.8.5.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/7] sysvinit-inittab: avoid pipe with grep
Replace:
cat file | grep xxx
By:
grep xxx file
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
index 30641da..c3244b4 100644
--- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
@@ -54,7 +54,7 @@ if [ x$D = x ] [ -e /proc/consoles ]; then
for i in $tmp
do
j=`echo ${i} | sed s/^.*\;//g`
- if [ -z `cat /proc/consoles | grep ${j}` ]; then
+ if [ -z `grep ${j} /proc/consoles` ]; then
sed -i /^.*${j}$/d /etc/inittab
fi
done
--
1.8.5.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/7] scripts/runqemu: avoid pipe with sed
Replace:
cat file | sed -e xxx
By:
sed -e xxx file
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
scripts/runqemu | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/runqemu b/scripts/runqemu
index e270274..ff64a1d 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -355,10 +355,10 @@ setup_path_vars() {
MACHINE=$MACHINE bitbake -e $BITBAKE_ENV_TMPFILE
if [ -z $OE_TMPDIR ] ; then
-OE_TMPDIR=`cat $BITBAKE_ENV_TMPFILE | sed -n
's/^TMPDIR=\\(.*\)\/\1/p'`
+OE_TMPDIR=`sed -n 's/^TMPDIR=\\(.*\)\/\1/p' $BITBAKE_ENV_TMPFILE`
fi
if [ -z $DEPLOY_DIR_IMAGE ] ; then
-DEPLOY_DIR_IMAGE=`cat $BITBAKE_ENV_TMPFILE | sed -n
's/^DEPLOY_DIR_IMAGE=\\(.*\)\/\1/p'`
+DEPLOY_DIR_IMAGE=`sed -n 's/^DEPLOY_DIR_IMAGE=\\(.*\)\/\1/p'
$BITBAKE_ENV_TMPFILE`
fi
if [ -z $OE_TMPDIR ]; then
# Check for errors from bitbake that the user needs to know about
--
1.8.5.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] openssh-sshd: host contamination fix
If you do a readelf -x .rodata
/path/.../to/openssh/6.5p1-r0/packages-split/openssh-sshd/usr/sbin/sshd
You'll see two references to OE's sysroots/${BUILD_SYS} login and passwd
binaries.
First one can be overridden with LOGIN_PROGRAM environment variable (see
configure.ac),
second needs a cached variable definition.
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-connectivity/openssh/openssh_6.5p1.bb | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-connectivity/openssh/openssh_6.5p1.bb
b/meta/recipes-connectivity/openssh/openssh_6.5p1.bb
index 2c4da70..d19cc5a 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.5p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.5p1.bb
@@ -7,7 +7,6 @@ SECTION = console/network
LICENSE = BSD
LIC_FILES_CHKSUM = file://LICENCE;md5=e326045657e842541d3f35aada442507
-
DEPENDS = zlib openssl
DEPENDS += ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}
@@ -55,7 +54,9 @@ inherit autotools-brokensep
CFLAGS += -D__FILE_OFFSET_BITS=64
export LD = ${CC}
-EXTRA_OECONF = ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam',
'--without-pam', d)} \
+# login path is hardcoded in sshd
+EXTRA_OECONF = 'LOGIN_PROGRAM=${base_bindir}/login' \
+${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam',
'--without-pam', d)} \
--without-zlib-version-check \
--with-privsep-path=/var/run/sshd \
--sysconfdir=${sysconfdir}/ssh \
@@ -64,9 +65,11 @@ EXTRA_OECONF = ${@base_contains('DISTRO_FEATURES', 'pam',
'--with-pam', '--with
# Since we do not depend on libbsd, we do not want configure to use it
# just because it finds libutil.h. But, specifying --disable-libutil
# causes compile errors, so...
-#
CACHED_CONFIGUREVARS += ac_cv_header_bsd_libutil_h=no
ac_cv_header_libutil_h=no
+# passwd path is hardcoded in sshd
+CACHED_CONFIGUREVARS += ac_cv_path_PATH_PASSWD_PROG=${bindir}/passwd
+
# This is a workaround for uclibc because including stdio.h
# pulls in pthreads.h and causes conflicts in function prototypes.
# This results in compilation failure, so unless this is fixed,
@@ -97,7 +100,7 @@ do_install_append () {
install -d ${D}/${sysconfdir}/default/volatiles
install -m 644 ${WORKDIR}/volatiles.99_sshd
${D}/${sysconfdir}/default/volatiles/99_sshd
-# Create config files for read-only rootfs
+ # Create config files for read-only rootfs
install -d ${D}${sysconfdir}/ssh
install -m 644 ${D}${sysconfdir}/ssh/sshd_config
${D}${sysconfdir}/ssh/sshd_config_readonly
sed -i '/HostKey/d' ${D}${sysconfdir}/ssh/sshd_config_readonly
@@ -130,7 +133,6 @@ FILES_${PN}-keygen = ${bindir}/ssh-keygen
RDEPENDS_${PN} += ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen
RDEPENDS_${PN}-sshd += ${PN}-keygen ${@base_contains('DISTRO_FEATURES',
'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}
-
CONFFILES_${PN}-sshd = ${sysconfdir}/ssh/sshd_config
CONFFILES_${PN}-ssh = ${sysconfdir}/ssh/ssh_config
--
1.8.5.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] documentation.conf (LICENSE): tiny addition
Examples: LICENSE = MIT LICENSE = GPLv2 LGPLv2.1 LICENSE = AFL-2 | GPLv2+ LICENSE = MIT BSD-3-Clause BSD-2-Clause PD LICENSE = GPLv2 (LGPLv2.1 | MPL-1.1 | BSD) LICENSE = GPLv2+ LGPLv2+ ( (GPLv2+ LGPLv2.1+) | (GPLv3+ LGPLv3+) ) Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com --- meta/conf/documentation.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf index 9d6e78f..7fa3f31 100644 --- a/meta/conf/documentation.conf +++ b/meta/conf/documentation.conf @@ -253,7 +253,7 @@ LAYERDIR[doc] = When used inside the layer.conf configuration file, this variab LAYERVERSION[doc] = Optionally specifies the version of a layer as a single number. This variable is used in the conf/layer.conf file and must be suffixed with the name of the specific layer. LEAD_SONAME[doc] = Specifies the lead (or primary) compiled library file (.so) that the debian class applies its naming policy to given a recipe that packages multiple libraries. LIC_FILES_CHKSUM[doc] = Checksums of the license text in the recipe source code. -LICENSE[doc] = The list of source licenses for the recipe. +LICENSE[doc] = The list of source licenses for the recipe. Logical operators '' or '|' and parentheses can be used. LICENSE_PATH[doc] = Path to additional licenses used during the build. LINUX_KERNEL_TYPE[doc] = Defines the kernel type to be used in assembling the configuration. LINUX_VERSION[doc] = The Linux version from kernel.org on which the Linux kernel image being built using the OpenEmbedded build system is based. You define this variable in the kernel recipe. -- 1.8.5.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3] rootfs.py: introduce USE_DEVFS check
Since commit a83144bac8d67704ff66f5dc0fc56f5b63979694 (2014-02-11), USE_DEVFS
is not considered anymore.
For compatibility, let's restore USE_DEVFS semantic.
Also add USE_DEVFS to documentation.conf.
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/conf/documentation.conf | 1 +
meta/lib/oe/rootfs.py| 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index 4d49a02..9d6e78f 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -436,6 +436,7 @@ UBOOT_MACHINE[doc] = Specifies the value passed on the
make command line when b
UBOOT_MAKE_TARGET[doc] = Specifies the target called in the Makefile.
UBOOT_SUFFIX[doc] = Points to the generated U-Boot extension.
UBOOT_TARGET[doc] = Specifies the target used for building U-Boot.
+USE_DEVFS[doc] = When building images, specifies to populate or not /dev.
This variable defaults to '1' (leave directory empty, surely because devtmpfs
do the job). Set it to '0' to use makedevs (or consider using a custom file
with IMAGE_DEVICE_TABLES).
USER_CLASSES[doc] = List of additional classes to use when building images
that enable extra features.
USERADD_PACKAGES[doc] = When a recipe inherits the useradd class, this
variable specifies the individual packages within the recipe that require users
and/or groups to be added.
USERADD_PARAM[doc] = When a recipe inherits the useradd class, this variable
specifies for a package what parameters should be passed to the useradd command
if you wish to add a user to the system when the package is installed.
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 3eac3c9..dddbef4 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -116,7 +116,8 @@ class Rootfs(object):
offline and rootfs is read-only: %s %
delayed_postinsts)
-self._create_devfs()
+if self.d.getVar('USE_DEVFS', True) != 1:
+self._create_devfs()
self._uninstall_uneeded()
--
1.8.5.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC][PATCH] files/device_table-minimal.txt: cleanup
Hi Richard, If I remember correctly, mmc devices are dynamically allocated numbers. Well, in my work experience, I always used this. However, according to include/uapi/linux/major.h: #define MMC_BLOCK_MAJOR 179 I only see ttyS, not S0 or S1? According to file: /dev/ttyS c 640 roottty 4 64 0 1 2 This will create ttyS0 and ttyS1. Matt -Message d'origine- De : Richard Purdie [mailto:richard.pur...@linuxfoundation.org] Envoyé : jeudi 3 avril 2014 09:27 À : Matthieu CRAPET Cc : openembedded-core@lists.openembedded.org Objet : Re: [OE-core] [RFC][PATCH] files/device_table-minimal.txt: cleanup On Wed, 2014-04-02 at 18:46 +0200, Matthieu Crapet wrote: This device list is only used if USE_DEVFS is set to '0' (which is NOT the default since 2013-12-14, see commit f54fdd6673a136ee1cee1f3263a8a7820de43ca3) and if IMAGE_DEVICE_TABLE and IMAGE_DEVICE_TABLES are not set. This is, of course a very subjective list but minimal with 62 (special) files. However, you should be able to boot correctly a lot of embedded linux around. Changes: - add sda, sdb, sda[1234], sdb[1234] - add mmcblk0, mmcblk0p[1234] If I remember correctly, mmc devices are dynamically allocated numbers. Can we guarantee these are going to be correct? - add rtc0, rtc1 - restrict maximum hdaX from 19 to 4 (pata is old) - add ttyS1 I only see ttyS, not S0 or S1? - remove initctl, apm_bios, tty8, ttySA - sorted entries Cheers, Richard Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com --- meta/files/device_table-minimal.txt | 26 +++--- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/meta/files/device_table-minimal.txt b/meta/files/device_table-minimal.txt index 56c74bb..e4891cc 100644 --- a/meta/files/device_table-minimal.txt +++ b/meta/files/device_table-minimal.txt @@ -9,23 +9,27 @@ #p Fifo (named pipe) /dev d 755 rootroot- - - - - -/dev/initctl p 600 rootroot- - - - - -/dev/apm_biosc 660 rootplugdev 10 134 - - - +/dev/console c 662 roottty 5 1 - - - /dev/fb0 c 600 rootroot29 0 - - - /dev/hda b 660 rootdisk3 0 - - - -/dev/hda b 660 rootdisk3 1 1 1 19 +/dev/hda b 660 rootdisk3 1 1 1 4 /dev/kmemc 640 rootkmem1 2 - - - /dev/kmsgc 600 rootroot1 11 - - - /dev/mem c 640 rootkmem1 1 - - - -/dev/nullc 666 rootroot1 3 - - - -/dev/ram b 640 rootroot1 0 0 1 4 -/dev/tty c 662 roottty 5 0 - - - -/dev/tty c 666 roottty 4 0 0 1 9 -/dev/ttySc 640 roottty 4 64 0 1 1 -/dev/ttySA c 640 roottty 204 5 0 1 1 -/dev/zeroc 644 rootroot1 5 - - - +/dev/mmcblk0 b 660 rootdisk179 0 - - - +/dev/mmcblk0pb 660 rootdisk179 1 1 1 4 /dev/mtd c 660 rootdisk90 0 0 2 8 /dev/mtdblockb 640 rootroot31 0 0 1 8 -/dev/console c 662 roottty 5 1 - - - +/dev/nullc 666 rootroot1 3 - - - +/dev/ram b 640 rootroot1 0 0 1 4 /dev/random c 644 rootroot1 8 - - - +/dev/rtc c 644 rootroot254 0 0 1 2 +/dev/sda b 660 rootdisk8 0 - - - +/dev/sda b 660 rootdisk8 1 1 1 4 +/dev/sdb b 660 rootdisk8 16 - - - +/dev/sdb b 660 rootdisk8 17 1 1 4 +/dev/tty c 662 roottty 5 0 - - - +/dev/tty c 666 roottty 4 0 0 1 8 +/dev/ttySc 640 roottty 4 64 0 1 2 /dev/urandom c 644 rootroot1 9 - - - +/dev/zeroc 644 rootroot1 5 - - - -- 1.8.5.4
[OE-core] [PATCH] rootfs.py: introduce USE_DEVFS check
Since commit a83144bac8d67704ff66f5dc0fc56f5b63979694 (2014-02-11), USE_DEVFS
is not considered anymore.
For compatibility, let's restore USE_DEVFS semantic.
Also add USE_DEVFS to documentation.conf.
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/conf/documentation.conf | 1 +
meta/lib/oe/rootfs.py| 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index 4d49a02..ced646b 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -436,6 +436,7 @@ UBOOT_MACHINE[doc] = Specifies the value passed on the
make command line when b
UBOOT_MAKE_TARGET[doc] = Specifies the target called in the Makefile.
UBOOT_SUFFIX[doc] = Points to the generated U-Boot extension.
UBOOT_TARGET[doc] = Specifies the target used for building U-Boot.
+USE_DEVFS[doc] = When building images, specifies to populate or not
${sysconfdir}. This variable defaults to '0' (leave directory empty, surely
because devtmpfs do the job). Set it to '1' to use makedevs (or consider using
a custom file with IMAGE_DEVICE_TABLES).
USER_CLASSES[doc] = List of additional classes to use when building images
that enable extra features.
USERADD_PACKAGES[doc] = When a recipe inherits the useradd class, this
variable specifies the individual packages within the recipe that require users
and/or groups to be added.
USERADD_PARAM[doc] = When a recipe inherits the useradd class, this variable
specifies for a package what parameters should be passed to the useradd command
if you wish to add a user to the system when the package is installed.
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 3eac3c9..dddbef4 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -116,7 +116,8 @@ class Rootfs(object):
offline and rootfs is read-only: %s %
delayed_postinsts)
-self._create_devfs()
+if self.d.getVar('USE_DEVFS', True) != 1:
+self._create_devfs()
self._uninstall_uneeded()
--
1.8.5.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] rootfs.py: introduce USE_DEVFS check
Ooops!
-Message d'origine-
De : Phil Blundell [mailto:p...@pbcl.net]
Envoyé : mercredi 2 avril 2014 17:53
À : Matthieu CRAPET
Cc : openembedded-core@lists.openembedded.org
Objet : Re: [OE-core] [PATCH] rootfs.py: introduce USE_DEVFS check
On Wed, 2014-04-02 at 17:15 +0200, Matthieu Crapet wrote:
+USE_DEVFS[doc] = When building images, specifies to populate or not
${sysconfdir}. This variable defaults to '0' (leave directory empty, surely
because devtmpfs do the job). Set it to '1' to use makedevs (or consider
using a custom file with IMAGE_DEVICE_TABLES).
That's backwards, isn't it?
p.
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] rootfs.py: introduce USE_DEVFS check
Since commit a83144bac8d67704ff66f5dc0fc56f5b63979694 (2014-02-11), USE_DEVFS
is not considered anymore.
For compatibility, let's restore USE_DEVFS semantic.
Also add USE_DEVFS to documentation.conf.
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/conf/documentation.conf | 1 +
meta/lib/oe/rootfs.py| 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index 4d49a02..315e1b5 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -436,6 +436,7 @@ UBOOT_MACHINE[doc] = Specifies the value passed on the
make command line when b
UBOOT_MAKE_TARGET[doc] = Specifies the target called in the Makefile.
UBOOT_SUFFIX[doc] = Points to the generated U-Boot extension.
UBOOT_TARGET[doc] = Specifies the target used for building U-Boot.
+USE_DEVFS[doc] = When building images, specifies to populate or not
${sysconfdir}. This variable defaults to '1' (leave directory empty, surely
because devtmpfs do the job). Set it to '0' to use makedevs (or consider using
a custom file with IMAGE_DEVICE_TABLES).
USER_CLASSES[doc] = List of additional classes to use when building images
that enable extra features.
USERADD_PACKAGES[doc] = When a recipe inherits the useradd class, this
variable specifies the individual packages within the recipe that require users
and/or groups to be added.
USERADD_PARAM[doc] = When a recipe inherits the useradd class, this variable
specifies for a package what parameters should be passed to the useradd command
if you wish to add a user to the system when the package is installed.
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 3eac3c9..dddbef4 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -116,7 +116,8 @@ class Rootfs(object):
offline and rootfs is read-only: %s %
delayed_postinsts)
-self._create_devfs()
+if self.d.getVar('USE_DEVFS', True) != 1:
+self._create_devfs()
self._uninstall_uneeded()
--
1.8.5.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC][PATCH] files/device_table-minimal.txt: cleanup
This device list is only used if USE_DEVFS is set to '0' (which is NOT the default since 2013-12-14, see commit f54fdd6673a136ee1cee1f3263a8a7820de43ca3) and if IMAGE_DEVICE_TABLE and IMAGE_DEVICE_TABLES are not set. This is, of course a very subjective list but minimal with 62 (special) files. However, you should be able to boot correctly a lot of embedded linux around. Changes: - add sda, sdb, sda[1234], sdb[1234] - add mmcblk0, mmcblk0p[1234] - add rtc0, rtc1 - restrict maximum hdaX from 19 to 4 (pata is old) - add ttyS1 - remove initctl, apm_bios, tty8, ttySA - sorted entries Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com --- meta/files/device_table-minimal.txt | 26 +++--- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/meta/files/device_table-minimal.txt b/meta/files/device_table-minimal.txt index 56c74bb..e4891cc 100644 --- a/meta/files/device_table-minimal.txt +++ b/meta/files/device_table-minimal.txt @@ -9,23 +9,27 @@ #p Fifo (named pipe) /dev d 755 rootroot- - - - - -/dev/initctl p 600 rootroot- - - - - -/dev/apm_bios c 660 rootplugdev 10 134 - - - +/dev/console c 662 roottty 5 1 - - - /dev/fb0 c 600 rootroot29 0 - - - /dev/hda b 660 rootdisk3 0 - - - -/dev/hda b 660 rootdisk3 1 1 1 19 +/dev/hda b 660 rootdisk3 1 1 1 4 /dev/kmem c 640 rootkmem1 2 - - - /dev/kmsg c 600 rootroot1 11 - - - /dev/mem c 640 rootkmem1 1 - - - -/dev/null c 666 rootroot1 3 - - - -/dev/ram b 640 rootroot1 0 0 1 4 -/dev/tty c 662 roottty 5 0 - - - -/dev/tty c 666 roottty 4 0 0 1 9 -/dev/ttyS c 640 roottty 4 64 0 1 1 -/dev/ttySA c 640 roottty 204 5 0 1 1 -/dev/zero c 644 rootroot1 5 - - - +/dev/mmcblk0 b 660 rootdisk179 0 - - - +/dev/mmcblk0p b 660 rootdisk179 1 1 1 4 /dev/mtd c 660 rootdisk90 0 0 2 8 /dev/mtdblock b 640 rootroot31 0 0 1 8 -/dev/console c 662 roottty 5 1 - - - +/dev/null c 666 rootroot1 3 - - - +/dev/ram b 640 rootroot1 0 0 1 4 /dev/randomc 644 rootroot1 8 - - - +/dev/rtc c 644 rootroot254 0 0 1 2 +/dev/sda b 660 rootdisk8 0 - - - +/dev/sda b 660 rootdisk8 1 1 1 4 +/dev/sdb b 660 rootdisk8 16 - - - +/dev/sdb b 660 rootdisk8 17 1 1 4 +/dev/tty c 662 roottty 5 0 - - - +/dev/tty c 666 roottty 4 0 0 1 8 +/dev/ttyS c 640 roottty 4 64 0 1 2 /dev/urandom c 644 rootroot1 9 - - - +/dev/zero c 644 rootroot1 5 - - - -- 1.8.5.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libomxil-0.9.3: fix configure unrecognised option
Drop --disable-ffmpegcomponents which is deprecated since
libomxil-bellagio-0.9.1
Components are external and are available separately here:
http://sourceforge.net/projects/omxil/files/components/
---
meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
b/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
index 4a7633d..103d789 100644
--- a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
+++ b/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
@@ -1,11 +1,13 @@
-SUMMARY = Bellagio OpenMAX Integration Layer
+SUMMARY = Bellagio OpenMAX Integration Layer (IL)
+DESCRIPTION = Bellagio is an opensource implementation of the Khronos OpenMAX
\
+ Integration Layer API to access multimedia components.
HOMEPAGE = http://omxil.sourceforge.net/;
+
LICENSE = LGPLv2.1+
LICENSE_FLAGS = commercial
LIC_FILES_CHKSUM = file://COPYING;md5=ae6f0f4dbc7ac193b50f323a6ae191cb \
file://src/omxcore.h;beginline=1;endline=27;md5=806b1e5566c06486fe8e42b461e03a90
-
SRC_URI = ${SOURCEFORGE_MIRROR}/omxil/libomxil-bellagio-${PV}.tar.gz \
file://configure-fix.patch \
file://parallel-make.patch \
@@ -19,7 +21,7 @@ S = ${WORKDIR}/${BPN}-bellagio-${PV}
inherit autotools
-EXTRA_OECONF += --disable-ffmpegcomponents --disable-Werror
+EXTRA_OECONF += --disable-doc --disable-Werror
FILES_${PN} += ${libdir}/bellagio/*${SOLIBS} \
${libdir}/omxloaders/*${SOLIBS}
--
1.8.5.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] libomxil-0.9.3: fix configure unrecognised option
Drop --disable-ffmpegcomponents which is deprecated since
libomxil-bellagio-0.9.1
Explicitly disable doc generation to prevent using doxygen from build machine.
Components are external and are available separately here:
http://sourceforge.net/projects/omxil/files/components/
---
meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
b/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
index 4a7633d..103d789 100644
--- a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
+++ b/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
@@ -1,11 +1,13 @@
-SUMMARY = Bellagio OpenMAX Integration Layer
+SUMMARY = Bellagio OpenMAX Integration Layer (IL)
+DESCRIPTION = Bellagio is an opensource implementation of the Khronos OpenMAX
\
+ Integration Layer API to access multimedia components.
HOMEPAGE = http://omxil.sourceforge.net/;
+
LICENSE = LGPLv2.1+
LICENSE_FLAGS = commercial
LIC_FILES_CHKSUM = file://COPYING;md5=ae6f0f4dbc7ac193b50f323a6ae191cb \
file://src/omxcore.h;beginline=1;endline=27;md5=806b1e5566c06486fe8e42b461e03a90
-
SRC_URI = ${SOURCEFORGE_MIRROR}/omxil/libomxil-bellagio-${PV}.tar.gz \
file://configure-fix.patch \
file://parallel-make.patch \
@@ -19,7 +21,7 @@ S = ${WORKDIR}/${BPN}-bellagio-${PV}
inherit autotools
-EXTRA_OECONF += --disable-ffmpegcomponents --disable-Werror
+EXTRA_OECONF += --disable-doc --disable-Werror
FILES_${PN} += ${libdir}/bellagio/*${SOLIBS} \
${libdir}/omxloaders/*${SOLIBS}
--
1.8.5.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libcap 2.22: fix, disable gperf detection
gperf straight invoke is not suitable for cross environment (gperf-native
should be used instead).
Formal patch has been submited to the upstream.
As libcap 2.24 is currently available, I prefer doing this quick fix.
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-support/libcap/libcap.inc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-support/libcap/libcap.inc
b/meta/recipes-support/libcap/libcap.inc
index ccc0fde..fef700a 100644
--- a/meta/recipes-support/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap.inc
@@ -24,6 +24,9 @@ do_configure() {
# on what should be replaced with ?=
sed -e 's,:=,?=,g' -i Make.Rules
sed -e 's,^BUILD_CFLAGS ?= $(.*CFLAGS),BUILD_CFLAGS :=
$(BUILD_CFLAGS),' -i Make.Rules
+
+ # disable gperf detection
+ sed -e '/shell gperf/cifeq (,yes)' -i libcap/Makefile
}
EXTRA_OEMAKE = \
--
1.8.5.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC][PATCH v2] fontcache.bbclass: add fontconfig-utils runtime dependency
In an image recipe, you can get a warning, for example:
WARNING: The postinstall intercept hook 'update_font_cache' failed (exit code:
1)! See log for details!
WARNING: The postinstalls for the following packages will be postponed for
first boot: ttf-dejavu-sans-mono
(because /usr/bin/fc-cache is missing)
In OE-core, rdepend is correctly done in each recipe:
- ttf-fonts/liberation-fonts
- ttf-fonts/ttf-bitstream-vera
In meta-OE, rdepend is not done but packagegroup-fonts-truetype.bb includes
fontconfig-utils:
- ttf-fonts/ttf-arphic-uming
- ttf-fonts/ttf-dejavu
- ttf-fonts/ttf-droid
- ttf-fonts/ttf-gentium
- ttf-fonts/ttf-hunkyfonts
- ttf-fonts/ttf-inconsolata
- ttf-fonts/ttf-liberation
- ttf-fonts/ttf-mplus
- ttf-fonts/ttf-sazanami
- ttf-fonts/ttf-ubuntu-font-family
- ttf-fonts/ttf-wqy-zenhei
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/classes/fontcache.bbclass | 4
meta/conf/documentation.conf | 1 +
meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb | 1 -
meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb | 1 -
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
index 325bcae..afd3fd2 100644
--- a/meta/classes/fontcache.bbclass
+++ b/meta/classes/fontcache.bbclass
@@ -7,6 +7,7 @@ DEPENDS += qemu-native
inherit qemu
FONT_PACKAGES ??= ${PN}
+FONT_EXTRA_RDEPENDS ?= fontconfig-utils
fontcache_common() {
if [ x$D != x ] ; then
@@ -19,8 +20,11 @@ fi
python populate_packages_append() {
font_pkgs = d.getVar('FONT_PACKAGES', True).split()
+deps = d.getVar(FONT_EXTRA_RDEPENDS, True)
for pkg in font_pkgs:
+if deps: d.appendVar('RDEPENDS_' + pkg, ' '+deps)
+
bb.note(adding fonts postinst and postrm scripts to %s % pkg)
postinst = d.getVar('pkg_postinst_%s' % pkg, True) or
d.getVar('pkg_postinst', True)
if not postinst:
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index 53c3da2..4d49a02 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -173,6 +173,7 @@ FILESEXTRAPATHS[doc] = Extends the search path the
OpenEmbedded build system us
FILESOVERRIDES[doc] = A subset of OVERRIDES used by the OpenEmbedded build
system for creating FILESPATH.
FILESPATH[doc] = The default set of directories the OpenEmbedded build system
uses when searching for patches and files. It is defined in the base.bbclass
class found in meta/classes in the Source Directory. Do not hand-edit the
FILESPATH variable.
FILESYSTEM_PERMS_TABLES[doc] = Allows you to define your own file permissions
settings table as part of your configuration for the packaging process.
+FONT_EXTRA_RDEPENDS[doc] = When a recipe inherits the fontcache class, this
variable specifies runtime dependencies for font packages. This variable
defaults to 'fontconfig-utils'.
FONT_PACKAGES[doc] = When a recipe inherits the fontcache class, this
variable identifies packages containing font files that need to be cached by
Fontconfig.
FULL_OPTIMIZATION[doc]= The options to pass in TARGET_CFLAGS and CFLAGS when
compiling an optimized system. This variable defaults to
'-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2'.
diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb
b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb
index c99521f..89fa4b2 100644
--- a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb
+++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb
@@ -8,7 +8,6 @@ BUGTRACKER = https://bugzilla.redhat.com/;
SECTION = x11/fonts
LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
-RDEPENDS_${PN} = fontconfig-utils
PR = r4
PE = 1
diff --git a/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb
b/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb
index 75f78a2..b2e4cef 100644
--- a/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb
+++ b/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb
@@ -8,7 +8,6 @@ SECTION = x11/fonts
LICENSE = BitstreamVera
LIC_FILES_CHKSUM = file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be
PR = r7
-RDEPENDS_${PN} = fontconfig-utils
inherit fontcache
--
1.8.5.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC][PATCH] linux-dummy: provide kernel-modules (empty) package
Like it is done in kernel.bbclass
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-kernel/linux/linux-dummy.bb | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-dummy.bb
b/meta/recipes-kernel/linux/linux-dummy.bb
index bab1ac1..5d29f5c 100644
--- a/meta/recipes-kernel/linux/linux-dummy.bb
+++ b/meta/recipes-kernel/linux/linux-dummy.bb
@@ -1,16 +1,22 @@
-SECTION = kernel
SUMMARY = Dummy Linux kernel
DESCRIPTION = Dummy Linux kernel, to be selected as the preferred \
provider for virtual/kernel to satisfy dependencies for situations \
where you wish to build the kernel externally from the build system.
-LICENSE = GPLv2
+SECTION = kernel
+LICENSE = GPLv2
LIC_FILES_CHKSUM =
file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe
PROVIDES += virtual/kernel
PACKAGES_DYNAMIC += ^kernel-module-.*
PACKAGES_DYNAMIC += ^kernel-image-.*
+PACKAGES_DYNAMIC += ^kernel-firmware-.*
+
+PACKAGES += kernel-modules
+FILES_kernel-modules =
+ALLOW_EMPTY_kernel-modules = 1
+DESCRIPTION_kernel-modules = Kernel modules meta package
#COMPATIBLE_MACHINE = your_machine
@@ -20,19 +26,19 @@ SRC_URI = file://COPYING.GPL
S = ${WORKDIR}
do_configure() {
-:
+ :
}
do_compile () {
-:
+ :
}
do_install() {
-:
+ :
}
do_bundle_initramfs() {
-:
+ :
}
do_deploy() {
--
1.8.5.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC][PATCH] fontcache.bbclass: add fontconfig-utils runtime dependency
In an image recipe, you can get a warning, for example:
WARNING: The postinstall intercept hook 'update_font_cache' failed (exit code:
1)! See log for details!
WARNING: The postinstalls for the following packages will be postponed for
first boot: ttf-dejavu-sans-mono
(because /usr/bin/fc-cache is missing)
In OE-core, rdepend is correctly done in each recipe:
- ttf-fonts/liberation-fonts
- ttf-fonts/ttf-bitstream-vera
In meta-OE, rdepend is not done but packagegroup-fonts-truetype.bb includes
fontconfig-utils:
- ttf-fonts/ttf-arphic-uming
- ttf-fonts/ttf-dejavu
- ttf-fonts/ttf-droid
- ttf-fonts/ttf-gentium
- ttf-fonts/ttf-hunkyfonts
- ttf-fonts/ttf-inconsolata
- ttf-fonts/ttf-liberation
- ttf-fonts/ttf-mplus
- ttf-fonts/ttf-sazanami
- ttf-fonts/ttf-ubuntu-font-family
- ttf-fonts/ttf-wqy-zenhei
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/classes/fontcache.bbclass | 4
meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb | 1 -
meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb | 1 -
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
index 325bcae..65fdce1 100644
--- a/meta/classes/fontcache.bbclass
+++ b/meta/classes/fontcache.bbclass
@@ -7,6 +7,7 @@ DEPENDS += qemu-native
inherit qemu
FONT_PACKAGES ??= ${PN}
+FONTCACHE_RDEPEND ?= 1
fontcache_common() {
if [ x$D != x ] ; then
@@ -19,8 +20,11 @@ fi
python populate_packages_append() {
font_pkgs = d.getVar('FONT_PACKAGES', True).split()
+cache = d.getVar(FONTCACHE_RDEPEND, True)
for pkg in font_pkgs:
+if cache == 1: d.appendVar('RDEPENDS_' + pkg, ' fontconfig-utils')
+
bb.note(adding fonts postinst and postrm scripts to %s % pkg)
postinst = d.getVar('pkg_postinst_%s' % pkg, True) or
d.getVar('pkg_postinst', True)
if not postinst:
diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb
b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb
index c99521f..89fa4b2 100644
--- a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb
+++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb
@@ -8,7 +8,6 @@ BUGTRACKER = https://bugzilla.redhat.com/;
SECTION = x11/fonts
LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
-RDEPENDS_${PN} = fontconfig-utils
PR = r4
PE = 1
diff --git a/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb
b/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb
index 75f78a2..b2e4cef 100644
--- a/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb
+++ b/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb
@@ -8,7 +8,6 @@ SECTION = x11/fonts
LICENSE = BitstreamVera
LIC_FILES_CHKSUM = file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be
PR = r7
-RDEPENDS_${PN} = fontconfig-utils
inherit fontcache
--
1.8.5.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] oe-setup-builddir: small rework
Changes: - drop useless subshell creation in test: if ! (test -r $BUILDDIR/conf/local.conf); then$ - replace source builtin by . (bashsism) - fix indentation 4 spaces (drop some tabs too) - fix return = exit (return is not allowed in main) - drop sed -i (doesn't exist in BSD sed) - for homogeneity, always use [ ] (instead of test) - replace old [ x = x$VAR ] by [ -z $VAR ] Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com --- scripts/oe-setup-builddir | 47 --- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index e4356f1..c91e079 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir @@ -25,51 +25,51 @@ fi mkdir -p $BUILDDIR/conf -if ! (test -d $BUILDDIR); then +if [ ! -d $BUILDDIR ]; then echo 2 Error: The builddir ($BUILDDIR) does not exist! exit 1 fi -if ! (test -w $BUILDDIR); then +if [ ! -w $BUILDDIR ]; then echo 2 Error: Cannot write to $BUILDDIR, perhaps try sourcing with a writable path? i.e. . oe-init-build-env ~/my-build exit 1 fi cd $BUILDDIR -if (test -f $BUILDDIR/conf/templateconf.cfg) then +if [ -f $BUILDDIR/conf/templateconf.cfg ]; then TEMPLATECONF=$(cat $BUILDDIR/conf/templateconf.cfg) fi -source $OEROOT/.templateconf +. $OEROOT/.templateconf -if ! (test -f $BUILDDIR/conf/templateconf.cfg) then +if [ ! -f $BUILDDIR/conf/templateconf.cfg ]; then echo $TEMPLATECONF $BUILDDIR/conf/templateconf.cfg fi # # $TEMPLATECONF can point to a directory for the template local.conf bblayers.conf # -if [ x != x$TEMPLATECONF ]; then -if ! (test -d $TEMPLATECONF); then - # Allow TEMPLATECONF=meta-xyz/conf as a shortcut - if [ -d $OEROOT/$TEMPLATECONF ]; then - TEMPLATECONF=$OEROOT/$TEMPLATECONF - fi - if ! (test -d $TEMPLATECONF); then - echo 2 Error: '$TEMPLATECONF' must be a directory containing local.conf bblayers.conf - return - fi +if [ -n $TEMPLATECONF ]; then +if [ ! -d $TEMPLATECONF ]; then +# Allow TEMPLATECONF=meta-xyz/conf as a shortcut +if [ -d $OEROOT/$TEMPLATECONF ]; then +TEMPLATECONF=$OEROOT/$TEMPLATECONF +fi +if [ ! -d $TEMPLATECONF ]; then +echo 2 Error: '$TEMPLATECONF' must be a directory containing local.conf bblayers.conf +exit 1 +fi fi OECORELAYERCONF=$TEMPLATECONF/bblayers.conf.sample OECORELOCALCONF=$TEMPLATECONF/local.conf.sample OECORENOTESCONF=$TEMPLATECONF/conf-notes.txt fi -if [ x = x$OECORELOCALCONF ]; then +if [ -z $OECORELOCALCONF ]; then OECORELOCALCONF=$OEROOT/meta/conf/local.conf.sample fi -if ! (test -r $BUILDDIR/conf/local.conf); then +if [ ! -r $BUILDDIR/conf/local.conf ]; then cat EOM You had no conf/local.conf file. This configuration file has therefore been created for you with some default values. You may wish to edit it to use a @@ -88,11 +88,11 @@ EOM cp -f $OECORELOCALCONF $BUILDDIR/conf/local.conf fi -if [ x = x$OECORELAYERCONF ]; then +if [ -z $OECORELAYERCONF ]; then OECORELAYERCONF=$OEROOT/meta/conf/bblayers.conf.sample fi -if ! (test -r $BUILDDIR/conf/bblayers.conf); then -cat EOM +if [ ! -r $BUILDDIR/conf/bblayers.conf ]; then +cat EOM You had no conf/bblayers.conf file. The configuration file has been created for you with some default values. To add additional metadata layers into your configuration please add entries to this file. @@ -109,10 +109,11 @@ EOM # Put the abosolute path to the layers in bblayers.conf so we can run # bitbake without the init script after the first run -sed s|##OEROOT##|$OEROOT|g $OECORELAYERCONF $BUILDDIR/conf/bblayers.conf # ##COREBASE## is deprecated as it's meaning was inconsistent, but continue # to replace it for compatibility. -sed -i -e s|##COREBASE##|$OEROOT|g $BUILDDIR/conf/bblayers.conf +sed -e s|##OEROOT##|$OEROOT|g \ +-e s|##COREBASE##|$OEROOT|g \ +$OECORELAYERCONF $BUILDDIR/conf/bblayers.conf fi # Prevent disturbing a new GIT clone in same console @@ -126,7 +127,7 @@ cat EOM You can now run 'bitbake target' EOM -if [ x = x$OECORENOTESCONF ]; then +if [ -z $OECORENOTESCONF ]; then OECORENOTESCONF=$OEROOT/meta/conf/conf-notes.txt fi [ ! -r $OECORENOTESCONF ] || cat $OECORENOTESCONF -- 1.8.5.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] oe-setup-builddir: small rework
Hi, Saul, I included your bashism fix in my patch. I wanted to update copyright to something like: # Copyright (C) 2012-2012 OpenEmbedded Team but didn't know if this was appropriate. Regards, Matthieu -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] image.bbclass: USE_DEVFS is now useless
Hi, Since : http://cgit.openembedded.org/openembedded-core/commit/meta/classes/image.bbclass?id=a83144bac8d67704ff66f5dc0fc56f5b63979694 USE_DEVFS is not considered anymore. Setting IMAGE_DEVICE_TABLE or IMAGE_DEVICE_TABLES to empty string in an image recipe works (makedevs is not called) Should be we drop USE_DEVFS variable (meta/classes/image.bbclass) or (re)add check in meta/lib/oe/rootfs.py? I can propose a patch. Regards, Matthieu ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] scripts/oe-setup-builddir: Keep track of TEMPLATECONF setting
Hi,
You can drop parenthesis in your test (it will create a useless subshell).
Regards,
Matthieu
-Message d'origine-
De : openembedded-core-boun...@lists.openembedded.org
[mailto:openembedded-core-boun...@lists.openembedded.org] De la part de Gary
Thomas
Envoyé : lundi 24 février 2014 16:18
À : openembedded-core@lists.openembedded.org
Cc : Gary Thomas
Objet : [OE-core] [PATCH 2/2] scripts/oe-setup-builddir: Keep track of
TEMPLATECONF setting
Keeping track of the TEMPLATECONF variable in the build tree will let this
script produce the same output when listing 'conf-notes.txt' every time the
script is run, regardless of whether or not TEMPLATECONF has been provided by
the user.
Signed-off-by: Gary Thomas g...@mlbassoc.com
---
scripts/oe-setup-builddir |8
1 file changed, 8 insertions(+)
diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index
a869fdc..4322158 100755
--- a/scripts/oe-setup-builddir
+++ b/scripts/oe-setup-builddir
@@ -37,8 +37,16 @@ fi
cd $BUILDDIR
+if (test -f $BUILDDIR/conf/template.conf) then
+TEMPLATECONF=$(cat $BUILDDIR/conf/template.conf) fi
+
TEMPLATECONF=${TEMPLATECONF:-meta/conf}
+if ! (test -f $BUILDDIR/conf/template.conf) then
+echo $TEMPLATECONF $BUILDDIR/conf/template.conf fi
+
#
# $TEMPLATECONF can point to a directory for the template local.conf
bblayers.conf #
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH] vim: add (custom) license file
This is will delete this message: WARNING: vim: No generic license file exists for: vim in any provider Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com --- meta-oe/licenses/vim | 81 1 file changed, 81 insertions(+) create mode 100644 meta-oe/licenses/vim diff --git a/meta-oe/licenses/vim b/meta-oe/licenses/vim new file mode 100644 index 000..4aa818e --- /dev/null +++ b/meta-oe/licenses/vim @@ -0,0 +1,81 @@ +VIM LICENSE + +I) There are no restrictions on distributing unmodified copies of Vim except +that they must include this license text. You can also distribute +unmodified parts of Vim, likewise unrestricted except that they must +include this license text. You are also allowed to include executables +that you made from the unmodified Vim sources, plus your own usage +examples and Vim scripts. + +II) It is allowed to distribute a modified (or extended) version of Vim, +including executables and/or source code, when the following four +conditions are met: +1) This license text must be included unmodified. +2) The modified Vim must be distributed in one of the following five ways: + a) If you make changes to Vim yourself, you must clearly describe in + the distribution how to contact you. When the maintainer asks you + (in any way) for a copy of the modified Vim you distributed, you + must make your changes, including source code, available to the + maintainer without fee. The maintainer reserves the right to + include your changes in the official version of Vim. What the + maintainer will do with your changes and under what license they + will be distributed is negotiable. If there has been no negotiation + then this license, or a later version, also applies to your changes. + The current maintainer is Bram Moolenaar b...@vim.org. If this + changes it will be announced in appropriate places (most likely + vim.sf.net, www.vim.org and/or comp.editors). When it is completely + impossible to contact the maintainer, the obligation to send him + your changes ceases. Once the maintainer has confirmed that he has + received your changes they will not have to be sent again. + b) If you have received a modified Vim that was distributed as + mentioned under a) you are allowed to further distribute it + unmodified, as mentioned at I). If you make additional changes the + text under a) applies to those changes. + c) Provide all the changes, including source code, with every copy of + the modified Vim you distribute. This may be done in the form of a + context diff. You can choose what license to use for new code you + add. The changes and their license must not restrict others from + making their own changes to the official version of Vim. + d) When you have a modified Vim which includes changes as mentioned + under c), you can distribute it without the source code for the + changes if the following three conditions are met: + - The license that applies to the changes permits you to distribute + the changes to the Vim maintainer without fee or restriction, and + permits the Vim maintainer to include the changes in the official + version of Vim without fee or restriction. + - You keep the changes for at least three years after last + distributing the corresponding modified Vim. When the maintainer + or someone who you distributed the modified Vim to asks you (in + any way) for the changes within this period, you must make them + available to him. + - You clearly describe in the distribution how to contact you. This + contact information must remain valid for at least three years + after last distributing the corresponding modified Vim, or as long + as possible. + e) When the GNU General Public License (GPL) applies to the changes, + you can distribute the modified Vim under the GNU GPL version 2 or + any later version. +3) A message must be added, at least in the output of the :version + command and in the intro screen, such that the user of the modified Vim + is able to see that it was modified. When distributing as mentioned + under 2)e) adding the message is only required for as far as this does + not conflict with the license used for the changes. +4) The contact information as required under 2)a) and 2)d) must not be + removed or changed, except that the person himself can make + corrections. + +III) If you distribute a modified version of Vim, you are encouraged to use + the Vim license for your changes and make them available to the + maintainer, including the source code. The preferred
[OE-core] [PATCH] recipes: convert remaining SUMMARY/DESCRIPTION cosmetic issues (part 2)
Completes previous commit b5292d4115a4555a66b5e35acdc67dd71fb8577f. Updates SUMMARY[doc] (meta/conf/documentation.conf). Changes: - rename DESCRIPTION with length 80 to (non present tag) SUMMARY - drop final point character at the end of SUMMARY string - remove trailing whitespace of SUMMARY line Note: don't bump PR Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com --- meta-hob/recipes-core/meta/hob-toolchain.bb | 2 +- meta-skeleton/recipes-skeleton/service/service_0.1.bb| 2 +- meta/conf/documentation.conf | 2 +- meta/recipes-bsp/alsa-state/alsa-state.bb| 2 +- meta/recipes-bsp/libacpi/libacpi_0.2.bb | 2 +- meta/recipes-bsp/usbutils/usbutils_007.bb| 2 +- meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb | 2 +- meta/recipes-core/base-files/base-files_3.0.14.bb| 2 +- meta/recipes-core/base-passwd/base-passwd_3.5.29.bb | 2 +- meta/recipes-core/busybox/busybox.inc| 2 +- meta/recipes-core/console-tools/console-tools_0.3.2.bb | 2 +- meta/recipes-core/coreutils/coreutils_6.9.bb | 2 +- meta/recipes-core/coreutils/coreutils_8.22.bb| 2 +- meta/recipes-core/eglibc/eglibc-package.inc | 2 +- meta/recipes-core/expat/expat.inc| 2 +- meta/recipes-core/images/core-image-base.bb | 2 +- meta/recipes-core/images/core-image-minimal.bb | 2 +- meta/recipes-core/jpeg/jpeg_8d.bb| 2 +- meta/recipes-core/packagegroups/packagegroup-base.bb | 4 ++-- meta/recipes-core/packagegroups/packagegroup-core-nfs.bb | 2 +- meta/recipes-core/psplash/psplash_git.bb | 2 +- meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb | 2 +- meta/recipes-core/update-rc.d/update-rc.d_0.7.bb | 2 +- meta/recipes-core/util-linux/util-linux.inc | 2 +- meta/recipes-devtools/autoconf/autoconf.inc | 2 +- meta/recipes-devtools/automake/automake.inc | 2 +- meta/recipes-devtools/bison/bison_2.3.bb | 2 +- meta/recipes-devtools/bison/bison_2.7.1.bb | 2 +- meta/recipes-devtools/guile/guile_2.0.9.bb | 2 +- meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb | 2 +- meta/recipes-devtools/perl/libxml-perl_0.08.bb | 2 +- meta/recipes-devtools/python/python-distribute_0.6.32.bb | 2 +- meta/recipes-devtools/python/python-mako_0.9.1.bb| 2 +- meta/recipes-devtools/python/python-numpy_1.7.0.bb | 2 +- meta/recipes-devtools/python/python3-distribute_0.6.32.bb| 2 +- meta/recipes-devtools/rpm/rpm_5.4.9.bb | 12 ++-- meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb | 2 +- meta/recipes-extended/bzip2/bzip2_1.0.6.bb | 2 +- meta/recipes-extended/diffutils/diffutils.inc| 2 +- meta/recipes-extended/findutils/findutils.inc| 2 +- meta/recipes-extended/mailx/mailx_12.5.bb| 2 +- meta/recipes-extended/msmtp/msmtp_1.4.31.bb | 2 +- .../packagegroups/packagegroup-core-basic.bb | 2 +- meta/recipes-extended/perl/libxml-sax-perl_0.99.bb | 2 +- meta/recipes-extended/wget/wget.inc | 2 +- meta/recipes-gnome/gnome/gnome-doc-utils.inc | 2 +- meta/recipes-gnome/json-glib/json-glib_0.16.2.bb | 2 +- .../packagegroups/packagegroup-toolset-native.bb | 2 +- meta/recipes-graphics/images/core-image-directfb.bb | 2 +- meta/recipes-graphics/images/core-image-weston.bb| 2 +- meta/recipes-graphics/images/core-image-x11.bb | 2 +- meta/recipes-graphics/tslib/tslib_1.1.bb | 2 +- meta/recipes-graphics/xorg-lib/libxfixes_5.0.1.bb| 2 +- meta/recipes-lsb4/perl/libdumpvalue-perl_1.17.bb | 2 +- meta/recipes-lsb4/perl/libenv-perl_1.04.bb | 2 +- meta/recipes-lsb4/perl/libpod-plainer-perl_1.03.bb | 2 +- meta/recipes-multimedia/libav/libav.inc | 2 +- .../nativesdk-packagegroup-qt-toolchain-host.bb | 2 +- .../nativesdk-packagegroup-qte-toolchain-host.bb | 2 +- meta/recipes-qt/packagegroups/packagegroup-core-qt.bb| 2 +- .../packagegroups/packagegroup-qt-toolchain-target.bb| 2 +- .../packagegroups/packagegroup-qte-toolchain-target.bb | 2 +- meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb | 2 +- 63 files changed, 69 insertions(+), 69 deletions(-) diff --git a/meta-hob/recipes-core/meta/hob-toolchain.bb b/meta-hob/recipes-core/meta/hob-toolchain.bb index 69cc0f7..5565273 100644
[OE-core] [PATCH] image_types: minor, inline CPIO_TOUCH_INIT()
Since generic compression solution has been introduced
(see revision b7e4ed41ee480f00b7265341e9e2d2c2b9135143),
CPIO_TOUCH_INIT() is only called by IMAGE_CMD_cpio.
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/classes/image_types.bbclass | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 0467abd..27b0796 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -66,14 +66,10 @@ IMAGE_CMD_squashfs = mksquashfs ${IMAGE_ROOTFS}
${DEPLOY_DIR_IMAGE}/${IMAGE_NAM
IMAGE_CMD_squashfs-xz = mksquashfs ${IMAGE_ROOTFS}
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-xz ${EXTRA_IMAGECMD}
-noappend -comp xz
IMAGE_CMD_tar = cd ${IMAGE_ROOTFS} tar -cvf
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar .
-CPIO_TOUCH_INIT () {
- if [ ! -L ${IMAGE_ROOTFS}/init ]
- then
- touch ${IMAGE_ROOTFS}/init
- fi
-}
IMAGE_CMD_cpio () {
- ${CPIO_TOUCH_INIT}
+ if [ ! -L ${IMAGE_ROOTFS}/init ]; then
+ touch ${IMAGE_ROOTFS}/init
+ fi
cd ${IMAGE_ROOTFS} (find . | cpio -o -H newc
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio)
}
--
1.8.5.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v1] recipes: convert remaining SUMMARY/DESCRIPTION cosmetic issues
Rename SUMMARY with length 80 to DESCRIPTION. Note: don't bump PR Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com --- meta/recipes-bsp/hostap/hostap-conf_1.0.bb | 3 ++- meta/recipes-devtools/json-c/json-c_0.11.bb | 3 ++- meta/recipes-graphics/xorg-proto/presentproto_git.bb | 14 ++ meta/recipes-multimedia/x264/x264_git.bb | 3 ++- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/meta/recipes-bsp/hostap/hostap-conf_1.0.bb b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb index 0208509..e2c7cc0 100644 --- a/meta/recipes-bsp/hostap/hostap-conf_1.0.bb +++ b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb @@ -1,4 +1,5 @@ -SUMMARY = PCMCIA-cs configuration files for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset +SUMMARY = Configuration files for HostAP (wifi) driver +DESCRIPTION = PCMCIA-cs configuration files for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset. SECTION = kernel/modules LICENSE = GPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=393a5ca445f6965873eca0259a17f833 diff --git a/meta/recipes-devtools/json-c/json-c_0.11.bb b/meta/recipes-devtools/json-c/json-c_0.11.bb index d1bf0e9..389e0f9 100644 --- a/meta/recipes-devtools/json-c/json-c_0.11.bb +++ b/meta/recipes-devtools/json-c/json-c_0.11.bb @@ -1,4 +1,5 @@ -SUMMARY = JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C +SUMMARY = C bindings for apps which will manipulate JSON data +DESCRIPTION = JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C. HOMEPAGE = https://github.com/json-c/json-c/wiki; LICENSE = MIT LIC_FILES_CHKSUM = file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2 diff --git a/meta/recipes-graphics/xorg-proto/presentproto_git.bb b/meta/recipes-graphics/xorg-proto/presentproto_git.bb index 007824f..bd6c60a 100644 --- a/meta/recipes-graphics/xorg-proto/presentproto_git.bb +++ b/meta/recipes-graphics/xorg-proto/presentproto_git.bb @@ -1,13 +1,11 @@ require xorg-proto-common.inc -SUMMARY = The Present extension provides a way for applications to update their \ - window contents from a pixmap in a well defined fashion, synchronizing \ - with the display refresh and potentially using a more efficient \ - mechanism than copying the contents of the source pixmap.\ - - -DESCRIPTION = This package provides the basic headers for the X Window \ -System. +SUMMARY = This package provides the basic headers for the X Window System +DESCRIPTION = The Present extension provides a way for applications to update their \ + window contents from a pixmap in a well defined fashion, synchronizing \ + with the display refresh and potentially using a more efficient \ + mechanism than copying the contents of the source pixmap.\ + LICENSE = GPLv2 diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb index 406df30..5ebf885 100644 --- a/meta/recipes-multimedia/x264/x264_git.bb +++ b/meta/recipes-multimedia/x264/x264_git.bb @@ -1,4 +1,5 @@ -SUMMARY = A free software library and application for encoding video streams into the H.264/MPEG-4 AVC format +SUMMARY = H.264/MPEG-4 AVC video encoder +DESCRIPTION = A free software library and application for encoding video streams into the H.264/MPEG-4 AVC format. HOMEPAGE = http://www.videolan.org/developers/x264.html; LICENSE = GPLv2 -- 1.8.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v1] recipes: convert remaining SUMMARY/DESCRIPTION cosmetic issues
Hi, Few explanations ;) Seen in: https://wiki.yoctoproject.org/wiki/Janitors Didn't find any opened bugtracker. These recipes are pending, i.e. 80 len(SUMMARY) 95: meta/recipes-support/libunistring/libunistring_0.9.3.bb meta/recipes-devtools/devel-config/nfs-export-root.bb meta/recipes-devtools/autogen/autogen-native_5.18.2.bb Should I translate them to DESCRIPTION ? Regards, Matthieu ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] recipes: convert remaining SUMMARY/DESCRIPTION cosmetic issues
Rename SUMMARY with length 80 to DESCRIPTION.
Note: don't bump PR
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-bsp/hostap/hostap-conf_1.0.bb | 3 ++-
meta/recipes-devtools/autogen/autogen-native_5.18.2.bb | 2 +-
meta/recipes-devtools/devel-config/nfs-export-root.bb | 3 ++-
meta/recipes-devtools/json-c/json-c_0.11.bb | 3 ++-
meta/recipes-graphics/xorg-proto/presentproto_git.bb| 14 ++
meta/recipes-multimedia/x264/x264_git.bb| 3 ++-
meta/recipes-support/libunistring/libunistring_0.9.3.bb | 2 +-
7 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
index 0208509..e2c7cc0 100644
--- a/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
+++ b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
@@ -1,4 +1,5 @@
-SUMMARY = PCMCIA-cs configuration files for wireless LAN cards based on
Intersil's Prism2/2.5/3 chipset
+SUMMARY = Configuration files for HostAP (wifi) driver
+DESCRIPTION = PCMCIA-cs configuration files for wireless LAN cards based on
Intersil's Prism2/2.5/3 chipset.
SECTION = kernel/modules
LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=393a5ca445f6965873eca0259a17f833
diff --git a/meta/recipes-devtools/autogen/autogen-native_5.18.2.bb
b/meta/recipes-devtools/autogen/autogen-native_5.18.2.bb
index c7950c3..98bdb59 100644
--- a/meta/recipes-devtools/autogen/autogen-native_5.18.2.bb
+++ b/meta/recipes-devtools/autogen/autogen-native_5.18.2.bb
@@ -1,4 +1,4 @@
-SUMMARY = AutoGen is a tool to manage programs that contain large amounts of
repetitious text.
+SUMMARY = Automated text and program generation tool
DESCRIPTION = AutoGen is a tool designed to simplify the creation and\
maintenance of programs that contain large amounts of repetitious text.\
It is especially valuable in programs that have several blocks of text\
diff --git a/meta/recipes-devtools/devel-config/nfs-export-root.bb
b/meta/recipes-devtools/devel-config/nfs-export-root.bb
index fc35cc8..169d005 100644
--- a/meta/recipes-devtools/devel-config/nfs-export-root.bb
+++ b/meta/recipes-devtools/devel-config/nfs-export-root.bb
@@ -1,4 +1,5 @@
-SUMMARY = Enables NFS access from any host to the entire filesystem (for
development purposes)
+SUMMARY = Configuration script to export target rootfs filesystem
+DESCRIPTION = Enables NFS access from any host to the entire filesystem (for
development purposes).
LICENSE = MIT
LIC_FILES_CHKSUM =
file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420
diff --git a/meta/recipes-devtools/json-c/json-c_0.11.bb
b/meta/recipes-devtools/json-c/json-c_0.11.bb
index d1bf0e9..389e0f9 100644
--- a/meta/recipes-devtools/json-c/json-c_0.11.bb
+++ b/meta/recipes-devtools/json-c/json-c_0.11.bb
@@ -1,4 +1,5 @@
-SUMMARY = JSON-C implements a reference counting object model that allows you
to easily construct JSON objects in C
+SUMMARY = C bindings for apps which will manipulate JSON data
+DESCRIPTION = JSON-C implements a reference counting object model that allows
you to easily construct JSON objects in C.
HOMEPAGE = https://github.com/json-c/json-c/wiki;
LICENSE = MIT
LIC_FILES_CHKSUM = file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2
diff --git a/meta/recipes-graphics/xorg-proto/presentproto_git.bb
b/meta/recipes-graphics/xorg-proto/presentproto_git.bb
index 007824f..bd6c60a 100644
--- a/meta/recipes-graphics/xorg-proto/presentproto_git.bb
+++ b/meta/recipes-graphics/xorg-proto/presentproto_git.bb
@@ -1,13 +1,11 @@
require xorg-proto-common.inc
-SUMMARY = The Present extension provides a way for applications to update
their \
- window contents from a pixmap in a well defined fashion,
synchronizing \
- with the display refresh and potentially using a more efficient \
- mechanism than copying the contents of the source pixmap.\
-
-
-DESCRIPTION = This package provides the basic headers for the X Window \
-System.
+SUMMARY = This package provides the basic headers for the X Window System
+DESCRIPTION = The Present extension provides a way for applications to update
their \
+ window contents from a pixmap in a well defined fashion,
synchronizing \
+ with the display refresh and potentially using a more efficient
\
+ mechanism than copying the contents of the source pixmap.\
+
LICENSE = GPLv2
diff --git a/meta/recipes-multimedia/x264/x264_git.bb
b/meta/recipes-multimedia/x264/x264_git.bb
index 406df30..5ebf885 100644
--- a/meta/recipes-multimedia/x264/x264_git.bb
+++ b/meta/recipes-multimedia/x264/x264_git.bb
@@ -1,4 +1,5 @@
-SUMMARY = A free software library and application for encoding video streams
into the H.264/MPEG-4 AVC format
+SUMMARY = H.264/MPEG-4 AVC video encoder
+DESCRIPTION
Re: [OE-core] [PATCH] util-linux: add reset.1 manpage in update-alternatives
Should I create an entry in https://bugzilla.yoctoproject.org/ (OE-Core
component)?
-Message d'origine-
De : Matthieu Crapet [mailto:matthieu.cra...@ingenico.com]
Envoyé : mardi 14 janvier 2014 16:10
À : openembedded-core@lists.openembedded.org
Cc : Matthieu CRAPET
Objet : [PATCH] util-linux: add reset.1 manpage in update-alternatives
Adding doc-pkgs to IMAGE_FEATURES (in an image recipe) reports a conflict
with reset.1 file, present both in util-linux and ncurses-doc packages.
log
| Collected errors:
| * check_data_file_clashes: Package util-linux-doc wants to install file
/home/matt/tmp/oe-p/build/tmp-eglibc/work/qemux86_64-tiny-linux/test-image/1.0-r3/rootfs/usr/share/man/man1/reset.1
| But that file is already provided by package * ncurses-doc
| * opkg_install_cmd: Cannot install package util-linux-doc.
| WARNING:
/home/matt/tmp/oe-p/build/tmp-eglibc/work/qemux86_64-tiny-linux/test-image/1.0-r3/temp/run.do_rootfs.13877:1
exit 255 from
| opkg-cl -f $INSTALL_CONF_IPK -o $INSTALL_ROOTFS_IPK --force_postinstall
--prefer-arch-to-version install `cat $1`
| ERROR: Function failed: do_rootfs (log file is located at
/home/matt/tmp/oe-p/build/tmp-eglibc/work/qemux86_64-tiny-linux/test-image/1.0-r3/temp/log.do_rootfs.13877)
/log
Same issue already occured few months ago:
Re: [OE-core] Clashing man pages
https://www.mail-archive.com/openembedded-core@lists.openembedded.org/msg38590.html
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-core/util-linux/util-linux.inc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc
b/meta/recipes-core/util-linux/util-linux.inc
index aaa7ec3..8b39240 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -175,11 +175,12 @@ ALTERNATIVE_LINK_NAME[eject] = ${bindir}/eject
ALTERNATIVE_LINK_NAME[getopt] = ${base_bindir}/getopt
ALTERNATIVE_TARGET[getopt] = ${bindir}/getopt
-ALTERNATIVE_${PN}-doc = mountpoint.1 last.1 mesg.1 wall.1 sulogin.8
utmpdump.1
+ALTERNATIVE_${PN}-doc = mountpoint.1 last.1 mesg.1 wall.1 sulogin.8
utmpdump.1 reset.1
ALTERNATIVE_LINK_NAME[last.1] = ${mandir}/man1/last.1
ALTERNATIVE_LINK_NAME[mesg.1] = ${mandir}/man1/mesg.1
ALTERNATIVE_LINK_NAME[mountpoint.1] = ${mandir}/man1/mountpoint.1
+ALTERNATIVE_LINK_NAME[reset.1] = ${mandir}/man1/reset.1
ALTERNATIVE_LINK_NAME[sulogin.8] = ${mandir}/man8/sulogin.8
ALTERNATIVE_LINK_NAME[utmpdump.1] = ${mandir}/man1/utmpdump.1
ALTERNATIVE_LINK_NAME[wall.1] = ${mandir}/man1/wall.1
--
1.8.2.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] util-linux: add reset.1 manpage in update-alternatives
Adding doc-pkgs to IMAGE_FEATURES (in an image recipe) reports a conflict
with reset.1 file, present both in util-linux and ncurses-doc packages.
log
| Collected errors:
| * check_data_file_clashes: Package util-linux-doc wants to install file
/home/matt/tmp/oe-p/build/tmp-eglibc/work/qemux86_64-tiny-linux/test-image/1.0-r3/rootfs/usr/share/man/man1/reset.1
| But that file is already provided by package * ncurses-doc
| * opkg_install_cmd: Cannot install package util-linux-doc.
| WARNING:
/home/matt/tmp/oe-p/build/tmp-eglibc/work/qemux86_64-tiny-linux/test-image/1.0-r3/temp/run.do_rootfs.13877:1
exit 255 from
| opkg-cl -f $INSTALL_CONF_IPK -o $INSTALL_ROOTFS_IPK --force_postinstall
--prefer-arch-to-version install `cat $1`
| ERROR: Function failed: do_rootfs (log file is located at
/home/matt/tmp/oe-p/build/tmp-eglibc/work/qemux86_64-tiny-linux/test-image/1.0-r3/temp/log.do_rootfs.13877)
/log
Same issue already occured few months ago:
Re: [OE-core] Clashing man pages
https://www.mail-archive.com/openembedded-core@lists.openembedded.org/msg38590.html
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-core/util-linux/util-linux.inc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc
b/meta/recipes-core/util-linux/util-linux.inc
index aaa7ec3..8b39240 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -175,11 +175,12 @@ ALTERNATIVE_LINK_NAME[eject] = ${bindir}/eject
ALTERNATIVE_LINK_NAME[getopt] = ${base_bindir}/getopt
ALTERNATIVE_TARGET[getopt] = ${bindir}/getopt
-ALTERNATIVE_${PN}-doc = mountpoint.1 last.1 mesg.1 wall.1 sulogin.8
utmpdump.1
+ALTERNATIVE_${PN}-doc = mountpoint.1 last.1 mesg.1 wall.1 sulogin.8
utmpdump.1 reset.1
ALTERNATIVE_LINK_NAME[last.1] = ${mandir}/man1/last.1
ALTERNATIVE_LINK_NAME[mesg.1] = ${mandir}/man1/mesg.1
ALTERNATIVE_LINK_NAME[mountpoint.1] = ${mandir}/man1/mountpoint.1
+ALTERNATIVE_LINK_NAME[reset.1] = ${mandir}/man1/reset.1
ALTERNATIVE_LINK_NAME[sulogin.8] = ${mandir}/man8/sulogin.8
ALTERNATIVE_LINK_NAME[utmpdump.1] = ${mandir}/man1/utmpdump.1
ALTERNATIVE_LINK_NAME[wall.1] = ${mandir}/man1/wall.1
--
1.8.2.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] bash-completion: add recipe
Hi, Thanks for comments. I have posted a v2 patch on oe-devel list. Changes: - Drop PR. As this is a new recipe, this should be PR = r0, and r0 is the default. - Add PE = 1 to not conflict with old recipe (OE-Classic) PV = 20040711 - Moved LIC* entry before SECTION Question: - Kept DESCRIPTION, should it be renamed to SUMMARY? Cheers, M -Message d'origine- De : Paul Eggleton [mailto:paul.eggle...@linux.intel.com] Envoyé : vendredi 13 décembre 2013 17:36 À : Matthieu CRAPET; Saul Wold Cc : openembedded-core@lists.openembedded.org Objet : Re: [OE-core] [PATCH] bash-completion: add recipe On Friday 13 December 2013 08:27:41 Saul Wold wrote: Needs more comment as to why we need this along with a Signed-off-by: tag. Can you include where you brought this in from. I think this probably belongs in meta-oe rather than OE-Core, unless a good case for everyone needing it can be made. 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] gstreamer1.0-plugins-base: fix missing rprovides
Hi,
My previous patch is wrong.
I've seen libgst* packages in gstreamer1.0-plugins-base
gstreamer1.0-plugins-bad.
I'm using directly libgst* packages from a third party plugin.
I've thought changing gstreamer1.0-plugins.inc (instead of
gstreamer1.0-plugins-base.inc):
-PACKAGES_DYNAMIC = ^${PN}-.*
+PACKAGES_DYNAMIC = ^${PN}-.* ^libgst.*
But unfortunately this introduces a nasty (but not fatal) warning message. For
examples:
NOTE: multiple providers are available for runtime libgstaudio-1.0
(gstreamer1.0-plugins-bad, gstreamer1.0-plugins-base, gstreamer1.0-plugins-good)
NOTE: consider defining a PREFERRED_PROVIDER entry to match libgstaudio-1.0
libgstaudio-1.0 is only provided by gstreamer1.0-plugins-base
NOTE: multiple providers are available for runtime libgstmpegts-1.0
(gstreamer1.0-plugins-bad, gstreamer1.0-plugins-base, gstreamer1.0-plugins-good)
NOTE: consider defining a PREFERRED_PROVIDER entry to match libgstmpegts-1.0
libgstmpegts-1.0 is only provided by gstreamer1.0-plugins-bad
Is this a side effect of PACKAGES_DYNAMIC with empty package?
Regards,
M
-Message d'origine-
De : Matthieu Crapet [mailto:matthieu.cra...@ingenico.com]
Envoyé : vendredi 13 décembre 2013 11:50
À : openembedded-core@lists.openembedded.org
Cc : Matthieu CRAPET
Objet : [PATCH] gstreamer1.0-plugins-base: fix missing rprovides
split_gstreamer10_packages creates libgst* packages which are missing in
PACKAGES list.
---
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
index ebfa7cd..697b5bd 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
@@ -7,6 +7,7 @@ DEPENDS += freetype liboil util-linux
inherit gettext
+PACKAGES_DYNAMIC =+ ^libgst.*
PACKAGECONFIG ??= \
${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
--
1.8.2.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] bash-completion: add recipe
---
.../bash-completion/bash-completion_2.0.bb | 31 ++
1 file changed, 31 insertions(+)
create mode 100644 meta/recipes-support/bash-completion/bash-completion_2.0.bb
diff --git a/meta/recipes-support/bash-completion/bash-completion_2.0.bb
b/meta/recipes-support/bash-completion/bash-completion_2.0.bb
new file mode 100644
index 000..f08988a
--- /dev/null
+++ b/meta/recipes-support/bash-completion/bash-completion_2.0.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = Programmable Completion for Bash 4
+HOMEPAGE = http://bash-completion.alioth.debian.org/;
+BUGTRACKER = https://alioth.debian.org/projects/bash-completion/;
+
+SECTION = console/utils
+RDEPENDS_${PN} = bash
+PR = r1
+
+SRC_URI=http://bash-completion.alioth.debian.org/files/${BPN}-${PV}.tar.bz2;
+
+SRC_URI[md5sum] = 0d903f398be8c8f24bc5ffa6f86127f8
+SRC_URI[sha256sum] =
e5a490a4301dfb228361bdca2ffca597958e47dd6056005ef9393a5852af5804
+
+LICENSE = GPLv2
+LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe
+
+inherit allarch autotools
+
+do_configure() {
+ oe_runconf
+}
+
+do_install_append() {
+ install -d ${D}${sysconfdir}/bash_completion.d/
+ echo '. ${datadir}/${BPN}/bash_completion'
${D}${sysconfdir}/bash_completion
+}
+
+# Some recipes are providing ${PN}-bash-completion packages
+PACKAGES_prepend += ${PN}-extra
+FILES_${PN}-extra = ${datadir}/${BPN}/completions/ \
+${datadir}/${BPN}/helpers/
--
1.8.2.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] bash-completion
Hi, What's the status of this ? Is bash-completion recipe available somewhere? Regards, M -Message d'origine- De : openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] De la part de Martin Jansa Envoyé : dimanche 21 avril 2013 01:29 À : bitbake-devel Cc : openembedded-core@lists.openembedded.org Objet : Re: [OE-core] bash-completion On Sun, Apr 21, 2013 at 12:56:59AM +0200, Martin Jansa wrote: There is old thread on oe-devel about it http://lists.linuxtogo.org/pipermail/openembedded-devel/2007-December/ 003764.html Is there any reason why it wasn't added to contrib yet? Would it be applied if I send git patch adding it and update commands to include cleansstate and packagedata + new options like -S and maybe more? Or maybe in oe-core/contrib, as list of possible commands is not defined in bitbake. -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libomxil (0.9.3): drop unecessary dependencies
Since version 0.9.2, Bellagio's components (vorbis, mad, also, ...) are shipped in separate packages. Signed-off-by: Matthieu Crapetmcra...@gmail.com --- meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb b/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb index ded0e1c..8c3166f 100644 --- a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb +++ b/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb @@ -4,7 +4,6 @@ LICENSE = LGPLv2.1+ LICENSE_FLAGS = commercial LIC_FILES_CHKSUM = file://COPYING;md5=ae6f0f4dbc7ac193b50f323a6ae191cb \ file://src/omxcore.h;beginline=1;endline=27;md5=806b1e5566c06486fe8e42b461e03a90 -DEPENDS = libvorbis libogg alsa-lib libmad PR = r0 -- 1.8.2.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libomxil (0.9.3): drop unecessary dependencies
Since version 0.9.2, Bellagio's components (vorbis, mad, also, ...) are shipped in separate packages. Signed-off-by: Matthieu Crapet mcra...@gmail.com --- meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb b/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb index ded0e1c..8c3166f 100644 --- a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb +++ b/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb @@ -4,7 +4,6 @@ LICENSE = LGPLv2.1+ LICENSE_FLAGS = commercial LIC_FILES_CHKSUM = file://COPYING;md5=ae6f0f4dbc7ac193b50f323a6ae191cb \ file://src/omxcore.h;beginline=1;endline=27;md5=806b1e5566c06486fe8e42b461e03a90 -DEPENDS = libvorbis libogg alsa-lib libmad PR = r0 -- 1.8.2.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] Libtool external toolchain .la files
Dear all,
I have some issue regarding Libtool and my external toolchain (located in /opt)
I've created a basic C++ (STL) library using autotools.
My configure.ac is very simple:
code
AC_PREREQ([2.60])
AC_INIT([exemple], [1.2.3], [t...@exemple.org])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CANONICAL_HOST
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign])
LT_PREREQ([2.4])
LT_INIT
dnl Check for progs
AC_PROG_CXX
AC_SUBST([LIBEXEMPLE_SO_VERSION], [1:2:3])
AC_OUTPUT([
Makefile
])
/code
Then I've made a basic OE recipe to build it:
code
SUMMARY = Libtool simple exemple
LICENSE = MIT
LIC_FILES_CHKSUM = \
file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58
\
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \
PR = r1
SRC_URI = git://xx.xx.xx.xx/libexemple.git
SRCREV = HEAD
S = ${WORKDIR}/git
inherit autotools
/code
Works fine but resulting .la files (in libexemple-dev package) contains:
dependency_libs='/opt/...-linux-gnueabi/lib/libstdc++.la'
This is bad because if another program (using libtool) depends on libexample,
libtool will search
libstdc++ in ${STAGING_DIR_HOST}/opt/...-linux-gnueabi/lib/libstdc++.la
(instead of ${STAGING_DIR_HOST}/lib/libstdc++.la).
I would like that dependency_libs points to openembedded sysroot.
Note: Toolchain's .la files located in ${STAGING_DIR_HOST} are correct (and not
referencing /opt).
I am wondering what is the best workaround for this. For now I've patched my
recipe:
code
do_compile_prepend () {
cd ${S}
sed -i -e
'/^compiler_lib_search_dirs=/s/.*/compiler_lib_search_dirs=/'
${HOST_SYS}-libtool
sed -i -e
'/^compiler_lib_search_path=/s/.*/compiler_lib_search_path=/'
${HOST_SYS}-libtool
sed -i -e
'/^sys_lib_search_path_spec=/s/.*/sys_lib_search_path_spec=/'
${HOST_SYS}-libtool
}
/code
Ugly but works because libstdc++ can be found (using --sysroot argument). But
dependency_libs is empty is .la file.
In real life: this is libglu and glew.
Regards,
Matthieu Crapet
PS: exemple is french word for example ;)
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] sstate, cache or licence issue?
Hi,
Yes, this was bug#3674!
Applied:
sstate.bbclass:specify function dirs to avoid race
http://cgit.openembedded.org/openembedded-core/commit/?id=ccef1cf783669a4683eda9d4b44dbe6bcf426259
Tested with success. Thanks a lot!
Regards,
Matthieu Crapet
De : openembedded-core-boun...@lists.openembedded.org
[mailto:openembedded-core-boun...@lists.openembedded.org] De la part de ChenQi
Envoyé : jeudi 10 janvier 2013 03:32
À : openembedded-core@lists.openembedded.org
Objet : Re: [OE-core] sstate, cache or licence issue?
On 01/10/2013 01:40 AM, Matthieu CRAPET wrote:
Dear all,
I've got some trouble with my today's update to oe-core.
I created a basic (image) recipe:
---
DESCRIPTION = A console-only production image with headers.
PR = r0
LICENSE = MIT
IMAGE_FEATURES += dev-pkgs debug-tweaks package-management
ssh-server-openssh
inherit core-image
IMAGE_INSTALL += openssh openssl directfb directfb-examples
---
I've got a do_populate_lic failure but image is generated correctly
(do_rootfs is ok). It fails in sstate_create_package
| DEBUG: Executing shell function sstate_create_package
| shell-init: error retrieving current directory: getcwd: cannot access
parent directories: No such file or directory
| chdir: error retrieving current directory: getcwd: cannot access
parent directories: No such file or directory
run.sstate_create_package.$PID
sstate_create_package() {
cd
/lingot/build/tmp-eglibc/work/rp02-ing-linux-gnueabi/test-image/1.0-r0/sstate-build-populate-lic/
TFILE=`mktemp ...
...
The problem is that the directory exists (containing
license-destdir/test-image/{COPYING.MIT,LICENSE,generic_MIT})
If re-bitbake recipe, works fine.
If I bitbake -c cleanall first + manually delete recipe directory
(/lingot/build/tmp-eglibc/work/rp02-ing-linux-gnueabi/test-image) then,
re-bitbake recipe: the do_populate_lic fails again.
More surprising: if I wait some times (few minutes). I re-get the error
but with the extra lines:
| DEBUG: Removing manifest:
/lingot/build/tmp-eglibc/deploy/licenses/test-image/LICENSE
| DEBUG: Removing manifest:
/lingot/build/tmp-eglibc/deploy/licenses/test-image/COPYING.MIT
| DEBUG: Removing manifest:
/lingot/build/tmp-eglibc/deploy/licenses/test-image/generic_MIT
| DEBUG: Removing manifest:
/lingot/build/tmp-eglibc/deploy/licenses/test-image/
I added and removed package in IMAGE_INSTALL, sometimes it passes,
sometimes not, maybe there is a concurrent access somewhere?
Maybe it's the same bug with bug#3674
(https://bugzilla.yoctoproject.org/show_bug.cgi?id=3674).
Cheers,
Chen Qi
The two logs are available here:
http://pastebin.com/raw.php?i=CVczF2vB
Notice that I'm using my own external toolchain but I don't know that It is
relevant.
Any hint appreciated here!
Regards,
Matthieu Crapet
About Ingenico (Euronext: FR125346 - ING)
Ingenico is a leading provider of payment solutions, with over 17 million
terminals deployed in more than 125 countries. Its 3,600 employees worldwide
support retailers, banks and service providers to optimize and secure their
electronic payments solutions, develop their offer of services and increase
their point of sales revenue.
More information on www.ingenico.com http://www.ingenico.com/ .
This message may contain confidential and/or privileged information. If you are
not the addressee or authorized to receive this for the addressee, you must not
use, copy, disclose or take any action based on this message or any information
herein. If you have received this message in error, please advise the sender
immediately by reply e-mail and delete this message. Thank you for your
cooperation.
P Please consider the environment before printing this e-mail
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] sstate, cache or licence issue?
Dear all,
I've got some trouble with my today's update to oe-core.
I created a basic (image) recipe:
---
DESCRIPTION = A console-only production image with headers.
PR = r0
LICENSE = MIT
IMAGE_FEATURES += dev-pkgs debug-tweaks package-management
ssh-server-openssh
inherit core-image
IMAGE_INSTALL += openssh openssl directfb directfb-examples
---
I've got a do_populate_lic failure but image is generated correctly
(do_rootfs is ok). It fails in sstate_create_package
| DEBUG: Executing shell function sstate_create_package
| shell-init: error retrieving current directory: getcwd: cannot access
parent directories: No such file or directory
| chdir: error retrieving current directory: getcwd: cannot access
parent directories: No such file or directory
run.sstate_create_package.$PID
sstate_create_package() {
cd
/lingot/build/tmp-eglibc/work/rp02-ing-linux-gnueabi/test-image/1.0-r0/s
state-build-populate-lic/
TFILE=`mktemp ...
...
The problem is that the directory exists (containing
license-destdir/test-image/{COPYING.MIT,LICENSE,generic_MIT})
If re-bitbake recipe, works fine.
If I bitbake -c cleanall first + manually delete recipe directory
(/lingot/build/tmp-eglibc/work/rp02-ing-linux-gnueabi/test-image) then,
re-bitbake recipe: the do_populate_lic fails again.
More surprising: if I wait some times (few minutes). I re-get the error
but with the extra lines:
| DEBUG: Removing manifest:
/lingot/build/tmp-eglibc/deploy/licenses/test-image/LICENSE
| DEBUG: Removing manifest:
/lingot/build/tmp-eglibc/deploy/licenses/test-image/COPYING.MIT
| DEBUG: Removing manifest:
/lingot/build/tmp-eglibc/deploy/licenses/test-image/generic_MIT
| DEBUG: Removing manifest:
/lingot/build/tmp-eglibc/deploy/licenses/test-image/
I added and removed package in IMAGE_INSTALL, sometimes it passes,
sometimes not, maybe there is a concurrent access somewhere?
The two logs are available here:
http://pastebin.com/raw.php?i=CVczF2vB
Notice that I'm using my own external toolchain but I don't know that It
is relevant.
Any hint appreciated here!
Regards,
Matthieu Crapet
About Ingenico (Euronext: FR125346 - ING)
Ingenico is a leading provider of payment solutions, with over 17 million
terminals deployed in more than 125 countries. Its 3,600 employees worldwide
support retailers, banks and service providers to optimize and secure their
electronic payments solutions, develop their offer of services and increase
their point of sales revenue.
More information on http://www.ingenico.com/.
This message may contain confidential and/or privileged information. If you are
not the addressee or authorized to receive this for the addressee, you must not
use, copy, disclose or take any action based on this message or any information
herein. If you have received this message in error, please advise the sender
immediately by reply e-mail and delete this message. Thank you for your
cooperation.
P Please consider the environment before printing this e-mail
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] SDK and external toolchain
Greetings,
Updated recently my oe-core and faced an unwanted side effect.
You need to know that I'm using an externel (linaro) toolchain (my
.bb/.inc are a clone of sourcery toolchain example).
My toolchain is compiled against a custom (external) eglibc 2.15.
Since commit a0de2a56f19ae4d8cd88e46e96917a7a019fe1ab --
image.bbclass: Add support to build the SDK in parallel with the image
http://cgit.openembedded.org/openembedded-core/commit/?id=a0de2a56f19ae4
d8cd88e46e96917a7a019fe1ab
my images generation are failing because it tries to compile eglib 2.16
and do_configure fails. I have also 3 errors:
ERROR: Multiple .bb files are due to be built which each provide
virtual/libc (.../meta/recipes-core/eglibc/eglibc_2.15.bb
.../meta-ingenico/recipes/external-linaro-toolchain/external-linaro-tool
chain.bb).
This usually means one provides something the other doesn't and should.
ERROR: Multiple .bb files are due to be built which each provide
virtual/arm-ingenico-linux-gnueabi-libc-for-gcc
(.../meta/recipes-core/eglibc/eglibc_2.15.bb
.../meta-ingenico/recipes/external-linaro-toolchain/external-linaro-tool
chain.bb).
This usually means one provides something the other doesn't and should.
ERROR: Multiple .bb files are due to be built which each provide
virtual/libiconv (.../meta/recipes-core/eglibc/eglibc_2.15.bb
.../meta-ingenico/recipes/external-linaro-toolchain/external-linaro-tool
chain.bb).
This usually means one provides something the other doesn't and should.
Notice that PREFERRED_PROVIDERs are correctly defined (like in
distro/include/tcmode-external-sourcery.inc). And I use bitbake 1.15.3.
For now I fixed it crudely, because I don't need SDK.
diff --git a/meta/classes/toolchain-scripts.bbclass
b/meta/classes/toolchain-scripts.bbclass
index 44284c3..f5fd4d7 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -136,7 +136,7 @@ toolchain_create_sdk_env_script_for_installer () {
#we get the cached site config in the runtime
TOOLCHAIN_CONFIGSITE_NOCACHE = ${@siteinfo_get_files(d, True)}
TOOLCHAIN_CONFIGSITE_SYSROOTCACHE =
${STAGING_DATADIR}/${TARGET_SYS}_config_site.d
-TOOLCHAIN_NEED_CONFIGSITE_CACHE = ${TCLIBC} ncurses
+TOOLCHAIN_NEED_CONFIGSITE_CACHE = ncurses
#This function create a site config file
toolchain_create_sdk_siteconfig () {
---
populate_sdk_base.bbclass inheric toolchain-scripts which adds the
(unwanted) eglibc dependency.
Maybe this should be conditional from TOOLCHAIN_TARGET_TASK value? Or
dependencies should be added only when calling
task-core-standalone-sdk-target?
In my use case, when I bitbake an image recipe, I don't want to deal
with SDK.
Concerning errors, is there a way to see what's not provided in order to
fix virtual/libc message (bitbake -e) ?
Best regards,
Matthieu
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Broken gettext/gdbm
Hi,
$ bitbake gdbm -e | grep ^DEPENDS
DEPENDS_GETTEXT=virtual/gettext gettext-native
DEPENDS=autoconf-native automake-native libtool-native libtool-cross
gnu-config-native virtual/gettext gettext-native
virtual/arm-ingenico-linux-gnueabi-gcc
virtual/arm-ingenico-linux-gnueabi-compilerlibs virtual/libc
$ bitbake gettext -e | grep ^DEPENDS
DEPENDS_virtclass-native=libxml2-native gettext-minimal-native
DEPENDS=autoconf-native automake-native libtool-native libtool-cross
gnu-config-native virtual/arm-ingenico-linux-gnueabi-gcc
virtual/arm-ingenico-linux-gnueabi-compilerlibs virtual/libc libxml2-native
gettext-native virtual/libiconv ncurses expat
Note: We are using our own external toolchain.
I wasn't clear enough in my previous post. It appear to be a circular
dependency.
Since my update I have this log:
NOTE: Resolving any missing task queue dependencies
NOTE: multiple providers are available for virtual/gettext (proxy-libintl,
gettext)
NOTE: consider defining a PREFERRED_PROVIDER entry to match virtual/gettext
When I just try to build gettext, It wants to build gdbm.. which depends of
gettext too.
gettext-minimal-native doesn't have config.rpath, gettext-native has it.
But config.rpath is taken from ${STAGING_DATADIR}/gettext/config.rpath and not
${STAGING_DATADIR_NATIVE}/gettext/config.rpath.
Patching meta/classes/autotools.bbclass would be a proper fix ?
Cheers,
Matthieu
-Message d'origine-
De : openembedded-core-boun...@lists.openembedded.org
[mailto:openembedded-core-boun...@lists.openembedded.org] De la part de Richard
Purdie
Envoyé : vendredi 20 juillet 2012 17:07
À : Patches and discussions about the oe-core layer
Objet : Re: [OE-core] Broken gettext/gdbm
On Fri, 2012-07-20 at 15:10 +0200, Matthieu CRAPET wrote:
Greetings,
I updated my OE-core and bitbake today (2012.07.20). Build from
scratch
fails:
code
NOTE: package gdbm-1.10-r3: task do_configure: Started
ERROR: Function failed: do_configure (see
/home/.../build/tmp-eglibc/work/armv5te-ing-linux-gnueabi/gdbm-1.10-r3
/t
emp/log.do_configure.31222 for further information)
ERROR: Logfile of failure stored in:
/home/.../build/tmp-eglibc/work/armv5te-ing-linux-gnueabi/gdbm-1.10-r3
/t
emp/log.do_configure.31222
Log data follows:
| DEBUG: Executing python function sysroot_cleansstate
| DEBUG: Python function sysroot_cleansstate finished
| DEBUG: SITE files ['endian-little', 'bit-32', 'arm-common',
'common-linux', 'common-glibc', 'arm-linux', 'arm-linux-gnueabi',
'common']
| DEBUG: Executing shell function do_configure automake (GNU automake)
| 1.12.1 Copyright (C) 2012 Free Software Foundation, Inc.
| License GPLv2+: GNU GPL version 2 or later
http://gnu.org/licenses/gpl-2.0.html
| This is free software: you are free to change and redistribute it.
| There is NO WARRANTY, to the extent permitted by law.
|
| Written by Tom Tromey tro...@redhat.com
|and Alexandre Duret-Lutz a...@gnu.org.
| AUTOV is 1.12
| cp: cannot stat
`/home/.../build/tmp-eglibc/sysroots/rp02/usr/share/gettext/config.rpa
th
': No such file or directory
| ERROR: Function failed: do_configure (see
/home/.../build/tmp-eglibc/work/armv5te-ing-linux-gnueabi/gdbm-1.10-r3
/t
emp/log.do_configure.31222 for further information)
NOTE: package gdbm-1.10-r3: task do_configure: Failed /code
gdbm needs gettext to have config.rpath. But gettext is not built, but
gettext-native gettext-minimal-native are built.
Issue comes from meta/classes/autotools.bbclass:
code
else if grep ^[[:space:]]*AM_GNU_GETTEXT $CONFIGURE_AC
/dev/null; then
# We'd call gettextize here if it wasn't
so broken...
cp ${STAGING_DATADIR}/gettext/config.rpath
${AUTOTOOLS_AUXDIR}/
/code
What would be the best workaround to take config.rpath from
gettext-native?
This is odd since gdbm inherits gettext and therefore should have a DEPENDS on
virtual/gettext. gettext should therefore have been built.
Any idea why gettext wasn't built?
bitbake gdbm -e | grep ^DEPENDS
shows virtual/gettext here...
Cheers,
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Broken gettext/gdbm
PREFERRED_PROVIDER_virtual/gettext = gettext fixes the issue!
So something is wrong with proxy-libintl.
Thanks for help!
Regards,
Matthieu
-Message d'origine-
De : openembedded-core-boun...@lists.openembedded.org
[mailto:openembedded-core-boun...@lists.openembedded.org] De la part de Richard
Purdie
Envoyé : lundi 23 juillet 2012 09:19
À : Patches and discussions about the oe-core layer
Objet : Re: [OE-core] Broken gettext/gdbm
On Mon, 2012-07-23 at 08:50 +0200, Matthieu CRAPET wrote:
Hi,
$ bitbake gdbm -e | grep ^DEPENDS
DEPENDS_GETTEXT=virtual/gettext gettext-native
DEPENDS=autoconf-native automake-native libtool-native libtool-cross
gnu-config-native virtual/gettext gettext-native
virtual/arm-ingenico-linux-gnueabi-gcc
virtual/arm-ingenico-linux-gnueabi-compilerlibs virtual/libc
$ bitbake gettext -e | grep ^DEPENDS
DEPENDS_virtclass-native=libxml2-native gettext-minimal-native
DEPENDS=autoconf-native automake-native libtool-native libtool-cross
gnu-config-native virtual/arm-ingenico-linux-gnueabi-gcc
virtual/arm-ingenico-linux-gnueabi-compilerlibs virtual/libc libxml2-native
gettext-native virtual/libiconv ncurses expat
Note: We are using our own external toolchain.
That is an important detail!
I wasn't clear enough in my previous post. It appear to be a circular
dependency.
A circular dependency on what?
Since my update I have this log:
NOTE: Resolving any missing task queue dependencies
NOTE: multiple providers are available for virtual/gettext
(proxy-libintl, gettext)
NOTE: consider defining a PREFERRED_PROVIDER entry to match
virtual/gettext
Have you tried setting:
PREFERRED_PROVIDER_virtual/gettext = gettext
?
When I just try to build gettext, It wants to build gdbm.. which depends of
gettext too.
gettext-minimal-native doesn't have config.rpath, gettext-native has it.
But config.rpath is taken from ${STAGING_DATADIR}/gettext/config.rpath and
not ${STAGING_DATADIR_NATIVE}/gettext/config.rpath.
Patching meta/classes/autotools.bbclass would be a proper fix ?
No, that doesn't sound right.
I think the problem is that the system is thinking virtual/gettext is provided
by proxy-libintl. Adding the line above should convince it otherwise and then
things should work better.
Cheers,
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] Broken gettext/gdbm
Greetings,
I updated my OE-core and bitbake today (2012.07.20). Build from scratch
fails:
code
NOTE: package gdbm-1.10-r3: task do_configure: Started
ERROR: Function failed: do_configure (see
/home/.../build/tmp-eglibc/work/armv5te-ing-linux-gnueabi/gdbm-1.10-r3/t
emp/log.do_configure.31222 for further information)
ERROR: Logfile of failure stored in:
/home/.../build/tmp-eglibc/work/armv5te-ing-linux-gnueabi/gdbm-1.10-r3/t
emp/log.do_configure.31222
Log data follows:
| DEBUG: Executing python function sysroot_cleansstate
| DEBUG: Python function sysroot_cleansstate finished
| DEBUG: SITE files ['endian-little', 'bit-32', 'arm-common',
'common-linux', 'common-glibc', 'arm-linux', 'arm-linux-gnueabi',
'common']
| DEBUG: Executing shell function do_configure
| automake (GNU automake) 1.12.1
| Copyright (C) 2012 Free Software Foundation, Inc.
| License GPLv2+: GNU GPL version 2 or later
http://gnu.org/licenses/gpl-2.0.html
| This is free software: you are free to change and redistribute it.
| There is NO WARRANTY, to the extent permitted by law.
|
| Written by Tom Tromey tro...@redhat.com
|and Alexandre Duret-Lutz a...@gnu.org.
| AUTOV is 1.12
| cp: cannot stat
`/home/.../build/tmp-eglibc/sysroots/rp02/usr/share/gettext/config.rpath
': No such file or directory
| ERROR: Function failed: do_configure (see
/home/.../build/tmp-eglibc/work/armv5te-ing-linux-gnueabi/gdbm-1.10-r3/t
emp/log.do_configure.31222 for further information)
NOTE: package gdbm-1.10-r3: task do_configure: Failed
/code
gdbm needs gettext to have config.rpath. But gettext is not built, but
gettext-native gettext-minimal-native are built.
Issue comes from meta/classes/autotools.bbclass:
code
else if grep ^[[:space:]]*AM_GNU_GETTEXT $CONFIGURE_AC
/dev/null; then
# We'd call gettextize here if it wasn't so
broken...
cp ${STAGING_DATADIR}/gettext/config.rpath
${AUTOTOOLS_AUXDIR}/
/code
What would be the best workaround to take config.rpath from
gettext-native?
Thanks for support.
Regards,
Matthieu
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
