libinput: add ptest
PATCH 1/24 libinput: add ptest
The test takes about 17 minutes, and fully passes.
--- meta/conf/distro/include/ptest-packagelists.inc | 1 + meta/recipes-graphics/wayland/libinput/run-ptest | 9 +++++++++ meta/recipes-graphics/wayland/libinput_1.15.2.bb | 16 +++++++++++++--- 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-graphics/wayland/libinput/run-ptest
meta/conf/distro/include/ptest-packagelists.inc +1 -0
@@ -72,6 +72,7 @@ PTESTS_SLOW = "\ glib-2.0-ptest \ gstreamer1.0-ptest \ libevent-ptest \ + libinput-ptest \ lttng-tools-ptest \ openssh-ptest \ openssl-ptest \
meta/recipes-graphics/wayland/libinput/run-ptest new file +9 -0
@@ -0,0 +1,9 @@ +#!/bin/sh + +/usr/libexec/libinput/libinput-test-suite +if [ $? -eq 0 ]; then + echo 'PASS: libinput-test-suite' +else + echo 'FAIL: libinput-test-suite' +fi +
meta/recipes-graphics/wayland/libinput_1.15.2.bb +13 -3
@@ -10,9 +10,10 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=1f2ea9ebff3a2c6d458faf58492efb63" -DEPENDS = "libevdev udev mtdev" +DEPENDS = "libevdev udev mtdev libcheck" SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ + file://run-ptest \ file://determinism.patch \ " SRC_URI[md5sum] = "eb6bd2907ad33d53954d70dfb881a643"
@@ -20,7 +21,15 @@ SRC_URI[sha256sum] = "971c3fbfb624f95c911adeb2803c372e4e3647d1b98f278f660051f834 UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" -inherit meson pkgconfig lib_package +inherit meson pkgconfig lib_package ptest + +# Patch out build directory, otherwise it leaks into ptest binary +do_configure_append() { + sed -i -e "s,${WORKDIR},,g" config.h + if [ -e "litest-config.h" ]; then + sed -i -e "s,${WORKDIR},,g" litest-config.h + fi +} PACKAGECONFIG ??= "" PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom"
@@ -30,7 +39,7 @@ UDEVDIR = "`pkg-config --variable=udevdir udev`" EXTRA_OEMESON += "-Dudev-dir=${UDEVDIR} \ -Ddocumentation=false \ - -Dtests=false \ + ${@bb.utils.contains('PTEST_ENABLED', '1', '-Dtests=true -Dinstall-tests=true', '-Dtests=false -Dinstall-tests=false', d)} \ -Dzshcompletiondir=no" # package name changed in 1.8.1 upgrade: make sure package upgrades work
@@ -38,3 +47,4 @@ RPROVIDES_${PN} = "libinput" RREPLACES_${PN} = "libinput" RCONFLICTS_${PN} = "libinput" +FILES_${PN}-ptest += "${libexecdir}/libinput/libinput-test-suite"
Signature · 1 line
2.26.1
PATCH 2/24 libinput: update 1.15.2 -> 1.15.5
---
.../wayland/{libinput_1.15.2.bb => libinput_1.15.5.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/wayland/{libinput_1.15.2.bb => libinput_1.15.5.bb} (92%)meta/recipes-graphics/wayland/libinput_1.15.5.bb renamed from meta/recipes-graphics/wayland/libinput_1.15.2.bb +2 -2
@@ -16,8 +16,8 @@ SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ file://run-ptest \ file://determinism.patch \ " -SRC_URI[md5sum] = "eb6bd2907ad33d53954d70dfb881a643" -SRC_URI[sha256sum] = "971c3fbfb624f95c911adeb2803c372e4e3647d1b98f278f660051f834597747" +SRC_URI[md5sum] = "c9a1b15bb932eaf22f840efe4c3f84eb" +SRC_URI[sha256sum] = "a90efc8f423c3094f2f9f372fb92381b2f3aad62e8b5882a8abe333aa8249c97" UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
Signature · 1 line
2.26.1
PATCH 3/24 avahi: merge avahi-ui into the main recipe
In reply to Alexander KanavinThe split was building the same code twice, awkward to maintain, and causing issues with upgrades.
Disabling the gtk bits can be easily done through the standard PACKAGECONFIG mechanism when needed.
--- meta/conf/distro/include/maintainers.inc | 1 - .../avahi/avahi-ui_0.7.bb | 54 ---------- meta/recipes-connectivity/avahi/avahi.inc | 86 ---------------- meta/recipes-connectivity/avahi/avahi_0.7.bb | 98 ++++++++++++++++++- 4 files changed, 95 insertions(+), 144 deletions(-) delete mode 100644 meta/recipes-connectivity/avahi/avahi-ui_0.7.bb delete mode 100644 meta/recipes-connectivity/avahi/avahi.inc
meta/conf/distro/include/maintainers.inc +0 -1
@@ -57,7 +57,6 @@ RECIPE_MAINTAINER_pn-autoconf = "Robert Yang <[email protected]>" RECIPE_MAINTAINER_pn-autoconf-archive = "Robert Yang <[email protected]>" RECIPE_MAINTAINER_pn-automake = "Robert Yang <[email protected]>" RECIPE_MAINTAINER_pn-avahi = "Yi Zhao <[email protected]>" -RECIPE_MAINTAINER_pn-avahi-ui = "Yi Zhao <[email protected]>" RECIPE_MAINTAINER_pn-babeltrace = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-babeltrace2 = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-base-files = "Anuj Mittal <[email protected]>"
meta/recipes-connectivity/avahi/avahi-ui_0.7.bb deleted +0 -54
54 lines not on this page · raw message
meta/recipes-connectivity/avahi/avahi.inc deleted +0 -86
86 lines not on this page · raw message
meta/recipes-connectivity/avahi/avahi_0.7.bb +95 -3
116 lines not on this page · raw message
Signature · 1 line
2.26.1
PATCH 4/24 avahi: update to 0.8
In reply to Alexander Kanavin---
.../avahi/{avahi_0.7.bb => avahi_0.8.bb} | 20 ++++----
.../avahi/files/fix-CVE-2017-6519.patch | 48 -------------------
2 files changed, 9 insertions(+), 59 deletions(-)
rename meta/recipes-connectivity/avahi/{avahi_0.7.bb => avahi_0.8.bb} (95%)
delete mode 100644 meta/recipes-connectivity/avahi/files/fix-CVE-2017-6519.patchmeta/recipes-connectivity/avahi/avahi_0.8.bb renamed from meta/recipes-connectivity/avahi/avahi_0.7.bb +9 -11
@@ -20,12 +20,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz \ - file://fix-CVE-2017-6519.patch \ + file://00avahi-autoipd \ + file://99avahi-autoipd \ + file://initscript.patch \ + file://0001-Fix-opening-etc-resolv.conf-error.patch \ " UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/" -SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6" -SRC_URI[sha256sum] = "57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804" +SRC_URI[md5sum] = "229c6aa30674fc43c202b22c5f8c2be7" +SRC_URI[sha256sum] = "060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda" DEPENDS = "expat libcap libdaemon glib-2.0 intltool-native"
@@ -37,12 +40,15 @@ PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+" PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3" PACKAGECONFIG[libdns_sd] = "--enable-compat-libdns_sd --enable-dbus,,dbus" +PACKAGECONFIG[libevent] = "--enable-libevent,--disable-libevent,libevent" +PACKAGECONFIG[qt5] = "--enable-qt5,--disable-qt5,qtbase" inherit autotools pkgconfig gettext gobject-introspection EXTRA_OECONF = "--with-avahi-priv-access-group=adm \ --disable-stack-protector \ --disable-gdbm \ + --disable-dbm \ --disable-mono \ --disable-monodoc \ --disable-qt3 \
@@ -59,8 +65,6 @@ EXTRA_OECONF_SYSVINIT = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--wi EXTRA_OECONF_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}" do_configure_prepend() { - sed 's:AM_CHECK_PYMOD:echo "no pymod" #AM_CHECK_PYMOD:g' -i ${S}/configure.ac - # This m4 file will get in the way of our introspection.m4 with special cross-compilation fixes rm "${S}/common/introspection.m4" || true }
@@ -85,12 +89,6 @@ FILES_libavahi-compat-libdnssd = "${libdir}/libdns_sd.so.*" RPROVIDES_libavahi-compat-libdnssd = "libdns-sd" -SRC_URI += "file://00avahi-autoipd \ - file://99avahi-autoipd \ - file://initscript.patch \ - file://0001-Fix-opening-etc-resolv.conf-error.patch \ - " - inherit update-rc.d systemd useradd PACKAGES =+ "libavahi-gobject avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils avahi-discover avahi-ui"
meta/recipes-connectivity/avahi/files/fix-CVE-2017-6519.patch deleted +0 -48
48 lines not on this page · raw message
Signature · 1 line
2.26.1
PATCH 5/24 testsdkext/devtool: initialize the test component's git repo
In reply to Alexander KanavinDevtool is relying on externalsrc class, which, in order to determine if a rebuild is needed, relies on git to checksum files (if the component tree is a git repo), or sets a flag to always rebuild if the component tree is not a git repo.
This is problematic in testsdkext scenario, where the test component is inside a build directory, which itself is inside the poky repo checkout, and listed in .gitignore. What happens is that git walks up the tree and uses the index of the poky repo. This works okay with older versions of git, but git 2.26 complains that we're inside a directory that is ignored, and returns an error.
To fix the issue, the git repository is initialized directly in the component directory, just prior to running the tests.
--- meta/lib/oeqa/sdkext/cases/devtool.py | 6 ++++++ 1 file changed, 6 insertions(+)
meta/lib/oeqa/sdkext/cases/devtool.py +6 -0
@@ -20,10 +20,16 @@ class DevtoolTest(OESDKExtTestCase): myapp_src = os.path.join(cls.tc.esdk_files_dir, "myapp") cls.myapp_dst = os.path.join(cls.tc.sdk_dir, "myapp") shutil.copytree(myapp_src, cls.myapp_dst) + subprocess.check_output(['git', 'init', '.'], cwd=cls.myapp_dst) + subprocess.check_output(['git', 'add', '.'], cwd=cls.myapp_dst) + subprocess.check_output(['git', 'commit', '-m', "'test commit'"], cwd=cls.myapp_dst) myapp_cmake_src = os.path.join(cls.tc.esdk_files_dir, "myapp_cmake") cls.myapp_cmake_dst = os.path.join(cls.tc.sdk_dir, "myapp_cmake") shutil.copytree(myapp_cmake_src, cls.myapp_cmake_dst) + subprocess.check_output(['git', 'init', '.'], cwd=cls.myapp_cmake_dst) + subprocess.check_output(['git', 'add', '.'], cwd=cls.myapp_cmake_dst) + subprocess.check_output(['git', 'commit', '-m', "'test commit'"], cwd=cls.myapp_cmake_dst) @classmethod def tearDownClass(cls):
Signature · 1 line
2.26.1
Re: [OE-core] [PATCH 05/24] testsdkext/devtool: initialize the test component's git repo
Is this patch suitable for dunfell?
Thanks,
Steve
Quoted 46 lines · Alexander Kanavin
Devtool is relying on externalsrc class, which, in order to determine if a rebuild is needed, relies on git to checksum files (if the component tree is a git repo), or sets a flag to always rebuild if the component tree is not a git repo.
This is problematic in testsdkext scenario, where the test component is inside a build directory, which itself is inside the poky repo checkout, and listed in .gitignore. What happens is that git walks up the tree and uses the index of the poky repo. This works okay with older versions of git, but git 2.26 complains that we're inside a directory that is ignored, and returns an error.
To fix the issue, the git repository is initialized directly in the component directory, just prior to running the tests.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/lib/oeqa/sdkext/cases/devtool.py | 6 ++++++ 1 file changed, 6 insertions(+)meta/lib/oeqa/sdkext/cases/devtool.py +6
-1@@ -20,10 +20,16 @@ class DevtoolTest(OESDKExtTestCase): myapp_src = os.path.join(cls.tc.esdk_files_dir, "myapp") cls.myapp_dst = os.path.join(cls.tc.sdk_dir, "myapp") shutil.copytree(myapp_src, cls.myapp_dst) + subprocess.check_output(['git', 'init', '.'], cwd=cls.myapp_dst) + subprocess.check_output(['git', 'add', '.'], cwd=cls.myapp_dst) + subprocess.check_output(['git', 'commit', '-m', "'test commit'"], cwd=cls.myapp_dst) myapp_cmake_src = os.path.join(cls.tc.esdk_files_dir, "myapp_cmake") cls.myapp_cmake_dst = os.path.join(cls.tc.sdk_dir, "myapp_cmake") shutil.copytree(myapp_cmake_src, cls.myapp_cmake_dst) + subprocess.check_output(['git', 'init', '.'], cwd=cls.myapp_cmake_dst) + subprocess.check_output(['git', 'add', '.'], cwd=cls.myapp_cmake_dst) + subprocess.check_output(['git', 'commit', '-m', "'test commit'"], cwd=cls.myapp_cmake_dst) @classmethod def tearDownClass(cls): --2.26.1
Re: [OE-core] [PATCH 05/24] testsdkext/devtool: initialize the test component's git repo
Quoted 2 lines · Steve Sakoman
Is this patch suitable for dunfell?
Ah, probably not since we aren't bumping the git version in dunfell :-)
Steve
Quoted 47 lines · Alexander Kanavin
Quoted 46 lines
Devtool is relying on externalsrc class, which, in order to determine if a rebuild is needed, relies on git to checksum files (if the component tree is a git repo), or sets a flag to always rebuild if the component tree is not a git repo.
This is problematic in testsdkext scenario, where the test component is inside a build directory, which itself is inside the poky repo checkout, and listed in .gitignore. What happens is that git walks up the tree and uses the index of the poky repo. This works okay with older versions of git, but git 2.26 complains that we're inside a directory that is ignored, and returns an error.
To fix the issue, the git repository is initialized directly in the component directory, just prior to running the tests.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/lib/oeqa/sdkext/cases/devtool.py | 6 ++++++ 1 file changed, 6 insertions(+)meta/lib/oeqa/sdkext/cases/devtool.py +6
-1@@ -20,10 +20,16 @@ class DevtoolTest(OESDKExtTestCase): myapp_src = os.path.join(cls.tc.esdk_files_dir, "myapp") cls.myapp_dst = os.path.join(cls.tc.sdk_dir, "myapp") shutil.copytree(myapp_src, cls.myapp_dst) + subprocess.check_output(['git', 'init', '.'], cwd=cls.myapp_dst) + subprocess.check_output(['git', 'add', '.'], cwd=cls.myapp_dst) + subprocess.check_output(['git', 'commit', '-m', "'test commit'"], cwd=cls.myapp_dst) myapp_cmake_src = os.path.join(cls.tc.esdk_files_dir, "myapp_cmake") cls.myapp_cmake_dst = os.path.join(cls.tc.sdk_dir, "myapp_cmake") shutil.copytree(myapp_cmake_src, cls.myapp_cmake_dst) + subprocess.check_output(['git', 'init', '.'], cwd=cls.myapp_cmake_dst) + subprocess.check_output(['git', 'add', '.'], cwd=cls.myapp_cmake_dst) + subprocess.check_output(['git', 'commit', '-m', "'test commit'"], cwd=cls.myapp_cmake_dst) @classmethod def tearDownClass(cls): --2.26.1
Re: [OE-core] [PATCH 05/24] testsdkext/devtool: initialize the test component's git repo
In reply to Alexander KanavinQuoted 12 lines · Alexander Kanavin
Devtool is relying on externalsrc class, which, in order to determine if a rebuild is needed, relies on git to checksum files (if the component tree is a git repo), or sets a flag to always rebuild if the component tree is not a git repo.
This is problematic in testsdkext scenario, where the test component is inside a build directory, which itself is inside the poky repo checkout, and listed in .gitignore. What happens is that git walks up the tree and uses the index of the poky repo. This works okay with older versions of git, but git 2.26 complains that we're inside a directory that is ignored, and returns an error.
Quoted 3 lines
To fix the issue, the git repository is initialized directly in the component directory, just prior to running the tests.
I recently sent a patch to set GIT_CEILING_DIRECTORIES when building, could we do something like that here also?
Quoted 37 lines
Signed-off-by Alexander Kanavin <[email protected]>--- meta/lib/oeqa/sdkext/cases/devtool.py | 6 ++++++ 1 file changed, 6 insertions(+)meta/lib/oeqa/sdkext/cases/devtool.py +5
-0@@ -20,10 +20,16 @@ class DevtoolTest(OESDKExtTestCase): myapp_src = os.path.join(cls.tc.esdk_files_dir, "myapp") cls.myapp_dst = os.path.join(cls.tc.sdk_dir, "myapp") shutil.copytree(myapp_src, cls.myapp_dst) + subprocess.check_output(['git', 'init', '.'], cwd=cls.myapp_dst) + subprocess.check_output(['git', 'add', '.'], cwd=cls.myapp_dst) + subprocess.check_output(['git', 'commit', '-m', "'test commit'"], cwd=cls.myapp_dst) myapp_cmake_src = os.path.join(cls.tc.esdk_files_dir, "myapp_cmake") cls.myapp_cmake_dst = os.path.join(cls.tc.sdk_dir, "myapp_cmake") shutil.copytree(myapp_cmake_src, cls.myapp_cmake_dst) + subprocess.check_output(['git', 'init', '.'], cwd=cls.myapp_cmake_dst) + subprocess.check_output(['git', 'add', '.'],cwd=cls.myapp_cmake_dst)
+ subprocess.check_output(['git', 'commit', '-m', "'test commit'"],
cwd=cls.myapp_cmake_dst)@classmethod
def tearDownClass(cls):
--
2.26.1
Re: [OE-core] [PATCH 05/24] testsdkext/devtool: initialize the test component's git repo
Quoted 3 lines · Joshua Watt
I recently sent a patch to set
GIT_CEILING_DIRECTORIESwhen building, could we do something like that here also?
Yes, except my patch is already merged. It doesn't hurt to put two barriers :)
Alex
PATCH 6/24 git: update to 2.26.2
In reply to Alexander KanavinDisable iconv, as configure.ac attempts to run a
cross-compiled test program otherwise.
--- meta/recipes-devtools/git/git.inc | 1 + meta/recipes-devtools/git/git_2.24.1.bb | 11 ----------- meta/recipes-devtools/git/git_2.26.2.bb | 10 ++++++++++ 3 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 meta/recipes-devtools/git/git_2.24.1.bb create mode 100644 meta/recipes-devtools/git/git_2.26.2.bb
meta/recipes-devtools/git/git.inc +1 -0
@@ -21,6 +21,7 @@ PACKAGECONFIG[svn] = "" EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \ --without-tcltk \ + --without-iconv \ " EXTRA_OECONF_append_class-nativesdk = " --with-gitconfig=/etc/gitconfig "
meta/recipes-devtools/git/git_2.24.1.bb deleted +0 -11
@@ -1,11 +0,0 @@ -require git.inc - -EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ - ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ - " -EXTRA_OEMAKE += "NO_GETTEXT=1" - -SRC_URI[tarball.md5sum] = "166bde96adbbc11c8843d4f8f4f9811b" -SRC_URI[tarball.sha256sum] = "ad5334956301c86841eb1e5b1bb20884a6bad89a10a6762c958220c7cf64da02" -SRC_URI[manpages.md5sum] = "31c2272a8979022497ba3d4202df145d" -SRC_URI[manpages.sha256sum] = "9a7ae3a093bea39770eb96ca3e5b40bff7af0b9f6123f089d7821d0e5b8e1230"
meta/recipes-devtools/git/git_2.26.2.bb new file +10 -0
@@ -0,0 +1,10 @@ +require git.inc + +EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ + ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ + " +EXTRA_OEMAKE += "NO_GETTEXT=1" + +SRC_URI[tarball.sha256sum] = "e1c17777528f55696815ef33587b1d20f5eec246669f3b839d15dbfffad9c121" +SRC_URI[manpages.sha256sum] = "b3c6cfc980f3c593d0cd0c63e0c97d6f1cafe7b72321fc3a94948758b9529c5b" +
Signature · 1 line
2.26.1
PATCH 7/24 libcap: update to 2.33
In reply to Alexander Kanavin---
...-tests-do-not-statically-link-a-test.patch | 32 +++++++++++++++----
...hread_yield-with-standard-sched_yiel.patch | 24 ++++++++++++++
.../libcap/{libcap_2.32.bb => libcap_2.33.bb} | 5 +--
3 files changed, 53 insertions(+), 8 deletions(-)
create mode 100644 meta/recipes-support/libcap/files/0004-psx.c-replace-pthread_yield-with-standard-sched_yiel.patch
rename meta/recipes-support/libcap/{libcap_2.32.bb => libcap_2.33.bb} (90%)meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch +26 -6
@@ -1,4 +1,4 @@ -From 1179b423cce8d119b42cebfb3daa77c540fdca43 Mon Sep 17 00:00:00 2001 +From 24d59c99bcba065f1f40f49f870a5f6483b4b078 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 15 Jan 2020 17:16:28 +0100 Subject: [PATCH] tests: do not statically link a test
@@ -7,20 +7,40 @@ This fails on e.g. centos 7 Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <[email protected]> + --- - tests/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + tests/Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Makefile b/tests/Makefile -index 7162cf0..6af47af 100644 +index f9cec56..aa0d09b 100644 --- a/tests/Makefile +++ b/tests/Makefile -@@ -29,7 +29,7 @@ psx_test_wrap: psx_test.c $(DEPS) +@@ -29,23 +29,23 @@ psx_test_wrap: psx_test.c $(DEPS) run_libcap_psx_test: libcap_psx_test libcap_psx_test: libcap_psx_test.c $(DEPS) - $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static + $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create + run_libcap_launch_test: libcap_launch_test libcap_psx_launch_test noop + sudo ./libcap_launch_test + sudo ./libcap_psx_launch_test + + libcap_launch_test: libcap_launch_test.c $(DEPS) +- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) --static ++ $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) + + # this varies only slightly from the above insofar as it currently + # only links in the pthreads fork support. TODO() we need to change + # the source to do something interesting with pthreads. + libcap_psx_launch_test: libcap_launch_test.c $(DEPS) +- $(CC) $(CFLAGS) $(IPATH) -DWITH_PTHREADS $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static ++ $(CC) $(CFLAGS) $(IPATH) -DWITH_PTHREADS $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create + + noop: noop.c +- $(CC) $(CFLAGS) $< -o $@ --static ++ $(CC) $(CFLAGS) $< -o $@ + clean: - rm -f psx_test psx_test_wrap libcap_psx_test + rm -f psx_test psx_test_wrap libcap_psx_test libcap_launch_test *~
meta/recipes-support/libcap/files/0004-psx.c-replace-pthread_yield-with-standard-sched_yiel.patch new file +24 -0
@@ -0,0 +1,24 @@ +From a2c4cdb05d0e382101b13944c09c4375e8d7de5f Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Tue, 31 Mar 2020 13:39:28 +0200 +Subject: [PATCH] psx.c: replace pthread_yield() with standard sched_yield() + +This was causing failures when building with musl C library in +particular. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <[email protected]> +--- +diff --git a/libcap/psx.c b/libcap/psx.c +index 04d250f..7e4ac10 100644 +--- a/libcap/psx.c ++++ b/libcap/psx.c +@@ -533,7 +533,7 @@ long int __psx_syscall(long int syscall_nr, ...) { + if (!waiting) { + break; + } +- pthread_yield(); ++ sched_yield(); + } + + errno = restore_errno;
meta/recipes-support/libcap/libcap_2.33.bb renamed from meta/recipes-support/libcap/libcap_2.32.bb +3 -2
@@ -11,9 +11,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${ file://0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch \ file://0002-tests-do-not-run-target-executables.patch \ file://0001-tests-do-not-statically-link-a-test.patch \ + file://0004-psx.c-replace-pthread_yield-with-standard-sched_yiel.patch \ " -SRC_URI[md5sum] = "7416119c9fdcfd0e8dd190a432c668e9" -SRC_URI[sha256sum] = "1005e3d227f2340ad1e3360ef8b69d15e3c72a29c09f4894d7aac038bd26e2be" +SRC_URI[md5sum] = "dcc6220b4a9bf260050b20c07edcddf4" +SRC_URI[sha256sum] = "08edeaba2757021aeec45c4eeec52566675e0e0f5d4f057284d729e04f2643d6" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/"
Signature · 1 line
2.26.1
PATCH 8/24 libhandy: add a recipe from meta-oe
In reply to Alexander KanavinThis is needed by new versions of epiphany browser.
--- meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-gnome/libhandy/libhandy_git.bb | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 meta/recipes-gnome/libhandy/libhandy_git.bb
meta/conf/distro/include/maintainers.inc +1 -0
@@ -337,6 +337,7 @@ RECIPE_MAINTAINER_pn-libgloss = "Alejandro Hernandez <[email protected]>" RECIPE_MAINTAINER_pn-libglu = "Ross Burton <[email protected]>" RECIPE_MAINTAINER_pn-libgpg-error = "Hongxu Jia <[email protected]>" RECIPE_MAINTAINER_pn-libgudev = "Ross Burton <[email protected]>" +RECIPE_MAINTAINER_pn-libhandy = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-libical = "Ross Burton <[email protected]>" RECIPE_MAINTAINER_pn-libice = "Armin Kuster <[email protected]>" RECIPE_MAINTAINER_pn-libid3tag = "Tanu Kaskinen <[email protected]>"
meta/recipes-gnome/libhandy/libhandy_git.bb new file +21 -0
@@ -0,0 +1,21 @@ +SUMMARY = "A library full of GTK+ widgets for mobile phones" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "git://source.puri.sm/Librem5/${BPN}.git;protocol=https" +SRCREV = "7a193d7692c9c76a1a94f17c4d30b585f77d177c" +S = "${WORKDIR}/git" +PV = "0.0.13" + +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' +GTKDOC_MESON_OPTION = 'gtk_doc' + +inherit meson gobject-introspection vala gettext gtk-doc features_check + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +DEPENDS += "gtk+3" + +PACKAGES =+ "${PN}-examples" +FILES_${PN}-examples = "${bindir}"
Signature · 1 line
2.26.1
PATCH 9/24 libdazzle: update to 3.36.0
In reply to Alexander Kanavin---
.../libdazzle/{libdazzle_3.34.1.bb => libdazzle_3.36.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/libdazzle/{libdazzle_3.34.1.bb => libdazzle_3.36.0.bb} (82%)meta/recipes-gnome/libdazzle/libdazzle_3.36.0.bb renamed from meta/recipes-gnome/libdazzle/libdazzle_3.34.1.bb +2 -2
@@ -12,8 +12,8 @@ inherit gnomebase upstream-version-is-even vala features_check gobject-introspec DEPENDS = "glib-2.0-native glib-2.0 gtk+3" -SRC_URI[archive.md5sum] = "e796a92dd3f529616ed388c15208359b" -SRC_URI[archive.sha256sum] = "3d981cbb9d9bb87bfaff7bfd44d9847223b3ef81e69225e4d1f6ac725a669505" +SRC_URI[archive.md5sum] = "154be45a6aac020e7d59f477bd7cafcf" +SRC_URI[archive.sha256sum] = "82b31bbf550fc62970c78bf7f9d55e5fae5b8ea13b24fe2d13c8c6039409d958" GIR_MESON_OPTION = 'with_introspection'
Signature · 1 line
2.26.1
PATCH 10/24 epiphany: update to 3.36.1
In reply to Alexander Kanavinlibhandy is a new hard dependency.
---
.../epiphany/{epiphany_3.34.4.bb => epiphany_3.36.1.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-gnome/epiphany/{epiphany_3.34.4.bb => epiphany_3.36.1.bb} (79%)meta/recipes-gnome/epiphany/epiphany_3.36.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.34.4.bb +3 -3
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr \ gsettings-desktop-schemas libxml2-native \ - glib-2.0 glib-2.0-native json-glib libdazzle" + glib-2.0 glib-2.0-native json-glib libdazzle libhandy" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings features_check upstream-version-is-even gettext mime-xdg
@@ -14,8 +14,8 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ file://0002-help-meson.build-disable-the-use-of-yelp.patch \ " -SRC_URI[archive.md5sum] = "a559f164bb7d6cbeceb348648076830b" -SRC_URI[archive.sha256sum] = "60e190fc07ec7e33472e60c7e633e04004f7e277a0ffc5e9cd413706881e598d" +SRC_URI[archive.md5sum] = "d66416d0be97ec7789564473337bfe57" +SRC_URI[archive.sha256sum] = "f6f233fb43c6318476d4594707b3fdd5b4127b5e35263e73fbcad8895db8efb6" FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas"
Signature · 1 line
2.26.1
PATCH 11/24 patchelf: switch to git
In reply to Alexander KanavinThe tarball download website is full of broken links; while direct tarball download still works, exploring around and checking for latest versions does not.
--- meta/recipes-devtools/patchelf/patchelf_0.10.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
meta/recipes-devtools/patchelf/patchelf_0.10.bb +4 -3
@@ -1,4 +1,4 @@ -SRC_URI = "https://nixos.org/releases/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.bz2 \ +SRC_URI = "git://github.com/NixOS/patchelf;protocol=https \ file://handle-read-only-files.patch \ file://fix-adjusting-startPage.patch \ "
@@ -6,8 +6,9 @@ SRC_URI = "https://nixos.org/releases/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.bz2 \ LICENSE = "GPLv3" SUMMARY = "Tool to allow editing of RPATH and interpreter fields in ELF binaries" -SRC_URI[md5sum] = "6c3f3a06a95705870d129494a6880106" -SRC_URI[sha256sum] = "f670cd462ac7161588c28f45349bc20fb9bd842805e3f71387a320e7a9ddfcf3" +SRCREV = "e1e39f3639e39360ceebb2f7ed533cede4623070" + +S = "${WORKDIR}/git" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
Signature · 1 line
2.26.1
PATCH 12/24 powertop: switch to Arjan's git
In reply to Alexander Kanavin01.org seems unmaintained; while the tarball is still there, the page to download it from is gone.
--- meta/recipes-kernel/powertop/powertop_2.10.bb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
meta/recipes-kernel/powertop/powertop_2.10.bb +5 -8
@@ -6,25 +6,22 @@ DEPENDS = "ncurses libnl pciutils" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" -SRC_URI = "https://01.org/sites/default/files/downloads/powertop-v${PV}.tar.gz \ +SRC_URI = "git://github.com/fenrus75/powertop;protocol=https \ file://0001-wakeup_xxx.h-include-limits.h.patch \ " +SRCREV = "e8765b5475b22b7a2b6e9e8a031c68a268a0b0b3" -SRC_URI[md5sum] = "a69bd55901cf919cc564187402ea2c9c" -SRC_URI[sha256sum] = "d3b7459eaba7d01c8841dd33a3b4d369416c01e9bd8951b0d88234cf18fe4a75" - -UPSTREAM_CHECK_URI = "https://01.org/powertop/downloads" -UPSTREAM_CHECK_REGEX = "powertop-[v]?(?P<pver>\d+(\.\d+)+)\.tar" +S = "${WORKDIR}/git" inherit autotools gettext pkgconfig -S = "${WORKDIR}/${BPN}-v${PV}" - # we do not want libncursesw if we can do_configure_prepend() { # configure.ac checks for delwin() in "ncursesw ncurses" so let's drop first one sed -i -e "s/ncursesw//g" ${S}/configure.ac mkdir -p ${B}/src/tuning/ + echo "${PV}" > ${S}/version-long + echo "${PV}" > ${S}/version-short } inherit update-alternatives
Signature · 1 line
2.26.1
PATCH 13/24 meson: fix upstream version check
In reply to Alexander Kanavin--- meta/recipes-devtools/meson/meson.inc | 1 + 1 file changed, 1 insertion(+)
meta/recipes-devtools/meson/meson.inc +1 -0
@@ -26,6 +26,7 @@ SRC_URI_append_class-native = " \ " UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases" +UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar" inherit setuptools3
Signature · 1 line
2.26.1
PATCH 14/24 rpcsvc-proto: update to 1.4.1
In reply to Alexander Kanavin--- meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb +7 -3
@@ -15,9 +15,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0daaf958d5531ab86169ec6e275e1517" SECTION = "libs" DEPENDS += "rpcsvc-proto-native" -PV = "1.4+git${SRCPV}" +PV = "1.4.1" -SRCREV = "9bc3b5b785723cfff459b0c01b39d87d4bed975c" +SRCREV = "e295c9a3b67752734995dfc057bfbf5313ed0d82" SRC_URI = "git://github.com/thkukuk/${BPN} \ file://0001-Use-cross-compiled-rpcgen.patch \
@@ -25,10 +25,14 @@ SRC_URI = "git://github.com/thkukuk/${BPN} \ S = "${WORKDIR}/git" -inherit autotools +inherit autotools gettext EXTRA_OEMAKE_class-native = " -C rpcgen" +do_configure_prepend() { + touch ${S}/ABOUT-NLS +} + do_install_append() { # They come from quota recipe rm -rf ${D}${includedir}/rpcsvc/rquota.[hx]
Signature · 1 line
2.26.1
PATCH 15/24 vulkan-headers: upgrade 1.1.126.0 -> 1.2.135.0
In reply to Alexander Kanavin---
...ulkan-headers_1.1.126.0.bb => vulkan-headers_1.2.135.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/vulkan/{vulkan-headers_1.1.126.0.bb => vulkan-headers_1.2.135.0.bb} (87%)meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb renamed from meta/recipes-graphics/vulkan/vulkan-headers_1.1.126.0.bb +2 -2
@@ -5,9 +5,9 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=sdk-1.1.126" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=sdk-1.2.135" -SRCREV = "5bc459e2921304c32568b73edaac8d6df5f98b84" +SRCREV = "fb7f9c9bcd1d1544ea203a1f3d4253d0e90c5a90" S = "${WORKDIR}/git"
Signature · 1 line
2.26.1
PATCH 16/24 vulkan-loader: upgrade 1.1.126.0 -> 1.2.135.0
In reply to Alexander Kanavin---
...{vulkan-loader_1.1.126.0.bb => vulkan-loader_1.2.135.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/vulkan/{vulkan-loader_1.1.126.0.bb => vulkan-loader_1.2.135.0.bb} (95%)meta/recipes-graphics/vulkan/vulkan-loader_1.2.135.0.bb renamed from meta/recipes-graphics/vulkan/vulkan-loader_1.1.126.0.bb +2 -2
@@ -9,8 +9,8 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.1.126" -SRCREV = "4adad4ff705fa76f9edb2d37cb57e593decb60ed" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.2.135" +SRCREV = "86429d9e7f3542e88fb98ffa7d8a82c10c9828ac" S = "${WORKDIR}/git"
Signature · 1 line
2.26.1
PATCH 17/24 vulkan-tools: upgrade 1.1.126.0 -> 1.2.135.0
In reply to Alexander Kanavin---
.../{vulkan-tools_1.1.126.0.bb => vulkan-tools_1.2.135.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/vulkan/{vulkan-tools_1.1.126.0.bb => vulkan-tools_1.2.135.0.bb} (94%)meta/recipes-graphics/vulkan/vulkan-tools_1.2.135.0.bb renamed from meta/recipes-graphics/vulkan/vulkan-tools_1.1.126.0.bb +2 -2
@@ -5,8 +5,8 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.1.126" -SRCREV = "09695dfc5dbe54f869aeaff8db93bb7bb6a220e0" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.2.135" +SRCREV = "6d8197fd6c91d352a601587ffdde28f4cd7bc399" S = "${WORKDIR}/git"
Signature · 1 line
2.26.1
PATCH 18/24 vulkan-demos: upgrade to latest revision
In reply to Alexander Kanavingli is replaced upstream with ktx.
lfs objects are not in a revision that we use, so they can be ignored.
--- ...uild-demos-with-questionably-licensed-data.patch | 13 ++++++++----- meta/recipes-graphics/vulkan/vulkan-demos_git.bb | 6 +++--- 2 files changed, 11 insertions(+), 8 deletions(-)
meta/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch +8 -5
@@ -1,4 +1,4 @@ -From 0cbf9c9831f773e0da66209be9a6ff28d57c2321 Mon Sep 17 00:00:00 2001 +From 663d51cd31fd98411e25f37aaf52b591d9639bf5 Mon Sep 17 00:00:00 2001 From: "Maxin B. John" <[email protected]> Date: Mon, 30 Jul 2018 17:23:29 +0300 Subject: [PATCH] Don't build demos with questionably licensed data
@@ -33,16 +33,15 @@ Upstream-Status: Inappropriate [configuration] Signed-off-by: Jussi Kukkonen <[email protected]> Signed-off-by: Maxin B. John <[email protected]> - --- examples/CMakeLists.txt | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt -index e07918c..08b6e23 100644 +index a53c834..71a12e7 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt -@@ -55,18 +55,12 @@ set(EXAMPLES +@@ -55,9 +55,6 @@ set(EXAMPLES conditionalrender conservativeraster debugmarker
@@ -52,9 +51,10 @@ index e07918c..08b6e23 100644 descriptorsets displacement distancefieldfonts - dynamicuniformbuffer +@@ -65,9 +62,6 @@ set(EXAMPLES gears geometryshader + gltfscene - hdr - imgui - indirectdraw
@@ -93,3 +93,6 @@ index e07918c..08b6e23 100644 ) buildExamples() +-- +2.17.1 +
meta/recipes-graphics/vulkan/vulkan-demos_git.bb +3 -3
@@ -6,15 +6,15 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=dcf473723faabf17baa9b5f2207599d0 \ file://examples/triangle/triangle.cpp;endline=12;md5=bccd1bf9cadd9e10086cf7872157e4fa" SRCREV_glm = "1ad55c5016339b83b7eec98c31007e0aee57d2bf" -SRCREV_gli = "7da5f50931225e9819a26d5cb323c5f42da50bcd" +SRCREV_ktx = "726d14d02c95bb21ec9e43807751b491d295dd3c" SRC_URI = "git://github.com/SaschaWillems/Vulkan.git \ git://github.com/g-truc/glm;destsuffix=git/external/glm;name=glm \ - git://github.com/g-truc/gli;destsuffix=git/external/gli;name=gli \ + git://github.com/KhronosGroup/KTX-Software;destsuffix=git/external/ktx;name=ktx;lfs=0 \ file://0001-Don-t-build-demos-with-questionably-licensed-data.patch \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "6d63dc32c320a49be0a56c365151c8f2f176bc59" +SRCREV = "10a1ecaf7bbcbc316c83f7c52742baaba0ae2f45" UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for" S = "${WORKDIR}/git"
Signature · 1 line
2.26.1
PATCH 19/24 e2fsprogs: update to 1.45.6
In reply to Alexander KanavinDrop backports, and also 0001-misc-create_inode.c-set-dir-s-mode-correctly.patch as upstream code has been refactored.
---
...-t-try-to-rehash-a-deleted-directory.patch | 49 ------------
...ate_inode.c-set-dir-s-mode-correctly.patch | 41 ----------
.../e2fsprogs/e2fsprogs/CVE-2019-5188.patch | 57 --------------
...fix-use-after-free-in-calculate_tree.patch | 76 -------------------
...-missing-check-for-permission-denied.patch | 2 +-
.../e2fsprogs/e2fsprogs/quiet-debugfs.patch | 2 +-
...2fsprogs_1.45.4.bb => e2fsprogs_1.45.6.bb} | 6 +-
7 files changed, 3 insertions(+), 230 deletions(-)
delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch
delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode-correctly.patch
delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2019-5188.patch
delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsck-fix-use-after-free-in-calculate_tree.patch
rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.45.4.bb => e2fsprogs_1.45.6.bb} (94%)meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch deleted +0 -49
@@ -1,49 +0,0 @@ -From 71ba13755337e19c9a826dfc874562a36e1b24d3 Mon Sep 17 00:00:00 2001 -From: Theodore Ts'o <[email protected]> -Date: Thu, 19 Dec 2019 19:45:06 -0500 -Subject: [PATCH] e2fsck: don't try to rehash a deleted directory - -If directory has been deleted in pass1[bcd] processing, then we -shouldn't try to rehash the directory in pass 3a when we try to -rehash/reoptimize directories. - -Signed-off-by: Theodore Ts'o <[email protected]> - -Upstream-Status: Backport [https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?id=71ba13755337e19c9a826dfc874562a36e1b24d3] -Signed-off-by: Anuj Mittal <[email protected]> ---- - e2fsck/pass1b.c | 4 ++++ - e2fsck/rehash.c | 2 ++ - 2 files changed, 6 insertions(+) - -diff --git a/e2fsck/pass1b.c b/e2fsck/pass1b.c -index 5693b9cf..bca701ca 100644 ---- a/e2fsck/pass1b.c -+++ b/e2fsck/pass1b.c -@@ -705,6 +705,10 @@ static void delete_file(e2fsck_t ctx, ext2_ino_t ino, - fix_problem(ctx, PR_1B_BLOCK_ITERATE, &pctx); - if (ctx->inode_bad_map) - ext2fs_unmark_inode_bitmap2(ctx->inode_bad_map, ino); -+ if (ctx->inode_reg_map) -+ ext2fs_unmark_inode_bitmap2(ctx->inode_reg_map, ino); -+ ext2fs_unmark_inode_bitmap2(ctx->inode_dir_map, ino); -+ ext2fs_unmark_inode_bitmap2(ctx->inode_used_map, ino); - ext2fs_inode_alloc_stats2(fs, ino, -1, LINUX_S_ISDIR(dp->inode.i_mode)); - quota_data_sub(ctx->qctx, &dp->inode, ino, - pb.dup_blocks * fs->blocksize); -diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c -index 3dd1e941..2c908be0 100644 ---- a/e2fsck/rehash.c -+++ b/e2fsck/rehash.c -@@ -1028,6 +1028,8 @@ void e2fsck_rehash_directories(e2fsck_t ctx) - if (!ext2fs_u32_list_iterate(iter, &ino)) - break; - } -+ if (!ext2fs_test_inode_bitmap2(ctx->inode_dir_map, ino)) -+ continue; - - pctx.dir = ino; - if (first) { --- -2.24.1 -
meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode-correctly.patch deleted +0 -41
41 lines not on this page · raw message
meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2019-5188.patch deleted +0 -57
57 lines not on this page · raw message
meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsck-fix-use-after-free-in-calculate_tree.patch deleted +0 -76
76 lines not on this page · raw message
meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch +1 -1
@@ -1,4 +1,4 @@ -From e8331a76983e839a3d193446ab8ae9c1b09daa07 Mon Sep 17 00:00:00 2001 +From b55dfb4b62e507ae4f0814aec7597b56f9d6292a Mon Sep 17 00:00:00 2001 From: Jackie Huang <[email protected]> Date: Wed, 10 Aug 2016 11:19:44 +0800 Subject: [PATCH] Fix missing check for permission denied.
meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch +1 -1
@@ -1,4 +1,4 @@ -From de6d6f0dd010f5b9d917553acb9430278f448f23 Mon Sep 17 00:00:00 2001 +From 9aa68ad81b97847dda3493145f4b0a7cc580c551 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Mon, 23 Dec 2013 13:38:34 +0000 Subject: [PATCH] e2fsprogs: silence debugfs
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.6.bb renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb +1 -5
@@ -4,19 +4,15 @@ SRC_URI += "file://remove.ldconfig.call.patch \ file://run-ptest \ file://ptest.patch \ file://mkdir_p.patch \ - file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \ file://0001-configure.ac-correct-AM_GNU_GETTEXT.patch \ file://0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch \ - file://CVE-2019-5188.patch \ - file://0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch \ - file://e2fsck-fix-use-after-free-in-calculate_tree.patch \ " SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ file://quiet-debugfs.patch \ " -SRCREV = "984ff8d6a0a1d5dc300505f67b38ed5047d51dac" +SRCREV = "506d96fe640f76ab04276e0a7c578aa108ce19f8" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$" EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
Signature · 1 line
2.26.1
PATCH 20/24 build-compare: update to latest revision
In reply to Alexander KanavinDrop the patch as upstream has refactored the code, and recent reproducible builds work has likely rendered it unnecessary.
--- .../build-compare/build-compare_git.bb | 8 ++-- .../files/Ignore-DWARF-sections.patch | 37 ------------------- 2 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 meta/recipes-devtools/build-compare/files/Ignore-DWARF-sections.patch
meta/recipes-devtools/build-compare/build-compare_git.bb +3 -5
@@ -5,15 +5,13 @@ HOMEPAGE = "https://github.com/openSUSE/build-compare" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "git://github.com/openSUSE/build-compare.git \ - file://Ignore-DWARF-sections.patch;striplevel=1 \ - " +SRC_URI = "git://github.com/openSUSE/build-compare.git" # Date matches entry in build-compare.changes and date of SRCREV. # -SRCREV = "4dfa207660776cae120afa4353aec7f1f2a998d2" +SRCREV = "28bf642fcfdab94adb9b847329338005be6f73c7" PE = "1" -PV = "2019.08.14+git${SRCPV}" +PV = "2020.03.31+git${SRCPV}" UPSTREAM_CHECK_COMMITS = "1" S = "${WORKDIR}/git"
meta/recipes-devtools/build-compare/files/Ignore-DWARF-sections.patch deleted +0 -37
@@ -1,37 +0,0 @@ -From 015715694eadd714b903f30ade876e0738d44974 Mon Sep 17 00:00:00 2001 -From: Randy Witt <[email protected]> -Date: Mon, 5 Jan 2015 15:09:20 -0800 -Subject: [PATCH] Ignore DWARF sections. - -Assume for now that we don't care about the DWARF sections due to path -differences. However, in the case the tool is ran on a "debug" package -it will most likely falsely say the packages have no differences. - -Upstream-Status: Inappropriate [other] - -The package difference tool is correctly labelling the packages as different -when the DWARF sections don't match due to paths. The paths in the debug info -should actually be made to be the same using compile flags or some other -mechanism. - -However, to make the tool more useful to Yocto until the work can be done -to ensure identical paths in debug sections, this patch is being applied. - -Signed-off-by: Randy Witt <[email protected]> ---- - pkg-diff.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pkg-diff.sh b/pkg-diff.sh -index 9c2125e..b0d77c8 100755 ---- a/pkg-diff.sh -+++ b/pkg-diff.sh -@@ -851,7 +851,7 @@ check_single_file() - echo "" >$file1 - echo "" >$file2 - # Don't compare .build-id, .gnu_debuglink and .gnu_debugdata sections -- sections="$($OBJDUMP -s new/$file | grep "Contents of section .*:" | sed -r "s,.* (.*):,\1,g" | grep -v -e "\.build-id" -e "\.gnu_debuglink" -e "\.gnu_debugdata" | tr "\n" " ")" -+ sections="$($OBJDUMP -s new/$file | grep "Contents of section .*:" | sed -r "s,.* (.*):,\1,g" | grep -v -e "\.build-id" -e "\.gnu_debuglink" -e "\.gnu_debugdata" -e "\.debug_abbrev" -e "\.debug_aranges" -e "\.debug_frame" -e "\.debug_info" -e "\.debug_line" -e "\.debug_loc" -e "\.debug_macinfo" -e "\.debug_pubnames" -e "\.debug_pubtypes" -e "\.debug_ranges" -e "\.debug_str" | tr "\n" " ")" - for section in $sections; do - $OBJDUMP -s -j $section old/$file | sed "s,^old/,," > $file1 - $OBJDUMP -s -j $section new/$file | sed "s,^new/,," > $file2
Signature · 1 line
2.26.1
PATCH 21/24 ovmf: update to 202002
In reply to Alexander Kanavin---
...st.patch => 0001-ovmf-Update-to-latest.patch} | 16 ++++++++--------
meta/recipes-core/ovmf/ovmf_git.bb | 8 ++++----
2 files changed, 12 insertions(+), 12 deletions(-)
rename meta/recipes-core/ovmf/ovmf/{0004-ovmf-Update-to-latest.patch => 0001-ovmf-Update-to-latest.patch} (85%)meta/recipes-core/ovmf/ovmf/0001-ovmf-Update-to-latest.patch renamed from meta/recipes-core/ovmf/ovmf/0004-ovmf-Update-to-latest.patch +8 -8
@@ -1,7 +1,7 @@ -From 94eff316b31b4d0348af28c77be5c00bc09fe8e7 Mon Sep 17 00:00:00 2001 +From 640a634936ba8eca4778470fb14c6eb9cfd19953 Mon Sep 17 00:00:00 2001 From: Steve Langasek <[email protected]> Date: Sat, 10 Jun 2017 01:39:36 -0700 -Subject: [PATCH 4/5] ovmf: Update to latest +Subject: [PATCH 1/2] ovmf: Update to latest Description: pass -fno-stack-protector to all GCC toolchains The upstream build rules inexplicably pass -fno-stack-protector only
@@ -15,12 +15,12 @@ Upstream-Status: Pending 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template -index ca0b122dbb..b0066c2ab8 100755 +index 2b17d3b297..4cd2567c2a 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template -@@ -1941,10 +1941,10 @@ DEFINE GCC_X64_RC_FLAGS = -I binary -O elf64-x86-64 -B i386 - DEFINE GCC_ARM_RC_FLAGS = -I binary -O elf32-littlearm -B arm --rename-section .data=.hii - DEFINE GCC_AARCH64_RC_FLAGS = -I binary -O elf64-littleaarch64 -B aarch64 --rename-section .data=.hii +@@ -1950,10 +1950,10 @@ DEFINE GCC_AARCH64_RC_FLAGS = -I binary -O elf64-littleaarch64 -B aarch64 + # GCC Build Flag for included header file list generation + DEFINE GCC_DEPS_FLAGS = -MMD -MF [email protected] -DEFINE GCC48_ALL_CC_FLAGS = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings +DEFINE GCC48_ALL_CC_FLAGS = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -fno-stack-protector -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
@@ -32,7 +32,7 @@ index ca0b122dbb..b0066c2ab8 100755 DEFINE GCC48_IA32_X64_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_DLINK_COMMON) -Wl,--entry,ReferenceAcpiTable -u ReferenceAcpiTable DEFINE GCC48_IA32_X64_DLINK_FLAGS = DEF(GCC48_IA32_X64_DLINK_COMMON) -Wl,--entry,$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Wl,-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map,--whole-archive DEFINE GCC48_IA32_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x220 DEF(GCC_DLINK2_FLAGS_COMMON) -@@ -1953,7 +1953,7 @@ DEFINE GCC48_X64_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x228 DEF +@@ -1962,7 +1962,7 @@ DEFINE GCC48_X64_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x228 DEF DEFINE GCC48_ASM_FLAGS = DEF(GCC_ASM_FLAGS) DEFINE GCC48_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian DEFINE GCC48_AARCH64_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian
@@ -42,5 +42,5 @@ index ca0b122dbb..b0066c2ab8 100755 DEFINE GCC48_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mcmodel=large DEF(GCC_AARCH64_CC_FLAGS) DEFINE GCC48_AARCH64_CC_XIPFLAGS = DEF(GCC_AARCH64_CC_XIPFLAGS) -- -2.17.1 +2.24.0
meta/recipes-core/ovmf/ovmf_git.bb +4 -4
@@ -12,15 +12,15 @@ LIC_FILES_CHKSUM = "file://OvmfPkg/License.txt;md5=06357ddc23f46577c2aeaeaf7b776 PACKAGECONFIG ??= "" PACKAGECONFIG[secureboot] = ",,," -SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=git \ +SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \ file://0001-ovmf-update-path-to-native-BaseTools.patch \ file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ file://0003-ovmf-enable-long-path-file.patch \ - file://0004-ovmf-Update-to-latest.patch \ + file://0001-ovmf-Update-to-latest.patch \ " -PV = "edk2-stable201911" -SRCREV = "bd85bf54c268204c7a698a96f3ccd96cd77952cd" +PV = "edk2-stable202002" +SRCREV = "4c0f6e349d32cf27a7104ddd3e729d6ebc88ea70" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)" inherit deploy
Signature · 1 line
2.26.1
PATCH 22/24 cdrtools-native: fix upstream version check
In reply to Alexander Kanavin--- meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb | 1 - 1 file changed, 1 deletion(-)
meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb +0 -1
@@ -11,7 +11,6 @@ SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/cdrtools/cdrtools-${PV}.tar.bz2 \ file://0001-Don-t-set-uid-gid-during-install.patch \ " -UPSTREAM_VERSION_UNKNOWN = "1" SRC_URI[md5sum] = "7d45c5b7e1f78d85d1583b361aee6e8b" SRC_URI[sha256sum] = "ed282eb6276c4154ce6a0b5dee0bdb81940d0cbbfc7d03f769c4735ef5f5860f"
Signature · 1 line
2.26.1
PATCH 23/24 testresults.json: add duration of the tests as well
In reply to Alexander KanavinThis is printed by testimage, but isn't actually saved. It's a useful metric for tracking execution times.
--- meta/lib/oeqa/core/runner.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
meta/lib/oeqa/core/runner.py +5 -1
@@ -182,8 +182,10 @@ class OETestResult(_TestResult): (status, log) = self._getTestResultDetails(case) t = "" + duration = 0 if case.id() in self.starttime and case.id() in self.endtime: - t = " (" + "{0:.2f}".format(self.endtime[case.id()] - self.starttime[case.id()]) + "s)" + duration = self.endtime[case.id()] - self.starttime[case.id()] + t = " (" + "{0:.2f}".format(duration) + "s)" if status not in logs: logs[status] = []
@@ -191,6 +193,8 @@ class OETestResult(_TestResult): report = {'status': status} if log: report['log'] = log + if duration: + report['duration'] = duration if dump_streams and case.id() in self.logged_output: (stdout, stderr) = self.logged_output[case.id()] report['stdout'] = stdout
Signature · 1 line
2.26.1
PATCH 24/24 re2c: correct upstream location
In reply to Alexander Kanavin--- meta/recipes-support/re2c/re2c_1.0.1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-support/re2c/re2c_1.0.1.bb +2 -1
@@ -5,9 +5,10 @@ SECTION = "devel" LICENSE = "PD" LIC_FILES_CHKSUM = "file://README;beginline=146;md5=881056c9add17f8019ccd8c382ba963a" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" +SRC_URI = "https://github.com/skvadrik/re2c/releases/download/${PV}/${BPN}-${PV}.tar.gz" SRC_URI[md5sum] = "e2c6cf52fc6a21595f21bc82db5324f8" SRC_URI[sha256sum] = "605058d18a00e01bfc32aebf83af35ed5b13180b4e9f279c90843afab2c66c7c" +UPSTREAM_CHECK_URI = "https://github.com/skvadrik/re2c/releases" BBCLASSEXTEND = "native"
Signature · 1 line
2.26.1