Re: [OE-core] [meta-oe][PATCH] pcsc-lite: Seperate GPLV3 portions from BSD
* Mark Hatle [160810 22:18]:
> On 8/10/16 2:12 PM, Davis, Michael wrote:
> > GPLV3 and BSD portions were originally placed in the same package.
> > The GPLv3 portion has been seperated into pcsc-lite-spy so the package can
> > be used with GPLv3 blacklisted.
> > Signed-off-by: Michael Davis
> > ---
> > meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb | 11 +++
> > 1 file changed, 7 insertions(+), 4 deletions(-)
> > diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
> > b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
> > index cc72549..e1d405b 100644
> > --- a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
> > +++ b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
> > @@ -1,6 +1,7 @@
> > SUMMARY = "PC/SC Lite smart card framework and applications"
> > HOMEPAGE = "http://pcsclite.alioth.debian.org/";
> > -LICENSE = "BSD & GPLv3+"
> > +LICENSE = "BSD"
> LICENSE should be the overall license(s) of the sources used to produce the
> binaries.
> So in this case you'd want to do:
> LICENSE = "BSD & GPLv3+"
> LICENSE_${PN} = "BSD"
> LICENSE_${PN}-lib = "BSD"
> ...
> LICENSE_${PN}-spy = "GPLv3+"
> LICENSE_${PN}-dev = "GPLv3+"
Shouldn't the ${PN}-dev package have the combined license?
Cheers,
Anders
--
Anders Darander, Senior System Architect
ChargeStorm AB / eStorm AB
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] what's with meta-yocto-bsp directory in openembedded-core?
never noticed this before, but why is there a "meta-yocto-bsp" directory in the openembedded-core checkout that contains nothing but: . └── lib └── oeqa └── selftest └── systemd_boot.py i can see the commit that put it there: commit 3f859816aef3c3dba35cfbea15f0c56483205544 Author: Jose Perez Carranza Date: Mon Jul 4 16:15:07 2016 -0500 systemd_boot: Enable module to test systemd bootloader Module systemd_boot created wtih a class "Systemdboot" and a test case "test_efi_systemdboot_images_can_be_built" to test new systemd bootloader. [YOCTO #9706] Signed-off-by: Jose Perez Carranza Signed-off-by: Ross Burton just curious as to why it had to go in a directory whose name normally implies a layer. rday -- Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/10] classes/populate_sdk_ext: properly handle buildtools install failure
If the buildtools installation failed, we were using a subshell instead
of a compound command and thus the subshell exited but the script
continued on, which is really not what we want to happen. Additionally
log the buildtools installer output to a file and cat it if it fails so
that you can actually see what went wrong, as well as amending the
environment setup script to print a warning as we do when the
preparation fails.
Signed-off-by: Paul Eggleton
---
meta/classes/populate_sdk_ext.bbclass | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/classes/populate_sdk_ext.bbclass
b/meta/classes/populate_sdk_ext.bbclass
index a075a09..18013564 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -490,14 +490,16 @@ SDK_PRE_INSTALL_COMMAND_task-populate-sdk-ext =
"${sdk_ext_preinst}"
sdk_ext_postinst() {
printf "\nExtracting buildtools...\n"
cd $target_sdk_dir
- printf "buildtools\ny" | ./*buildtools-nativesdk-standalone* >
/dev/null || ( printf 'ERROR: buildtools installation failed\n' ; exit 1 )
+
env_setup_script="$target_sdk_dir/environment-setup-${REAL_MULTIMACH_TARGET_SYS}"
+ printf "buildtools\ny" | ./*buildtools-nativesdk-standalone* >
buildtools.log || { printf 'ERROR: buildtools installation failed:\n' ; cat
buildtools.log ; echo "printf 'ERROR: this SDK was not fully installed and
needs reinstalling\n'" >> $env_setup_script ; exit 1 ; }
# Delete the buildtools tar file since it won't be used again
rm ./*buildtools-nativesdk-standalone*.sh -f
+ # We don't need the log either since it succeeded
+ rm -f buildtools.log
# Make sure when the user sets up the environment, they also get
# the buildtools-tarball tools in their path.
-
env_setup_script="$target_sdk_dir/environment-setup-${REAL_MULTIMACH_TARGET_SYS}"
echo ". $target_sdk_dir/buildtools/environment-setup*" >>
$env_setup_script
# Allow bitbake environment setup to be ran as part of this sdk.
--
2.5.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/10] classes/populate_sdk_ext: sstate filtering fixes
A couple of fixes for the recent sstate filtering implemented in OE-Core
revision 4b7b48fcb9b39fccf8222650c2608325df2a4507:
* We shouldn't be deleting the downloads directory here, since it
contains the uninative tarball that we will need
* TMPDIR might not be named "tmp" - in OE-Core the default is tmp-glibc
so use the actual name of TMPDIR here instead.
Signed-off-by: Paul Eggleton
---
meta/classes/populate_sdk_ext.bbclass | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta/classes/populate_sdk_ext.bbclass
b/meta/classes/populate_sdk_ext.bbclass
index c16e228..a075a09 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -85,10 +85,11 @@ SDK_EXT_HOST_MANIFEST =
"${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.host.manifest"
SDK_TITLE_task-populate-sdk-ext = "${@d.getVar('DISTRO_NAME', True) or
d.getVar('DISTRO', True)} Extensible SDK"
-def clean_esdk_builddir(sdkbasepath):
+def clean_esdk_builddir(d, sdkbasepath):
"""Clean up traces of the fake build for create_filtered_tasklist()"""
import shutil
-cleanpaths = 'tmp cache conf/sanity_info conf/templateconf.cfg
downloads'.split()
+cleanpaths = 'cache conf/sanity_info conf/templateconf.cfg'.split()
+cleanpaths.append(os.path.basename(d.getVar('TMPDIR', True)))
for pth in cleanpaths:
fullpth = os.path.join(sdkbasepath, pth)
if os.path.isdir(fullpth):
@@ -140,7 +141,7 @@ def create_filtered_tasklist(d, sdkbasepath, tasklistfile,
conf_initpath):
os.rename(temp_sdkbasepath, sdkbasepath)
# Clean out residue of running bitbake, which check_sstate_task_list()
# will effectively do
-clean_esdk_builddir(sdkbasepath)
+clean_esdk_builddir(d, sdkbasepath)
finally:
os.replace(sdkbasepath + '/conf/local.conf.bak', sdkbasepath +
'/conf/local.conf')
--
2.5.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 03/10] classes/populate_sdk_ext: handle lack of uninative when filtering sstate
If the build in which the eSDK is being built isn't using uninative,
this will have an effect on NATIVELSBSTRING, which will mean that the
eSDK installer won't be able to find any of the native sstate packages.
To keep things simple, under this scenario just disable uninative
temporarily while we run the SDK installer to help us check the presence
of the sstate artifacts we need. Ideally I'd rather not have things like
this that are artificial in this verification step, but on the other
hand this was the least ugly way to solve the problem.
Signed-off-by: Paul Eggleton
---
meta/classes/populate_sdk_ext.bbclass | 5 +
1 file changed, 5 insertions(+)
diff --git a/meta/classes/populate_sdk_ext.bbclass
b/meta/classes/populate_sdk_ext.bbclass
index f758d98..c16e228 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -108,9 +108,14 @@ def create_filtered_tasklist(d, sdkbasepath, tasklistfile,
conf_initpath):
# Create a temporary build directory that we can pass to the env setup
script
shutil.copyfile(sdkbasepath + '/conf/local.conf', sdkbasepath +
'/conf/local.conf.bak')
try:
+# Force the use of sstate from the build system
with open(sdkbasepath + '/conf/local.conf', 'a') as f:
f.write('\nSSTATE_DIR_forcevariable = "%s"\n' %
d.getVar('SSTATE_DIR', True))
f.write('SSTATE_MIRRORS_forcevariable = ""\n')
+# Drop uninative if the build isn't using it (or else
NATIVELSBSTRING will
+# be different and we won't be able to find our native sstate)
+if not bb.data.inherits_class('uninative', d):
+f.write('INHERIT_remove = "uninative"\n')
# Unfortunately the default SDKPATH (or even a custom value) may
contain characters that bitbake
# will not allow in its COREBASE path, so we need to rename the
directory temporarily
--
2.5.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/10] classes/populate_sdk_ext: drop duplicated error message
The preparation script itself prints out an error on failure, and we
aren't redirecting its output anymore, so we no longer need to print out
a message here when it fails. At the same time, make the message printed
out by the script a little clearer - we're just writing the log out to
the file, we shouldn't give the user an expectation that there will be
extra details in there (other than the output produced by
oe-init-build-env there won't be).
Signed-off-by: Paul Eggleton
---
meta/classes/populate_sdk_ext.bbclass | 2 +-
meta/files/ext-sdk-prepare.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/populate_sdk_ext.bbclass
b/meta/classes/populate_sdk_ext.bbclass
index f1ae7c1..b52ad41 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -578,7 +578,7 @@ sdk_ext_postinst() {
# current working directory when first ran, nor will it set $1
when
# sourcing a script. That is why this has to look so ugly.
LOGFILE="$target_sdk_dir/preparing_build_system.log"
- sh -c ". buildtools/environment-setup* > $LOGFILE && cd
$target_sdk_dir/`dirname ${oe_init_build_env_path}` && set $target_sdk_dir && .
$target_sdk_dir/${oe_init_build_env_path} $target_sdk_dir >> $LOGFILE && python
$target_sdk_dir/ext-sdk-prepare.py $LOGFILE '${SDK_INSTALL_TARGETS}'" || { echo
"ERROR: SDK preparation failed: see $LOGFILE for a slightly more detailed log";
echo "printf 'ERROR: this SDK was not fully installed and needs
reinstalling\n'" >> $env_setup_script ; exit 1 ; }
+ sh -c ". buildtools/environment-setup* > $LOGFILE && cd
$target_sdk_dir/`dirname ${oe_init_build_env_path}` && set $target_sdk_dir && .
$target_sdk_dir/${oe_init_build_env_path} $target_sdk_dir >> $LOGFILE && python
$target_sdk_dir/ext-sdk-prepare.py $LOGFILE '${SDK_INSTALL_TARGETS}'" || { echo
"printf 'ERROR: this SDK was not fully installed and needs reinstalling\n'" >>
$env_setup_script ; exit 1 ; }
rm $target_sdk_dir/ext-sdk-prepare.py
fi
echo done
diff --git a/meta/files/ext-sdk-prepare.py b/meta/files/ext-sdk-prepare.py
index 8b15982..78c1d16 100644
--- a/meta/files/ext-sdk-prepare.py
+++ b/meta/files/ext-sdk-prepare.py
@@ -59,7 +59,7 @@ def main():
for line in f:
logf.write(line)
if ret:
-print('ERROR: SDK preparation failed: see %s' % logfile)
+print('ERROR: SDK preparation failed: error log written to %s' %
logfile)
return ret
if __name__ == "__main__":
--
2.5.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 09/10] classes/populate_sdk_ext: add some pre-install checks
Check a number of things as early as possible in the eSDK installer
script so that the user gets an error up front rather than waiting for
the build system to be extracted and then have the error produced:
* Check for missing utilities specified in SANITY_REQUIRED_UTILITIES
(along with gcc and g++), taking into account that some of these are
satisfied by buildtools which ships as part of the SDK. We use the
newly added capability to list an SDK's contents to allow us to see
exactly which binaries are inside the buildtools installer.
* Check that Python is available (since the buildtools installer's
relocate script is written in Python).
* Check that locale value set by the script is actually available
* Check that the install path is not on NFS
This does duplicate some of the checks in sanity.bbclass but it's
difficult to avoid that given that here they have to be written in shell
and there they are written in Python, as well as the fact that we only
need to run some of the checks here and not all (i.e. the ones that
relate to the host system or install path, and not those that check the
configuration or metadata). Given those issues and the fact that the
amount of code is fairly small I elected to just re-implement the checks
here.
Fixes [YOCTO #8657].
Signed-off-by: Paul Eggleton
---
meta/classes/populate_sdk_ext.bbclass | 60 +--
meta/files/toolchain-shar-extract.sh | 10 ++
2 files changed, 68 insertions(+), 2 deletions(-)
diff --git a/meta/classes/populate_sdk_ext.bbclass
b/meta/classes/populate_sdk_ext.bbclass
index 2464acb..f1ae7c1 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -459,6 +459,36 @@ def get_current_buildtools(d):
btfiles.sort(key=os.path.getctime)
return os.path.basename(btfiles[-1])
+def get_sdk_required_utilities(buildtools_fn, d):
+"""Find required utilities that aren't provided by the buildtools"""
+sanity_required_utilities = (d.getVar('SANITY_REQUIRED_UTILITIES', True)
or '').split()
+sanity_required_utilities.append(d.expand('${BUILD_PREFIX}gcc'))
+sanity_required_utilities.append(d.expand('${BUILD_PREFIX}g++'))
+buildtools_installer = os.path.join(d.getVar('SDK_DEPLOY', True),
buildtools_fn)
+filelist, _ = bb.process.run('%s -l' % buildtools_installer)
+localdata = bb.data.createCopy(d)
+localdata.setVar('SDKPATH', '.')
+sdkpathnative = localdata.getVar('SDKPATHNATIVE', True)
+sdkbindirs = [localdata.getVar('bindir_nativesdk', True),
+ localdata.getVar('sbindir_nativesdk', True),
+ localdata.getVar('base_bindir_nativesdk', True),
+ localdata.getVar('base_sbindir_nativesdk', True)]
+for line in filelist.splitlines():
+splitline = line.split()
+if len(splitline) > 5:
+fn = splitline[5]
+if not fn.startswith('./'):
+fn = './%s' % fn
+if fn.startswith(sdkpathnative):
+relpth = '/' + os.path.relpath(fn, sdkpathnative)
+for bindir in sdkbindirs:
+if relpth.startswith(bindir):
+relpth = os.path.relpath(relpth, bindir)
+if relpth in sanity_required_utilities:
+sanity_required_utilities.remove(relpth)
+break
+return ' '.join(sanity_required_utilities)
+
install_tools() {
install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}
lnr ${SDK_OUTPUT}/${SDKPATH}/${scriptrelpath}/devtool
${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/devtool
@@ -472,13 +502,38 @@ install_tools() {
}
do_populate_sdk_ext[file-checksums] +=
"${COREBASE}/meta/files/ext-sdk-prepare.py:True"
-# Since bitbake won't run as root it doesn't make sense to try and install
-# the extensible sdk as root.
sdk_ext_preinst() {
+ # Since bitbake won't run as root it doesn't make sense to try and
install
+ # the extensible sdk as root.
if [ "`id -u`" = "0" ]; then
echo "ERROR: The extensible sdk cannot be installed as root."
exit 1
fi
+ if ! command -v locale > /dev/null; then
+ echo "ERROR: The installer requires the locale command, please
install it first"
+ exit 1
+ fi
+# Check setting of LC_ALL set above
+ canonicalised_locale=`echo $LC_ALL | sed 's/UTF-8/utf8/'`
+ if ! locale -a | grep -q $canonicalised_locale ; then
+ echo "ERROR: the installer requires the $LC_ALL locale to be
installed (but not selected), please install it first"
+ exit 1
+ fi
+ # The relocation script used by buildtools installer requires python
+ if ! command -v python > /dev/null; then
+ echo "ERROR: The installer requires python, please install it
first"
+ exit 1
+ fi
+ missing_utils="
[OE-core] [PATCH 01/10] gen-lockedsig-cache: ensure symlinks are dereferenced
If you set up a local mirror in SSTATE_MIRRORS then you can end up with
symlinks in SSTATE_DIR rather than real files. We don't want these
symlinks in the sstate-cache prodcued by gen-lockedsig-cache, so
dereference any symlinks before copying.
Signed-off-by: Paul Eggleton
---
scripts/gen-lockedsig-cache | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/scripts/gen-lockedsig-cache b/scripts/gen-lockedsig-cache
index de8a20c..49de74e 100755
--- a/scripts/gen-lockedsig-cache
+++ b/scripts/gen-lockedsig-cache
@@ -57,13 +57,14 @@ for f in files:
destdir = os.path.dirname(dst)
mkdir(destdir)
+src = os.path.realpath(f)
if os.path.exists(dst):
os.remove(dst)
-if (os.stat(f).st_dev == os.stat(destdir).st_dev):
+if (os.stat(src).st_dev == os.stat(destdir).st_dev):
print('linking')
-os.link(f, dst)
+os.link(src, dst)
else:
print('copying')
-shutil.copyfile(f, dst)
+shutil.copyfile(src, dst)
print('Done!')
--
2.5.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/10] classes/populate_sdk_ext: ensure eSDK can build without uninative enabled
We were relying on uninative being enabled in the build in which the
eSDK was being produced, which is not the case for example for OE-Core's
default configuration. Move the code that copies the uninative tarball
and writes the checksum to copy_buildsystem so that it happens early
enough for that part of the configuration to be set up when we do the
filtering (which requires running bitbake).
Signed-off-by: Paul Eggleton
---
meta/classes/populate_sdk_ext.bbclass | 19 ++-
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/meta/classes/populate_sdk_ext.bbclass
b/meta/classes/populate_sdk_ext.bbclass
index f6b0834..f758d98 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -233,6 +233,14 @@ python copy_buildsystem () {
f.write('$' + '{SDKBASEMETAPATH}/workspace \\\n')
f.write('"\n')
+# Copy uninative tarball
+# For now this is where uninative.bbclass expects the tarball
+uninative_file =
d.expand('${SDK_DEPLOY}/${BUILD_ARCH}-nativesdk-libc.tar.bz2')
+uninative_checksum = bb.utils.sha256_file(uninative_file)
+uninative_outdir = '%s/downloads/uninative/%s' % (baseoutpath,
uninative_checksum)
+bb.utils.mkdirhier(uninative_outdir)
+shutil.copy(uninative_file, uninative_outdir)
+
env_whitelist = (d.getVar('BB_ENV_EXTRAWHITE', True) or '').split()
env_whitelist_values = {}
@@ -267,7 +275,8 @@ python copy_buildsystem () {
# Write a newline just in case there's none at the end of the
original
f.write('\n')
-f.write('INHERIT += "%s"\n\n' % 'uninative')
+f.write('INHERIT += "%s"\n' % 'uninative')
+f.write('UNINATIVE_CHECKSUM[%s] = "%s"\n\n' %
(d.getVar('BUILD_ARCH', True), uninative_checksum))
f.write('CONF_VERSION = "%s"\n\n' % d.getVar('CONF_VERSION',
False))
# Some classes are not suitable for SDK, remove them from INHERIT
@@ -446,18 +455,10 @@ install_tools() {
lnr ${SDK_OUTPUT}/${SDKPATH}/${scriptrelpath}/recipetool
${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/recipetool
touch ${SDK_OUTPUT}/${SDKPATH}/.devtoolbase
- localconf=${SDK_OUTPUT}/${SDKPATH}/conf/local.conf
-
# find latest buildtools-tarball and install it
buildtools_path=`ls -t1
${SDK_DEPLOY}/${@extsdk_get_buildtools_filename(d)} | head -n1`
install $buildtools_path ${SDK_OUTPUT}/${SDKPATH}
- # For now this is where uninative.bbclass expects the tarball
- chksum=`sha256sum ${SDK_DEPLOY}/${BUILD_ARCH}-nativesdk-libc.tar.bz2 |
cut -f 1 -d ' '`
- install -d ${SDK_OUTPUT}/${SDKPATH}/downloads/uninative/$chksum/
- install ${SDK_DEPLOY}/${BUILD_ARCH}-nativesdk-libc.tar.bz2
${SDK_OUTPUT}/${SDKPATH}/downloads/uninative/$chksum/
- echo "UNINATIVE_CHECKSUM[${BUILD_ARCH}] = '$chksum'" >>
${SDK_OUTPUT}/${SDKPATH}/conf/local.conf
-
install -m 0644 ${COREBASE}/meta/files/ext-sdk-prepare.py
${SDK_OUTPUT}/${SDKPATH}
}
do_populate_sdk_ext[file-checksums] +=
"${COREBASE}/meta/files/ext-sdk-prepare.py:True"
--
2.5.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/10] toolchain-shar-extract.sh: add option to list contents
Add a -l command-line option for SDK installers to get a list of files
that will be extracted by the SDK - internally this just runs "tar tv"
on the embedded tarball. This can be used to look at which files the SDK
provides without actually installing it. The initial user of this is the
extensible SDK build process which needs to know what binaries are going
to be installed by the buildtools installer without installing it.
Signed-off-by: Paul Eggleton
---
meta/files/toolchain-shar-extract.sh | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/meta/files/toolchain-shar-extract.sh
b/meta/files/toolchain-shar-extract.sh
index 9279310..4345104 100644
--- a/meta/files/toolchain-shar-extract.sh
+++ b/meta/files/toolchain-shar-extract.sh
@@ -47,7 +47,8 @@ relocate=1
savescripts=0
verbose=0
publish=0
-while getopts ":yd:npDRS" OPT; do
+listcontents=0
+while getopts ":yd:npDRSl" OPT; do
case $OPT in
y)
answer="Y"
@@ -72,6 +73,9 @@ while getopts ":yd:npDRS" OPT; do
S)
savescripts=1
;;
+ l)
+ listcontents=1
+ ;;
*)
echo "Usage: $(basename $0) [-y] [-d ]"
echo " -y Automatic yes to all prompts"
@@ -83,11 +87,18 @@ while getopts ":yd:npDRS" OPT; do
echo " -S Save relocation scripts"
echo " -R Do not relocate executables"
echo " -D use set -x to see what is going on"
+ echo " -l list files that will be extracted"
exit 1
;;
esac
done
+payload_offset=$(($(grep -na -m1 "^MARKER:$" $0|cut -d':' -f1) + 1))
+if [ "$listcontents" = "1" ] ; then
+tail -n +$payload_offset $0| tar tvJ || exit 1
+exit
+fi
+
titlestr="@SDK_TITLE@ installer version @SDK_VERSION@"
printf "%s\n" "$titlestr"
printf "%${#titlestr}s\n" | tr " " "="
@@ -187,8 +198,6 @@ if [ ! -x $target_sdk_dir -o ! -w $target_sdk_dir -o ! -r
$target_sdk_dir ]; the
$SUDO_EXEC mkdir -p $target_sdk_dir >/dev/null 2>&1
fi
-payload_offset=$(($(grep -na -m1 "^MARKER:$" $0|cut -d':' -f1) + 1))
-
printf "Extracting SDK..."
tail -n +$payload_offset $0| $SUDO_EXEC tar xJ -C $target_sdk_dir
--checkpoint=.2500 $EXTRA_TAR_OPTIONS || exit 1
echo "done"
--
2.5.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 07/10] classes/populate_sdk_ext: properly determine buildtools filename
Determine the name of the current buildtools installer ahead of time,
set it in a variable and use that variable rather than the wildcarded
version everywhere, since it's much tidier.
Signed-off-by: Paul Eggleton
---
meta/classes/populate_sdk_ext.bbclass | 17 +++--
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/meta/classes/populate_sdk_ext.bbclass
b/meta/classes/populate_sdk_ext.bbclass
index 18013564..2464acb 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -452,8 +452,12 @@ python copy_buildsystem () {
f.write('%s\t%s\n' % (chksum, os.path.relpath(fn,
baseoutpath)))
}
-def extsdk_get_buildtools_filename(d):
-return '*-buildtools-nativesdk-standalone-*.sh'
+def get_current_buildtools(d):
+"""Get the file name of the current buildtools installer"""
+import glob
+btfiles = glob.glob(os.path.join(d.getVar('SDK_DEPLOY', True),
'*-buildtools-nativesdk-standalone-*.sh'))
+btfiles.sort(key=os.path.getctime)
+return os.path.basename(btfiles[-1])
install_tools() {
install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}
@@ -462,8 +466,7 @@ install_tools() {
touch ${SDK_OUTPUT}/${SDKPATH}/.devtoolbase
# find latest buildtools-tarball and install it
- buildtools_path=`ls -t1
${SDK_DEPLOY}/${@extsdk_get_buildtools_filename(d)} | head -n1`
- install $buildtools_path ${SDK_OUTPUT}/${SDKPATH}
+ install ${SDK_DEPLOY}/${SDK_BUILDTOOLS_INSTALLER}
${SDK_OUTPUT}/${SDKPATH}
install -m 0644 ${COREBASE}/meta/files/ext-sdk-prepare.py
${SDK_OUTPUT}/${SDKPATH}
}
@@ -491,10 +494,10 @@ sdk_ext_postinst() {
printf "\nExtracting buildtools...\n"
cd $target_sdk_dir
env_setup_script="$target_sdk_dir/environment-setup-${REAL_MULTIMACH_TARGET_SYS}"
- printf "buildtools\ny" | ./*buildtools-nativesdk-standalone* >
buildtools.log || { printf 'ERROR: buildtools installation failed:\n' ; cat
buildtools.log ; echo "printf 'ERROR: this SDK was not fully installed and
needs reinstalling\n'" >> $env_setup_script ; exit 1 ; }
+ printf "buildtools\ny" | ./${SDK_BUILDTOOLS_INSTALLER} > buildtools.log
|| { printf 'ERROR: buildtools installation failed:\n' ; cat buildtools.log ;
echo "printf 'ERROR: this SDK was not fully installed and needs
reinstalling\n'" >> $env_setup_script ; exit 1 ; }
# Delete the buildtools tar file since it won't be used again
- rm ./*buildtools-nativesdk-standalone*.sh -f
+ rm -f ./${SDK_BUILDTOOLS_INSTALLER}
# We don't need the log either since it succeeded
rm -f buildtools.log
@@ -538,6 +541,8 @@ fakeroot python do_populate_sdk_ext() {
bb.fatal('The extensible SDK can currently only be built for the same
architecture as the machine being built on - SDK_ARCH is set to %s (likely via
setting SDKMACHINE) which is different from the architecture of the build
machine (%s). Unable to continue.' % (d.getVar('SDK_ARCH', True),
d.getVar('BUILD_ARCH', True)))
d.setVar('SDK_INSTALL_TARGETS', get_sdk_install_targets(d))
+buildtools_fn = get_current_buildtools(d)
+d.setVar('SDK_BUILDTOOLS_INSTALLER', buildtools_fn)
bb.build.exec_func("do_populate_sdk", d)
}
--
2.5.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 00/10] Extensible SDK fixes
Fixes for building the extensible SDK without uninative enabled, fixes for the recently implemented sstate filtering, fixes for buildtools handling within the eSDK installer, addition of sanity tests early in the eSDK install process, and a couple of other related fixes. Worth noting is that this changeset, building the eSDK with OE-Core's default configuration now works again. It's not clear to me when it broke (it may have only been recently, certainly it was after the sstate filtering patches that the YP autobuilder started warning that the tests were failing with OE-Core). The following changes since commit 5ed0d5a7d9b051a551a6de644bf6a42b87c12471: dbus: backport stdint.h build fix (2016-08-10 10:45:33 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib paule/extsdkfixes13-oe http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/extsdkfixes13-oe Paul Eggleton (10): gen-lockedsig-cache: ensure symlinks are dereferenced classes/populate_sdk_ext: ensure eSDK can build without uninative enabled classes/populate_sdk_ext: handle lack of uninative when filtering sstate classes/populate_sdk_ext: sstate filtering fixes lib/oe/copy_buildsystem: fix merging sstate directories for eSDK classes/populate_sdk_ext: properly handle buildtools install failure classes/populate_sdk_ext: properly determine buildtools filename toolchain-shar-extract.sh: add option to list contents classes/populate_sdk_ext: add some pre-install checks classes/populate_sdk_ext: drop duplicated error message meta/classes/populate_sdk_ext.bbclass | 114 +++--- meta/files/ext-sdk-prepare.py | 2 +- meta/files/toolchain-shar-extract.sh | 25 +++- meta/lib/oe/copy_buildsystem.py | 20 +++--- scripts/gen-lockedsig-cache | 7 ++- 5 files changed, 131 insertions(+), 37 deletions(-) -- 2.5.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 05/10] lib/oe/copy_buildsystem: fix merging sstate directories for eSDK
When we don't have uninative enabled there's more merging to be done in
the default configuration (SDK_EXT_TYPE = "full" which by default means
SDK_INCLUDE_TOOLCHAIN = "1") and there are likely files that already
exist in the sstate feed we're assembling, so we need to take care to
merge the directory contents rather than just moving the directories
over. Additionally we now only run this if uninative genuinely isn't
enabled (i.e. NATIVELSBSTRING is different to the fixed value of
"universal".)
In the process of fixing this I discovered an unusual behaviour in
os.rename() - when we're merging these feeds we're dealing with
hard-linked sstate artifacts, and whilst os.rename() is supposed to
silently overwrite an existing destination (permissions allowing), if
you have the source and destination as hardlinks to the same file then
the os.rename() call will just silently fail. As a result the code now
just checks if the destination exists and deletes the source if so
(since we know it will be the same file, we don't need to check in this
case.)
Signed-off-by: Paul Eggleton
---
meta/lib/oe/copy_buildsystem.py | 20
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/meta/lib/oe/copy_buildsystem.py b/meta/lib/oe/copy_buildsystem.py
index 4d3faf6..3d5a746 100644
--- a/meta/lib/oe/copy_buildsystem.py
+++ b/meta/lib/oe/copy_buildsystem.py
@@ -201,21 +201,25 @@ def merge_lockedsigs(copy_tasks, lockedsigs_main,
lockedsigs_extra, merged_outpu
write_sigs_file(merged_output, arch_order, merged)
def create_locked_sstate_cache(lockedsigs, input_sstate_cache,
output_sstate_cache, d, fixedlsbstring="", filterfile=None):
+import shutil
bb.note('Generating sstate-cache...')
nativelsbstring = d.getVar('NATIVELSBSTRING', True)
bb.process.run("gen-lockedsig-cache %s %s %s %s %s" % (lockedsigs,
input_sstate_cache, output_sstate_cache, nativelsbstring, filterfile or ''))
-if fixedlsbstring:
+if fixedlsbstring and nativelsbstring != fixedlsbstring:
nativedir = output_sstate_cache + '/' + nativelsbstring
if os.path.isdir(nativedir):
destdir = os.path.join(output_sstate_cache, fixedlsbstring)
-bb.utils.mkdirhier(destdir)
-
-dirlist = os.listdir(nativedir)
-for i in dirlist:
-src = os.path.join(nativedir, i)
-dest = os.path.join(destdir, i)
-os.rename(src, dest)
+for root, _, files in os.walk(nativedir):
+for fn in files:
+src = os.path.join(root, fn)
+dest = os.path.join(destdir, os.path.relpath(src,
nativedir))
+if os.path.exists(dest):
+# Already exists, and it'll be the same file, so just
delete it
+os.unlink(src)
+else:
+bb.utils.mkdirhier(os.path.dirname(dest))
+shutil.move(src, dest)
def check_sstate_task_list(d, targets, filteroutfile, cmdprefix='', cwd=None,
logfile=None):
import subprocess
--
2.5.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] oe-buildenv-internal: hint at specifying bitbake path in error message
If you check out OE-Core and then run oe-init-build-env you get an error about not having bitbake checked out in a "bitbake" subdirectory, however it's possible to specify the bitbake path on the oe-init-build-env command line, so hint at that in the error message rather than implying it has to be in the default location. Signed-off-by: Paul Eggleton --- scripts/oe-buildenv-internal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal index 03dc50f..9fae3b4 100755 --- a/scripts/oe-buildenv-internal +++ b/scripts/oe-buildenv-internal @@ -96,7 +96,7 @@ BITBAKEDIR=$(readlink -f "$BITBAKEDIR") BUILDDIR=$(readlink -f "$BUILDDIR") if [ ! -d "$BITBAKEDIR" ]; then -echo >&2 "Error: The bitbake directory ($BITBAKEDIR) does not exist! Please ensure a copy of bitbake exists at this location" +echo >&2 "Error: The bitbake directory ($BITBAKEDIR) does not exist! Please ensure a copy of bitbake exists at this location or specify an alternative path on the command line" return 1 fi -- 2.5.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] oe-buildenv-internal: hint at specifying bitbake path in error message
The following changes since commit 5ed0d5a7d9b051a551a6de644bf6a42b87c12471: dbus: backport stdint.h build fix (2016-08-10 10:45:33 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib paule/oe-init-bitbake http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/oe-init-bitbake Paul Eggleton (1): oe-buildenv-internal: hint at specifying bitbake path in error message scripts/oe-buildenv-internal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.5.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] npm: npm.bbclass now adds nodejs to RDEPENDS
We expect that any package that uses the npm bbclass
will have a runtime dependency on node.js
Signed-off-by: Henry Bruce
---
meta/classes/npm.bbclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/classes/npm.bbclass b/meta/classes/npm.bbclass
index 95be751..55c7c3e 100644
--- a/meta/classes/npm.bbclass
+++ b/meta/classes/npm.bbclass
@@ -1,4 +1,5 @@
DEPENDS_prepend = "nodejs-native "
+RDEPENDS_${PN}_prepend = "nodejs "
S = "${WORKDIR}/npmpkg"
NPM_INSTALLDIR = "${D}${libdir}/node_modules/${PN}"
--
2.4.11
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] npm: npm.bbclass now adds nodejs to RDEPENDS
On Wed, Aug 10, 2016 at 3:15 PM, Henry Bruce wrote:
> We expect that any package that uses the npm bbclass
> will have a runtime dependency on node.js
>
> Signed-off-by: Henry Bruce
> ---
> meta/classes/npm.bbclass | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/meta/classes/npm.bbclass b/meta/classes/npm.bbclass
> index 95be751..541fd3b 100644
> --- a/meta/classes/npm.bbclass
> +++ b/meta/classes/npm.bbclass
> @@ -1,4 +1,5 @@
> DEPENDS_prepend = "nodejs-native "
> +RDEPENDS_${PN}_prepend += "nodejs "
>
The += here is pointless. It adds a leading space, which does nothing, and
isn't needed for a prepend anyway. Just use =, the same as is used for
DEPENDS.
--
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] npm: npm.bbclass now adds nodejs to RDEPENDS
We expect that any package that uses the npm bbclass
will have a runtime dependency on node.js
Signed-off-by: Henry Bruce
---
meta/classes/npm.bbclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/classes/npm.bbclass b/meta/classes/npm.bbclass
index 95be751..541fd3b 100644
--- a/meta/classes/npm.bbclass
+++ b/meta/classes/npm.bbclass
@@ -1,4 +1,5 @@
DEPENDS_prepend = "nodejs-native "
+RDEPENDS_${PN}_prepend += "nodejs "
S = "${WORKDIR}/npmpkg"
NPM_INSTALLDIR = "${D}${libdir}/node_modules/${PN}"
--
2.4.11
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCHv4] pcsc-lite: Seperate GPLV3 portions from BSD
GPLV3 and BSD portions were originally placed in the same package.
The GPLv3 portion has been seperated into pcsc-lite-spy and
pcsc-lite-spy-dev so the package can be used with GPLv3 blacklisted.
---
.../recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb | 24 ++
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
index cc72549..0d2cb33 100644
--- a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
+++ b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
@@ -1,7 +1,13 @@
SUMMARY = "PC/SC Lite smart card framework and applications"
HOMEPAGE = "http://pcsclite.alioth.debian.org/";
LICENSE = "BSD & GPLv3+"
-LICENSE_${PN}-dev = "GPLv3+"
+LICENSE_${PN} = "BSD"
+LICENSE_${PN}-lib = "BSD"
+LICENSE_${PN}-doc = "BSD"
+LICENSE_${PN}-dev = "BSD"
+LICENSE_${PN}-dbg = "BSD & GPLv3+"
+LICENSE_${PN}-spy = "GPLv3+"
+LICENSE_${PN}-spy-dev = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=bcfbd85230ac3c586fb294c8b627cf32"
DEPENDS = "udev"
@@ -20,14 +26,24 @@ EXTRA_OECONF = " \
S = "${WORKDIR}/pcsc-lite-${PV}"
-PACKAGES =+ "${PN}-lib"
+PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-lib ${PN}-doc ${PN}-spy
${PN}-spy-dev"
RRECOMMENDS_${PN} = "ccid"
-FILES_${PN}-lib = "${libdir}/lib*${SOLIBS}"
+FILES_${PN} = "${sbindir}/pcscd"
+FILES_${PN}-lib = "${libdir}/libpcsclite*${SOLIBS}"
+FILES_${PN}-dev = "${includedir} \
+ ${libdir}/pkgconfig \
+ ${libdir}/libpcsclite.la \
+ ${libdir}/libpcsclite.so"
+
+FILES_${PN}-spy = "${bindir}/pcsc-spy \
+ ${libdir}/libpcscspy*${SOLIBS}"
+FILES_${PN}-spy-dev = "${libdir}/libpcscspy.la \
+ ${libdir}/libpcscspy.so "
RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd"
SYSTEMD_SERVICE_${PN} = "pcscd.socket"
-RDEPENDS_${PN} +="python"
+RDEPENDS_${PN}-spy +="python"
--
2.5.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCHv3] pcsc-lite: Seperate GPLV3 portions from BSD
Ignore this one found an issue when I re-enabled my blacklist again.
On Wednesday, August 10, 2016 08:54:05 PM Davis, Michael wrote:
> GPLV3 and BSD portions were originally placed in the same package.
> The GPLv3 portion has been seperated into pcsc-lite-spy so the package can be
> used with GPLv3 blacklisted.
>
> Signed-off-by: Michael Davis
> ---
> meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb | 16
> 1 file changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
> b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
> index cc72549..7213276 100644
> --- a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
> +++ b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
> @@ -1,7 +1,12 @@
> SUMMARY = "PC/SC Lite smart card framework and applications"
> HOMEPAGE = "http://pcsclite.alioth.debian.org/";
> LICENSE = "BSD & GPLv3+"
> -LICENSE_${PN}-dev = "GPLv3+"
> +LICENSE_${PN} = "BSD"
> +LICENSE_${PN}-lib = "BSD"
> +LICENSE_${PN}-dev = "BSD"
> +LICENSE_${PN}-doc = "BSD"
> +LICENSE_${PN}-dbg = "BSD & GPLv3+"
> +LICENSE_${PN}-spy = "GPLv3+"
> LIC_FILES_CHKSUM = "file://COPYING;md5=bcfbd85230ac3c586fb294c8b627cf32"
> DEPENDS = "udev"
>
> @@ -20,14 +25,17 @@ EXTRA_OECONF = " \
>
> S = "${WORKDIR}/pcsc-lite-${PV}"
>
> -PACKAGES =+ "${PN}-lib"
> +PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-lib ${PN}-doc ${PN}-spy"
>
> RRECOMMENDS_${PN} = "ccid"
>
> -FILES_${PN}-lib = "${libdir}/lib*${SOLIBS}"
> +FILES_${PN}-spy += "${bindir}/pcsc-spy \
> +${libdir}/libpcscspy*${SOLIBS} \
> +${libdir{/libpcscspy.la"
> +FILES_${PN}-lib = "${libdir}/libpcsclite*${SOLIBS}"
>
> RPROVIDES_${PN} += "${PN}-systemd"
> RREPLACES_${PN} += "${PN}-systemd"
> RCONFLICTS_${PN} += "${PN}-systemd"
> SYSTEMD_SERVICE_${PN} = "pcscd.socket"
> -RDEPENDS_${PN} +="python"
> +RDEPENDS_${PN}-spy +="python"
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCHv3] pcsc-lite: Seperate GPLV3 portions from BSD
GPLV3 and BSD portions were originally placed in the same package.
The GPLv3 portion has been seperated into pcsc-lite-spy so the package can be
used with GPLv3 blacklisted.
Signed-off-by: Michael Davis
---
meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb | 16
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
index cc72549..7213276 100644
--- a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
+++ b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
@@ -1,7 +1,12 @@
SUMMARY = "PC/SC Lite smart card framework and applications"
HOMEPAGE = "http://pcsclite.alioth.debian.org/";
LICENSE = "BSD & GPLv3+"
-LICENSE_${PN}-dev = "GPLv3+"
+LICENSE_${PN} = "BSD"
+LICENSE_${PN}-lib = "BSD"
+LICENSE_${PN}-dev = "BSD"
+LICENSE_${PN}-doc = "BSD"
+LICENSE_${PN}-dbg = "BSD & GPLv3+"
+LICENSE_${PN}-spy = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=bcfbd85230ac3c586fb294c8b627cf32"
DEPENDS = "udev"
@@ -20,14 +25,17 @@ EXTRA_OECONF = " \
S = "${WORKDIR}/pcsc-lite-${PV}"
-PACKAGES =+ "${PN}-lib"
+PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-lib ${PN}-doc ${PN}-spy"
RRECOMMENDS_${PN} = "ccid"
-FILES_${PN}-lib = "${libdir}/lib*${SOLIBS}"
+FILES_${PN}-spy += "${bindir}/pcsc-spy \
+${libdir}/libpcscspy*${SOLIBS} \
+${libdir{/libpcscspy.la"
+FILES_${PN}-lib = "${libdir}/libpcsclite*${SOLIBS}"
RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd"
SYSTEMD_SERVICE_${PN} = "pcscd.socket"
-RDEPENDS_${PN} +="python"
+RDEPENDS_${PN}-spy +="python"
--
2.5.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2] simultaneous do_rootfs tasks with testimage fix
Changed since V1: I've added a fix to the smart tests which creates a fresh index of the RPM packages specifically for the tests. This decouples the tests and the rootfs processes, which also does some indexing for installation. Stephano Cetola (1): Allow for simultaneous do_rootfs tasks with rpm meta/classes/rootfs_rpm.bbclass | 5 - meta/lib/oe/package_manager.py | 17 ++--- meta/lib/oeqa/runtime/smart.py | 41 - 3 files changed, 54 insertions(+), 9 deletions(-) -- 2.9.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2] Allow for simultaneous do_rootfs tasks with rpm
Give each rootfs its own RPM channel to use. This puts the RPM metadata
in a private subdirectory of $WORKDIR, rather than living in DEPLOY_DIR
where other tasks may race with it.
This allows us to reduce the time that the rpm.lock is held to only the
time needed to hardlink the RPMs, allowing the majority of the rootfs
operation to run in parallel.
Also, this fixes the smart tests by generating an index for all packages
at the time of the test, rather than using the one provided by the
rootfs process.
Original credit for the enhancement should go to Steven Walter
stevenrwal...@gmail.com.
Signed-off-by: Stephano Cetola
---
meta/classes/rootfs_rpm.bbclass | 5 -
meta/lib/oe/package_manager.py | 17 ++---
meta/lib/oeqa/runtime/smart.py | 41 -
3 files changed, 54 insertions(+), 9 deletions(-)
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 38b3c99..37730a7 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -24,11 +24,6 @@ do_populate_sdk[depends] += "${RPMROOTFSDEPENDS}"
do_rootfs[recrdeptask] += "do_package_write_rpm"
do_rootfs[vardeps] += "PACKAGE_FEED_URIS"
-# RPM doesn't work with multiple rootfs generation at once due to collisions
in the use of files
-# in ${DEPLOY_DIR_RPM}. This can be removed if package_update_index_rpm can be
called concurrently
-do_rootfs[lockfiles] += "${DEPLOY_DIR_RPM}/rpm.lock"
-do_populate_sdk[lockfiles] += "${DEPLOY_DIR_RPM}/rpm.lock"
-
python () {
if d.getVar('BUILD_IMAGES_FROM_FEEDS', True):
flags = d.getVarFlag('do_rootfs', 'recrdeptask', True)
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 47f6831..2802254 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -9,6 +9,7 @@ import collections
import bb
import tempfile
import oe.utils
+import oe.path
import string
from oe.gpg_sign import get_signer
@@ -175,7 +176,7 @@ class RpmIndexer(Indexer):
dbpath = os.path.join(self.d.getVar('WORKDIR', True), 'rpmdb',
arch)
if os.path.exists(dbpath):
bb.utils.remove(dbpath, True)
-arch_dir = os.path.join(self.deploy_dir, arch)
+arch_dir = os.path.join(self.d.getVar('WORKDIR', True), 'rpms',
arch)
if not os.path.isdir(arch_dir):
continue
@@ -1010,8 +1011,18 @@ class RpmPM(PackageManager):
ch_already_added = []
for canonical_arch in platform_extra:
arch = canonical_arch.split('-')[0]
-arch_channel = os.path.join(self.deploy_dir, arch)
-if os.path.exists(arch_channel) and not arch in ch_already_added:
+arch_channel = os.path.join(self.d.getVar('WORKDIR', True),
'rpms', arch)
+oe.path.remove(arch_channel)
+deploy_arch_dir = os.path.join(self.deploy_dir, arch)
+if not os.path.exists(deploy_arch_dir):
+continue
+
+lockfilename = self.d.getVar('DEPLOY_DIR_RPM', True) + "/rpm.lock"
+lf = bb.utils.lockfile(lockfilename, False)
+oe.path.copyhardlinktree(deploy_arch_dir, arch_channel)
+bb.utils.unlockfile(lf)
+
+if not arch in ch_already_added:
bb.note('Adding Smart channel %s (%s)' %
(arch, channel_priority))
self._invoke_smart('channel --add %s type=rpm-md baseurl=%s -y'
diff --git a/meta/lib/oeqa/runtime/smart.py b/meta/lib/oeqa/runtime/smart.py
index c7a5753..c8ba433 100644
--- a/meta/lib/oeqa/runtime/smart.py
+++ b/meta/lib/oeqa/runtime/smart.py
@@ -1,5 +1,7 @@
import unittest
import re
+import oe
+import subprocess
from oeqa.oetest import oeRuntimeTest, skipModule
from oeqa.utils.decorators import *
from oeqa.utils.httpserver import HTTPService
@@ -53,9 +55,46 @@ class SmartBasicTest(SmartTest):
class SmartRepoTest(SmartTest):
@classmethod
+def create_index(self, arg):
+index_cmd = arg
+try:
+bb.note("Executing '%s' ..." % index_cmd)
+result = subprocess.check_output(index_cmd,
stderr=subprocess.STDOUT, shell=True).decode("utf-8")
+except subprocess.CalledProcessError as e:
+return("Index creation command '%s' failed with return code
%d:\n%s" %
+(e.cmd, e.returncode, e.output.decode("utf-8")))
+if result:
+bb.note(result)
+return None
+
+@classmethod
def setUpClass(self):
self.repolist = []
-self.repo_server = HTTPService(oeRuntimeTest.tc.d.getVar('DEPLOY_DIR',
True), oeRuntimeTest.tc.target.server_ip)
+
+# Index RPMs
+rpm_createrepo = bb.utils.which(os.getenv('PATH'), "createrepo")
+index_cmds = []
+rpm_dirs_found = False
+archs = (oeRuntimeTest.tc.d.getVar('ALL_MULTILIB_PACKAGE_ARCHS', True)
or "").replace('-', '_').split()
+
Re: [OE-core] [meta-oe][PATCH] pcsc-lite: Seperate GPLV3 portions from BSD
On 8/10/16 2:12 PM, Davis, Michael wrote:
> GPLV3 and BSD portions were originally placed in the same package.
> The GPLv3 portion has been seperated into pcsc-lite-spy so the package can be
> used with GPLv3 blacklisted.
>
> Signed-off-by: Michael Davis
> ---
> meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb | 11 +++
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
> b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
> index cc72549..e1d405b 100644
> --- a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
> +++ b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
> @@ -1,6 +1,7 @@
> SUMMARY = "PC/SC Lite smart card framework and applications"
> HOMEPAGE = "http://pcsclite.alioth.debian.org/";
> -LICENSE = "BSD & GPLv3+"
> +LICENSE = "BSD"
LICENSE should be the overall license(s) of the sources used to produce the
binaries.
So in this case you'd want to do:
LICENSE = "BSD & GPLv3+"
LICENSE_${PN} = "BSD"
LICENSE_${PN}-lib = "BSD"
...
LICENSE_${PN}-spy = "GPLv3+"
LICENSE_${PN}-dev = "GPLv3+"
Once the packages deviate from the overall source code license you need to
explicitly list them for each package. (The -dbg usually always matches the
${PN}, so that isn't necessary.)
In order to allow for the blacklisting, you may have to add some additional code
to disable the GPL3 pieces if the blacklist is in place. I think there are some
examples of this elsewhere in oe-core.
--Mark
> +LICENSE_${PN}-spy = "GPLv3+"
> LICENSE_${PN}-dev = "GPLv3+"
> LIC_FILES_CHKSUM = "file://COPYING;md5=bcfbd85230ac3c586fb294c8b627cf32"
> DEPENDS = "udev"
> @@ -20,14 +21,16 @@ EXTRA_OECONF = " \
>
> S = "${WORKDIR}/pcsc-lite-${PV}"
>
> -PACKAGES =+ "${PN}-lib"
> +PACKAGES =+ "${PN}-lib ${PN}-spy"
>
> RRECOMMENDS_${PN} = "ccid"
>
> -FILES_${PN}-lib = "${libdir}/lib*${SOLIBS}"
> +FILES_${PN}-spy += "${bindir}/pcsc-spy \
> +${libdir}/libpcscspy*${SOLIBS}"
> +FILES_${PN}-lib = "${libdir}/libpcsclite*${SOLIBS}"
>
> RPROVIDES_${PN} += "${PN}-systemd"
> RREPLACES_${PN} += "${PN}-systemd"
> RCONFLICTS_${PN} += "${PN}-systemd"
> SYSTEMD_SERVICE_${PN} = "pcscd.socket"
> -RDEPENDS_${PN} +="python"
> +RDEPENDS_${PN}-spy +="python"
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCHv2] pcsc-lite: Seperate GPLV3 portions from BSD
GPLV3 and BSD portions were originally placed in the same package.
The GPLv3 portion has been seperated into pcsc-lite-spy so the package can be
used with GPLv3 blacklisted.
Signed-off-by: Michael Davis
---
meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
index cc72549..da6a067 100644
--- a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
+++ b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
@@ -1,6 +1,8 @@
SUMMARY = "PC/SC Lite smart card framework and applications"
HOMEPAGE = "http://pcsclite.alioth.debian.org/";
LICENSE = "BSD & GPLv3+"
+LICENSE_${PN} = "BSD"
+LICENSE_${PN}-spy = "GPLv3+"
LICENSE_${PN}-dev = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=bcfbd85230ac3c586fb294c8b627cf32"
DEPENDS = "udev"
@@ -20,14 +22,16 @@ EXTRA_OECONF = " \
S = "${WORKDIR}/pcsc-lite-${PV}"
-PACKAGES =+ "${PN}-lib"
+PACKAGES =+ "${PN}-lib ${PN}-spy"
RRECOMMENDS_${PN} = "ccid"
-FILES_${PN}-lib = "${libdir}/lib*${SOLIBS}"
+FILES_${PN}-spy += "${bindir}/pcsc-spy \
+${libdir}/libpcscspy*${SOLIBS}"
+FILES_${PN}-lib = "${libdir}/libpcsclite*${SOLIBS}"
RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd"
SYSTEMD_SERVICE_${PN} = "pcscd.socket"
-RDEPENDS_${PN} +="python"
+RDEPENDS_${PN}-spy +="python"
--
2.5.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH RESEND] kernel.bbclass: fix emit_depmod_pkgdata() workdir
On 10 August 2016 at 16:58, Ioan-Adrian Ratiu wrote:
> bitbake commit 67a7b8b02 "build: don't use $B as the default cwd for
> functions" breaks the assumption that this function is running under
> ${B}. This causes build failures because System.map is under ${B}.
>
For clarity, can the function simply always use absolute paths instead of
relying on cwd?
Ross
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH] pcsc-lite: Seperate GPLV3 portions from BSD
On 10 August 2016 at 20:12, Davis, Michael wrote: > GPLV3 and BSD portions were originally placed in the same package. > The GPLv3 portion has been seperated into pcsc-lite-spy so the package can > be used with GPLv3 blacklisted. > Wrong list - openembedded-devel@ for meta-oe. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] REPLACEMENT: Gummiboot to Systemd-boot
Dear All, The gummiboot has been merged into systemd project and is “systemd-boot” now. The project at the location referred in recipes is obsoleted and not maintained any more. The systemd-boot provides same functionality of gummiboot from my understanding and test. Seeing no much benefit to keep gummiboot, we suggest to replace it with systemd-boot in OE. Please refer to the below list for a proposed plan and what’s done on systemd-boot so far. () Build systemd-boot without dependency on the rest of systemd (merged in OE master) () wic plugin & wks for systemd-boot (merged in OE master) () New test cases by QA (done) () New test target by QA (done) () Overall document update for the replacement (patch in bz9707, reviewed) () Propose the plan (this letter) () If you have any work derived from gummiboot like patches, scripts, recipes or bbclasses in your layers, you will have to migrate such work onto systemd-boot accordingly. If you find any features gummiboot supports but not available on systemd-boot yet, please let us know and we will re-evaluate the situation before taking the next step. () Purge all implementation around gummiboot in OE after, say, 30 days. All gummiboot functions are still available in this period until cleaning up starts. Feel free to suggest us another time line if you need. Change in documentation could happen prior to this step. To enable systemd-boot, use the same interface for gummiboot and other EFI bootloaders: EFI_PROVIDER = "systemd-boot" We appreciate help from groups (BSP dev, QA, documentation...) in this task. Any feedback is welcome. Thanks -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH] pcsc-lite: Seperate GPLV3 portions from BSD
GPLV3 and BSD portions were originally placed in the same package.
The GPLv3 portion has been seperated into pcsc-lite-spy so the package can be
used with GPLv3 blacklisted.
Signed-off-by: Michael Davis
---
meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
index cc72549..e1d405b 100644
--- a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
+++ b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.13.bb
@@ -1,6 +1,7 @@
SUMMARY = "PC/SC Lite smart card framework and applications"
HOMEPAGE = "http://pcsclite.alioth.debian.org/";
-LICENSE = "BSD & GPLv3+"
+LICENSE = "BSD"
+LICENSE_${PN}-spy = "GPLv3+"
LICENSE_${PN}-dev = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=bcfbd85230ac3c586fb294c8b627cf32"
DEPENDS = "udev"
@@ -20,14 +21,16 @@ EXTRA_OECONF = " \
S = "${WORKDIR}/pcsc-lite-${PV}"
-PACKAGES =+ "${PN}-lib"
+PACKAGES =+ "${PN}-lib ${PN}-spy"
RRECOMMENDS_${PN} = "ccid"
-FILES_${PN}-lib = "${libdir}/lib*${SOLIBS}"
+FILES_${PN}-spy += "${bindir}/pcsc-spy \
+${libdir}/libpcscspy*${SOLIBS}"
+FILES_${PN}-lib = "${libdir}/libpcsclite*${SOLIBS}"
RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd"
SYSTEMD_SERVICE_${PN} = "pcscd.socket"
-RDEPENDS_${PN} +="python"
+RDEPENDS_${PN}-spy +="python"
--
2.5.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kernel.bbclass: add lzop dependency
On Wed, 2016-08-10 at 09:07 -0700, Khem Raj wrote: > On Aug 10, 2016 1:59 AM, "Richard Purdie" < > richard.pur...@linuxfoundation.org> wrote: > > > > On Tue, 2016-08-09 at 12:27 -0700, Khem Raj wrote: > > > > On Aug 9, 2016, at 5:08 AM, Mike Looijmans < > mike.looijm...@topic.nl > > > > > wrote: > > > > > > > > I've been adding "lzop-native" to a lot of kernel recipes > because > > > > you also need it when generating an LZO compressed kernel (I > like > > > > my boot time to be under 1 second). > > > > > > > > It's a small dependency which is hard to automatically figure > out, > > > > since there are a number of ways to trigger it (we just found > two). > > > > I would welcome this patch very much, and I don't think many > will > > > > suffer… > > > > > > From linux.inc days there is a python snippet which can do this > > > conditionally e.g. see > > > > > > > https://github.com/kraj/meta-raspberrypi/blob/master/recipes-kernel/l > > > inux/linux-rpi.inc#L121 > > > > Which is fine if you have a prebuild defconfig file however in many > > cases we don't have that :( > > > Thats right perhaps dependency could be conputed after configure task > and added to say compile task Bitbake computes the dependency trees in advance, not on the fly so its sadly not possible to change the dependency graph during a running build. I'm sure you could design such a system but its not what we have today, nor does it likely warrant the extra complexity it could involve. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kernel.bbclass: add lzop dependency
On Aug 10, 2016 1:59 AM, "Richard Purdie" < richard.pur...@linuxfoundation.org> wrote: > > On Tue, 2016-08-09 at 12:27 -0700, Khem Raj wrote: > > > On Aug 9, 2016, at 5:08 AM, Mike Looijmans > > > wrote: > > > > > > I've been adding "lzop-native" to a lot of kernel recipes because > > > you also need it when generating an LZO compressed kernel (I like > > > my boot time to be under 1 second). > > > > > > It's a small dependency which is hard to automatically figure out, > > > since there are a number of ways to trigger it (we just found two). > > > I would welcome this patch very much, and I don't think many will > > > suffer… > > > > From linux.inc days there is a python snippet which can do this > > conditionally e.g. see > > > > https://github.com/kraj/meta-raspberrypi/blob/master/recipes-kernel/l > > inux/linux-rpi.inc#L121 > > Which is fine if you have a prebuild defconfig file however in many > cases we don't have that :( > Thats right perhaps dependency could be conputed after configure task and added to say compile task > Cheers, > > Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH RESEND] kernel.bbclass: fix emit_depmod_pkgdata() workdir
bitbake commit 67a7b8b02 "build: don't use $B as the default cwd for
functions" breaks the assumption that this function is running under
${B}. This causes build failures because System.map is under ${B}.
Signed-off-by: Ioan-Adrian Ratiu
---
meta/classes/kernel.bbclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 062a0df..1a9b404 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -356,6 +356,7 @@ do_shared_workdir_setscene () {
}
emit_depmod_pkgdata() {
+ cd ${B}
# Stash data for depmod
install -d ${PKGDESTWORK}/${KERNEL_PACKAGE_NAME}-depmod/
echo "${KERNEL_VERSION}" >
${PKGDESTWORK}/${KERNEL_PACKAGE_NAME}-depmod/${KERNEL_PACKAGE_NAME}-abiversion
--
2.9.2
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] buildperf: Add support for times without decimal part
Add logic for the cases when the time retrieved does
not have decimal part.
Signed-off-by: Jose Perez Carranza
---
meta/lib/oeqa/buildperf/base.py | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/buildperf/base.py b/meta/lib/oeqa/buildperf/base.py
index 527563b..1eb21f6 100644
--- a/meta/lib/oeqa/buildperf/base.py
+++ b/meta/lib/oeqa/buildperf/base.py
@@ -244,7 +244,11 @@ class BuildPerfTest(object):
split = strtime.split(':')
hours = int(split[0]) if len(split) > 2 else 0
mins = int(split[-2])
-secs, frac = split[-1].split('.')
+try:
+secs, frac = split[-1].split('.')
+except:
+secs = split[-1]
+frac = '0'
secs = int(secs)
microsecs = int(float('0.' + frac) * pow(10, 6))
return timedelta(0, hours*3600 + mins*60 + secs, microsecs)
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe] [RFT] binutils 2.27
I'm not sure if it's caused by this binutils upgrade (because openssl in oe-core is also using version script, imported from debian) or some change in cmake/openssl, but today all recipes using cmake are failing with: | DEBUG: Executing shell function do_configure | cmake: sysroots/x86_64-linux/usr/bin/../lib/libcrypto.so.1.0.0: version `OPENSSL_1.0.0' not found (required by cmake) | cmake: sysroots/x86_64-linux/usr/bin/../lib/libssl.so.1.0.0: version `OPENSSL_1.0.1' not found (required by cmake) | cmake: sysroots/x86_64-linux/usr/bin/../lib/libssl.so.1.0.0: version `OPENSSL_1.0.0' not found (required by cmake) | WARNING: exit code 1 from a shell command. Maybe it's another symptom of missing openssl-native dependency in cmake-native (just like libidn-native issue reported here https://bugzilla.yoctoproject.org/show_bug.cgi?id=9639) - and cmake-native was originally linked against host's openssl which was built with version script and binutils-2.24 (Ubuntu-14.04), but then it's executed with libssl and libcrypto from native sysroot, where the version script didn't work: $ ldd sysroots/x86_64-linux/usr/bin/cmake sysroots/x86_64-linux/usr/bin/cmake: sysroots/x86_64-linux/usr/bin/../lib/libcrypto.so.1.0.0: version `OPENSSL_1.0.0' not found (required by sysroots/x86_64-linux/usr/bin/cmake) sysroots/x86_64-linux/usr/bin/cmake: sysroots/x86_64-linux/usr/bin/../lib/libssl.so.1.0.0: version `OPENSSL_1.0.1' not found (required by sysroots/x86_64-linux/usr/bin/cmake) sysroots/x86_64-linux/usr/bin/cmake: sysroots/x86_64-linux/usr/bin/../lib/libssl.so.1.0.0: version `OPENSSL_1.0.0' not found (required by sysroots/x86_64-linux/usr/bin/cmake) linux-vdso.so.1 => (0x7ffed2fce000) libdl.so.2 => /lib/x86_64-linux-gnu/libdl.so.2 (0x7fb631276000) libssl.so.1.0.0 => sysroots/x86_64-linux/usr/bin/../lib/libssl.so.1.0.0 (0x7fb63100c000) libcrypto.so.1.0.0 => sysroots/x86_64-linux/usr/bin/../lib/libcrypto.so.1.0.0 (0x7fb630bc1000) libstdc++.so.6 => /usr/lib/x86_64-linux-gnu/libstdc++.so.6 (0x7fb6308bd000) libm.so.6 => /lib/x86_64-linux-gnu/libm.so.6 (0x7fb6305b7000) libgcc_s.so.1 => /lib/x86_64-linux-gnu/libgcc_s.so.1 (0x7fb6303a1000) libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x7fb62ffdc000) /lib64/ld-linux-x86-64.so.2 (0x7fb63147a000) Which is sort of confirmed by removing libssl.so and libcrypto.so from native sysroot, I can execute cmake binary again. On Tue, Aug 9, 2016 at 5:24 PM, Richard Purdie < richard.pur...@linuxfoundation.org> wrote: > On Tue, 2016-08-09 at 07:42 -0700, Khem Raj wrote: > > I could also see it on ppc. backtrace, shows the segfault is in exit > > path and happens in libc > > at this point, I think the problem is how libc is compiled with > > binutils 2.27, connman itself > > is ok. > > Its the issue here: > > https://sourceware.org/ml/glibc-bugs/2015-01/msg00274.html > https://sourceware.org/bugzilla/show_bug.cgi?id=17908 > > Basically, if you remove the global _IO_stdin_used symbol, it triggers > compatibility code which crashes. > > I've confirmed that if I add that symbol to the version-script in > connman, things work again. > > Any idea how we raise the priority of this issue. There are no comments > on the bug despite it having been posted a while ago :(. > > Cheers, > > Richard > -- > ___ > Openembedded-devel mailing list > openembedded-de...@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/8] Jethro-next pull request
Please consider these changes for jethro-next. The QEMU changes are a second request. The following changes since commit 7ed60009e2bcdd2380265ca95eb5de2328825eb5: libxml2: Security fix for CVE-2016-4448 (2016-07-09 15:47:51 -0700) are available in the git repository at: git://git.yoctoproject.org/poky-contrib akuster/jethro-next http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akuster/jethro-next Armin Kuster (4): qemu: Security fix for CVE-2016-2858 qemu: Security fix for CVE-2016-4001 qemu: Security fix for CVE-2016-4020 qemu: Security fix for CVE-2016-4037 Awais Belal (1): python3: fix CROSSPYTHONPATH for cross builds Ismo Puustinen (1): libpcre: Fix CVE-2016-3191 Jackie Huang (1): python: Fix cross compiling issue Jussi Kukkonen (1): bind: CVE-2016-2088 .../bind/bind/CVE-2016-2088.patch | 247 + meta/recipes-connectivity/bind/bind_9.10.2-P4.bb | 1 + .../add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch | 31 +++ meta/recipes-devtools/python/python3_3.4.3.bb | 4 +- meta/recipes-devtools/python/python_2.7.9.bb | 1 + .../recipes-devtools/qemu/qemu/CVE-2016-2858.patch | 182 +++ .../qemu/qemu/CVE-2016-2858_pre_1.patch| 99 + .../qemu/qemu/CVE-2016-2858_pre_2.patch| 137 .../qemu/qemu/CVE-2016-2858_pre_3.patch| 165 ++ .../recipes-devtools/qemu/qemu/CVE-2016-4001.patch | 50 + .../recipes-devtools/qemu/qemu/CVE-2016-4020.patch | 38 .../recipes-devtools/qemu/qemu/CVE-2016-4037.patch | 66 ++ meta/recipes-devtools/qemu/qemu_2.4.0.bb | 7 + .../libpcre/libpcre/CVE-2016-3191.patch| 174 +++ meta/recipes-support/libpcre/libpcre_8.38.bb | 1 + 15 files changed, 1201 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-connectivity/bind/bind/CVE-2016-2088.patch create mode 100644 meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2016-2858.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2016-2858_pre_1.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2016-2858_pre_2.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2016-2858_pre_3.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2016-4001.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2016-4020.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2016-4037.patch create mode 100644 meta/recipes-support/libpcre/libpcre/CVE-2016-3191.patch -- 2.3.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-commits] [openembedded-core] 01/51: piglit: fix build failure with gold linker
On Wed, Aug 10, 2016 at 11:42:34AM +0100, Richard Purdie wrote:
> On Wed, 2016-08-10 at 11:59 +0200, Martin Jansa wrote:
> > On Wed, Aug 10, 2016 at 09:47:26AM +, g...@git.openembedded.org wr
> > ote:
> > > rpurdie pushed a commit to branch master
> > > in repository openembedded-core.
> > >
> > > commit 79005ff905f8c82a8766af5a927b9a0f8929e24f
> > > Author: Maxin B. John
> > > AuthorDate: Mon Aug 1 18:34:49 2016 +0300
> > >
> > > piglit: fix build failure with gold linker
> > >
> > > When we use gold linker while DISTRO set to "nodistro", piglit
> > > build
> > > fails with the following error:
> > >
> > > | ../../../../lib/libpiglitutil_gl.so.0: error: undefined
> > > reference to
> > > 'dlsym'
> > > | ../../../../lib/libpiglitutil_gl.so.0: error: undefined
> > > reference to
> > > 'dlerror'
> > > | ../../../../lib/libpiglitutil_gl.so.0: error: undefined
> > > reference to
> > > 'dlopen'
> > > | collect2: error: ld returned 1 exit status
> > >
> > > Fix it by providing '-ldl' to LDFLAGS.
> > >
> > > [YOCTO #9851]
> > >
> > > Signed-off-by: Maxin B. John
> > > Signed-off-by: Ross Burton
> > > ---
> > > meta/recipes-graphics/piglit/piglit_git.bb | 2 ++
> > > 1 file changed, 2 insertions(+)
> > >
> > > diff --git a/meta/recipes-graphics/piglit/piglit_git.bb
> > > b/meta/recipes-graphics/piglit/piglit_git.bb
> > > index 811f7af..df90c4d 100644
> > > --- a/meta/recipes-graphics/piglit/piglit_git.bb
> > > +++ b/meta/recipes-graphics/piglit/piglit_git.bb
> > > @@ -30,6 +30,8 @@ do_compile[dirs] =+ "${B}/temp/"
> > > PACKAGECONFIG ??= ""
> > > PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,
> > > -DPIGLIT_USE_GLUT=0,freeglut,"
> > >
> > > +LDFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is
> > > -gold', '-ldl', '', d)}"
> >
> > There was request to fix it properly in piglit code, why was this
> > version merged instead?
>
> Accidentally. It made it into mut and I'd assumed this was a v2. Sadly
> I don't keep all patch context in my head. I can revert it.
I don't blame you, it's hard to keep all patch context in head without tools to
keep it for you (gerrit) :).
It can be properly resolved in follow-up change, so I think revert isn't
necessary for now.
Thanks
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 00/10] replace xtscal with xinput-calibrator
Hi Martin, On Wed, Aug 10, 2016 at 11:58:12AM +0200, Martin Jansa wrote: > On Wed, Aug 10, 2016 at 12:30:19PM +0300, Maxin B. John wrote: > > Remove xtscal in preference of xinput-calibrator > > > > [YOCTO #9365] > > [YOCTO #8380] > > > > Changes in v2: > > 1. Removed bash dependency from xinput-calibrator > > 2. Moved tslib recipe from oe-core since modern systems tend to use > >kernel driver or libinput > > 3. removed pointercal reference from packagegroup-core-x11-base > > 4. removed tslib references from packagegroup-core-tools-testapps > > > > The following changes since commit dfc016fbf13e62f7767edaf7abadf1d1b72680b2: > > > > maintainers.inc: remove augeas (2016-08-02 14:05:58 +0100) > > It would be nice to order the changes in this series that the recipes > are removed only after the references to them to keep the history > bisect-able, e.g. xtscal, tslib and pointercal are removed while they are > still > referenced from elsewhere. Sure, I have reordered the patches and force pushed those to "maxin/xtscal" branch: New order is as below: Maxin B. John (10): xtscal: remove recipe tslib: remove recipe pointercal: remove recipe x11-common: replace xtscal with xinput-calibrator pointercal-xinput: add a dummy calibration file for qemu packagegroup-core-x11-base.bb: remove pointercal xinput-calibrator: remove bash dependency packagegroup-core-tools-testapps: remove tslib references distro_alias.inc: remove xtscal, pointercal and tslib references layer.conf: remove pointercal > > are available in the git repository at: > > > > git://git.yoctoproject.org/poky-contrib maxin/xtscal > > http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=maxin/xtscal > > > > Maxin B. John (10): > > xtscal: remove recipe > > x11-common: replace xtscal with xinput-calibrator > > pointercal-xinput: add a dummy calibration file for qemu > > packagegroup-core-x11-base.bb: remove pointercal > > xinput-calibrator: remove bash dependency > > pointercal: remove recipe > > tslib: remove recipe > > packagegroup-core-tools-testapps: remove tslib references > > distro_alias.inc: remove xtscal, pointercal and tslib references > > layer.conf: remove pointercal > > Best Regards, Maxin -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [[PATCH v3] init-install*: /etc/mtab make a link rather than a copy
Ping!
BR,
Awais
From: openembedded-core-boun...@lists.openembedded.org
[openembedded-core-boun...@lists.openembedded.org] on behalf of Belal, Awais
Sent: Monday, August 01, 2016 4:31 PM
To: openembedded-core@lists.openembedded.org
Subject: [OE-core] [[PATCH v3] init-install*: /etc/mtab make a link rather
than a copy
Using a copy would only make management of devices erroneous
and makes the system unstable in some scenarios as tools will
have to manipulate both files separately. A link ensures that
both files /proc/mounts and /etc/mtab will have the same
information at all times and this is how it is handled
on newer systems where there is such a need. Same is
suggested by busybox.
Signed-off-by: Awais Belal
---
meta/recipes-core/initrdscripts/files/init-install-efi.sh | 4 ++--
meta/recipes-core/initrdscripts/files/init-install.sh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index f564f4e..c5db2f0 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
@@ -122,8 +122,8 @@ umount ${device}* 2> /dev/null || /bin/true
mkdir -p /tmp
# Create /etc/mtab if not present
-if [ ! -e /etc/mtab ]; then
-cat /proc/mounts > /etc/mtab
+if [ ! -e /etc/mtab ] && [ -e /proc/mounts ]; then
+ln -sf /proc/mounts /etc/mtab
fi
disk_size=$(parted ${device} unit mb print | grep '^Disk .*: .*MB' | cut -d" "
-f 3 | sed -e "s/MB//")
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh
b/meta/recipes-core/initrdscripts/files/init-install.sh
index 72ce92b..bf92acb 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -118,8 +118,8 @@ if [ ! -b /dev/loop0 ] ; then
fi
mkdir -p /tmp
-if [ ! -L /etc/mtab ]; then
-cat /proc/mounts > /etc/mtab
+if [ ! -L /etc/mtab ] && [ -e /proc/mounts ]; then
+ln -sf /proc/mounts /etc/mtab
fi
disk_size=$(parted ${device} unit mb print | grep '^Disk .*: .*MB' | cut -d" "
-f 3 | sed -e "s/MB//")
--
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
Re: [OE-core] [oe-commits] [openembedded-core] 01/51: piglit: fix build failure with gold linker
On Wed, 2016-08-10 at 11:59 +0200, Martin Jansa wrote:
> On Wed, Aug 10, 2016 at 09:47:26AM +, g...@git.openembedded.org wr
> ote:
> > rpurdie pushed a commit to branch master
> > in repository openembedded-core.
> >
> > commit 79005ff905f8c82a8766af5a927b9a0f8929e24f
> > Author: Maxin B. John
> > AuthorDate: Mon Aug 1 18:34:49 2016 +0300
> >
> > piglit: fix build failure with gold linker
> >
> > When we use gold linker while DISTRO set to "nodistro", piglit
> > build
> > fails with the following error:
> >
> > | ../../../../lib/libpiglitutil_gl.so.0: error: undefined
> > reference to
> > 'dlsym'
> > | ../../../../lib/libpiglitutil_gl.so.0: error: undefined
> > reference to
> > 'dlerror'
> > | ../../../../lib/libpiglitutil_gl.so.0: error: undefined
> > reference to
> > 'dlopen'
> > | collect2: error: ld returned 1 exit status
> >
> > Fix it by providing '-ldl' to LDFLAGS.
> >
> > [YOCTO #9851]
> >
> > Signed-off-by: Maxin B. John
> > Signed-off-by: Ross Burton
> > ---
> > meta/recipes-graphics/piglit/piglit_git.bb | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/meta/recipes-graphics/piglit/piglit_git.bb
> > b/meta/recipes-graphics/piglit/piglit_git.bb
> > index 811f7af..df90c4d 100644
> > --- a/meta/recipes-graphics/piglit/piglit_git.bb
> > +++ b/meta/recipes-graphics/piglit/piglit_git.bb
> > @@ -30,6 +30,8 @@ do_compile[dirs] =+ "${B}/temp/"
> > PACKAGECONFIG ??= ""
> > PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,
> > -DPIGLIT_USE_GLUT=0,freeglut,"
> >
> > +LDFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is
> > -gold', '-ldl', '', d)}"
>
> There was request to fix it properly in piglit code, why was this
> version merged instead?
Accidentally. It made it into mut and I'd assumed this was a v2. Sadly
I don't keep all patch context in my head. I can revert it.
Cheers,
Richard
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-commits] [openembedded-core] 01/51: piglit: fix build failure with gold linker
On Wed, Aug 10, 2016 at 09:47:26AM +, g...@git.openembedded.org wrote:
> rpurdie pushed a commit to branch master
> in repository openembedded-core.
>
> commit 79005ff905f8c82a8766af5a927b9a0f8929e24f
> Author: Maxin B. John
> AuthorDate: Mon Aug 1 18:34:49 2016 +0300
>
> piglit: fix build failure with gold linker
>
> When we use gold linker while DISTRO set to "nodistro", piglit build
> fails with the following error:
>
> | ../../../../lib/libpiglitutil_gl.so.0: error: undefined reference to
> 'dlsym'
> | ../../../../lib/libpiglitutil_gl.so.0: error: undefined reference to
> 'dlerror'
> | ../../../../lib/libpiglitutil_gl.so.0: error: undefined reference to
> 'dlopen'
> | collect2: error: ld returned 1 exit status
>
> Fix it by providing '-ldl' to LDFLAGS.
>
> [YOCTO #9851]
>
> Signed-off-by: Maxin B. John
> Signed-off-by: Ross Burton
> ---
> meta/recipes-graphics/piglit/piglit_git.bb | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/meta/recipes-graphics/piglit/piglit_git.bb
> b/meta/recipes-graphics/piglit/piglit_git.bb
> index 811f7af..df90c4d 100644
> --- a/meta/recipes-graphics/piglit/piglit_git.bb
> +++ b/meta/recipes-graphics/piglit/piglit_git.bb
> @@ -30,6 +30,8 @@ do_compile[dirs] =+ "${B}/temp/"
> PACKAGECONFIG ??= ""
> PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut,"
>
> +LDFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold',
> '-ldl', '', d)}"
There was request to fix it properly in piglit code, why was this
version merged instead?
> +
> do_configure_prepend() {
> if [ "${@bb.utils.contains('PACKAGECONFIG', 'freeglut', 'yes', 'no', d)}"
> = "no" ]; then
> sed -i -e "/^#.*include $/d"
> ${S}/src/piglit/glut_wrap.h
>
> --
> To stop receiving notification emails like this one, please contact
> the administrator of this repository.
> --
> ___
> Openembedded-commits mailing list
> openembedded-comm...@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-commits
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 00/10] replace xtscal with xinput-calibrator
On Wed, Aug 10, 2016 at 12:30:19PM +0300, Maxin B. John wrote: > Remove xtscal in preference of xinput-calibrator > > [YOCTO #9365] > [YOCTO #8380] > > Changes in v2: > 1. Removed bash dependency from xinput-calibrator > 2. Moved tslib recipe from oe-core since modern systems tend to use >kernel driver or libinput > 3. removed pointercal reference from packagegroup-core-x11-base > 4. removed tslib references from packagegroup-core-tools-testapps > > The following changes since commit dfc016fbf13e62f7767edaf7abadf1d1b72680b2: > > maintainers.inc: remove augeas (2016-08-02 14:05:58 +0100) It would be nice to order the changes in this series that the recipes are removed only after the references to them to keep the history bisect-able, e.g. xtscal, tslib and pointercal are removed while they are still referenced from elsewhere. > are available in the git repository at: > > git://git.yoctoproject.org/poky-contrib maxin/xtscal > http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=maxin/xtscal > > Maxin B. John (10): > xtscal: remove recipe > x11-common: replace xtscal with xinput-calibrator > pointercal-xinput: add a dummy calibration file for qemu > packagegroup-core-x11-base.bb: remove pointercal > xinput-calibrator: remove bash dependency > pointercal: remove recipe > tslib: remove recipe > packagegroup-core-tools-testapps: remove tslib references > distro_alias.inc: remove xtscal, pointercal and tslib references > layer.conf: remove pointercal > > meta/conf/distro/include/distro_alias.inc | 3 - > meta/conf/layer.conf | 1 - > meta/recipes-bsp/pointercal/pointercal/COPYING | 2 - > meta/recipes-bsp/pointercal/pointercal/pointercal | 0 > .../pointercal/pointercal/qemuarm/pointercal | 1 - > .../pointercal/pointercal/qemuarmv6/pointercal | 1 - > .../pointercal/pointercal/qemuarmv7/pointercal | 1 - > .../pointercal/pointercal/qemumips/pointercal | 1 - > .../pointercal/pointercal/qemuppc/pointercal | Bin 36 -> 0 bytes > .../pointercal/pointercal/qemux86-64/pointercal| 1 - > .../pointercal/pointercal/qemux86/pointercal | 1 - > meta/recipes-bsp/pointercal/pointercal_0.0.bb | 22 - > .../packagegroup-core-tools-testapps.bb| 2 - > .../packagegroups/packagegroup-core-x11-base.bb| 1 - > meta/recipes-graphics/tslib/tslib/ts.conf | 25 - > meta/recipes-graphics/tslib/tslib/tslib.sh | 8 - > meta/recipes-graphics/tslib/tslib_1.1.bb | 53 -- > meta/recipes-graphics/x11-common/x11-common_0.1.bb | 2 +- > .../pointercal-xinput/qemuall/pointercal.xinput| 2 + > .../add-geometry-input-when-calibrating.patch | 31 +- > .../xinput-calibrator/xinput-calibrator_git.bb | 2 +- > .../xtscal/xtscal/30xTs_Calibrate.sh | 13 - > .../xtscal/xtscal/change-cross.patch | 18 - > meta/recipes-graphics/xtscal/xtscal/cleanup.patch | 621 > - > .../xtscal/dso_linking_change_build_fix.patch | 27 - > meta/recipes-graphics/xtscal/xtscal_0.6.3.bb | 33 -- > 26 files changed, 20 insertions(+), 852 deletions(-) > delete mode 100644 meta/recipes-bsp/pointercal/pointercal/COPYING > delete mode 100644 meta/recipes-bsp/pointercal/pointercal/pointercal > delete mode 100644 meta/recipes-bsp/pointercal/pointercal/qemuarm/pointercal > delete mode 100644 > meta/recipes-bsp/pointercal/pointercal/qemuarmv6/pointercal > delete mode 100644 > meta/recipes-bsp/pointercal/pointercal/qemuarmv7/pointercal > delete mode 100644 meta/recipes-bsp/pointercal/pointercal/qemumips/pointercal > delete mode 100644 meta/recipes-bsp/pointercal/pointercal/qemuppc/pointercal > delete mode 100644 > meta/recipes-bsp/pointercal/pointercal/qemux86-64/pointercal > delete mode 100644 meta/recipes-bsp/pointercal/pointercal/qemux86/pointercal > delete mode 100644 meta/recipes-bsp/pointercal/pointercal_0.0.bb > delete mode 100644 meta/recipes-graphics/tslib/tslib/ts.conf > delete mode 100644 meta/recipes-graphics/tslib/tslib/tslib.sh > delete mode 100644 meta/recipes-graphics/tslib/tslib_1.1.bb > create mode 100644 > meta/recipes-graphics/xinput-calibrator/pointercal-xinput/qemuall/pointercal.xinput > delete mode 100644 meta/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh > delete mode 100644 meta/recipes-graphics/xtscal/xtscal/change-cross.patch > delete mode 100644 meta/recipes-graphics/xtscal/xtscal/cleanup.patch > delete mode 100644 > meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch > delete mode 100644 meta/recipes-graphics/xtscal/xtscal_0.6.3.bb > > -- > 2.4.0 > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature
[OE-core] [PATCH] systemd: fix typo in avoid-using-system-auth.patch
The patch 0015-systemd-user-avoid-using-system-auth.patch makes PAM session for systemd-user include common-account file which doesn't contain any session related lines and that breaks launching "systemd --user" with the error: Jul 29 13:03:24 intel-corei7-64 systemd[691]: user@0.service: Failed at step PAM spawning /lib/systemd/systemd: Operation not permitted This change fixes the patch by including common-session file instead. Signed-off-by: Dmitry Rozhkov --- .../systemd/systemd/0015-systemd-user-avoid-using-system-auth.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd/0015-systemd-user-avoid-using-system-auth.patch b/meta/recipes-core/systemd/systemd/0015-systemd-user-avoid-using-system-auth.patch index f7a5b19..6e6f344 100644 --- a/meta/recipes-core/systemd/systemd/0015-systemd-user-avoid-using-system-auth.patch +++ b/meta/recipes-core/systemd/systemd/0015-systemd-user-avoid-using-system-auth.patch @@ -29,7 +29,7 @@ index f188a8e..862d8d7 100644 )m4_dnl session required pam_loginuid.so -session include system-auth -+session include common-account ++session include common-session -- 2.8.3 -- 2.5.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/10] layer.conf: remove pointercal
remove pointercal reference from layer.conf file since we moved the pointercal recipe from oe-core. Signed-off-by: Maxin B. John --- meta/conf/layer.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index b6d5f1c..24b4df0 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -26,7 +26,6 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \ connman-conf \ formfactor \ xserver-xf86-config \ - pointercal \ pointercal-xinput \ base-files \ keymaps \ -- 2.4.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 07/10] tslib: remove recipe
Modern systems generally use the kernel driver or libinput instead
of tslib. Move tslib from oe-core along with xtscal.
Signed-off-by: Maxin B. John
---
meta/recipes-graphics/tslib/tslib/ts.conf | 25 --
meta/recipes-graphics/tslib/tslib/tslib.sh | 8 -
meta/recipes-graphics/tslib/tslib_1.1.bb | 53 --
3 files changed, 86 deletions(-)
delete mode 100644 meta/recipes-graphics/tslib/tslib/ts.conf
delete mode 100644 meta/recipes-graphics/tslib/tslib/tslib.sh
delete mode 100644 meta/recipes-graphics/tslib/tslib_1.1.bb
diff --git a/meta/recipes-graphics/tslib/tslib/ts.conf
b/meta/recipes-graphics/tslib/tslib/ts.conf
deleted file mode 100644
index 1b0da93..000
--- a/meta/recipes-graphics/tslib/tslib/ts.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# Uncomment if you wish to use the linux input layer event interface
-module_raw input
-
-# Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d
-# module_raw collie
-
-# Uncomment if you're using a Sharp Zaurus SL-C700/C750/C760/C860
-# module_raw corgi
-
-# Uncomment if you're using a device with a UCB1200/1300/1400 TS interface
-# module_raw ucb1x00
-
-# Uncomment if you're using an HP iPaq h3600 or similar
-# module_raw h3600
-
-# Uncomment if you're using a Hitachi Webpad
-# module_raw mk712
-
-# Uncomment if you're using an IBM Arctic II
-# module_raw arctic2
-
-module pthres pmin=1
-module variance delta=30
-module dejitter delta=100
-module linear
diff --git a/meta/recipes-graphics/tslib/tslib/tslib.sh
b/meta/recipes-graphics/tslib/tslib/tslib.sh
deleted file mode 100644
index 7068e8d..000
--- a/meta/recipes-graphics/tslib/tslib/tslib.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if [ -e /dev/input/touchscreen0 ]; then
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-
-export TSLIB_TSDEVICE
-fi
-
diff --git a/meta/recipes-graphics/tslib/tslib_1.1.bb
b/meta/recipes-graphics/tslib/tslib_1.1.bb
deleted file mode 100644
index b0264c3..000
--- a/meta/recipes-graphics/tslib/tslib_1.1.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-SUMMARY = "An abstraction layer for touchscreen panel events"
-DESCRIPTION = "Tslib is an abstraction layer for touchscreen panel \
-events, as well as a filter stack for the manipulation of those events. \
-Tslib is generally used on embedded devices to provide a common user \
-space interface to touchscreen functionality."
-HOMEPAGE = "http://tslib.berlios.de/";
-
-AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
-SECTION = "base"
-LICENSE = "LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a"
-
-SRC_URI =
"https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}.tar.xz;downloadfilename=tslib-${PV}.tar.xz
\
- file://ts.conf \
- file://tslib.sh \
-"
-
-SRC_URI[md5sum] = "14771f8607b341bb4b297819d37e837d"
-SRC_URI[sha256sum] =
"fe35e5f710ea933b118f710e2ce4403ac076fe69926b570333867d4de082a51c"
-
-UPSTREAM_CHECK_URI = "https://github.com/kergoth/tslib/releases";
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--enable-shared --disable-h3600 --enable-input --disable-corgi
--disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00"
-
-do_install_prepend() {
- install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf
-}
-
-do_install_append() {
- install -d ${D}${sysconfdir}/profile.d/
- install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
-}
-
-# People should consider using udev's /dev/input/touchscreen0 symlink
-# instead of detect-stylus
-#RDEPENDS_tslib-conf_weird-machine = "detect-stylus"
-RPROVIDES_tslib-conf = "libts-0.0-conf"
-
-PACKAGES =+ "tslib-conf tslib-tests tslib-calibrate"
-DEBIAN_NOAUTONAME_tslib-conf = "1"
-DEBIAN_NOAUTONAME_tslib-tests = "1"
-DEBIAN_NOAUTONAME_tslib-calibrate = "1"
-
-RDEPENDS_${PN} = "tslib-conf"
-RRECOMMENDS_${PN} = "pointercal"
-
-FILES_${PN}-dev += "${libdir}/ts/*.la"
-FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh
${datadir}/tslib"
-FILES_${PN} = "${libdir}/*.so.* ${libdir}/ts/*.so*"
-FILES_tslib-calibrate += "${bindir}/ts_calibrate"
-FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print
${bindir}/ts_print_raw ${bindir}/ts_test"
--
2.4.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 09/10] distro_alias.inc: remove xtscal, pointercal and tslib references
Remove xtscal, pointercal and tslib reference from distro_alias.inc file since we moved those recipes from oe-core Signed-off-by: Maxin B. John --- meta/conf/distro/include/distro_alias.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index 5948b75..9e00ae6 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc @@ -311,7 +311,6 @@ DISTRO_PN_ALIAS_pn-patchelf = "Opensuse=patchelf Fedora=patchelf" DISTRO_PN_ALIAS_pn-perf = "OSPDT" DISTRO_PN_ALIAS_pn-piglit = "OE-Core" DISTRO_PN_ALIAS_pn-pkgconfig = "Ubuntu=pkg-config Fedora=pkgconfig" -DISTRO_PN_ALIAS_pn-pointercal = "OE-Core" DISTRO_PN_ALIAS_pn-pointercal-xinput = "OE-Core" DISTRO_PN_ALIAS_pn-pong-clock = "OpenedHand" DISTRO_PN_ALIAS_pn-portmap = "Debian=rpcbind Fedora=rpcbind" @@ -379,7 +378,6 @@ DISTRO_PN_ALIAS_pn-texinfo-dummy-native = "OE-Core" DISTRO_PN_ALIAS_pn-tiny-init = "OSPDT" DISTRO_PN_ALIAS_pn-trace-cmd = "Mandriva=trace-cmd Ubuntu=trace-cmd" DISTRO_PN_ALIAS_pn-tremor = "OSPDT upstream=http://www.xiph.org/vorbis/"; -DISTRO_PN_ALIAS_pn-tslib = "Debian=tslib Ubuntu=tslib" DISTRO_PN_ALIAS_pn-ttf-bitstream-vera = "Debian=ttf-bitstream-vera Ubuntu=ttf-bitstream-vera" DISTRO_PN_ALIAS_pn-tzcode = "OSPDT" DISTRO_PN_ALIAS_pn-u-boot-fw-utils = "Ubuntu=u-boot-tools Debian=u-boot-tools" @@ -448,7 +446,6 @@ DISTRO_PN_ALIAS_pn-xserver-xf86-dri-lite = "Fedora=xorg-x11-server Ubuntu=xserve DISTRO_PN_ALIAS_pn-xserver-xf86-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg" DISTRO_PN_ALIAS_pn-xserver-xorg = "Fedora=xorg-x11-server Ubuntu=xserver-xorg" DISTRO_PN_ALIAS_pn-xset = "Fedora=xorg-x11-server-utils Ubuntu=x11-xserver-utils Debian=x11-xserver-utils Opensuse=xorg-x11" -DISTRO_PN_ALIAS_pn-xtscal = "OSPDT upstream=http://gpe.linuxtogo.org/download/source/"; DISTRO_PN_ALIAS_pn-xuser-account = "OE-Core" DISTRO_PN_ALIAS_pn-xvideo-tests = "OpenedHand" DISTRO_PN_ALIAS_pn-xvinfo = "Fedora=xorg-x11-utils Ubuntu=x11-utils" -- 2.4.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/10] packagegroup-core-tools-testapps: remove tslib references
Remove tslib references from packagegroup-core-tools-testapps since
we removed tslib along with xtscal.
Signed-off-by: Maxin B. John
---
meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb | 2 --
1 file changed, 2 deletions(-)
diff --git
a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
index e2d93d2..3170978 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
@@ -35,8 +35,6 @@ X11TOOLS = "\
RDEPENDS_${PN} = "\
blktool \
-tslib-calibrate \
-tslib-tests \
lrzsz \
${KEXECTOOLS} \
alsa-utils-amixer \
--
2.4.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/10] packagegroup-core-x11-base.bb: remove pointercal
Remove pointercal from packagegroup-core-x11-base since we removed
xtscal in favour of xinput-calibrator
Signed-off-by: Maxin B. John
---
meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
index db3dfe3..7ea72d5 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
@@ -10,7 +10,6 @@ RDEPENDS_${PN} = "\
packagegroup-core-x11-xserver \
packagegroup-core-x11-utils \
dbus \
-pointercal \
matchbox-terminal \
matchbox-wm \
mini-x-session \
--
2.4.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 05/10] xinput-calibrator: remove bash dependency
Refresh add-geometry-input-when-calibrating.patch to remove
bashism from it.
Signed-off-by: Maxin B. John
---
.../add-geometry-input-when-calibrating.patch | 31 +++---
.../xinput-calibrator/xinput-calibrator_git.bb | 2 +-
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git
a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch
b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch
index 9351331..9dc94ae 100644
---
a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch
+++
b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch
@@ -1,33 +1,34 @@
-Upstream-Status: Inappropriate [no longer maintained]
-
-From 93abf28d602da637376b78de8c88b7ab5cf13b4f Mon Sep 17 00:00:00 2001
-From: Jonathan David
-Date: Mon, 30 Nov 2015 12:12:20 -0600
+From 1cb83759632bb218559c4d0d65ff79f868c03dc5 Mon Sep 17 00:00:00 2001
+From: "Maxin B. John"
+Date: Tue, 9 Aug 2016 17:03:31 +0300
Subject: [PATCH] add geometry input when calibrating
Send monitor geometry to xinput_calibrator when running the script
+Update:
+Remove bashism
+
+Upstream-Status: Inappropriate [no longer maintained]
Signed-off-by: Jonathan David
+Signed-off-by: Maxin B. John
---
- scripts/xinput_calibrator_pointercal.sh | 5 -
- 1 file changed, 4 insertions(+), 1 deletion(-)
+ scripts/xinput_calibrator_pointercal.sh | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/xinput_calibrator_pointercal.sh
b/scripts/xinput_calibrator_pointercal.sh
-index 0ada7da..6a3aded 100755
+index fccb197..fea7c2f 100755
--- a/scripts/xinput_calibrator_pointercal.sh
+++ b/scripts/xinput_calibrator_pointercal.sh
-@@ -37,7 +37,10 @@ done
-
- [ "$USER" != "root" ] && CALFILE=$USER_CALFILE
+@@ -24,7 +24,8 @@ if [ -e $CALFILE ] ; then
+ fi
+ fi
-CALDATA=`$BINARY --output-type xinput -v | tee $LOGFILE | grep 'xinput
set' | sed 's/^//g; s/$/;/g'`
-+read RESOLUTION <<< $(xrandr | awk -F '[[:space:]+]' '/ connected/ \
-+ { if ($3 != "primary") print $3; if ($3 == "primary") print $4 }')
-+
++RESOLUTION=$(xrandr | awk -F '[[:space:]+]' '/ connected/ { if ($3 !=
"primary") print $3; if ($3 == "primary") print $4 }')
+CALDATA=`$BINARY --geometry $RESOLUTION --output-type xinput -v | tee
$LOGFILE | grep 'xinput set' | sed 's/^//g; s/$/;/g'`
if [ ! -z "$CALDATA" ] ; then
echo $CALDATA > $CALFILE
echo "Calibration data stored in $CALFILE (log in $LOGFILE)"
--
-1.9.1
+2.4.0
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
index 98ce7ee..57c3a7a 100644
--- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
+++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
@@ -34,5 +34,5 @@ do_install_append() {
}
FILES_${PN} += "${sysconfdir}/xdg/autostart"
-RDEPENDS_${PN} = "xinput formfactor xrandr bash"
+RDEPENDS_${PN} = "xinput formfactor xrandr"
RRECOMMENDS_${PN} = "pointercal-xinput"
--
2.4.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 01/10] xtscal: remove recipe
Remove xtscal in preference of xinput-calibrator
[YOCTO #9365]
Signed-off-by: Maxin B. John
---
.../xtscal/xtscal/30xTs_Calibrate.sh | 13 -
.../xtscal/xtscal/change-cross.patch | 18 -
meta/recipes-graphics/xtscal/xtscal/cleanup.patch | 621 -
.../xtscal/dso_linking_change_build_fix.patch | 27 -
meta/recipes-graphics/xtscal/xtscal_0.6.3.bb | 33 --
5 files changed, 712 deletions(-)
delete mode 100644 meta/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh
delete mode 100644 meta/recipes-graphics/xtscal/xtscal/change-cross.patch
delete mode 100644 meta/recipes-graphics/xtscal/xtscal/cleanup.patch
delete mode 100644
meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch
delete mode 100644 meta/recipes-graphics/xtscal/xtscal_0.6.3.bb
diff --git a/meta/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh
b/meta/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh
deleted file mode 100644
index fa43617..000
--- a/meta/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-. /etc/formfactor/config
-
-if [ "$HAVE_TOUCHSCREEN" = "1" ]; then
- n=1
- while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ] && [ $n -le
5 ]
- do
- /usr/bin/xtscal
- sleep 1
- n=$(($n+1))
- done
-fi
diff --git a/meta/recipes-graphics/xtscal/xtscal/change-cross.patch
b/meta/recipes-graphics/xtscal/xtscal/change-cross.patch
deleted file mode 100644
index 1da7717..000
--- a/meta/recipes-graphics/xtscal/xtscal/change-cross.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Upstream-Status: Pending
-
tmp/main.c.orig2007-01-02 15:39:54.0 +
-+++ tmp/main.c 2007-01-02 15:39:54.0 +
-@@ -131,9 +131,10 @@
- {
- XRenderFillRectangles (dpy, PictOpSrc, pict, &rect_color, rectangles, 2);
-
-- XFillArc (dpy, crosshair_w, crosshair_gc, (CROSSHAIR_SIZE / 2) - (WIDTH /
2) - 1,
-- (CROSSHAIR_SIZE / 2) - (WIDTH / 2) - 1,
-- WIDTH + 1, WIDTH + 1, 0, 360 * 64);
-+ XFillRectangle (dpy, crosshair_w, crosshair_gc,
-+(CROSSHAIR_SIZE / 2) - (WIDTH / 2),
-+(CROSSHAIR_SIZE / 2) - (WIDTH / 2),
-+WIDTH, WIDTH);
- }
-
- void
diff --git a/meta/recipes-graphics/xtscal/xtscal/cleanup.patch
b/meta/recipes-graphics/xtscal/xtscal/cleanup.patch
deleted file mode 100644
index f7b0854..000
--- a/meta/recipes-graphics/xtscal/xtscal/cleanup.patch
+++ /dev/null
@@ -1,621 +0,0 @@
- Makefile.am |9 --
- configure.ac |3
- gpe-dist.am | 12 ---
- h3600_ts.h | 216
---
- main.c | 210 ++---
- xtscal.in| 19 -
- 6 files changed, 14 insertions(+), 455 deletions(-)
-
-Upstream-Status: Pending
-
-Index: xtscal-0.6.3/xtscal.in
-===
xtscal-0.6.3.orig/xtscal.in2004-09-10 20:10:36.0 +0100
-+++ /dev/null 1970-01-01 00:00:00.0 +
-@@ -1,19 +0,0 @@
--#!/bin/sh
--
--module_id() {
--# Get model name
--echo `grep "^Hardware" /proc/cpuinfo | sed -e "s/.*: *//" | tr a-z A-Z`
--}
--
--case `module_id` in
-- "HP IPAQ H3100" | "HP IPAQ H3800" )
-- ARGS="-rotate 90" ;;
-- "HP IPAQ H3600" | "HP IPAQ H3700" | "HP IPAQ H3900" | *COLLIE | *POODLE)
-- ARGS="-rotate 270" ;;
-- # H2200: works without rotation
--esac
--
--# the things we do for autoconf
--prefix=@prefix@
--exec_prefix=@exec_prefix@
--exec @libexecdir@/xtscal.bin $ARGS $*
-Index: xtscal-0.6.3/main.c
-===
xtscal-0.6.3.orig/main.c 2007-07-01 01:12:52.0 +0100
-+++ xtscal-0.6.3/main.c2007-07-01 01:12:55.0 +0100
-@@ -22,12 +22,10 @@
- #include
-
- #include
--#include
- #include
- #include
- #include
-
--#include "h3600_ts.h"
- #include "calibrate.h"
-
- Display *dpy;
-@@ -45,15 +43,11 @@ XftColor xftcol;
- XftDraw *xftdraw;
- XftFont *xftfont;
- int screen_x, screen_y;
--int ts_fd;
- int samples;
- Pixmap bg_pixmap;
- int flag_debug;
--int rotation = 0;
- int error_base, event_base;
-
--int using_xcalibrate;
--
- int moving;
-
- #define CROSSHAIR_SIZE25
-@@ -63,7 +57,6 @@ int moving;
- #define ENOUGH 5
- #define MAX_SAMPLES 40
-
--#define RAW_DEVICE "/dev/h3600_tsraw"
- #define FONTNAME "sans-10"
-
- struct point
-@@ -287,12 +280,8 @@ sort_by_y (const void* a, const void *b)
- void
- set_calibration (calibration *cal)
- {
-- TS_CAL tc;
-- int xtrans, ytrans, xscale, yscale, xyscale, yxscale;
- calibration ocal = *cal;
-
-- if (using_xcalibrate)
--{
- FILE *fp;
- if (flag_debug)
- printf ("constants are: %d %d %d %d %d %d %d\n", cal->a[1], cal->a[2],
cal->a[0], cal->a[4], cal->a[5], cal->a[3], cal->a[6]);
-@@ -304,29 +293,6 @@ set_calibration (
[OE-core] [PATCH 06/10] pointercal: remove recipe
Remove pointercal recipe along with xtscal since we replace it with
xinput-calibrator
[YOCTO #9365]
Signed-off-by: Maxin B. John
---
meta/recipes-bsp/pointercal/pointercal/COPYING | 2 --
meta/recipes-bsp/pointercal/pointercal/pointercal | 0
.../pointercal/pointercal/qemuarm/pointercal | 1 -
.../pointercal/pointercal/qemuarmv6/pointercal | 1 -
.../pointercal/pointercal/qemuarmv7/pointercal | 1 -
.../pointercal/pointercal/qemumips/pointercal | 1 -
.../pointercal/pointercal/qemuppc/pointercal | Bin 36 -> 0 bytes
.../pointercal/pointercal/qemux86-64/pointercal| 1 -
.../pointercal/pointercal/qemux86/pointercal | 1 -
meta/recipes-bsp/pointercal/pointercal_0.0.bb | 22 -
10 files changed, 30 deletions(-)
delete mode 100644 meta/recipes-bsp/pointercal/pointercal/COPYING
delete mode 100644 meta/recipes-bsp/pointercal/pointercal/pointercal
delete mode 100644 meta/recipes-bsp/pointercal/pointercal/qemuarm/pointercal
delete mode 100644 meta/recipes-bsp/pointercal/pointercal/qemuarmv6/pointercal
delete mode 100644 meta/recipes-bsp/pointercal/pointercal/qemuarmv7/pointercal
delete mode 100644 meta/recipes-bsp/pointercal/pointercal/qemumips/pointercal
delete mode 100644 meta/recipes-bsp/pointercal/pointercal/qemuppc/pointercal
delete mode 100644 meta/recipes-bsp/pointercal/pointercal/qemux86-64/pointercal
delete mode 100644 meta/recipes-bsp/pointercal/pointercal/qemux86/pointercal
delete mode 100644 meta/recipes-bsp/pointercal/pointercal_0.0.bb
diff --git a/meta/recipes-bsp/pointercal/pointercal/COPYING
b/meta/recipes-bsp/pointercal/pointercal/COPYING
deleted file mode 100644
index 63f5293..000
--- a/meta/recipes-bsp/pointercal/pointercal/COPYING
+++ /dev/null
@@ -1,2 +0,0 @@
-This is a blank COPYING file, and should be filled in by original author in
future.
-
diff --git a/meta/recipes-bsp/pointercal/pointercal/pointercal
b/meta/recipes-bsp/pointercal/pointercal/pointercal
deleted file mode 100644
index e69de29..000
diff --git a/meta/recipes-bsp/pointercal/pointercal/qemuarm/pointercal
b/meta/recipes-bsp/pointercal/pointercal/qemuarm/pointercal
deleted file mode 100644
index abd84ca..000
--- a/meta/recipes-bsp/pointercal/pointercal/qemuarm/pointercal
+++ /dev/null
@@ -1 +0,0 @@
-8313 4 -8526 7 8334 -82604 65536
diff --git a/meta/recipes-bsp/pointercal/pointercal/qemuarmv6/pointercal
b/meta/recipes-bsp/pointercal/pointercal/qemuarmv6/pointercal
deleted file mode 100644
index abd84ca..000
--- a/meta/recipes-bsp/pointercal/pointercal/qemuarmv6/pointercal
+++ /dev/null
@@ -1 +0,0 @@
-8313 4 -8526 7 8334 -82604 65536
diff --git a/meta/recipes-bsp/pointercal/pointercal/qemuarmv7/pointercal
b/meta/recipes-bsp/pointercal/pointercal/qemuarmv7/pointercal
deleted file mode 100644
index abd84ca..000
--- a/meta/recipes-bsp/pointercal/pointercal/qemuarmv7/pointercal
+++ /dev/null
@@ -1 +0,0 @@
-8313 4 -8526 7 8334 -82604 65536
diff --git a/meta/recipes-bsp/pointercal/pointercal/qemumips/pointercal
b/meta/recipes-bsp/pointercal/pointercal/qemumips/pointercal
deleted file mode 100644
index abd84ca..000
--- a/meta/recipes-bsp/pointercal/pointercal/qemumips/pointercal
+++ /dev/null
@@ -1 +0,0 @@
-8313 4 -8526 7 8334 -82604 65536
diff --git a/meta/recipes-bsp/pointercal/pointercal/qemuppc/pointercal
b/meta/recipes-bsp/pointercal/pointercal/qemuppc/pointercal
deleted file mode 100644
index
c2d6e37bf0c0d956ba17ba9955613c4cee5a147a..
GIT binary patch
literal 0
HcmV?d1
literal 36
mcmXpsFt#*Q&;=n=3lPgl!O+0i%uK=9!qiZ~%+%D_i~#_8+XjmO
diff --git a/meta/recipes-bsp/pointercal/pointercal/qemux86-64/pointercal
b/meta/recipes-bsp/pointercal/pointercal/qemux86-64/pointercal
deleted file mode 100644
index 640053d..000
--- a/meta/recipes-bsp/pointercal/pointercal/qemux86-64/pointercal
+++ /dev/null
@@ -1 +0,0 @@
-1280 0 1002 0 960 328 65536
diff --git a/meta/recipes-bsp/pointercal/pointercal/qemux86/pointercal
b/meta/recipes-bsp/pointercal/pointercal/qemux86/pointercal
deleted file mode 100644
index 640053d..000
--- a/meta/recipes-bsp/pointercal/pointercal/qemux86/pointercal
+++ /dev/null
@@ -1 +0,0 @@
-1280 0 1002 0 960 328 65536
diff --git a/meta/recipes-bsp/pointercal/pointercal_0.0.bb
b/meta/recipes-bsp/pointercal/pointercal_0.0.bb
deleted file mode 100644
index df735a5..000
--- a/meta/recipes-bsp/pointercal/pointercal_0.0.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "Touchscreen calibration data"
-SECTION = "base"
-PR = "r11"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4b5fcfc87fb615860d398b5e38685edf"
-
-SRC_URI = "file://pointercal \
- file://COPYING"
-
-S = "${WORKDIR}"
-
-do_install() {
- # Only install file if it has a contents
- if [ -s ${S}/pointercal ]; then
- install -d ${D}${sysconfdir}/
- install -m 0644 ${S}/pointercal ${D}${sysconfdir}/
- fi
-}
-
-ALLOW_EMPTY_${PN} = "1"
[OE-core] [PATCH 03/10] pointercal-xinput: add a dummy calibration file for qemu
In qemu, the emulated PS/2 mouse reports itself as an "absolute coordinate" device and that makes xinput_calibrator think it could be calibrated. Add a dummy calibration file as a work around to prevent xinput_calibrator from popping up on every boot in qemu. [YOCTO #8380] Signed-off-by: Maxin B. John Signed-off-by: Jussi Kukkonen --- .../xinput-calibrator/pointercal-xinput/qemuall/pointercal.xinput | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/qemuall/pointercal.xinput diff --git a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/qemuall/pointercal.xinput b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/qemuall/pointercal.xinput new file mode 100644 index 000..a816d6d --- /dev/null +++ b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/qemuall/pointercal.xinput @@ -0,0 +1,2 @@ +# Dummy pointercal.xinput file to prevent xinput_calibrator +# from running on qemu startup -- 2.4.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/10] x11-common: replace xtscal with xinput-calibrator
Replace xtscal with xinput-calibrator as part of removing xtscal.
[YOCTO #9365]
Signed-off-by: Maxin B. John
---
meta/recipes-graphics/x11-common/x11-common_0.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/x11-common/x11-common_0.1.bb
b/meta/recipes-graphics/x11-common/x11-common_0.1.bb
index 6d7c347..2bc0d33 100644
--- a/meta/recipes-graphics/x11-common/x11-common_0.1.bb
+++ b/meta/recipes-graphics/x11-common/x11-common_0.1.bb
@@ -26,5 +26,5 @@ do_install() {
chmod -R 755 ${D}${sysconfdir}
}
-RDEPENDS_${PN} = "dbus-x11 xmodmap xdpyinfo xtscal xinit formfactor"
+RDEPENDS_${PN} = "dbus-x11 xmodmap xdpyinfo xinput-calibrator xinit formfactor"
--
2.4.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 00/10] replace xtscal with xinput-calibrator
Remove xtscal in preference of xinput-calibrator [YOCTO #9365] [YOCTO #8380] Changes in v2: 1. Removed bash dependency from xinput-calibrator 2. Moved tslib recipe from oe-core since modern systems tend to use kernel driver or libinput 3. removed pointercal reference from packagegroup-core-x11-base 4. removed tslib references from packagegroup-core-tools-testapps The following changes since commit dfc016fbf13e62f7767edaf7abadf1d1b72680b2: maintainers.inc: remove augeas (2016-08-02 14:05:58 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib maxin/xtscal http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=maxin/xtscal Maxin B. John (10): xtscal: remove recipe x11-common: replace xtscal with xinput-calibrator pointercal-xinput: add a dummy calibration file for qemu packagegroup-core-x11-base.bb: remove pointercal xinput-calibrator: remove bash dependency pointercal: remove recipe tslib: remove recipe packagegroup-core-tools-testapps: remove tslib references distro_alias.inc: remove xtscal, pointercal and tslib references layer.conf: remove pointercal meta/conf/distro/include/distro_alias.inc | 3 - meta/conf/layer.conf | 1 - meta/recipes-bsp/pointercal/pointercal/COPYING | 2 - meta/recipes-bsp/pointercal/pointercal/pointercal | 0 .../pointercal/pointercal/qemuarm/pointercal | 1 - .../pointercal/pointercal/qemuarmv6/pointercal | 1 - .../pointercal/pointercal/qemuarmv7/pointercal | 1 - .../pointercal/pointercal/qemumips/pointercal | 1 - .../pointercal/pointercal/qemuppc/pointercal | Bin 36 -> 0 bytes .../pointercal/pointercal/qemux86-64/pointercal| 1 - .../pointercal/pointercal/qemux86/pointercal | 1 - meta/recipes-bsp/pointercal/pointercal_0.0.bb | 22 - .../packagegroup-core-tools-testapps.bb| 2 - .../packagegroups/packagegroup-core-x11-base.bb| 1 - meta/recipes-graphics/tslib/tslib/ts.conf | 25 - meta/recipes-graphics/tslib/tslib/tslib.sh | 8 - meta/recipes-graphics/tslib/tslib_1.1.bb | 53 -- meta/recipes-graphics/x11-common/x11-common_0.1.bb | 2 +- .../pointercal-xinput/qemuall/pointercal.xinput| 2 + .../add-geometry-input-when-calibrating.patch | 31 +- .../xinput-calibrator/xinput-calibrator_git.bb | 2 +- .../xtscal/xtscal/30xTs_Calibrate.sh | 13 - .../xtscal/xtscal/change-cross.patch | 18 - meta/recipes-graphics/xtscal/xtscal/cleanup.patch | 621 - .../xtscal/dso_linking_change_build_fix.patch | 27 - meta/recipes-graphics/xtscal/xtscal_0.6.3.bb | 33 -- 26 files changed, 20 insertions(+), 852 deletions(-) delete mode 100644 meta/recipes-bsp/pointercal/pointercal/COPYING delete mode 100644 meta/recipes-bsp/pointercal/pointercal/pointercal delete mode 100644 meta/recipes-bsp/pointercal/pointercal/qemuarm/pointercal delete mode 100644 meta/recipes-bsp/pointercal/pointercal/qemuarmv6/pointercal delete mode 100644 meta/recipes-bsp/pointercal/pointercal/qemuarmv7/pointercal delete mode 100644 meta/recipes-bsp/pointercal/pointercal/qemumips/pointercal delete mode 100644 meta/recipes-bsp/pointercal/pointercal/qemuppc/pointercal delete mode 100644 meta/recipes-bsp/pointercal/pointercal/qemux86-64/pointercal delete mode 100644 meta/recipes-bsp/pointercal/pointercal/qemux86/pointercal delete mode 100644 meta/recipes-bsp/pointercal/pointercal_0.0.bb delete mode 100644 meta/recipes-graphics/tslib/tslib/ts.conf delete mode 100644 meta/recipes-graphics/tslib/tslib/tslib.sh delete mode 100644 meta/recipes-graphics/tslib/tslib_1.1.bb create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/qemuall/pointercal.xinput delete mode 100644 meta/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh delete mode 100644 meta/recipes-graphics/xtscal/xtscal/change-cross.patch delete mode 100644 meta/recipes-graphics/xtscal/xtscal/cleanup.patch delete mode 100644 meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch delete mode 100644 meta/recipes-graphics/xtscal/xtscal_0.6.3.bb -- 2.4.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kernel.bbclass: add lzop dependency
On Tue, 2016-08-09 at 12:27 -0700, Khem Raj wrote: > > On Aug 9, 2016, at 5:08 AM, Mike Looijmans > > wrote: > > > > I've been adding "lzop-native" to a lot of kernel recipes because > > you also need it when generating an LZO compressed kernel (I like > > my boot time to be under 1 second). > > > > It's a small dependency which is hard to automatically figure out, > > since there are a number of ways to trigger it (we just found two). > > I would welcome this patch very much, and I don't think many will > > suffer… > > From linux.inc days there is a python snippet which can do this > conditionally e.g. see > > https://github.com/kraj/meta-raspberrypi/blob/master/recipes-kernel/l > inux/linux-rpi.inc#L121 Which is fine if you have a prebuild defconfig file however in many cases we don't have that :( Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] init-install*: only pick root mmc devices
Some eMMC devices show special sub-devices such as mmcblk0boot0
etc. The installation script currently pick all of them up and
displays it to the user which makes some confusions because these
sub-devices are pretty small and complete installation including
rootfs won't be possible in most cases.
We simply now drop these sub-devices and only present the user
with the root of such mmc devices.
Signed-off-by: Awais Belal
---
meta/recipes-core/initrdscripts/files/init-install-efi.sh | 8 +++-
meta/recipes-core/initrdscripts/files/init-install.sh | 8 +++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index f564f4e..776dcbb 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
@@ -29,7 +29,13 @@ esac
echo "Searching for hard drives ..."
-for device in `ls /sys/block/`; do
+# Some eMMC devices have special sub devices such as mmcblk0boot0 etc
+# we're currently only interested in the root device so pick them wisely
+devices=`ls /sys/block/ | grep -v mmcblk`
+mmc_devices=`ls /sys/block/ | grep "mmcblk[0-9]\{1,\}$"`
+devices="$devices $mmc_devices"
+
+for device in $devices; do
case $device in
loop*)
# skip loop device
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh
b/meta/recipes-core/initrdscripts/files/init-install.sh
index 72ce92b..9c4189b 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -28,7 +28,13 @@ esac
echo "Searching for hard drives ..."
-for device in `ls /sys/block/`; do
+# Some eMMC devices have special sub devices such as mmcblk0boot0 etc
+# we're currently only interested in the root device so pick them wisely
+devices=`ls /sys/block/ | grep -v mmcblk`
+mmc_devices=`ls /sys/block/ | grep "mmcblk[0-9]\{1,\}$"`
+devices="$devices $mmc_devices"
+
+for device in $devices; do
case $device in
loop*)
# skip loop device
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3] glibc: apply complocaledir while localedir changed
Since localedir changed
---
commit bbca0646c7b55aa28dbf796ab9135bbc63a92a8d
Author: Chen Qi
Date: Mon Aug 8 13:55:42 2016 +0800
bitbake.conf: change localedir
---
Refer nativesdk, We should apply complocaledir=${localedir} for target.
Build image with IMAGE_LINGUAS="en-us en-gb"
Boot target and display all locales:
...
root@localhost:~# locale -a
C
POSIX
en_GB
en_US
...
(LOCAL REV: NOT UPSTREAM) -- sent to oe-core on 20160810
Signed-off-by: Hongxu Jia
---
meta/recipes-core/glibc/glibc_2.24.bb | 4
1 file changed, 4 insertions(+)
diff --git a/meta/recipes-core/glibc/glibc_2.24.bb
b/meta/recipes-core/glibc/glibc_2.24.bb
index 88bcbef2..c1b5190 100644
--- a/meta/recipes-core/glibc/glibc_2.24.bb
+++ b/meta/recipes-core/glibc/glibc_2.24.bb
@@ -134,6 +134,10 @@ do_compile_prepend_class-nativesdk() {
echo "complocaledir=/usr/lib/locale" >> ${S}/configparms
}
+do_compile_prepend_class-target() {
+echo "complocaledir=${localedir}" >> ${S}/configparms
+}
+
require glibc-package.inc
BBCLASSEXTEND = "nativesdk"
--
2.8.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] UBOOT_SUFFIX scope
Hey, I'm wondering about UBOOT_SUFFIX, this variable is currently set in meta/recipes-bsp/u-boot/u-boot.inc. However, to be truly useful, it seems to me that it should be available from outside the u-boot recipe as well. For example, it is common to refer to the complete file name, including the suffix, when building an image that contains a bootloader. Does this make sense, or am I missing an obvious way of getting at this variable? -- Kristian -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] sanity.bbclass: Only verify /bin/sh link if it's a link
If /bin/sh is a regular file (and not a symlink), we assume it's a
reasonable shell and allow it.
Signed-off-by: Olof Johansson
---
meta/classes/sanity.bbclass | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 088dd2a..98345ce 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -932,10 +932,11 @@ def check_sanity_everybuild(status, d):
with open(checkfile, "w") as f:
f.write(tmpdir)
-# Check /bin/sh links to dash or bash
-real_sh = os.path.realpath('/bin/sh')
-if not real_sh.endswith('/dash') and not real_sh.endswith('/bash'):
-status.addresult("Error, /bin/sh links to %s, must be dash or bash\n"
% real_sh)
+# If /bin/sh is a symlink, check that it points to dash or bash
+if os.path.islink('/bin/sh'):
+real_sh = os.path.realpath('/bin/sh')
+if not real_sh.endswith('/dash') and not real_sh.endswith('/bash'):
+status.addresult("Error, /bin/sh links to %s, must be dash or
bash\n" % real_sh)
def check_sanity(sanity_data):
class SanityStatus(object):
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2] glibc: apply complocaledir while localedir changed
Since localedir changed, we should apply complocaledir=${localedir}
Build image with IMAGE_LINGUAS="en-us en-gb"
Boot target and display all locales:
...
root@localhost:~# locale -a
C
POSIX
en_GB
en_US
...
Signed-off-by: Hongxu Jia
---
meta/recipes-core/glibc/glibc_2.24.bb | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/glibc/glibc_2.24.bb
b/meta/recipes-core/glibc/glibc_2.24.bb
index 88bcbef2..2f0c4be 100644
--- a/meta/recipes-core/glibc/glibc_2.24.bb
+++ b/meta/recipes-core/glibc/glibc_2.24.bb
@@ -128,10 +128,8 @@ do_compile () {
}
-# Use the host locale archive when built for nativesdk so that we don't need to
-# ship a complete (100MB) locale set.
-do_compile_prepend_class-nativesdk() {
-echo "complocaledir=/usr/lib/locale" >> ${S}/configparms
+do_compile_prepend() {
+echo "complocaledir=${localedir}" >> ${S}/configparms
}
require glibc-package.inc
--
2.8.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] tiff: Security fix CVE-2015-8781
From: Armin Kuster
CVE-2015-8781 libtiff: out-of-bounds writes for invalid images
External Reference:
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-8781
Signed-off-by: Armin Kuster
Signed-off-by: Yi Zhao
---
.../libtiff/files/CVE-2015-8781.patch | 195 +
meta/recipes-multimedia/libtiff/tiff_4.0.6.bb | 1 +
2 files changed, 196 insertions(+)
create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2015-8781.patch
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2015-8781.patch
b/meta/recipes-multimedia/libtiff/files/CVE-2015-8781.patch
new file mode 100644
index 000..0846f0f
--- /dev/null
+++ b/meta/recipes-multimedia/libtiff/files/CVE-2015-8781.patch
@@ -0,0 +1,195 @@
+From aaab5c3c9d2a2c6984f23ccbc79702610439bc65 Mon Sep 17 00:00:00 2001
+From: erouault
+Date: Sun, 27 Dec 2015 16:25:11 +
+Subject: [PATCH] * libtiff/tif_luv.c: fix potential out-of-bound writes in
+ decode functions in non debug builds by replacing assert()s by regular if
+ checks (bugzilla #2522). Fix potential out-of-bound reads in case of short
+ input data.
+
+Upstream-Status: Backport
+
+https://github.com/vadz/libtiff/commit/aaab5c3c9d2a2c6984f23ccbc79702610439bc65
+hand applied Changelog changes
+
+CVE: CVE-2015-8781
+
+Signed-off-by: Armin Kuster
+---
+ ChangeLog | 7 +++
+ libtiff/tif_luv.c | 55 ---
+ 2 files changed, 51 insertions(+), 11 deletions(-)
+
+Index: tiff-4.0.4/ChangeLog
+===
+--- tiff-4.0.4.orig/ChangeLog
tiff-4.0.4/ChangeLog
+@@ -1,3 +1,10 @@
++2015-12-27 Even Rouault
++
++ * libtiff/tif_luv.c: fix potential out-of-bound writes in decode
++ functions in non debug builds by replacing assert()s by regular if
++ checks (bugzilla #2522).
++ Fix potential out-of-bound reads in case of short input data.
++
+ 2015-12-26 Even Rouault
+
+ * libtiff/tif_getimage.c: fix out-of-bound reads in TIFFRGBAImage
+Index: tiff-4.0.4/libtiff/tif_luv.c
+===
+--- tiff-4.0.4.orig/libtiff/tif_luv.c
tiff-4.0.4/libtiff/tif_luv.c
+@@ -202,7 +202,11 @@ LogL16Decode(TIFF* tif, uint8* op, tmsiz
+ if (sp->user_datafmt == SGILOGDATAFMT_16BIT)
+ tp = (int16*) op;
+ else {
+- assert(sp->tbuflen >= npixels);
++ if(sp->tbuflen < npixels) {
++ TIFFErrorExt(tif->tif_clientdata, module,
++ "Translation buffer too
short");
++ return (0);
++ }
+ tp = (int16*) sp->tbuf;
+ }
+ _TIFFmemset((void*) tp, 0, npixels*sizeof (tp[0]));
+@@ -211,9 +215,11 @@ LogL16Decode(TIFF* tif, uint8* op, tmsiz
+ cc = tif->tif_rawcc;
+ /* get each byte string */
+ for (shft = 2*8; (shft -= 8) >= 0; ) {
+- for (i = 0; i < npixels && cc > 0; )
++ for (i = 0; i < npixels && cc > 0; ) {
+ if (*bp >= 128) { /* run */
+- rc = *bp++ + (2-128); /* TODO: potential
input buffer overrun when decoding corrupt or truncated data */
++ if( cc < 2 )
++ break;
++ rc = *bp++ + (2-128);
+ b = (int16)(*bp++ << shft);
+ cc -= 2;
+ while (rc-- && i < npixels)
+@@ -223,6 +229,7 @@ LogL16Decode(TIFF* tif, uint8* op, tmsiz
+ while (--cc && rc-- && i < npixels)
+ tp[i++] |= (int16)*bp++ << shft;
+ }
++ }
+ if (i != npixels) {
+ #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
+ TIFFErrorExt(tif->tif_clientdata, module,
+@@ -268,13 +275,17 @@ LogLuvDecode24(TIFF* tif, uint8* op, tms
+ if (sp->user_datafmt == SGILOGDATAFMT_RAW)
+ tp = (uint32 *)op;
+ else {
+- assert(sp->tbuflen >= npixels);
++ if(sp->tbuflen < npixels) {
++ TIFFErrorExt(tif->tif_clientdata, module,
++ "Translation buffer too
short");
++ return (0);
++ }
+ tp = (uint32 *) sp->tbuf;
+ }
+ /* copy to array of uint32 */
+ bp = (unsigned char*) tif->tif_rawcp;
+ cc = tif->tif_rawcc;
+- for (i = 0; i < npixels && cc > 0; i++) {
++ for (i = 0; i < npixels && cc >= 3; i++) {
+ tp[i] = bp[0] << 16 | bp[1] << 8 | bp[2];
+ bp += 3;
+ cc -= 3;
+@@ -325,7 +336,11 @@ LogLuvDecode32(TIFF* tif, uint8* op, tms
+ if (sp->user_datafmt == SGILOGDATAFMT_RAW)
+ tp = (uint3
[OE-core] [PATCH 3/5] tiff: Security fix CVE-2016-3186
CVE-2016-3186 libtiff: buffer overflow in the readextension function in
gif2tiff.c allows remote attackers to cause a denial of service via a
crafted GIF file
External References:
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-3186
https://bugzilla.redhat.com/show_bug.cgi?id=1319503
Patch from:
https://bugzilla.redhat.com/attachment.cgi?id=1144235&action=diff
Signed-off-by: Yi Zhao
---
.../libtiff/files/CVE-2016-3186.patch | 24 ++
meta/recipes-multimedia/libtiff/tiff_4.0.6.bb | 1 +
2 files changed, 25 insertions(+)
create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2016-3186.patch
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-3186.patch
b/meta/recipes-multimedia/libtiff/files/CVE-2016-3186.patch
new file mode 100644
index 000..4a08aba
--- /dev/null
+++ b/meta/recipes-multimedia/libtiff/files/CVE-2016-3186.patch
@@ -0,0 +1,24 @@
+Buffer overflow in the readextension function in gif2tiff.c
+allows remote attackers to cause a denial of service via a crafted GIF file.
+
+External References:
+https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-3186
+https://bugzilla.redhat.com/show_bug.cgi?id=1319503
+
+CVE: CVE-2016-3186
+Upstream-Status: Backport (RedHat)
+https://bugzilla.redhat.com/attachment.cgi?id=1144235&action=diff
+
+Signed-off-by: Yi Zhao
+
+--- tiff-4.0.6/tools/gif2tiff.c2016-04-06 15:43:01.586048341 +0200
tiff-4.0.6/tools/gif2tiff.c2016-04-06 15:48:05.523207710 +0200
+@@ -349,7 +349,7 @@
+ int status = 1;
+
+ (void) getc(infile);
+-while ((count = getc(infile)) && count <= 255)
++while ((count = getc(infile)) && count >= 0 && count <= 255)
+ if (fread(buf, 1, count, infile) != (size_t) count) {
+ fprintf(stderr, "short read from file %s (%s)\n",
+ filename, strerror(errno));
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
b/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
index 0506475..36cb34e 100644
--- a/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
@@ -8,6 +8,7 @@ SRC_URI =
"ftp://ftp.remotesensing.org/pub/libtiff/tiff-${PV}.tar.gz \
file://CVE-2015-8665_8683.patch \
file://CVE-2015-8781.patch \
file://CVE-2015-8784.patch \
+ file://CVE-2016-3186.patch \
"
SRC_URI[md5sum] = "d1d2e940dea0b5ad435f21f03d96dd72"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] tiff: Security fix CVE-2016-5321
CVE-2016-5321 libtiff: a maliciously crafted TIFF file could cause the
application to crash when using tiffcrop command
External References:
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-5321
http://bugzilla.maptools.org/show_bug.cgi?id=2558
Patch from:
https://github.com/vadz/libtiff/commit/d9783e4a1476b6787a51c5ae9e9b3156527589f0
Signed-off-by: Yi Zhao
---
.../libtiff/files/CVE-2016-5321.patch | 49 ++
meta/recipes-multimedia/libtiff/tiff_4.0.6.bb | 1 +
2 files changed, 50 insertions(+)
create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2016-5321.patch
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-5321.patch
b/meta/recipes-multimedia/libtiff/files/CVE-2016-5321.patch
new file mode 100644
index 000..63c6650
--- /dev/null
+++ b/meta/recipes-multimedia/libtiff/files/CVE-2016-5321.patch
@@ -0,0 +1,49 @@
+From d9783e4a1476b6787a51c5ae9e9b3156527589f0 Mon Sep 17 00:00:00 2001
+From: erouault
+Date: Mon, 11 Jul 2016 21:26:03 +
+Subject: [PATCH 1/2] * tools/tiffcrop.c: Avoid access outside of stack
+ allocated array on a tiled separate TIFF with more than 8 samples per pixel.
+ Reported by Kaixiang Zhang of the Cloud Security Team, Qihoo 360
+ (CVE-2016-5321, bugzilla #2558)
+
+CVE: CVE-2016-5321
+Upstream-Status: Backport
+https://github.com/vadz/libtiff/commit/d9783e4a1476b6787a51c5ae9e9b3156527589f0
+
+Signed-off-by: Yi Zhao
+---
+ ChangeLog| 7 +++
+ tools/tiffcrop.c | 2 +-
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index e98d54d..4e0302f 100644
+--- a/ChangeLog
b/ChangeLog
+@@ -1,3 +1,10 @@
++2016-07-11 Even Rouault
++
++ * tools/tiffcrop.c: Avoid access outside of stack allocated array
++ on a tiled separate TIFF with more than 8 samples per pixel.
++ Reported by Kaixiang Zhang of the Cloud Security Team, Qihoo 360
++ (CVE-2016-5321, bugzilla #2558)
++
+ 2015-12-27 Even Rouault
+
+ * libtiff/tif_next.c: fix potential out-of-bound write in NeXTDecode()
+diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
+index d959ae3..6fc8fc1 100644
+--- a/tools/tiffcrop.c
b/tools/tiffcrop.c
+@@ -989,7 +989,7 @@ static int readSeparateTilesIntoBuffer (TIFF* in, uint8
*obuf,
+ nrow = (row + tl > imagelength) ? imagelength - row : tl;
+ for (col = 0; col < imagewidth; col += tw)
+ {
+- for (s = 0; s < spp; s++)
++ for (s = 0; s < spp && s < MAX_SAMPLES; s++)
+ { /* Read each plane of a tile set into srcbuffs[s] */
+ tbytes = TIFFReadTile(in, srcbuffs[s], col, row, 0, s);
+ if (tbytes < 0 && !ignore)
+--
+2.7.4
+
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
b/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
index 36cb34e..63df126 100644
--- a/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
@@ -9,6 +9,7 @@ SRC_URI =
"ftp://ftp.remotesensing.org/pub/libtiff/tiff-${PV}.tar.gz \
file://CVE-2015-8781.patch \
file://CVE-2015-8784.patch \
file://CVE-2016-3186.patch \
+ file://CVE-2016-5321.patch \
"
SRC_URI[md5sum] = "d1d2e940dea0b5ad435f21f03d96dd72"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] tiff: Security fix CVE-2016-5323
CVE-2016-5323 libtiff: a maliciously crafted TIFF file could cause the
application to crash when using tiffcrop command
External References:
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-5323
http://bugzilla.maptools.org/show_bug.cgi?id=2559
Patch from:
https://github.com/vadz/libtiff/commit/2f79856097f423eb33796a15fcf700d2ea41bf31
Signed-off-by: Yi Zhao
---
.../libtiff/files/CVE-2016-5323.patch | 107 +
meta/recipes-multimedia/libtiff/tiff_4.0.6.bb | 1 +
2 files changed, 108 insertions(+)
create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2016-5323.patch
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-5323.patch
b/meta/recipes-multimedia/libtiff/files/CVE-2016-5323.patch
new file mode 100644
index 000..41eab91
--- /dev/null
+++ b/meta/recipes-multimedia/libtiff/files/CVE-2016-5323.patch
@@ -0,0 +1,107 @@
+From 2f79856097f423eb33796a15fcf700d2ea41bf31 Mon Sep 17 00:00:00 2001
+From: erouault
+Date: Mon, 11 Jul 2016 21:38:31 +
+Subject: [PATCH 2/2] (CVE-2016-5321 / CVE-2016-5323 , bugzilla #2558 / #2559)
+
+CVE: CVE-2016-5323
+Upstream-Status: Backport
+https://github.com/vadz/libtiff/commit/2f79856097f423eb33796a15fcf700d2ea41bf31
+
+Signed-off-by: Yi Zhao
+---
+ ChangeLog| 2 +-
+ tools/tiffcrop.c | 16
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 4e0302f..62dc1b5 100644
+--- a/ChangeLog
b/ChangeLog
+@@ -3,7 +3,7 @@
+ * tools/tiffcrop.c: Avoid access outside of stack allocated array
+ on a tiled separate TIFF with more than 8 samples per pixel.
+ Reported by Kaixiang Zhang of the Cloud Security Team, Qihoo 360
+- (CVE-2016-5321, bugzilla #2558)
++ (CVE-2016-5321 / CVE-2016-5323 , bugzilla #2558 / #2559)
+
+ 2016-07-10 Even Rouault
+
+diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
+index 6fc8fc1..27abc0b 100644
+--- a/tools/tiffcrop.c
b/tools/tiffcrop.c
+@@ -3738,7 +3738,7 @@ combineSeparateSamples8bits (uint8 *in[], uint8 *out,
uint32 cols,
+
+ matchbits = maskbits << (8 - src_bit - bps);
+ /* load up next sample from each plane */
+- for (s = 0; s < spp; s++)
++ for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
+ {
+ src = in[s] + src_offset + src_byte;
+ buff1 = ((*src) & matchbits) << (src_bit);
+@@ -3837,7 +3837,7 @@ combineSeparateSamples16bits (uint8 *in[], uint8 *out,
uint32 cols,
+ src_bit = bit_offset % 8;
+
+ matchbits = maskbits << (16 - src_bit - bps);
+- for (s = 0; s < spp; s++)
++ for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
+ {
+ src = in[s] + src_offset + src_byte;
+ if (little_endian)
+@@ -3947,7 +3947,7 @@ combineSeparateSamples24bits (uint8 *in[], uint8 *out,
uint32 cols,
+ src_bit = bit_offset % 8;
+
+ matchbits = maskbits << (32 - src_bit - bps);
+- for (s = 0; s < spp; s++)
++ for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
+ {
+ src = in[s] + src_offset + src_byte;
+ if (little_endian)
+@@ -4073,7 +4073,7 @@ combineSeparateSamples32bits (uint8 *in[], uint8 *out,
uint32 cols,
+ src_bit = bit_offset % 8;
+
+ matchbits = maskbits << (64 - src_bit - bps);
+- for (s = 0; s < spp; s++)
++ for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
+ {
+ src = in[s] + src_offset + src_byte;
+ if (little_endian)
+@@ -4263,7 +4263,7 @@ combineSeparateTileSamples8bits (uint8 *in[], uint8
*out, uint32 cols,
+
+ matchbits = maskbits << (8 - src_bit - bps);
+ /* load up next sample from each plane */
+- for (s = 0; s < spp; s++)
++ for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
+ {
+ src = in[s] + src_offset + src_byte;
+ buff1 = ((*src) & matchbits) << (src_bit);
+@@ -4362,7 +4362,7 @@ combineSeparateTileSamples16bits (uint8 *in[], uint8
*out, uint32 cols,
+ src_bit = bit_offset % 8;
+
+ matchbits = maskbits << (16 - src_bit - bps);
+- for (s = 0; s < spp; s++)
++ for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
+ {
+ src = in[s] + src_offset + src_byte;
+ if (little_endian)
+@@ -4471,7 +4471,7 @@ combineSeparateTileSamples24bits (uint8 *in[], uint8
*out, uint32 cols,
+ src_bit = bit_offset % 8;
+
+ matchbits = maskbits << (32 - src_bit - bps);
+- for (s = 0; s < spp; s++)
++ for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
+ {
+ src = in[s] + src_offset + src_byte;
+ if (little_endian)
+@@ -4597,7 +4597,7 @@ combineSeparateTileSamples32bits (uint8 *in[], uint8
*out, uint32 cols,
+ src_bit = bit_offset % 8;
+
+ matchbits = maskbits << (64 - src_bit - bps);
+- for (s = 0; s < spp; s++)
++ for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
+ {
+ src = in[s] + src_offset + src_byte;
+ if (little_endian)
+--
+2.7.4
+
diff --git a/
[OE-core] [PATCH 2/5] tiff: Security fix CVE-2015-8784
From: Armin Kuster
CVE-2015-8784 libtiff: out-of-bound write in NeXTDecode()
External Reference:
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-8784
Signed-off-by: Armin Kuster
Signed-off-by: Yi Zhao
---
.../libtiff/files/CVE-2015-8784.patch | 73 ++
meta/recipes-multimedia/libtiff/tiff_4.0.6.bb | 1 +
2 files changed, 74 insertions(+)
create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2015-8784.patch
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2015-8784.patch
b/meta/recipes-multimedia/libtiff/files/CVE-2015-8784.patch
new file mode 100644
index 000..0caf800
--- /dev/null
+++ b/meta/recipes-multimedia/libtiff/files/CVE-2015-8784.patch
@@ -0,0 +1,73 @@
+From b18012dae552f85dcc5c57d3bf4e997a15b1cc1c Mon Sep 17 00:00:00 2001
+From: erouault
+Date: Sun, 27 Dec 2015 16:55:20 +
+Subject: [PATCH] * libtiff/tif_next.c: fix potential out-of-bound write in
+ NeXTDecode() triggered by http://lcamtuf.coredump.cx/afl/vulns/libtiff5.tif
+ (bugzilla #2508)
+
+Upstream-Status: Backport
+https://github.com/vadz/libtiff/commit/b18012dae552f85dcc5c57d3bf4e997a15b1cc1c
+hand applied Changelog changes
+
+CVE: CVE-2015-8784
+Signed-off-by: Armin Kuster
+
+---
+ ChangeLog | 6 ++
+ libtiff/tif_next.c | 10 --
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+Index: tiff-4.0.4/ChangeLog
+===
+--- tiff-4.0.4.orig/ChangeLog
tiff-4.0.4/ChangeLog
+@@ -1,5 +1,11 @@
+ 2015-12-27 Even Rouault
+
++ * libtiff/tif_next.c: fix potential out-of-bound write in NeXTDecode()
++ triggered by http://lcamtuf.coredump.cx/afl/vulns/libtiff5.tif
++ (bugzilla #2508)
++
++2015-12-27 Even Rouault
++
+ * libtiff/tif_luv.c: fix potential out-of-bound writes in decode
+ functions in non debug builds by replacing assert()s by regular if
+ checks (bugzilla #2522).
+Index: tiff-4.0.4/libtiff/tif_next.c
+===
+--- tiff-4.0.4.orig/libtiff/tif_next.c
tiff-4.0.4/libtiff/tif_next.c
+@@ -37,7 +37,7 @@
+ case 0: op[0] = (unsigned char) ((v) << 6); break; \
+ case 1: op[0] |= (v) << 4; break; \
+ case 2: op[0] |= (v) << 2; break; \
+- case 3: *op++ |= (v); break; \
++ case 3: *op++ |= (v); op_offset++; break; \
+ } \
+ }
+
+@@ -106,6 +106,7 @@ NeXTDecode(TIFF* tif, uint8* buf, tmsize
+ uint32 imagewidth = tif->tif_dir.td_imagewidth;
+ if( isTiled(tif) )
+ imagewidth = tif->tif_dir.td_tilewidth;
++tmsize_t op_offset = 0;
+
+ /*
+* The scanline is composed of a sequence of constant
+@@ -122,10 +123,15 @@ NeXTDecode(TIFF* tif, uint8* buf, tmsize
+* bounds, potentially resulting in a security
+* issue.
+*/
+- while (n-- > 0 && npixels < imagewidth)
++ while (n-- > 0 && npixels < imagewidth &&
op_offset < scanline)
+ SETPIXEL(op, grey);
+ if (npixels >= imagewidth)
+ break;
++if (op_offset >= scanline ) {
++TIFFErrorExt(tif->tif_clientdata, module, "Invalid data
for scanline %ld",
++(long) tif->tif_row);
++return (0);
++}
+ if (cc == 0)
+ goto bad;
+ n = *bp++, cc--;
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
b/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
index 9879c8b..0506475 100644
--- a/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
@@ -7,6 +7,7 @@ SRC_URI =
"ftp://ftp.remotesensing.org/pub/libtiff/tiff-${PV}.tar.gz \
file://libtool2.patch \
file://CVE-2015-8665_8683.patch \
file://CVE-2015-8781.patch \
+ file://CVE-2015-8784.patch \
"
SRC_URI[md5sum] = "d1d2e940dea0b5ad435f21f03d96dd72"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/5] libtiff: CVE fixes
Fix CVE-2015-8781 CVE-2015-8784 CVE-2016-3186 CVE-2016-5321 CVE-2016-5323 The patches for CVE-2015-8781 and CVE-2015-8784 are cherry-picked from jethro branch since I found these 2 patches are also needed by tiff 4.0.6 Here is the comparing changes since 4.0.6 released, you could see these 2 patches are in the list: https://github.com/vadz/libtiff/compare/Release-v4-0-6...master The following changes since commit dfc016fbf13e62f7767edaf7abadf1d1b72680b2: maintainers.inc: remove augeas (2016-08-04 20:56:11 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib yzhao/tiff-cve http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=yzhao/tiff-cve Armin Kuster (2): tiff: Security fix CVE-2015-8781 tiff: Security fix CVE-2015-8784 Yi Zhao (3): tiff: Security fix CVE-2016-3186 tiff: Security fix CVE-2016-5321 tiff: Security fix CVE-2016-5323 .../libtiff/files/CVE-2015-8781.patch | 195 + .../libtiff/files/CVE-2015-8784.patch | 73 .../libtiff/files/CVE-2016-3186.patch | 24 +++ .../libtiff/files/CVE-2016-5321.patch | 49 ++ .../libtiff/files/CVE-2016-5323.patch | 107 +++ meta/recipes-multimedia/libtiff/tiff_4.0.6.bb | 5 + 6 files changed, 453 insertions(+) create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2015-8781.patch create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2015-8784.patch create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2016-3186.patch create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2016-5321.patch create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2016-5323.patch -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
