Skip to contentSkip to conversation

mesa: set PV from the .inc file and not via filenames

PATCH In review Alexander Kanavin 2 participants 33 messages Aug 22, 2024 – Aug 23, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/32 mesa: set PV from the .inc file and not via filenames

From: Alexander Kanavin <[email protected]>

This allows automated updates of the recipe together with mesa-gl variant, and avoids having to check that update submissions do include mesa-gl file rename.

---
 meta/recipes-graphics/mesa/{mesa-gl_24.0.7.bb => mesa-gl.bb} | 0
 meta/recipes-graphics/mesa/{mesa_24.0.7.bb => mesa.bb}       | 0
 meta/recipes-graphics/mesa/mesa.inc                          | 1 +
 3 files changed, 1 insertion(+)
 rename meta/recipes-graphics/mesa/{mesa-gl_24.0.7.bb => mesa-gl.bb} (100%)
 rename meta/recipes-graphics/mesa/{mesa_24.0.7.bb => mesa.bb} (100%)
meta/recipes-graphics/mesa/mesa-gl.bb renamed from meta/recipes-graphics/mesa/mesa-gl_24.0.7.bb +0 -0
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_24.0.7.bb
rename to meta/recipes-graphics/mesa/mesa-gl.bb
meta/recipes-graphics/mesa/mesa.bb renamed from meta/recipes-graphics/mesa/mesa_24.0.7.bb +0 -0
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa_24.0.7.bb
rename to meta/recipes-graphics/mesa/mesa.bb
meta/recipes-graphics/mesa/mesa.inc +1 -0
index 973b7621357..4cf7eabbb06 100644
@@ -24,6 +24,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
 "
 
 SRC_URI[sha256sum] = "7454425f1ed4a6f1b5b107e1672b30c88b22ea0efea000ae2c7d96db93f6c26a"
+PV = "24.0.7"
 
 UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
 
Signature · 1 line
2.39.2
#1 lore raw

PATCH 2/32 sysvinit: take release tarballs from github

From: Alexander Kanavin <[email protected]>

Upstream no longer publishes them on savannah, e.g. release announcement for 3.10:
https://lists.gnu.org/archive/html/sysvinit-devel/2024-07/msg00016.html

There's been several new versions since:
https://github.com/slicer69/sysvinit/releases

---
 meta/recipes-core/sysvinit/sysvinit_3.04.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
meta/recipes-core/sysvinit/sysvinit_3.04.bb +3 -2
index fb9d00891c6..27ab4162a79 100644
@@ -9,7 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
 
 RDEPENDS:${PN} = "${PN}-inittab"
 
-SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \
+GITHUB_BASE_URI = "https://github.com/slicer69/${BPN}/releases/"
+SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.xz \
            file://install.patch \
            file://crypt-lib.patch \
            file://pidof-add-m-option.patch \
@@ -27,7 +28,7 @@ SRC_URI[sha256sum] = "2a621fe6e4528bc91308b74867ddaaebbdf7753f02395c0c5bae817bd2
 
 S = "${WORKDIR}/sysvinit-${PV}"
 
-inherit update-alternatives features_check
+inherit update-alternatives features_check github-releases
 DEPENDS:append = " update-rc.d-native base-passwd virtual/crypt"
 do_package_setscene[depends] = "${MLPREFIX}base-passwd:do_populate_sysroot"
 
Signature · 1 line
2.39.2
#2 lore raw

PATCH 3/32 bash: upgrade 5.2.21 -> 5.2.32

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 ...T-handler-while-waiting-for-a-child-.patch | 21 ++++++++-----------
 .../bash/bash/0001-fix-c99.patch              |  2 +-
 .../bash/bash/build-tests.patch               |  7 +++----
 .../bash/bash/fix-filesubst-errexit.patch     |  7 ++-----
 .../bash/bash/fix-run-builtins.patch          |  9 +++-----
 .../bash/bash/mkbuiltins_have_stringize.patch | 18 ++++++++++++----
 .../bash/bash/test-output.patch               | 11 ++++------
 .../bash/bash/use_aclocal.patch               |  3 +--
 .../bash/{bash_5.2.21.bb => bash_5.2.32.bb}   |  2 +-
 9 files changed, 38 insertions(+), 42 deletions(-)
 rename meta/recipes-extended/bash/{bash_5.2.21.bb => bash_5.2.32.bb} (90%)
meta/recipes-extended/bash/bash/0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch +9 -12
index 77d770b3647..4e73edb9b3d 100644
@@ -1,4 +1,4 @@
-From 721d5be99eb37d31e48bd66d61808a66a4c5ab84 Mon Sep 17 00:00:00 2001
+From e4b9493ae4923595ec3ca67f85322129fb3056cf Mon Sep 17 00:00:00 2001
 From: Chet Ramey <[email protected]>
 Date: Mon, 30 Oct 2023 12:16:07 -0400
 Subject: [PATCH] changes to SIGINT handler while waiting for a child; skip
@@ -20,10 +20,10 @@ Signed-off-by: Xiangyu Chen <[email protected]>
  6 files changed, 43 insertions(+), 32 deletions(-)
 
 diff --git a/general.c b/general.c
-index 85c5a8b6..65e2ee06 100644
+index bda39f4..94a5339 100644
 --- a/general.c
 +++ b/general.c
-@@ -262,8 +262,9 @@ legal_number (string, result)
+@@ -264,8 +264,9 @@ legal_number (string, result)
    if (errno || ep == string)
      return 0;	/* errno is set on overflow or underflow */
  
@@ -36,7 +36,7 @@ index 85c5a8b6..65e2ee06 100644
  
    /* If *string is not '\0' but *ep is '\0' on return, the entire string
 diff --git a/jobs.c b/jobs.c
-index 6b986ed7..262d78de 100644
+index d3e4ab0..903cf9c 100644
 --- a/jobs.c
 +++ b/jobs.c
 @@ -2718,6 +2718,10 @@ wait_for_background_pids (ps)
@@ -96,7 +96,7 @@ index 6b986ed7..262d78de 100644
        waiting_for_child = 0;
        if (old_sigint_handler == SIG_IGN)
  	set_signal_handler (SIGINT, old_sigint_handler);
-@@ -4136,7 +4144,7 @@ set_job_status_and_cleanup (job)
+@@ -4141,7 +4149,7 @@ set_job_status_and_cleanup (job)
  		 SIGINT (if we reset the sighandler to the default).
  		 In this case, we have to fix things up.  What a crock. */
  	      if (temp_handler == trap_handler && signal_is_trapped (SIGINT) == 0)
@@ -106,7 +106,7 @@ index 6b986ed7..262d78de 100644
  	      if (temp_handler == SIG_DFL)
  		termsig_handler (SIGINT);	/* XXX */
 diff --git a/tests/redir.right b/tests/redir.right
-index 8db10414..9e1403c8 100644
+index 8db1041..9e1403c 100644
 --- a/tests/redir.right
 +++ b/tests/redir.right
 @@ -154,10 +154,10 @@ foo
@@ -123,7 +123,7 @@ index 8db10414..9e1403c8 100644
 +./redir11.sub: line 77: 42: No such file or directory
  42
 diff --git a/tests/redir11.sub b/tests/redir11.sub
-index d417cdb6..ca9854cd 100644
+index d417cdb..ca9854c 100644
 --- a/tests/redir11.sub
 +++ b/tests/redir11.sub
 @@ -34,6 +34,8 @@ a=4 b=7 ss=4 declare -i ss
@@ -136,7 +136,7 @@ index d417cdb6..ca9854cd 100644
  a=4 echo foo 2>&1 >&$(foo) | { grep -q 'Bad file' || echo 'redir11 bad 3'; }
  a=1 echo foo 2>&1 >&$(foo) | { grep -q 'Bad file' || echo 'redir11 bad 4'; }
 diff --git a/tests/type.right b/tests/type.right
-index bbc228e8..e0a66745 100644
+index bbc228e..c0c1c8b 100644
 --- a/tests/type.right
 +++ b/tests/type.right
 @@ -24,15 +24,15 @@ func ()
@@ -164,7 +164,7 @@ index bbc228e8..e0a66745 100644
  builtin is a shell builtin
  /bin/sh
 diff --git a/tests/type.tests b/tests/type.tests
-index fd39c18a..ddc15407 100644
+index fd39c18..ddc1540 100644
 --- a/tests/type.tests
 +++ b/tests/type.tests
 @@ -25,8 +25,6 @@ type -r ${THIS_SH}
@@ -221,6 +221,3 @@ index fd39c18a..ddc15407 100644
  type m
  
  hash -r
--- 
-2.35.5
-
meta/recipes-extended/bash/bash/0001-fix-c99.patch +1 -1
index aa810f7d4e6..abd83d09af3 100644
@@ -1,4 +1,4 @@
-From e9ed388e760ec33dcf9e72c639946c0d0abeec26 Mon Sep 17 00:00:00 2001
+From e8ec2d75a52bdc93c83a679a71a68f4033033b8b Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Wed, 19 Jun 2024 12:57:39 +0000
 Subject: [PATCH] Fix C99 problems
meta/recipes-extended/bash/bash/build-tests.patch +3 -4
index c1b9b8261f0..4cce1ba993f 100644
@@ -1,4 +1,4 @@
-From 318b762837c2ad25319caeaf0320eff613b64daf Mon Sep 17 00:00:00 2001
+From c3f58f8b4f7a359b9d9dd97a45bcaab50a89d224 Mon Sep 17 00:00:00 2001
 From: Anders Roxell <[email protected]>
 Date: Wed, 19 Dec 2012 17:18:31 +0100
 Subject: [PATCH] Add 'ptest' target to Makefile, to run tests without checking
@@ -9,16 +9,15 @@ Signed-off-by: Anders Roxell <[email protected]>
 
 Rebase to 5.0
 Signed-off-by: Hongxu Jia <[email protected]>
-
 ---
  Makefile.in | 24 +++++++++++++++++++-----
  1 file changed, 19 insertions(+), 5 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index bc97049..937ce39 100644
+index 0b4df73..7e2a34e 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -943,20 +943,34 @@ maybe-clean:
+@@ -958,20 +958,34 @@ maybe-clean:
  	fi
  
  recho$(EXEEXT):		$(SUPPORT_SRC)recho.c
meta/recipes-extended/bash/bash/fix-filesubst-errexit.patch +2 -5
index 60f1852316e..c5082ee3558 100644
@@ -1,4 +1,4 @@
-From 59ddfda14e3c9aa6286bb4c4c0748f7c1324a65a Mon Sep 17 00:00:00 2001
+From 16951b74971c7fd38fd036dac1410a9e53cbe736 Mon Sep 17 00:00:00 2001
 From: Chet Ramey <[email protected]>
 Date: Fri, 7 Apr 2023 00:28:46 -0700
 Subject: [PATCH] $(<nosuchfile) is no longer a fatal error with errexit
@@ -17,7 +17,7 @@ Signed-off-by: Zev Weiss <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/builtins/evalstring.c b/builtins/evalstring.c
-index df3dd68e2a7e..6612081cd646 100644
+index 53a7c0b..c5075cc 100644
 --- a/builtins/evalstring.c
 +++ b/builtins/evalstring.c
 @@ -753,7 +753,7 @@ open_redir_file (r, fnp)
@@ -29,6 +29,3 @@ index df3dd68e2a7e..6612081cd646 100644
        free (fn);
        if (fnp)
  	*fnp = 0;
--- 
-2.40.0
-
meta/recipes-extended/bash/bash/fix-run-builtins.patch +3 -6
index 2fa388302e2..05d08598213 100644
@@ -1,4 +1,4 @@
-From 0c4cab9594c96c2dc435a8d9724605824bcbf917 Mon Sep 17 00:00:00 2001
+From 15601c71b073a604ccda25c7f14f0bb12e9a3b28 Mon Sep 17 00:00:00 2001
 From: Dengke Du <[email protected]>
 Date: Tue, 19 Apr 2016 02:57:45 -0400
 Subject: [PATCH] fix run-builtins failed
@@ -16,10 +16,10 @@ Signed-off-by: Dengke Du <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tests/builtins.tests b/tests/builtins.tests
-index 9d77520..63f3af8 100644
+index 8eee43e..71c9eee 100644
 --- a/tests/builtins.tests
 +++ b/tests/builtins.tests
-@@ -109,7 +109,7 @@ esac
+@@ -124,7 +124,7 @@ esac
  
  # test options to exec
  (exec -a specialname ${THIS_SH} -c 'echo $0' )
@@ -28,6 +28,3 @@ index 9d77520..63f3af8 100644
  # test `clean' environment.  if /bin/sh is bash, and the script version of
  # printenv is run, there will be variables in the environment that bash
  # sets on startup.  Also test code that prefixes argv[0] with a dash.
--- 
-2.8.1
-
meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch +14 -4
index a9391d6cacb..eb29e7d836d 100644
@@ -1,3 +1,8 @@
+From d11685286144c2e5630545e435d11387b2908fd0 Mon Sep 17 00:00:00 2001
+From: Christopher Larson <[email protected]>
+Date: Wed, 14 Nov 2012 07:55:09 -0700
+Subject: [PATCH] bash: fix mkbuiltins build failure
+
 On hosts with FORTIFY_SOURCES, stringize support is required, as it's used by
 the macros to wrap functions (e.g. read and open in unistd.h). Those wrappers
 use the STRING() macro from unistd.h. A header in the bash sources overrides
@@ -13,14 +18,19 @@ stringize support, or to not define STRING() at all when FORTIFY_SOURCES is
 defined, letting the unistd.h one be used, instead.
 
 Upstream-Status: Pending
+---
+ builtins/mkbuiltins.c | 1 +
+ 1 file changed, 1 insertion(+)
 
---- bash-4.2.orig/builtins/mkbuiltins.c
-+++ bash-4.2/builtins/mkbuiltins.c
+diff --git a/builtins/mkbuiltins.c b/builtins/mkbuiltins.c
+index f505ebd..b5b2eed 100644
+--- a/builtins/mkbuiltins.c
++++ b/builtins/mkbuiltins.c
 @@ -28,6 +28,7 @@
  #  define HAVE_STDLIB_H
-
+ 
  #  define HAVE_RENAME
 +#  define HAVE_STRINGIZE
  #endif /* CROSS_COMPILING */
-
+ 
  #if defined (HAVE_UNISTD_H)
meta/recipes-extended/bash/bash/test-output.patch +4 -7
index 0ffcc24587c..3225907b661 100644
@@ -1,7 +1,7 @@
-From 28eb06047ebd2deaa8c7cd2bf6655ef6a469dc14 Mon Sep 17 00:00:00 2001
+From f5cbd5a4954b89857c9e397cacceda552484f5d5 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <[email protected]>
 Date: Tue, 15 Aug 2017 10:01:56 +0800
-Subject: [PATCH 1/2] Add FAIL/PASS output to test output.
+Subject: [PATCH] Add FAIL/PASS output to test output.
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -16,10 +16,10 @@ Signed-off-by: Hongxu Jia <[email protected]>
  1 file changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/tests/run-all b/tests/run-all
-index 2882fe0..e21d026 100644
+index 1f74923..ba36a1f 100644
 --- a/tests/run-all
 +++ b/tests/run-all
-@@ -33,7 +33,16 @@ do
+@@ -57,7 +57,16 @@ do
  	case $x in
  	$0|run-minimal|run-gprof)	;;
  	*.orig|*~) ;;
@@ -37,6 +37,3 @@ index 2882fe0..e21d026 100644
  	esac
  done
  
--- 
-1.8.3.1
-
meta/recipes-extended/bash/bash/use_aclocal.patch +1 -2
index bd6870b3861..e966b037a27 100644
@@ -1,4 +1,4 @@
-From d1bf23817afffd5917b74da6946e0c3b7e63e336 Mon Sep 17 00:00:00 2001
+From b3a64702fa1978463c01bd5d9fe711e4628aba1e Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Mon, 28 Dec 2020 21:04:27 +0100
 Subject: [PATCH] bash: update 5.0 -> 5.1
@@ -9,7 +9,6 @@ as needed instead making it work like other autotools based projects.
 
 Upstream-Status: Inappropriate [OE configuration specific]
 RP 2021/1/20
-
 ---
  configure.ac | 43 -------------------------------------------
  1 file changed, 43 deletions(-)
meta/recipes-extended/bash/bash_5.2.32.bb renamed from meta/recipes-extended/bash/bash_5.2.21.bb +1 -1
similarity index 90%
rename from meta/recipes-extended/bash/bash_5.2.21.bb
rename to meta/recipes-extended/bash/bash_5.2.32.bb
index ccfe5c47a7e..b159c0232f8 100644
@@ -17,7 +17,7 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \
            file://0001-fix-c99.patch \
            "
 
-SRC_URI[tarball.sha256sum] = "c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8"
+SRC_URI[tarball.sha256sum] = "d3ef80d2b67d8cbbe4d3265c63a72c46f9b278ead6e0e06d61801b58f23f50b5"
 
 DEBUG_OPTIMIZATION:append:armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}"
 DEBUG_OPTIMIZATION:append:armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}"
Signature · 1 line
2.39.2
#3 lore raw

PATCH 4/32 boost: upgrade 1.85.0 -> 1.86.0

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../boost/{boost-1.85.0.inc => boost-1.86.0.inc}     |  2 +-
 ...native_1.85.0.bb => boost-build-native_1.86.0.bb} |  4 ++--
 ...-up-arch-instruction-set-flags-we-do-that-o.patch |  6 +++---
 .../0001-dont-setup-compiler-flags-m32-m64.patch     | 12 +++++++-----
 .../boost/boost/boost-math-disable-pch-for-gcc.patch |  2 +-
 .../boost/{boost_1.85.0.bb => boost_1.86.0.bb}       |  0
 6 files changed, 14 insertions(+), 12 deletions(-)
 rename meta/recipes-support/boost/{boost-1.85.0.inc => boost-1.86.0.inc} (90%)
 rename meta/recipes-support/boost/{boost-build-native_1.85.0.bb => boost-build-native_1.86.0.bb} (82%)
 rename meta/recipes-support/boost/{boost_1.85.0.bb => boost_1.86.0.bb} (100%)
meta/recipes-support/boost/boost-1.86.0.inc renamed from meta/recipes-support/boost/boost-1.85.0.inc +1 -1
similarity index 90%
rename from meta/recipes-support/boost/boost-1.85.0.inc
rename to meta/recipes-support/boost/boost-1.86.0.inc
index c2380bba6ec..2378b27575b 100644
@@ -12,7 +12,7 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}"
 BOOST_P = "boost_${BOOST_VER}"
 
 SRC_URI = "https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/${BOOST_P}.tar.bz2"
-SRC_URI[sha256sum] = "7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617"
+SRC_URI[sha256sum] = "1bed88e40401b2cb7a1f76d4bab499e352fa4d0c5f31c0dbae64e24d34d7513b"
 
 UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/"
 UPSTREAM_CHECK_REGEX = "release/(?P<pver>.*)/source/"
meta/recipes-support/boost/boost-build-native_1.86.0.bb renamed from meta/recipes-support/boost/boost-build-native_1.85.0.bb +2 -2
similarity index 82%
rename from meta/recipes-support/boost/boost-build-native_1.85.0.bb
rename to meta/recipes-support/boost/boost-build-native_1.86.0.bb
index b333c7c81a3..764f4107805 100644
@@ -7,7 +7,7 @@ LICENSE = "BSL-1.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
 
 SRC_URI = "git://github.com/boostorg/build;protocol=https;branch=master"
-SRCREV = "b0311a0d4f3bb0f93d06d3c6faca510c7f5a2012"
+SRCREV = "4a52d8c06635435b64e31a56eaf7ca5dc912a71d"
 PE = "1"
 
 UPSTREAM_CHECK_GITTAGREGEX = "boost-(?P<pver>(\d+(\.\d+)+))"
@@ -21,7 +21,7 @@ do_compile() {
 }
 
 do_install() {
-    HOME=/var/run ./b2 install --prefix=${prefix} staging-prefix=${D}${prefix}
+    HOME=/var/run ./b2 install --prefix=${D}${prefix}
 }
 
 # The build is either release mode (pre-stripped) or debug (-O0).
meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch +3 -3
index fffc675b08b..78f652f619c 100644
@@ -1,4 +1,4 @@
-From 0130a1c0d8ba3c0d59258cb79e8b4a04fe6d8eec Mon Sep 17 00:00:00 2001
+From f88354966fe3af33fd6d9ec889a8e3926b886a8a Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Tue, 18 Dec 2018 15:42:57 +0100
 Subject: [PATCH] Don't set up arch/instruction-set flags, we do that
@@ -13,10 +13,10 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  1 file changed, 153 deletions(-)
 
 diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam
-index e5f8f53a4..0186545e8 100644
+index b7825d4e6..ed7e39baf 100644
 --- a/tools/build/src/tools/gcc.jam
 +++ b/tools/build/src/tools/gcc.jam
-@@ -1111,156 +1111,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + :
+@@ -1144,156 +1144,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + :
          <architecture>$(architecture)/<instruction-set>$(instruction-set)
          : $(values) ;
  }
meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch +7 -5
index 1b01a04c6d9..8f130348b0a 100644
@@ -1,4 +1,4 @@
-From 9c3d6fa3544ca7bd6d8c4f4edbb62282cbc35861 Mon Sep 17 00:00:00 2001
+From 7130850d74863d1e9a0ae3e85462f1466bdf6d88 Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <[email protected]>
 Date: Thu, 14 Nov 2019 10:13:53 +0800
 Subject: [PATCH] dont setup compiler flags -m32/-m64
@@ -9,14 +9,14 @@ Upstream-Status: Inappropriate [OE-specific]
 
 Signed-off-by: Anuj Mittal <[email protected]>
 ---
- tools/build/src/tools/gcc.jam | 14 --------------
- 1 file changed, 14 deletions(-)
+ tools/build/src/tools/gcc.jam | 16 ----------------
+ 1 file changed, 16 deletions(-)
 
 diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam
-index 0186545e8..ba33c4086 100644
+index ed7e39baf..90513f84a 100644
 --- a/tools/build/src/tools/gcc.jam
 +++ b/tools/build/src/tools/gcc.jam
-@@ -360,20 +360,6 @@ local rule compile-link-flags ( * )
+@@ -377,22 +377,6 @@ local rule compile-link-flags ( * )
      compile-link-flags <link>shared/<target-os>$(non-windows) : -fPIC ;
  }
  
@@ -29,6 +29,8 @@ index 0186545e8..ba33c4086 100644
 -    compile-link-flags <target-os>hpux/<address-model>64 : -mlp64 ;
 -
 -    local generic-os = [ set.difference $(all-os) : aix hpux ] ;
+-    compile-link-flags <target-os>$(generic-os)/<architecture>s390x/<address-model>32 : -m31 ;
+-    compile-link-flags <target-os>$(generic-os)/<architecture>s390x/<address-model>64 : -m64 ;
 -    local arch = power sparc x86 ;
 -    compile-link-flags <target-os>$(generic-os)/<architecture>$(arch)/<address-model>32 : -m32 ;
 -    compile-link-flags <target-os>$(generic-os)/<architecture>$(arch)/<address-model>64 : -m64 ;
meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch +1 -1
index 9cb671e0134..dde21fa0763 100644
@@ -1,4 +1,4 @@
-From a61dd2b1336c06d232df58212ece88067e8a80bb Mon Sep 17 00:00:00 2001
+From c6009cdc1fe76db0092443593396e4d5f0eaa86b Mon Sep 17 00:00:00 2001
 From: Jackie Huang <[email protected]>
 Date: Fri, 23 Sep 2016 01:04:50 -0700
 Subject: [PATCH] boost-math: disable pch for gcc
meta/recipes-support/boost/boost_1.86.0.bb renamed from meta/recipes-support/boost/boost_1.85.0.bb +0 -0
similarity index 100%
rename from meta/recipes-support/boost/boost_1.85.0.bb
rename to meta/recipes-support/boost/boost_1.86.0.bb
Signature · 1 line
2.39.2
#4 lore raw

PATCH 5/32 ccache: upgrade 4.10.1 -> 4.10.2

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../ccache/{ccache_4.10.1.bb => ccache_4.10.2.bb}               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/ccache/{ccache_4.10.1.bb => ccache_4.10.2.bb} (93%)
meta/recipes-devtools/ccache/ccache_4.10.2.bb renamed from meta/recipes-devtools/ccache/ccache_4.10.1.bb +1 -1
similarity index 93%
rename from meta/recipes-devtools/ccache/ccache_4.10.1.bb
rename to meta/recipes-devtools/ccache/ccache_4.10.2.bb
index 6ae85af4f5d..361c1643f91 100644
@@ -17,7 +17,7 @@ DEPENDS = "zstd fmt xxhash"
 
 SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz"
 
-SRC_URI[sha256sum] = "8f8ad60d9363857812aa8af3fa7fb72be5ea5cf193f824d16d237a8a79256be4"
+SRC_URI[sha256sum] = "108100960bb7e64573ea925af2ee7611701241abb36ce0aae3354528403a7d87"
 
 inherit cmake github-releases
 
Signature · 1 line
2.39.2
#5 lore raw

PATCH 6/32 cmake: upgrade 3.30.1 -> 3.30.2

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../{cmake-native_3.30.1.bb => cmake-native_3.30.2.bb}     | 0
 meta/recipes-devtools/cmake/cmake.inc                      | 2 +-
 .../cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch    | 7 ++-----
 ...able-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch | 2 +-
 .../cmake/{cmake_3.30.1.bb => cmake_3.30.2.bb}             | 0
 5 files changed, 4 insertions(+), 7 deletions(-)
 rename meta/recipes-devtools/cmake/{cmake-native_3.30.1.bb => cmake-native_3.30.2.bb} (100%)
 rename meta/recipes-devtools/cmake/{cmake_3.30.1.bb => cmake_3.30.2.bb} (100%)
meta/recipes-devtools/cmake/cmake-native_3.30.2.bb renamed from meta/recipes-devtools/cmake/cmake-native_3.30.1.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake-native_3.30.1.bb
rename to meta/recipes-devtools/cmake/cmake-native_3.30.2.bb
meta/recipes-devtools/cmake/cmake.inc +1 -1
index 604a22a2f0a..b88a4e4bc6f 100644
@@ -19,7 +19,7 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
 SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
 "
 
-SRC_URI[sha256sum] = "df9b3c53e3ce84c3c1b7c253e5ceff7d8d1f084ff0673d048f260e04ccb346e1"
+SRC_URI[sha256sum] = "46074c781eccebc433e98f0bbfa265ca3fd4381f245ca3b140e7711531d60db2"
 
 UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
 
meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch +2 -5
index 090f441f0fe..7dc07582da0 100644
@@ -1,4 +1,4 @@
-From a2cd906c36a04c8ce5a0095ae53892902b30d728 Mon Sep 17 00:00:00 2001
+From 5e624d82c2838fec2f41ebec124f74aacff9e61f Mon Sep 17 00:00:00 2001
 From: Changqing Li <[email protected]>
 Date: Wed, 28 Dec 2022 17:51:27 +0800
 Subject: [PATCH] CMakeLists.txt: disable USE_NGHTTP2
@@ -22,7 +22,7 @@ Signed-off-by: Trevor Gamblin <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
-index b766aee425..34ae7d2a39 100644
+index b766aee4..34ae7d2a 100644
 --- a/Utilities/cmcurl/CMakeLists.txt
 +++ b/Utilities/cmcurl/CMakeLists.txt
 @@ -94,7 +94,7 @@ set(USE_ECH OFF)
@@ -34,6 +34,3 @@ index b766aee425..34ae7d2a39 100644
  set(USE_NGTCP2 OFF)
  set(USE_OPENSSL_QUIC OFF)
  set(USE_QUICHE OFF)
--- 
-2.39.2
-
meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch +1 -1
index af164084d03..8788cc7964e 100644
@@ -1,4 +1,4 @@
-From 2d3f6933f78d393514a48f8222ac8c3c39cb5fc7 Mon Sep 17 00:00:00 2001
+From b97f7dbb2637c6da772833c93bedc8be77520fb9 Mon Sep 17 00:00:00 2001
 From: Otavio Salvador <[email protected]>
 Date: Thu, 5 Jul 2018 10:28:04 -0300
 Subject: [PATCH] Disable use of ext2fs/ext2_fs.h by cmake's internal
meta/recipes-devtools/cmake/cmake_3.30.2.bb renamed from meta/recipes-devtools/cmake/cmake_3.30.1.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake_3.30.1.bb
rename to meta/recipes-devtools/cmake/cmake_3.30.2.bb
Signature · 1 line
2.39.2
#6 lore raw

PATCH 7/32 dpkg: upgrade 1.22.10 -> 1.22.11

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch        | 6 +++---
 .../dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch  | 4 ++--
 .../dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch         | 2 +-
 .../dpkg/dpkg/0001-script.c-avoid-use-of-chroot.patch       | 5 +----
 ...apt-to-linux-wrs-kernel-version-which-has-characte.patch | 6 +++---
 ...e-lutimes-function-doesn-t-work-properly-for-all-s.patch | 6 +++---
 .../dpkg/0006-add-musleabi-to-known-target-tripets.patch    | 2 +-
 ...pkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch | 4 ++--
 .../dpkg/dpkg/add_armeb_triplet_entry.patch                 | 6 ++----
 meta/recipes-devtools/dpkg/dpkg/arch_pm.patch               | 2 +-
 meta/recipes-devtools/dpkg/dpkg/noman.patch                 | 4 ++--
 .../dpkg/dpkg/remove-tar-no-timestamp.patch                 | 4 ++--
 .../dpkg/{dpkg_1.22.10.bb => dpkg_1.22.11.bb}               | 2 +-
 13 files changed, 24 insertions(+), 29 deletions(-)
 rename meta/recipes-devtools/dpkg/{dpkg_1.22.10.bb => dpkg_1.22.11.bb} (94%)
meta/recipes-devtools/dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch +3 -3
index 99044fbb1a9..8943f6c2f02 100644
@@ -1,4 +1,4 @@
-From 21459bb8d9a997e6a92885a4ef337ede9cc5aba7 Mon Sep 17 00:00:00 2001
+From 5c332c2a4625519a2b6065b9d9fc724e84c9b6d6 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 29 Apr 2020 22:02:23 -0700
 Subject: [PATCH] Add support for riscv32 CPU
@@ -23,10 +23,10 @@ index 575c008e3..7a801a03a 100644
  s390		s390		s390			32	big
  s390x		s390x		s390x			64	big
 diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
-index fcf5b1e2a..175c9f436 100644
+index edf94bc19..d76f97494 100644
 --- a/scripts/Dpkg/Vendor/Debian.pm
 +++ b/scripts/Dpkg/Vendor/Debian.pm
-@@ -202,6 +202,7 @@ sub set_build_features {
+@@ -216,6 +216,7 @@ sub set_build_features {
          powerpc
          ppc64
          ppc64el
meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch +2 -2
index 95a49053e85..185bbb90f18 100644
@@ -1,4 +1,4 @@
-From 4c5e6c280a2ab4d2009d3264e94286f5fe244d0b Mon Sep 17 00:00:00 2001
+From 067992f2d0b0ff6ca114031636eb0e1eac791892 Mon Sep 17 00:00:00 2001
 From: Paul Eggleton <[email protected]>
 Date: Tue, 16 Jun 2020 03:57:25 +0000
 Subject: [PATCH] build.c: ignore return of 1 from tar -cf
@@ -28,7 +28,7 @@ Signed-off-by: Paul Eggleton <[email protected]>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/src/deb/build.c b/src/deb/build.c
-index 92aba9553..6436b33da 100644
+index 87bd4142e..e85fd7d0f 100644
 --- a/src/deb/build.c
 +++ b/src/deb/build.c
 @@ -481,6 +481,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch +1 -1
index 602a0b22c5d..67fce89d805 100644
@@ -1,4 +1,4 @@
-From 1d192b60fc43e24e1c2d6ff452dabeee7a227cc0 Mon Sep 17 00:00:00 2001
+From df6c641e3fc248d0c864e4e752c4609412067df7 Mon Sep 17 00:00:00 2001
 From: sweeaun <[email protected]>
 Date: Sun, 10 Sep 2017 00:14:15 -0700
 Subject: [PATCH] dpkg: Support muslx32 build
meta/recipes-devtools/dpkg/dpkg/0001-script.c-avoid-use-of-chroot.patch +1 -4
index 7d4dc97e944..d0459cd0179 100644
@@ -1,4 +1,4 @@
-From cf135f2b3395e54dc1adfe51c1a25922e01c167e Mon Sep 17 00:00:00 2001
+From 5e5f06d396fe631990474ba6df83428987855365 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Wed, 26 Aug 2015 16:25:45 +0300
 Subject: [PATCH] script.c: avoid use of chroot
@@ -86,6 +86,3 @@ index e9aee0bf9..181e7c710 100644
  }
  
  /**
--- 
-2.39.2
-
meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch +3 -3
index fc097e5a669..a5c80773a58 100644
@@ -1,4 +1,4 @@
-From 0cac67ce5920d6d0c9df4278bfa77da878a8a37a Mon Sep 17 00:00:00 2001
+From 6e88e8b7b6924751112966f329525956735de9b4 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Wed, 26 Aug 2015 16:16:16 +0300
 Subject: [PATCH] Adapt to linux-wrs kernel version, which has character '_'
@@ -13,10 +13,10 @@ Upstream-Status: Inappropriate [embedded specific]
  1 file changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/lib/dpkg/parsehelp.c b/lib/dpkg/parsehelp.c
-index 63a36f55c..81901bd5a 100644
+index a999b5e78..7be0378ab 100644
 --- a/lib/dpkg/parsehelp.c
 +++ b/lib/dpkg/parsehelp.c
-@@ -275,14 +275,12 @@ parseversion(struct dpkg_version *rversion, const char *string,
+@@ -291,14 +291,12 @@ parseversion(struct dpkg_version *rversion, const char *string,
    ptr = rversion->version;
    if (!*ptr)
      return dpkg_put_error(err, _("version number is empty"));
meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch +3 -3
index 35c0c246f67..e49d54152c8 100644
@@ -1,4 +1,4 @@
-From 80ad29d22f8ca4033a6a79a726580fee17bdade9 Mon Sep 17 00:00:00 2001
+From 0fc90a3ed01a7fce34de925979460638b8a57402 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Wed, 26 Aug 2015 16:27:45 +0300
 Subject: [PATCH] The lutimes function doesn't work properly for all systems.
@@ -11,10 +11,10 @@ Upstream-Status: Inappropriate [embedded specific]
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/archives.c b/src/main/archives.c
-index 7e399f922..ec3b6878f 100644
+index d7279e1f5..f9c6facc9 100644
 --- a/src/main/archives.c
 +++ b/src/main/archives.c
-@@ -491,8 +491,9 @@ tarobject_set_mtime(struct tar_entry *te, const char *path)
+@@ -490,8 +490,9 @@ tarobject_set_mtime(struct tar_entry *te, const char *path)
  
    if (te->type == TAR_FILETYPE_SYMLINK) {
  #ifdef HAVE_LUTIMES
meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch +1 -1
index 2573afb8e4d..4f60a89a566 100644
@@ -1,4 +1,4 @@
-From 1c9e78dda91ba66fbd8fe02b66b6c603d08d3343 Mon Sep 17 00:00:00 2001
+From e3dc69aa987b379e247dde3fce479e43be6c81aa Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 30 Dec 2015 23:05:41 +0000
 Subject: [PATCH] add musleabi to known target tripets
meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch +2 -2
index 3d3a4f0bb9e..ded1707dfd9 100644
@@ -1,4 +1,4 @@
-From 6dd80236a91a505b5753bb74e5f1b47330d8b16b Mon Sep 17 00:00:00 2001
+From 20ba7fd8939e97bec3d70a67c0aac76ddc67898d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <[email protected]>
 Date: Tue, 21 Feb 2017 11:23:27 -0600
 Subject: [PATCH] dpkg-deb/build.c: Remove usage of --clamp-mtime in tar
@@ -27,7 +27,7 @@ Signed-off-by: Kai Kang <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/deb/build.c b/src/deb/build.c
-index 1f0c050ee..92aba9553 100644
+index a418dd122..87bd4142e 100644
 --- a/src/deb/build.c
 +++ b/src/deb/build.c
 @@ -504,7 +504,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch +2 -4
index b5eaa501722..d1fac2168a9 100644
@@ -1,14 +1,12 @@
-From 1c3a109df54b6092fa85a1fe2b7771e3b959655f Mon Sep 17 00:00:00 2001
+From 8ded32a35287a840de7e505c66e76cccd9edbac6 Mon Sep 17 00:00:00 2001
 From: "Krishnanjanappa, Jagadeesh"
  <[email protected]>
 Date: Wed, 8 Apr 2015 18:08:14 +0530
-Subject: [PATCH] dpkg: add triplet entry to fix build error for armeb
+Subject: [PATCH] add armeb triplet entry into triplettable.
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
-[PATCH] add armeb triplet entry into triplettable.
-
 Cross-compling dpkg application for armeb fails with below error
 during configure task,
 
meta/recipes-devtools/dpkg/dpkg/arch_pm.patch +1 -1
index ec5d5034883..b5a29231ddd 100644
@@ -1,4 +1,4 @@
-From bdf60ebbeb433a80e6cfcbde9d83d89564e79e20 Mon Sep 17 00:00:00 2001
+From 812dbb64f2805a3257ef9c9a61abbd10e0b3a08c Mon Sep 17 00:00:00 2001
 From: Joe Slater <[email protected]>
 Date: Mon, 26 Aug 2013 23:38:45 +0000
 Subject: [PATCH] dpkg: fix configuration issue for mips64
meta/recipes-devtools/dpkg/dpkg/noman.patch +2 -2
index e80549d7405..3f3e08351c5 100644
@@ -1,4 +1,4 @@
-From 008ec5150dd086ffa3940cb520f1ca91939f138d Mon Sep 17 00:00:00 2001
+From e671b43a52bf5785fe4aad84712dbabc6c86b39e Mon Sep 17 00:00:00 2001
 From: Chris Larson <[email protected]>
 Date: Tue, 5 Sep 2006 07:24:58 +0000
 Subject: [PATCH] Add dpkg, modified from upstream oe.
@@ -9,7 +9,7 @@ Upstream-Status: Inappropriate [disable feature]
  1 file changed, 1 deletion(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 7186045d4..daca9faf2 100644
+index 74f8df197..35e5eee39 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -11,7 +11,6 @@ SUBDIRS = \
meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch +2 -2
index 9307725e8b5..d3a1a13098d 100644
@@ -1,4 +1,4 @@
-From add92699ca1397205e1d7b46c3ab43de06b9a6c7 Mon Sep 17 00:00:00 2001
+From 7d69de114aa696cfb5e31b491a657ca6b6cbbbd5 Mon Sep 17 00:00:00 2001
 From: Constantin Musca <[email protected]>
 Date: Tue, 28 Aug 2012 17:02:40 +0300
 Subject: [PATCH] busybox-1.19.4 tar utility doesn't support
@@ -12,7 +12,7 @@ Upstream-Status: Inappropriate [configuration]
  1 file changed, 1 deletion(-)
 
 diff --git a/src/deb/extract.c b/src/deb/extract.c
-index 8b78a7eab..fd7595808 100644
+index 08b281564..c35a182ee 100644
 --- a/src/deb/extract.c
 +++ b/src/deb/extract.c
 @@ -338,7 +338,6 @@ extracthalf(const char *debar, const char *dir,
meta/recipes-devtools/dpkg/dpkg_1.22.11.bb renamed from meta/recipes-devtools/dpkg/dpkg_1.22.10.bb +1 -1
similarity index 94%
rename from meta/recipes-devtools/dpkg/dpkg_1.22.10.bb
rename to meta/recipes-devtools/dpkg/dpkg_1.22.11.bb
index b2474048553..47a8d5d5eaf 100644
@@ -17,6 +17,6 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=main
 
 SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch"
 
-SRCREV = "ef5536cfe24e4c41c6fdc56e4530161fade3887c"
+SRCREV = "ee7e9118d0a9581cb00c5ce02dccd561b3096387"
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.39.2
#7 lore raw

PATCH 8/32 e2fsprogs: upgrade 1.47.0 -> 1.47.1

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 ...-missing-check-for-permission-denied.patch |    3 +-
 .../e2fsprogs/e2fsprogs/mkdir_p.patch         |    7 +-
 .../e2fsprogs/e2fsprogs/ptest.patch           |    8 +-
 .../e2fsprogs/e2fsprogs/quiet-debugfs.patch   |    7 +-
 .../e2fsprogs/remove.ldconfig.call.patch      |   15 +-
 ...2fsprogs_1.47.0.bb => e2fsprogs_1.47.1.bb} |    2 +-
 ...2_fs.h-do-not-carry-an-outdated-copy.patch | 1197 +++++++++++++++++
 .../syslinux/syslinux_6.04-pre2.bb            |    3 +-
 8 files changed, 1217 insertions(+), 25 deletions(-)
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.47.0.bb => e2fsprogs_1.47.1.bb} (99%)
 create mode 100644 meta/recipes-devtools/syslinux/syslinux/0001-ext2_fs.h-do-not-carry-an-outdated-copy.patch
meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch +1 -2
index b038e61eb71..4cd10985976 100644
@@ -1,4 +1,4 @@
-From 5bc75654690a2d916190168b865770a7c93e65dd Mon Sep 17 00:00:00 2001
+From 1c7078fda6d23f1d80b0d95ac3e908364749e188 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.
@@ -13,7 +13,6 @@ Upstream-Status: Pending
 Written-by: Henrik Wallin <[email protected]>
 
 Signed-off-by: Jackie Huang <[email protected]>
-
 ---
  lib/support/profile.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir_p.patch +3 -4
index f6916a11120..2dbeba1095f 100644
@@ -1,4 +1,4 @@
-From e3a30baa5c1e2f0ac7e246539db1c7db5a2fe302 Mon Sep 17 00:00:00 2001
+From e143a900199c5bb10b28f3fc8f4d36bbb6ffdd5f Mon Sep 17 00:00:00 2001
 From: Joe Slater <[email protected]>
 Date: Tue, 7 Mar 2017 14:53:19 -0800
 Subject: [PATCH] e2fsprogs: expand @mkdir_p@
@@ -9,16 +9,15 @@ not expanded so no locale data is written into usr/share/locale.
 Upstream-Status: Pending
 
 Signed-off-by: Joe Slater <[email protected]>
-
 ---
  configure.ac | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 4c4b5523..3475c707 100644
+index 131caef3..ca448d97 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -919,6 +919,8 @@ AC_SUBST(PACKAGE)
+@@ -938,6 +938,8 @@ AC_SUBST(PACKAGE)
  AC_SUBST(VERSION)
  
  AM_GNU_GETTEXT([external])
meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch +4 -4
index 20839b72863..f4e1057a364 100644
@@ -1,4 +1,4 @@
-From b8842065ad621a03a971dfd50db862c5bffdeb49 Mon Sep 17 00:00:00 2001
+From 25db5ac7469cedd043a04bcf49ce7553979fbb32 Mon Sep 17 00:00:00 2001
 From: Dmitry Eremin-Solenikov <[email protected]>
 Date: Sat, 18 Apr 2015 17:58:17 +0300
 Subject: [PATCH] e2fsprogs: add ptest
@@ -14,10 +14,10 @@ Signed-off-by: Kai Kang <[email protected]>
  2 files changed, 18 insertions(+), 18 deletions(-)
 
 diff --git a/tests/Makefile.in b/tests/Makefile.in
-index 8c4d2048..e021af32 100644
+index ba06b3b6..5a3e48f4 100644
 --- a/tests/Makefile.in
 +++ b/tests/Makefile.in
-@@ -19,7 +19,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf
+@@ -20,7 +20,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf test_data.tmp
  	@echo "#!/bin/sh" > test_one
  	@echo "HTREE=y" >> test_one
  	@echo "QUOTA=y" >> test_one
@@ -26,7 +26,7 @@ index 8c4d2048..e021af32 100644
  	@echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one
  	@echo "SIZEOF_TIME_T=@SIZEOF_TIME_T@" >> test_one
  	@echo "DD=@DD@" >>test_one
-@@ -30,7 +30,7 @@ test_script: test_one test_script.in Makefile mke2fs.conf
+@@ -31,7 +31,7 @@ test_script: test_one test_script.in Makefile mke2fs.conf test_data.tmp
  	@echo "Creating test_script..."
  	@[ -f test_script ] && chmod u+w test_script || true
  	@echo "#!/bin/sh" > test_script
meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch +3 -4
index 0a6904208d9..4ba150e27d7 100644
@@ -1,4 +1,4 @@
-From 580ef6cae2d353f3aa5d5c52d6614bdc1df50f08 Mon Sep 17 00:00:00 2001
+From b66c973e004e0c458ef275b41ac2d8d9ff33d29f 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
@@ -8,16 +8,15 @@ filesystems at rootfs time.
 
 Upstream-Status: Inappropriate
 Signed-off-by: Ross Burton <[email protected]>
-
 ---
  debugfs/debugfs.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
-index 9b6321dc..8ebf3ddb 100644
+index 909c1df3..0842369e 100644
 --- a/debugfs/debugfs.c
 +++ b/debugfs/debugfs.c
-@@ -2516,7 +2516,7 @@ static int source_file(const char *cmd_file, int ss_idx)
+@@ -2529,7 +2529,7 @@ static int source_file(const char *cmd_file, int ss_idx)
  		cp = strchr(buf, '\r');
  		if (cp)
  			*cp = 0;
meta/recipes-devtools/e2fsprogs/e2fsprogs/remove.ldconfig.call.patch +6 -9
index f3e6eb778ff..307088d42b4 100644
@@ -1,10 +1,10 @@
-From b139e03ac2f72e644e547c7ee9b1514383af4d97 Mon Sep 17 00:00:00 2001
+From 972086935d6c7f6e603004fd7f94bd13a65f470c Mon Sep 17 00:00:00 2001
 From: Andrei Dinu <[email protected]>
 Date: Wed, 30 Jan 2013 15:22:04 +0200
 Subject: [PATCH] When /etc/ld.so.cache is writeable by user running bitbake
- then it creates invalid cache (in my case libstdc++.so
- cannot be found after building zlib(-native) and I have to
- call touch */libstdc++.so && /sbin/ldconfig to fix it.
+ then it creates invalid cache (in my case libstdc++.so cannot be found after
+ building zlib(-native) and I have to call touch */libstdc++.so &&
+ /sbin/ldconfig to fix it.
 
 So remove ldconfig call from make install-libs
 
@@ -15,11 +15,11 @@ Upstream-Status: Inappropriate [disable feature]
 Signed-off-by: Scott Garman <[email protected]>
 Signed-off-by: Andrei Dinu <[email protected]>
 ---
- lib/Makefile.elf-lib |    3 ---
+ lib/Makefile.elf-lib | 3 ---
  1 file changed, 3 deletions(-)
 
 diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib
-index 78479d3..4a4a5ac 100644
+index f850f3dd..cc1e6a70 100644
 --- a/lib/Makefile.elf-lib
 +++ b/lib/Makefile.elf-lib
 @@ -50,8 +50,6 @@ install-shlibs install:: $(ELF_LIB) installdirs-elf-lib $(DEP_INSTALL_SYMLINK)
@@ -39,6 +39,3 @@ index 78479d3..4a4a5ac 100644
  
  clean::
  	$(RM) -rf elfshared
--- 
-1.7.9.5
-
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.1.bb renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.0.bb +1 -1
similarity index 99%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.0.bb
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.1.bb
index 940b47c155d..bd6ac92cb14 100644
@@ -10,7 +10,7 @@ SRC_URI:append:class-native = " \
            file://quiet-debugfs.patch \
            "
 
-SRCREV = "f4c9cc4bedacde8408edda3520a32d3842290112"
+SRCREV = "b571b9b4240739a982e8bca62cfc914a3b50190a"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$"
 
 EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
meta/recipes-devtools/syslinux/syslinux/0001-ext2_fs.h-do-not-carry-an-outdated-copy.patch new file +1197 -0

1,197 lines not on this page · raw message

meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb +2 -1
index d75aa95c1fd..fa7054bc54f 100644
@@ -22,7 +22,8 @@ SRC_URI = "https://www.zytor.com/pub/syslinux/Testing/6.04/syslinux-${PV}.tar.xz
            file://0012-libinstaller-Fix-build-with-glibc-2.36.patch \
            file://0013-remove-clean-script.patch \
            file://0014-Fix-reproducibility-issues.patch \
-"
+           file://0001-ext2_fs.h-do-not-carry-an-outdated-copy.patch \
+           "
 
 SRC_URI[md5sum] = "2b31c78f087f99179feb357da312d7ec"
 SRC_URI[sha256sum] = "4441a5d593f85bb6e8d578cf6653fb4ec30f9e8f4a2315a3d8f2d0a8b3fadf94"
Signature · 1 line
2.39.2
#8 lore raw

Re: [OE-core] [PATCH 08/32] e2fsprogs: upgrade 1.47.0 -> 1.47.1

This is regressing libblockdev from meta-oe -
https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/4065/steps/14/logs/stdio

error snippet

| /home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/libblockdev/3.1.1/recipe-sysroot/usr/include/ext2fs/ext2fs.h:
In function '__encode_extra_time':
| /home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/libblockdev/3.1.1/recipe-sysroot/usr/include/ext2fs/ext2fs.h:588:48:
error: unused parameter 'seconds' [-Werror=unused-parameter]

   |   588 | static inline __u32 __encode_extra_time(time_t seconds, __u32 nsec)
   |       |                                         ~~~~~~~^~~~~~~
   | /home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/libblockdev/3.1.1/recipe-sysroot/usr/include/ext2fs/ext2fs.h:

In function '__decode_extra_sec':
| /home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/libblockdev/3.1.1/recipe-sysroot/usr/include/ext2fs/ext2fs.h:598:63:
error: unused parameter 'extra' [-Werror=unused-parameter]
| 598 | static inline time_t __decode_extra_sec(time_t seconds,
__u32 extra)

   |       |                                                         ~~~~~~^~~~~
   | cc1: all warnings being treated as errors
Quoted 1,410 lines · Alexander Kanavin via lists.openembedded.org

From: Alexander Kanavin <[email protected]>

---
 ...-missing-check-for-permission-denied.patch |    3 +-
 .../e2fsprogs/e2fsprogs/mkdir_p.patch         |    7 +-
 .../e2fsprogs/e2fsprogs/ptest.patch           |    8 +-
 .../e2fsprogs/e2fsprogs/quiet-debugfs.patch   |    7 +-
 .../e2fsprogs/remove.ldconfig.call.patch      |   15 +-
 ...2fsprogs_1.47.0.bb => e2fsprogs_1.47.1.bb} |    2 +-
 ...2_fs.h-do-not-carry-an-outdated-copy.patch | 1197 +++++++++++++++++
 .../syslinux/syslinux_6.04-pre2.bb            |    3 +-
 8 files changed, 1217 insertions(+), 25 deletions(-)
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.47.0.bb => e2fsprogs_1.47.1.bb} (99%)
 create mode 100644 meta/recipes-devtools/syslinux/syslinux/0001-ext2_fs.h-do-not-carry-an-outdated-copy.patch
meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch +1 -2
index b038e61eb71..4cd10985976 100644
@@ -1,4 +1,4 @@
-From 5bc75654690a2d916190168b865770a7c93e65dd Mon Sep 17 00:00:00 2001
+From 1c7078fda6d23f1d80b0d95ac3e908364749e188 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.
@@ -13,7 +13,6 @@ Upstream-Status: Pending
 Written-by: Henrik Wallin <[email protected]>
 
 Signed-off-by: Jackie Huang <[email protected]>
-
 ---
  lib/support/profile.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir_p.patch +3 -4
index f6916a11120..2dbeba1095f 100644
@@ -1,4 +1,4 @@
-From e3a30baa5c1e2f0ac7e246539db1c7db5a2fe302 Mon Sep 17 00:00:00 2001
+From e143a900199c5bb10b28f3fc8f4d36bbb6ffdd5f Mon Sep 17 00:00:00 2001
 From: Joe Slater <[email protected]>
 Date: Tue, 7 Mar 2017 14:53:19 -0800
 Subject: [PATCH] e2fsprogs: expand @mkdir_p@
@@ -9,16 +9,15 @@ not expanded so no locale data is written into usr/share/locale.
 Upstream-Status: Pending
 
 Signed-off-by: Joe Slater <[email protected]>
-
 ---
  configure.ac | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 4c4b5523..3475c707 100644
+index 131caef3..ca448d97 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -919,6 +919,8 @@ AC_SUBST(PACKAGE)
+@@ -938,6 +938,8 @@ AC_SUBST(PACKAGE)
  AC_SUBST(VERSION)
 
  AM_GNU_GETTEXT([external])
meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch +4 -4
index 20839b72863..f4e1057a364 100644
@@ -1,4 +1,4 @@
-From b8842065ad621a03a971dfd50db862c5bffdeb49 Mon Sep 17 00:00:00 2001
+From 25db5ac7469cedd043a04bcf49ce7553979fbb32 Mon Sep 17 00:00:00 2001
 From: Dmitry Eremin-Solenikov <[email protected]>
 Date: Sat, 18 Apr 2015 17:58:17 +0300
 Subject: [PATCH] e2fsprogs: add ptest
@@ -14,10 +14,10 @@ Signed-off-by: Kai Kang <[email protected]>
  2 files changed, 18 insertions(+), 18 deletions(-)
 
 diff --git a/tests/Makefile.in b/tests/Makefile.in
-index 8c4d2048..e021af32 100644
+index ba06b3b6..5a3e48f4 100644
 --- a/tests/Makefile.in
 +++ b/tests/Makefile.in
-@@ -19,7 +19,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf
+@@ -20,7 +20,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf test_data.tmp
        @echo "#!/bin/sh" > test_one
        @echo "HTREE=y" >> test_one
        @echo "QUOTA=y" >> test_one
@@ -26,7 +26,7 @@ index 8c4d2048..e021af32 100644
        @echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one
        @echo "SIZEOF_TIME_T=@SIZEOF_TIME_T@" >> test_one
        @echo "DD=@DD@" >>test_one
-@@ -30,7 +30,7 @@ test_script: test_one test_script.in Makefile mke2fs.conf
+@@ -31,7 +31,7 @@ test_script: test_one test_script.in Makefile mke2fs.conf test_data.tmp
        @echo "Creating test_script..."
        @[ -f test_script ] && chmod u+w test_script || true
        @echo "#!/bin/sh" > test_script
meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch +3 -4
index 0a6904208d9..4ba150e27d7 100644
@@ -1,4 +1,4 @@
-From 580ef6cae2d353f3aa5d5c52d6614bdc1df50f08 Mon Sep 17 00:00:00 2001
+From b66c973e004e0c458ef275b41ac2d8d9ff33d29f 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
@@ -8,16 +8,15 @@ filesystems at rootfs time.
 
 Upstream-Status: Inappropriate
 Signed-off-by: Ross Burton <[email protected]>
-
 ---
  debugfs/debugfs.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
-index 9b6321dc..8ebf3ddb 100644
+index 909c1df3..0842369e 100644
 --- a/debugfs/debugfs.c
 +++ b/debugfs/debugfs.c
-@@ -2516,7 +2516,7 @@ static int source_file(const char *cmd_file, int ss_idx)
+@@ -2529,7 +2529,7 @@ static int source_file(const char *cmd_file, int ss_idx)
                cp = strchr(buf, '\r');
                if (cp)
                        *cp = 0;
meta/recipes-devtools/e2fsprogs/e2fsprogs/remove.ldconfig.call.patch +6 -9
index f3e6eb778ff..307088d42b4 100644
@@ -1,10 +1,10 @@
-From b139e03ac2f72e644e547c7ee9b1514383af4d97 Mon Sep 17 00:00:00 2001
+From 972086935d6c7f6e603004fd7f94bd13a65f470c Mon Sep 17 00:00:00 2001
 From: Andrei Dinu <[email protected]>
 Date: Wed, 30 Jan 2013 15:22:04 +0200
 Subject: [PATCH] When /etc/ld.so.cache is writeable by user running bitbake
- then it creates invalid cache (in my case libstdc++.so
- cannot be found after building zlib(-native) and I have to
- call touch */libstdc++.so && /sbin/ldconfig to fix it.
+ then it creates invalid cache (in my case libstdc++.so cannot be found after
+ building zlib(-native) and I have to call touch */libstdc++.so &&
+ /sbin/ldconfig to fix it.
 
 So remove ldconfig call from make install-libs
 
@@ -15,11 +15,11 @@ Upstream-Status: Inappropriate [disable feature]
 Signed-off-by: Scott Garman <[email protected]>
 Signed-off-by: Andrei Dinu <[email protected]>
 ---
- lib/Makefile.elf-lib |    3 ---
+ lib/Makefile.elf-lib | 3 ---
  1 file changed, 3 deletions(-)
 
 diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib
-index 78479d3..4a4a5ac 100644
+index f850f3dd..cc1e6a70 100644
 --- a/lib/Makefile.elf-lib
 +++ b/lib/Makefile.elf-lib
 @@ -50,8 +50,6 @@ install-shlibs install:: $(ELF_LIB) installdirs-elf-lib $(DEP_INSTALL_SYMLINK)
@@ -39,6 +39,3 @@ index 78479d3..4a4a5ac 100644
 
  clean::
        $(RM) -rf elfshared
---
-1.7.9.5
-
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.1.bb renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.0.bb +1 -1
similarity index 99%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.0.bb
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.1.bb
index 940b47c155d..bd6ac92cb14 100644
@@ -10,7 +10,7 @@ SRC_URI:append:class-native = " \
            file://quiet-debugfs.patch \
            "
 
-SRCREV = "f4c9cc4bedacde8408edda3520a32d3842290112"
+SRCREV = "b571b9b4240739a982e8bca62cfc914a3b50190a"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$"
 
 EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
meta/recipes-devtools/syslinux/syslinux/0001-ext2_fs.h-do-not-carry-an-outdated-copy.patch new file +1197 -0
new file mode 100644
index 00000000000..299423b5a30
@@ -0,0 +1,1197 @@
+From daf017bc98276fecce1893c7e4db70cbd8c8f7a0 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Fri, 16 Aug 2024 16:59:21 +0200
+Subject: [PATCH] ext2_fs.h: do not carry an outdated copy
+
+This copy is no longer compatible with latest e2fsprogs
+(which installs a correct version).
+
+Upstream-Status: Inactive-Upstream
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ core/fs/ext2/ext2_fs.h        | 312 -------------
+ libinstaller/ext2fs/ext2_fs.h | 856 ----------------------------------
+ 2 files changed, 1168 deletions(-)
+ delete mode 100644 core/fs/ext2/ext2_fs.h
+ delete mode 100644 libinstaller/ext2fs/ext2_fs.h
+
+diff --git a/core/fs/ext2/ext2_fs.h b/core/fs/ext2/ext2_fs.h
+deleted file mode 100644
+index d8d07eb..0000000
+--- a/core/fs/ext2/ext2_fs.h
++++ /dev/null
+@@ -1,312 +0,0 @@
+-#ifndef __EXT2_FS_H
+-#define __EXT2_FS_H
+-
+-#include <stdint.h>
+-
+-#define       EXT2_SUPER_MAGIC        0xEF53
+-
+-#define EXT2_GOOD_OLD_REV       0       // The good old (original) format
+-#define EXT2_DYNAMIC_REV        1       // V2 format w/ dynamic inode sizes
+-#define EXT2_GOOD_OLD_INODE_SIZE 128
+-
+-// Special inode numbers
+-#define       EXT2_BAD_INO             1      // Bad blocks inode
+-#define EXT2_ROOT_INO          2      // Root inode
+-#define EXT2_BOOT_LOADER_INO   5      // Boot loader inode
+-#define EXT2_UNDEL_DIR_INO     6      // Undelete directory inode
+-#define EXT3_RESIZE_INO                7      // Reserved group descriptors inode
+-#define EXT3_JOURNAL_INO       8      // Journal inode
+-
+-// We're readonly, so we only care about incompat features.
+-#define EXT2_FEATURE_INCOMPAT_COMPRESSION     0x0001
+-#define EXT2_FEATURE_INCOMPAT_FILETYPE                0x0002
+-#define EXT3_FEATURE_INCOMPAT_RECOVER         0x0004
+-#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV     0x0008
+-#define EXT2_FEATURE_INCOMPAT_META_BG         0x0010
+-#define EXT2_FEATURE_INCOMPAT_ANY             0xffffffff
+-
+-#define EXT2_NDIR_BLOCKS      12
+-#define       EXT2_IND_BLOCK          EXT2_NDIR_BLOCKS
+-#define EXT2_DIND_BLOCK               (EXT2_IND_BLOCK+1)
+-#define       EXT2_TIND_BLOCK         (EXT2_DIND_BLOCK+1)
+-#define       EXT2_N_BLOCKS           (EXT2_TIND_BLOCK+1)
+-
+-
+-/* for EXT4 extent */
+-#define EXT4_EXT_MAGIC     0xf30a
+-#define EXT4_EXTENTS_FLAG  0x00080000
+-
+-/*
+- * File types and file modes
+- */
+-#define S_IFDIR               0040000         // Directory
+-#define S_IFCHR               0020000         // Character device
+-#define S_IFBLK               0060000         // Block device
+-#define S_IFREG               0100000         // Regular file
+-#define S_IFIFO               0010000         // FIFO
+-#define S_IFLNK               0120000         // Symbolic link
+-#define S_IFSOCK      0140000         // Socket
+-
+-#define S_IFSHIFT     12
+-
+-#define T_IFDIR               (S_IFDIR >> S_IFSHIFT)
+-#define T_IFCHR               (S_IFCHR >> S_IFSHIFT)
+-#define T_IFBLK               (S_IFBLK >> S_IFSHIFT)
+-#define T_IFREG               (S_IFREG >> S_IFSHIFT)
+-#define T_IFIFO               (S_IFIFO >> S_IFSHIFT)
+-#define T_IFLNK               (S_IFLNK >> S_IFSHIFT)
+-#define T_IFSOCK      (S_IFSOCK >> S_IFSHIFT)
+-
+-
+-#define ext2_group_desc_lg2size 5
+-
+-
+-
+-/*
+- * super block structure:
+- * include/linux/ext2_fs.h
+- */
+-struct ext2_super_block {
+-    uint32_t s_inodes_count;          /* Inodes count */
+-    uint32_t s_blocks_count;          /* Blocks count */
+-    uint32_t s_r_blocks_count;                /* Reserved blocks count */
+-    uint32_t s_free_blocks_count;     /* Free blocks count */
+-    uint32_t s_free_inodes_count;     /* Free inodes count */
+-    uint32_t s_first_data_block;      /* First Data Block */
+-    uint32_t s_log_block_size;                /* Block size */
+-    uint32_t s_log_frag_size;         /* Fragment size */
+-    uint32_t s_blocks_per_group;      /* # Blocks per group */
+-    uint32_t s_frags_per_group;               /* # Fragments per group */
+-    uint32_t s_inodes_per_group;      /* # Inodes per group */
+-    uint32_t s_mtime;                 /* Mount time */
+-    uint32_t s_wtime;                 /* Write time */
+-    uint16_t s_mnt_count;             /* Mount count */
+-    int16_t  s_max_mnt_count;         /* Maximal mount count */
+-    uint16_t s_magic;                 /* Magic signature */
+-    uint16_t s_state;                 /* File system state */
+-    uint16_t s_errors;                        /* Behaviour when detecting errors */
+-    uint16_t s_minor_rev_level;
+-    uint32_t s_lastcheck;             /* time of last check */
+-    uint32_t s_checkinterval;         /* max. time between checks */
+-    uint32_t s_creator_os;            /* OS */
+-    uint32_t s_rev_level;             /* Revision level */
+-    uint16_t s_def_resuid;            /* Default uid for reserved blocks */
+-    uint16_t s_def_resgid;            /* Default gid for reserved blocks */
+-
+-    uint32_t s_first_ino;             /* First non-reserved inode */
+-    uint16_t s_inode_size;            /* size of inode structure */
+-    uint16_t s_block_group_nr;                /* block group # of this superblock */
+-    uint32_t s_feature_compat;                /* compatible feature set */
+-    uint32_t s_feature_incompat;      /* incompatible feature set */
+-    uint32_t s_feature_ro_compat;     /* readonly-compatible feature set */
+-    uint8_t  s_uuid[16];              /* 128-bit uuid for volume */
+-    char  s_volume_name[16];          /* volume name */
+-    char  s_last_mounted[64];         /* directory where last mounted */
+-    uint32_t s_algorithm_usage_bitmap;  /* For compression */
+-    uint8_t  s_prealloc_blocks;               /* Nr of blocks to try to preallocate*/
+-    uint8_t  s_prealloc_dir_blocks;
+-    uint16_t s_reserved_gdt_blocks;   /* Per group desc for online growth */
+-    /*
+-     * Journaling support valid if EXT4_FEATURE_COMPAT_HAS_JOURNAL set.
+-     */
+-    uint8_t  s_journal_uuid[16];      /* uuid of journal superblock */
+-    uint32_t s_journal_inum;  /* inode number of journal file */
+-    uint32_t s_journal_dev;           /* device number of journal file */
+-    uint32_t s_last_orphan;           /* start of list of inodes to delete */
+-    uint32_t s_hash_seed[4];  /* HTREE hash seed */
+-    uint8_t  s_def_hash_version;      /* Default hash version to use */
+-    uint8_t  s_reserved_char_pad;
+-    uint16_t s_desc_size;             /* size of group descriptor */
+-    uint32_t s_default_mount_opts;
+-    uint32_t s_first_meta_bg; /* First metablock block group */
+-    uint32_t s_mkfs_time;             /* When the filesystem was created */
+-    uint32_t s_jnl_blocks[17];        /* Backup of the journal inode */
+-    /* 64bit support valid if EXT4_FEATURE_COMPAT_64BIT */
+-    uint32_t s_blocks_count_hi;       /* Blocks count */
+-    uint32_t s_r_blocks_count_hi;     /* Reserved blocks count */
+-    uint32_t s_free_blocks_count_hi;/* Free blocks count */
+-    uint16_t s_min_extra_isize;       /* All inodes have at least # bytes */
+-    uint16_t s_want_extra_isize;      /* New inodes should reserve # bytes */
+-    uint32_t s_flags;         /* Miscellaneous flags */
+-    uint16_t s_raid_stride;           /* RAID stride */
+-    uint16_t s_mmp_interval;        /* # seconds to wait in MMP checking */
+-    uint64_t s_mmp_block;           /* Block for multi-mount protection */
+-    uint32_t s_raid_stripe_width;   /* blocks on all data disks (N*stride)*/
+-    uint8_t  s_log_groups_per_flex; /* FLEX_BG group size */
+-    uint8_t  s_reserved_char_pad2;
+-    uint16_t s_reserved_pad;
+-    uint32_t s_reserved[162];        /* Padding to the end of the block */
+-};
+-
+-/*******************************************************************************
+-#ifndef DEPEND
+-#if ext2_super_block_size != 1024
+-#error ext2_super_block definition bogus
+-#endif
+-#endif
+-*******************************************************************************/
+-
+-/*
+- *  ext2 group desc structure:
+- */
+-struct ext2_group_desc {
+-    uint32_t bg_block_bitmap; /* Blocks bitmap block */
+-    uint32_t bg_inode_bitmap; /* Inodes bitmap block */
+-    uint32_t bg_inode_table;  /* Inodes table block */
+-    uint16_t bg_free_blocks_count;    /* Free blocks count */
+-    uint16_t bg_free_inodes_count;    /* Free inodes count */
+-    uint16_t bg_used_dirs_count;      /* Directories count */
+-    uint16_t bg_pad;
+-    uint32_t bg_reserved[3];
+-};
+-
+-/*******************************************************************************
+-#ifndef DEPEND
+-#if ext2_group_desc_size != 32
+-#error ext2_group_desc definition bogus
+-#endif
+-#endif
+-*******************************************************************************/
+-
+-
+-/*
+- * ext2 inode structure:
+- */
+-struct ext2_inode {
+-    uint16_t i_mode;          /* File mode */
+-    uint16_t i_uid;           /* Owner Uid */
+-    uint32_t i_size;          /* 4: Size in bytes */
+-    uint32_t i_atime;         /* Access time */
+-    uint32_t i_ctime;         /* 12: Creation time */
+-    uint32_t i_mtime;         /* Modification time */
+-    uint32_t i_dtime;         /* 20: Deletion Time */
+-    uint16_t i_gid;           /* Group Id */
+-    uint16_t i_links_count;   /* 24: Links count */
+-    uint32_t i_blocks;                /* Blocks count */
+-    uint32_t i_flags;         /* 32: File flags */
+-    uint32_t l_i_reserved1;
+-    uint32_t i_block[EXT2_N_BLOCKS];  /* 40: Pointers to blocks */
+-    uint32_t i_version;               /* File version (for NFS) */
+-    uint32_t i_file_acl;      /* File ACL */
+-    uint32_t i_dir_acl;               /* Directory ACL */
+-    uint32_t i_faddr;         /* Fragment address */
+-    uint8_t  l_i_frag;                /* Fragment number */
+-    uint8_t  l_i_fsize;               /* Fragment size */
+-    uint16_t i_pad1;
+-    uint32_t l_i_reserved2[2];
+-};
+-
+-/*******************************************************************************
+-#ifndef DEPEND
+-#if ext2_inode_size != 128
+-#error ext2_inode definition bogus
+-#endif
+-#endif
+-*******************************************************************************/
+-
+-
+-#define EXT2_NAME_LEN 255
+-struct ext2_dir_entry {
+-    unsigned int      d_inode;                /* Inode number */
+-    unsigned short    d_rec_len;              /* Directory entry length */
+-    unsigned char     d_name_len;             /* Name length */
+-    unsigned char     d_file_type;
+-    char      d_name[EXT2_NAME_LEN];          /* File name */
+-};
+-
+-/*******************************************************************************
+-#define EXT2_DIR_PAD   4
+-#define EXT2_DIR_ROUND        (EXT2_DIR_PAD - 1)
+-#define EXT2_DIR_REC_LEN(name_len)    (((name_len) + 8 + EXT2_DIR_ROUND) & \
+-                                       ~EXT2_DIR_ROUND)
+-*******************************************************************************/
+-
+-
+-
+-
+-
+-
+-/*
+- * This is the extent on-disk structure.
+- * It's used at the bottom of the tree.
+- */
+-struct ext4_extent {
+-    uint32_t ee_block;                /* first logical block extent covers */
+-    uint16_t ee_len;          /* number of blocks covered by extent */
+-    uint16_t ee_start_hi;     /* high 16 bits of physical block */
+-    uint32_t ee_start_lo;     /* low 32 bits of physical block */
+-};
+-
+-/*
+- * This is index on-disk structure.
+- * It's used at all the levels except the bottom.
+- */
+-struct ext4_extent_idx {
+-    uint32_t ei_block;                /* index covers logical blocks from 'block' */
+-    uint32_t ei_leaf_lo;      /* pointer to the physical block of the next *
+-                               * level. leaf or next index could be there */
+-    uint16_t ei_leaf_hi;      /* high 16 bits of physical block */
+-    uint16_t ei_unused;
+-};
+-
+-/*
+- * Each block (leaves and indexes), even inode-stored has header.
+- */
+-struct ext4_extent_header {
+-    uint16_t eh_magic;                /* probably will support different formats */
+-    uint16_t eh_entries;      /* number of valid entries */
+-    uint16_t eh_max;          /* capacity of store in entries */
+-    uint16_t eh_depth;                /* has tree real underlying blocks? */
+-    uint32_t eh_generation;   /* generation of the tree */
+-};
+-
+-
+-
+-#define EXT4_FIRST_EXTENT(header) ( (struct ext4_extent *)(header + 1) )
+-#define EXT4_FIRST_INDEX(header)  ( (struct ext4_extent_idx *) (header + 1) )
+-
+-
+-/*
+- * The ext2 super block information in memory
+- */
+-struct ext2_sb_info {
+-    uint32_t s_inodes_per_block;/* Number of inodes per block */
+-    uint32_t s_inodes_per_group;/* Number of inodes in a group */
+-    uint32_t s_blocks_per_group;/* Number of blocks in a group */
+-    uint32_t s_desc_per_block;  /* Number of group descriptors per block */
+-    uint32_t s_groups_count;    /* Number of groups in the fs */
+-    uint32_t s_first_data_block;      /* First Data Block */
+-    int      s_inode_size;
+-    uint8_t  s_uuid[16];      /* 128-bit uuid for volume */
+-    int      s_desc_size;     /* size of group descriptor */
+-};
+-
+-static inline struct ext2_sb_info *EXT2_SB(struct fs_info *fs)
+-{
+-    return fs->fs_info;
+-}
+-
+-#define EXT2_BLOCKS_PER_GROUP(fs)      (EXT2_SB(fs)->s_blocks_per_group)
+-#define EXT2_INODES_PER_GROUP(fs)      (EXT2_SB(fs)->s_inodes_per_group)
+-#define EXT2_INODES_PER_BLOCK(fs)      (EXT2_SB(fs)->s_inodes_per_block)
+-#define EXT2_DESC_PER_BLOCK(fs)        (EXT2_SB(fs)->s_desc_per_block)
+-
+-/*
+- * ext2 private inode information
+- */
+-struct ext2_pvt_inode {
+-    union {
+-      uint32_t i_block[EXT2_N_BLOCKS];
+-      struct ext4_extent_header i_extent_hdr;
+-    };
+-};
+-
+-#define PVT(i) ((struct ext2_pvt_inode *)((i)->pvt))
+-
+-/*
+- * functions
+- */
+-block_t ext2_bmap(struct inode *, block_t, size_t *);
+-int ext2_next_extent(struct inode *, uint32_t);
+-
+-#endif /* ext2_fs.h */
+diff --git a/libinstaller/ext2fs/ext2_fs.h b/libinstaller/ext2fs/ext2_fs.h
+deleted file mode 100644
+index e52c9e1..0000000
+--- a/libinstaller/ext2fs/ext2_fs.h
++++ /dev/null
+@@ -1,856 +0,0 @@
+-/*
+- *  linux/include/linux/ext2_fs.h
+- *
+- * Copyright (C) 1992, 1993, 1994, 1995
+- * Remy Card ([email protected])
+- * Laboratoire MASI - Institut Blaise Pascal
+- * Universite Pierre et Marie Curie (Paris VI)
+- *
+- *  from
+- *
+- *  linux/include/linux/minix_fs.h
+- *
+- *  Copyright (C) 1991, 1992  Linus Torvalds
+- */
+-
+-#ifndef _EXT2FS_EXT2_FS_H
+-#define _EXT2FS_EXT2_FS_H
+-
+-#include <linux/types.h>
+-
+-/*
+- * The second extended filesystem constants/structures
+- */
+-
+-/*
+- * Define EXT2FS_DEBUG to produce debug messages
+- */
+-#undef EXT2FS_DEBUG
+-
+-/*
+- * Define EXT2_PREALLOCATE to preallocate data blocks for expanding files
+- */
+-#define EXT2_PREALLOCATE
+-#define EXT2_DEFAULT_PREALLOC_BLOCKS  8
+-
+-/*
+- * The second extended file system version
+- */
+-#define EXT2FS_DATE           "95/08/09"
+-#define EXT2FS_VERSION                "0.5b"
+-
+-/*
+- * Special inode numbers
+- */
+-#define EXT2_BAD_INO           1      /* Bad blocks inode */
+-#define EXT2_ROOT_INO          2      /* Root inode */
+-#define EXT4_USR_QUOTA_INO     3      /* User quota inode */
+-#define EXT4_GRP_QUOTA_INO     4      /* Group quota inode */
+-#define EXT2_BOOT_LOADER_INO   5      /* Boot loader inode */
+-#define EXT2_UNDEL_DIR_INO     6      /* Undelete directory inode */
+-#define EXT2_RESIZE_INO                7      /* Reserved group descriptors inode */
+-#define EXT2_JOURNAL_INO       8      /* Journal inode */
+-#define EXT2_EXCLUDE_INO       9      /* The "exclude" inode, for snapshots */
+-#define EXT4_REPLICA_INO      10      /* Used by non-upstream feature */
+-
+-/* First non-reserved inode for old ext2 filesystems */
+-#define EXT2_GOOD_OLD_FIRST_INO       11
+-
+-/*
+- * The second extended file system magic number
+- */
+-#define EXT2_SUPER_MAGIC      0xEF53
+-
+-#ifdef __KERNEL__
+-#define EXT2_SB(sb)   (&((sb)->u.ext2_sb))
+-#else
+-/* Assume that user mode programs are passing in an ext2fs superblock, not
+- * a kernel struct super_block.  This will allow us to call the feature-test
+- * macros from user land. */
+-#define EXT2_SB(sb)   (sb)
+-#endif
+-
+-/*
+- * Maximal count of links to a file
+- */
+-#define EXT2_LINK_MAX         65000
+-
+-/*
+- * Macro-instructions used to manage several block sizes
+- */
+-#define EXT2_MIN_BLOCK_LOG_SIZE               10      /* 1024 */
+-#define EXT2_MAX_BLOCK_LOG_SIZE               16      /* 65536 */
+-#define EXT2_MIN_BLOCK_SIZE   (1 << EXT2_MIN_BLOCK_LOG_SIZE)
+-#define EXT2_MAX_BLOCK_SIZE   (1 << EXT2_MAX_BLOCK_LOG_SIZE)
+-#ifdef __KERNEL__
+-#define EXT2_BLOCK_SIZE(s)    ((s)->s_blocksize)
+-#define EXT2_BLOCK_SIZE_BITS(s)       ((s)->s_blocksize_bits)
+-#define EXT2_ADDR_PER_BLOCK_BITS(s)   (EXT2_SB(s)->addr_per_block_bits)
+-#define EXT2_INODE_SIZE(s)    (EXT2_SB(s)->s_inode_size)
+-#define EXT2_FIRST_INO(s)     (EXT2_SB(s)->s_first_ino)
+-#else
+-#define EXT2_BLOCK_SIZE(s)    (EXT2_MIN_BLOCK_SIZE << (s)->s_log_block_size)
+-#define EXT2_BLOCK_SIZE_BITS(s)       ((s)->s_log_block_size + 10)
+-#define EXT2_INODE_SIZE(s)    (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \
+-                               EXT2_GOOD_OLD_INODE_SIZE : (s)->s_inode_size)
+-#define EXT2_FIRST_INO(s)     (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \
+-                               EXT2_GOOD_OLD_FIRST_INO : (s)->s_first_ino)
+-#endif
+-#define EXT2_ADDR_PER_BLOCK(s)        (EXT2_BLOCK_SIZE(s) / sizeof(__u32))
+-
+-/*
+- * Macro-instructions used to manage allocation clusters
+- */
+-#define EXT2_MIN_CLUSTER_LOG_SIZE     EXT2_MIN_BLOCK_LOG_SIZE
+-#define EXT2_MAX_CLUSTER_LOG_SIZE     29      /* 512MB  */
+-#define EXT2_MIN_CLUSTER_SIZE         EXT2_MIN_BLOCK_SIZE
+-#define EXT2_MAX_CLUSTER_SIZE         (1 << EXT2_MAX_CLUSTER_LOG_SIZE)
+-#define EXT2_CLUSTER_SIZE(s)          (EXT2_MIN_BLOCK_SIZE << \
+-                                              (s)->s_log_cluster_size)
+-#define EXT2_CLUSTER_SIZE_BITS(s)     ((s)->s_log_cluster_size + 10)
+-
+-/*
+- * Macro-instructions used to manage fragments
+- *
+- * Note: for backwards compatibility only, for the dump program.
+- * Ext2/3/4 will never support fragments....
+- */
+-#define EXT2_MIN_FRAG_SIZE              EXT2_MIN_BLOCK_SIZE
+-#define EXT2_MAX_FRAG_SIZE              EXT2_MAX_BLOCK_SIZE
+-#define EXT2_MIN_FRAG_LOG_SIZE          EXT2_MIN_BLOCK_LOG_SIZE
+-#define EXT2_FRAG_SIZE(s)             EXT2_BLOCK_SIZE(s)
+-#define EXT2_FRAGS_PER_BLOCK(s)               1
+-
+-/*
+- * ACL structures
+- */
+-struct ext2_acl_header        /* Header of Access Control Lists */
+-{
+-      __u32   aclh_size;
+-      __u32   aclh_file_count;
+-      __u32   aclh_acle_count;
+-      __u32   aclh_first_acle;
+-};
+-
+-struct ext2_acl_entry /* Access Control List Entry */
+-{
+-      __u32   acle_size;
+-      __u16   acle_perms;     /* Access permissions */
+-      __u16   acle_type;      /* Type of entry */
+-      __u16   acle_tag;       /* User or group identity */
+-      __u16   acle_pad1;
+-      __u32   acle_next;      /* Pointer on next entry for the */
+-                                      /* same inode or on next free entry */
+-};
+-
+-/*
+- * Structure of a blocks group descriptor
+- */
+-struct ext2_group_desc
+-{
+-      __u32   bg_block_bitmap;        /* Blocks bitmap block */
+-      __u32   bg_inode_bitmap;        /* Inodes bitmap block */
+-      __u32   bg_inode_table;         /* Inodes table block */
+-      __u16   bg_free_blocks_count;   /* Free blocks count */
+-      __u16   bg_free_inodes_count;   /* Free inodes count */
+-      __u16   bg_used_dirs_count;     /* Directories count */
+-      __u16   bg_flags;
+-      __u32   bg_exclude_bitmap_lo;   /* Exclude bitmap for snapshots */
+-      __u16   bg_block_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+bitmap) LSB */
+-      __u16   bg_inode_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+bitmap) LSB */
+-      __u16   bg_itable_unused;       /* Unused inodes count */
+-      __u16   bg_checksum;            /* crc16(s_uuid+grouo_num+group_desc)*/
+-};
+-
+-/*
+- * Structure of a blocks group descriptor
+- */
+-struct ext4_group_desc
+-{
+-      __u32   bg_block_bitmap;        /* Blocks bitmap block */
+-      __u32   bg_inode_bitmap;        /* Inodes bitmap block */
+-      __u32   bg_inode_table;         /* Inodes table block */
+-      __u16   bg_free_blocks_count;   /* Free blocks count */
+-      __u16   bg_free_inodes_count;   /* Free inodes count */
+-      __u16   bg_used_dirs_count;     /* Directories count */
+-      __u16   bg_flags;               /* EXT4_BG_flags (INODE_UNINIT, etc) */
+-      __u32   bg_exclude_bitmap_lo;   /* Exclude bitmap for snapshots */
+-      __u16   bg_block_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+bitmap) LSB */
+-      __u16   bg_inode_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+bitmap) LSB */
+-      __u16   bg_itable_unused;       /* Unused inodes count */
+-      __u16   bg_checksum;            /* crc16(sb_uuid+group+desc) */
+-      __u32   bg_block_bitmap_hi;     /* Blocks bitmap block MSB */
+-      __u32   bg_inode_bitmap_hi;     /* Inodes bitmap block MSB */
+-      __u32   bg_inode_table_hi;      /* Inodes table block MSB */
+-      __u16   bg_free_blocks_count_hi;/* Free blocks count MSB */
+-      __u16   bg_free_inodes_count_hi;/* Free inodes count MSB */
+-      __u16   bg_used_dirs_count_hi;  /* Directories count MSB */
+-      __u16   bg_itable_unused_hi;    /* Unused inodes count MSB */
+-      __u32   bg_exclude_bitmap_hi;   /* Exclude bitmap block MSB */
+-      __u16   bg_block_bitmap_csum_hi;/* crc32c(s_uuid+grp_num+bitmap) MSB */
+-      __u16   bg_inode_bitmap_csum_hi;/* crc32c(s_uuid+grp_num+bitmap) MSB */
+-      __u32   bg_reserved;
+-};
+-
+-#define EXT2_BG_INODE_UNINIT  0x0001 /* Inode table/bitmap not initialized */
+-#define EXT2_BG_BLOCK_UNINIT  0x0002 /* Block bitmap not initialized */
+-#define EXT2_BG_INODE_ZEROED  0x0004 /* On-disk itable initialized to zero */
+-
+-/*
+- * Data structures used by the directory indexing feature
+- *
+- * Note: all of the multibyte integer fields are little endian.
+- */
+-
+-/*
+- * Note: dx_root_info is laid out so that if it should somehow get
+- * overlaid by a dirent the two low bits of the hash version will be
+- * zero.  Therefore, the hash version mod 4 should never be 0.
+- * Sincerely, the paranoia department.
+- */
+-struct ext2_dx_root_info {
+-      __u32 reserved_zero;
+-      __u8 hash_version; /* 0 now, 1 at release */
+-      __u8 info_length; /* 8 */
+-      __u8 indirect_levels;
+-      __u8 unused_flags;
+-};
+-
+-#define EXT2_HASH_LEGACY              0
+-#define EXT2_HASH_HALF_MD4            1
+-#define EXT2_HASH_TEA                 2
+-#define EXT2_HASH_LEGACY_UNSIGNED     3 /* reserved for userspace lib */
+-#define EXT2_HASH_HALF_MD4_UNSIGNED   4 /* reserved for userspace lib */
+-#define EXT2_HASH_TEA_UNSIGNED                5 /* reserved for userspace lib */
+-
+-#define EXT2_HASH_FLAG_INCOMPAT       0x1
+-
+-struct ext2_dx_entry {
+-      __u32 hash;
+-      __u32 block;
+-};
+-
+-struct ext2_dx_countlimit {
+-      __u16 limit;
+-      __u16 count;
+-};
+-
+-
+-/*
+- * Macro-instructions used to manage group descriptors
+- */
+-#define EXT2_MIN_DESC_SIZE             32
+-#define EXT2_MIN_DESC_SIZE_64BIT       64
+-#define EXT2_MAX_DESC_SIZE             EXT2_MIN_BLOCK_SIZE
+-#define EXT2_DESC_SIZE(s)                                                \
+-       ((EXT2_SB(s)->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT) ? \
+-      (s)->s_desc_size : EXT2_MIN_DESC_SIZE)
+-
+-#define EXT2_BLOCKS_PER_GROUP(s)      (EXT2_SB(s)->s_blocks_per_group)
+-#define EXT2_INODES_PER_GROUP(s)      (EXT2_SB(s)->s_inodes_per_group)
+-#define EXT2_CLUSTERS_PER_GROUP(s)    (EXT2_SB(s)->s_clusters_per_group)
+-#define EXT2_INODES_PER_BLOCK(s)      (EXT2_BLOCK_SIZE(s)/EXT2_INODE_SIZE(s))
+-/* limits imposed by 16-bit value gd_free_{blocks,inode}_count */
+-#define EXT2_MAX_BLOCKS_PER_GROUP(s)  ((((unsigned) 1 << 16) - 8) *   \
+-                                       (EXT2_CLUSTER_SIZE(s) / \
+-                                        EXT2_BLOCK_SIZE(s)))
+-#define EXT2_MAX_CLUSTERS_PER_GROUP(s)        (((unsigned) 1 << 16) - 8)
+-#define EXT2_MAX_INODES_PER_GROUP(s)  (((unsigned) 1 << 16) - \
+-                                       EXT2_INODES_PER_BLOCK(s))
+-#ifdef __KERNEL__
+-#define EXT2_DESC_PER_BLOCK(s)                (EXT2_SB(s)->s_desc_per_block)
+-#define EXT2_DESC_PER_BLOCK_BITS(s)   (EXT2_SB(s)->s_desc_per_block_bits)
+-#else
+-#define EXT2_DESC_PER_BLOCK(s)                (EXT2_BLOCK_SIZE(s) / EXT2_DESC_SIZE(s))
+-#endif
+-
+-/*
+- * Constants relative to the data blocks
+- */
+-#define EXT2_NDIR_BLOCKS              12
+-#define EXT2_IND_BLOCK                        EXT2_NDIR_BLOCKS
+-#define EXT2_DIND_BLOCK                       (EXT2_IND_BLOCK + 1)
+-#define EXT2_TIND_BLOCK                       (EXT2_DIND_BLOCK + 1)
+-#define EXT2_N_BLOCKS                 (EXT2_TIND_BLOCK + 1)
+-
+-/*
+- * Inode flags
+- */
+-#define EXT2_SECRM_FL                 0x00000001 /* Secure deletion */
+-#define EXT2_UNRM_FL                  0x00000002 /* Undelete */
+-#define EXT2_COMPR_FL                 0x00000004 /* Compress file */
+-#define EXT2_SYNC_FL                  0x00000008 /* Synchronous updates */
+-#define EXT2_IMMUTABLE_FL             0x00000010 /* Immutable file */
+-#define EXT2_APPEND_FL                        0x00000020 /* writes to file may only append */
+-#define EXT2_NODUMP_FL                        0x00000040 /* do not dump file */
+-#define EXT2_NOATIME_FL                       0x00000080 /* do not update atime */
+-/* Reserved for compression usage... */
+-#define EXT2_DIRTY_FL                 0x00000100
+-#define EXT2_COMPRBLK_FL              0x00000200 /* One or more compressed clusters */
+-#define EXT2_NOCOMPR_FL                       0x00000400 /* Access raw compressed data */
+-#define EXT2_ECOMPR_FL                        0x00000800 /* Compression error */
+-/* End compression flags --- maybe not all used */
+-#define EXT2_BTREE_FL                 0x00001000 /* btree format dir */
+-#define EXT2_INDEX_FL                 0x00001000 /* hash-indexed directory */
+-#define EXT2_IMAGIC_FL                        0x00002000
+-#define EXT3_JOURNAL_DATA_FL          0x00004000 /* file data should be journaled */
+-#define EXT2_NOTAIL_FL                        0x00008000 /* file tail should not be merged */
+-#define EXT2_DIRSYNC_FL               0x00010000 /* Synchronous directory modifications */
+-#define EXT2_TOPDIR_FL                        0x00020000 /* Top of directory hierarchies*/
+-#define EXT4_HUGE_FILE_FL               0x00040000 /* Set to each huge file */
+-#define EXT4_EXTENTS_FL               0x00080000 /* Inode uses extents */
+-#define EXT4_EA_INODE_FL              0x00200000 /* Inode used for large EA */
+-/* EXT4_EOFBLOCKS_FL 0x00400000 was here */
+-#define EXT4_SNAPFILE_FL              0x01000000  /* Inode is a snapshot */
+-#define EXT4_SNAPFILE_DELETED_FL      0x04000000  /* Snapshot is being deleted */
+-#define EXT4_SNAPFILE_SHRUNK_FL               0x08000000  /* Snapshot shrink has completed */
+-#define EXT2_RESERVED_FL              0x80000000 /* reserved for ext2 lib */
+-
+-#define EXT2_FL_USER_VISIBLE          0x004BDFFF /* User visible flags */
+-#define EXT2_FL_USER_MODIFIABLE               0x004B80FF /* User modifiable flags */
+-
+-/*
+- * ioctl commands
+- */
+-
+-/* Used for online resize */
+-struct ext2_new_group_input {
+-      __u32 group;            /* Group number for this data */
+-      __u32 block_bitmap;     /* Absolute block number of block bitmap */
+-      __u32 inode_bitmap;     /* Absolute block number of inode bitmap */
+-      __u32 inode_table;      /* Absolute block number of inode table start */
+-      __u32 blocks_count;     /* Total number of blocks in this group */
+-      __u16 reserved_blocks;  /* Number of reserved blocks in this group */
+-      __u16 unused;           /* Number of reserved GDT blocks in group */
+-};
+-
+-struct ext4_new_group_input {
+-      __u32 group;            /* Group number for this data */
+-      __u64 block_bitmap;     /* Absolute block number of block bitmap */
+-      __u64 inode_bitmap;     /* Absolute block number of inode bitmap */
+-      __u64 inode_table;      /* Absolute block number of inode table start */
+-      __u32 blocks_count;     /* Total number of blocks in this group */
+-      __u16 reserved_blocks;  /* Number of reserved blocks in this group */
+-      __u16 unused;
+-};
+-
+-#ifdef __GNU__                        /* Needed for the Hurd */
+-#define _IOT_ext2_new_group_input _IOT (_IOTS(__u32), 5, _IOTS(__u16), 2, 0, 0)
+-#endif
+-
+-#define EXT2_IOC_GETFLAGS             _IOR('f', 1, long)
+-#define EXT2_IOC_SETFLAGS             _IOW('f', 2, long)
+-#define EXT2_IOC_GETVERSION           _IOR('v', 1, long)
+-#define EXT2_IOC_SETVERSION           _IOW('v', 2, long)
+-#define EXT2_IOC_GETVERSION_NEW               _IOR('f', 3, long)
+-#define EXT2_IOC_SETVERSION_NEW               _IOW('f', 4, long)
+-#define EXT2_IOC_GROUP_EXTEND         _IOW('f', 7, unsigned long)
+-#define EXT2_IOC_GROUP_ADD            _IOW('f', 8,struct ext2_new_group_input)
+-#define EXT4_IOC_GROUP_ADD            _IOW('f', 8,struct ext4_new_group_input)
+-#define EXT4_IOC_RESIZE_FS            _IOW('f', 16, __u64)
+-
+-/*
+- * Structure of an inode on the disk
+- */
+-struct ext2_inode {
+-      __u16   i_mode;         /* File mode */
+-      __u16   i_uid;          /* Low 16 bits of Owner Uid */
+-      __u32   i_size;         /* Size in bytes */
+-      __u32   i_atime;        /* Access time */
+-      __u32   i_ctime;        /* Inode change time */
+-      __u32   i_mtime;        /* Modification time */
+-      __u32   i_dtime;        /* Deletion Time */
+-      __u16   i_gid;          /* Low 16 bits of Group Id */
+-      __u16   i_links_count;  /* Links count */
+-      __u32   i_blocks;       /* Blocks count */
+-      __u32   i_flags;        /* File flags */
+-      union {
+-              struct {
+-                      __u32   l_i_version; /* was l_i_reserved1 */
+-              } linux1;
+-              struct {
+-                      __u32  h_i_translator;
+-              } hurd1;
+-      } osd1;                         /* OS dependent 1 */
+-      __u32   i_block[EXT2_N_BLOCKS];/* Pointers to blocks */
+-      __u32   i_generation;   /* File version (for NFS) */
+-      __u32   i_file_acl;     /* File ACL */
+-      __u32   i_size_high;    /* Formerly i_dir_acl, directory ACL */
+-      __u32   i_faddr;        /* Fragment address */
+-      union {
+-              struct {
+-                      __u16   l_i_blocks_hi;
+-                      __u16   l_i_file_acl_high;
+-                      __u16   l_i_uid_high;   /* these 2 fields    */
+-                      __u16   l_i_gid_high;   /* were reserved2[0] */
+-                      __u16   l_i_checksum_lo; /* crc32c(uuid+inum+inode) */
+-                      __u16   l_i_reserved;
+-              } linux2;
+-              struct {
+-                      __u8    h_i_frag;       /* Fragment number */
+-                      __u8    h_i_fsize;      /* Fragment size */
+-                      __u16   h_i_mode_high;
+-                      __u16   h_i_uid_high;
+-                      __u16   h_i_gid_high;
+-                      __u32   h_i_author;
+-              } hurd2;
+-      } osd2;                         /* OS dependent 2 */
+-};
+-
+-/*
+- * Permanent part of an large inode on the disk
+- */
+-struct ext2_inode_large {
+-      __u16   i_mode;         /* File mode */
+-      __u16   i_uid;          /* Low 16 bits of Owner Uid */
+-      __u32   i_size;         /* Size in bytes */
+-      __u32   i_atime;        /* Access time */
+-      __u32   i_ctime;        /* Inode Change time */
+-      __u32   i_mtime;        /* Modification time */
+-      __u32   i_dtime;        /* Deletion Time */
+-      __u16   i_gid;          /* Low 16 bits of Group Id */
+-      __u16   i_links_count;  /* Links count */
+-      __u32   i_blocks;       /* Blocks count */
+-      __u32   i_flags;        /* File flags */
+-      union {
+-              struct {
+-                      __u32   l_i_version; /* was l_i_reserved1 */
+-              } linux1;
+-              struct {
+-                      __u32  h_i_translator;
+-              } hurd1;
+-      } osd1;                         /* OS dependent 1 */
+-      __u32   i_block[EXT2_N_BLOCKS];/* Pointers to blocks */
+-      __u32   i_generation;   /* File version (for NFS) */
+-      __u32   i_file_acl;     /* File ACL */
+-      __u32   i_size_high;    /* Formerly i_dir_acl, directory ACL */
+-      __u32   i_faddr;        /* Fragment address */
+-      union {
+-              struct {
+-                      __u16   l_i_blocks_hi;
+-                      __u16   l_i_file_acl_high;
+-                      __u16   l_i_uid_high;   /* these 2 fields    */
+-                      __u16   l_i_gid_high;   /* were reserved2[0] */
+-                      __u16   l_i_checksum_lo; /* crc32c(uuid+inum+inode) */
+-                      __u16   l_i_reserved;
+-              } linux2;
+-              struct {
+-                      __u8    h_i_frag;       /* Fragment number */
+-                      __u8    h_i_fsize;      /* Fragment size */
+-                      __u16   h_i_mode_high;
+-                      __u16   h_i_uid_high;
+-                      __u16   h_i_gid_high;
+-                      __u32   h_i_author;
+-              } hurd2;
+-      } osd2;                         /* OS dependent 2 */
+-      __u16   i_extra_isize;
+-      __u16   i_checksum_hi;  /* crc32c(uuid+inum+inode) */
+-      __u32   i_ctime_extra;  /* extra Change time (nsec << 2 | epoch) */
+-      __u32   i_mtime_extra;  /* extra Modification time (nsec << 2 | epoch) */
+-      __u32   i_atime_extra;  /* extra Access time (nsec << 2 | epoch) */
+-      __u32   i_crtime;       /* File creation time */
+-      __u32   i_crtime_extra; /* extra File creation time (nsec << 2 | epoch)*/
+-      __u32   i_version_hi;   /* high 32 bits for 64-bit version */
+-};
+-
+-#define i_dir_acl     i_size_high
+-
+-#if defined(__KERNEL__) || defined(__linux__)
+-#define i_reserved1   osd1.linux1.l_i_reserved1
+-#define i_frag                osd2.linux2.l_i_frag
+-#define i_fsize               osd2.linux2.l_i_fsize
+-#define i_uid_low     i_uid
+-#define i_gid_low     i_gid
+-#define i_uid_high    osd2.linux2.l_i_uid_high
+-#define i_gid_high    osd2.linux2.l_i_gid_high
+-#else
+-#if defined(__GNU__)
+-
+-#define i_translator  osd1.hurd1.h_i_translator
+-#define i_frag                osd2.hurd2.h_i_frag;
+-#define i_fsize               osd2.hurd2.h_i_fsize;
+-#define i_uid_high    osd2.hurd2.h_i_uid_high
+-#define i_gid_high    osd2.hurd2.h_i_gid_high
+-#define i_author      osd2.hurd2.h_i_author
+-
+-#endif  /* __GNU__ */
+-#endif        /* defined(__KERNEL__) || defined(__linux__) */
+-
+-#define inode_uid(inode)      ((inode).i_uid | (inode).osd2.linux2.l_i_uid_high << 16)
+-#define inode_gid(inode)      ((inode).i_gid | (inode).osd2.linux2.l_i_gid_high << 16)
+-#define ext2fs_set_i_uid_high(inode,x) ((inode).osd2.linux2.l_i_uid_high = (x))
+-#define ext2fs_set_i_gid_high(inode,x) ((inode).osd2.linux2.l_i_gid_high = (x))
+-
+-/*
+- * File system states
+- */
+-#define EXT2_VALID_FS                 0x0001  /* Unmounted cleanly */
+-#define EXT2_ERROR_FS                 0x0002  /* Errors detected */
+-#define EXT3_ORPHAN_FS                        0x0004  /* Orphans being recovered */
+-
+-/*
+- * Misc. filesystem flags
+- */
+-#define EXT2_FLAGS_SIGNED_HASH                0x0001  /* Signed dirhash in use */
+-#define EXT2_FLAGS_UNSIGNED_HASH      0x0002  /* Unsigned dirhash in use */
+-#define EXT2_FLAGS_TEST_FILESYS               0x0004  /* OK for use on development code */
+-#define EXT2_FLAGS_IS_SNAPSHOT                0x0010  /* This is a snapshot image */
+-#define EXT2_FLAGS_FIX_SNAPSHOT               0x0020  /* Snapshot inodes corrupted */
+-#define EXT2_FLAGS_FIX_EXCLUDE                0x0040  /* Exclude bitmaps corrupted */
+-
+-/*
+- * Mount flags
+- */
+-#define EXT2_MOUNT_CHECK              0x0001  /* Do mount-time checks */
+-#define EXT2_MOUNT_GRPID              0x0004  /* Create files with directory's group */
+-#define EXT2_MOUNT_DEBUG              0x0008  /* Some debugging messages */
+-#define EXT2_MOUNT_ERRORS_CONT                0x0010  /* Continue on errors */
+-#define EXT2_MOUNT_ERRORS_RO          0x0020  /* Remount fs ro on errors */
+-#define EXT2_MOUNT_ERRORS_PANIC               0x0040  /* Panic on errors */
+-#define EXT2_MOUNT_MINIX_DF           0x0080  /* Mimics the Minix statfs */
+-#define EXT2_MOUNT_NO_UID32           0x0200  /* Disable 32-bit UIDs */
+-
+-#define clear_opt(o, opt)             o &= ~EXT2_MOUNT_##opt
+-#define set_opt(o, opt)                       o |= EXT2_MOUNT_##opt
+-#define test_opt(sb, opt)             (EXT2_SB(sb)->s_mount_opt & \
+-                                       EXT2_MOUNT_##opt)
+-/*
+- * Maximal mount counts between two filesystem checks
+- */
+-#define EXT2_DFL_MAX_MNT_COUNT                20      /* Allow 20 mounts */
+-#define EXT2_DFL_CHECKINTERVAL                0       /* Don't use interval check */
+-
+-/*
+- * Behaviour when detecting errors
+- */
+-#define EXT2_ERRORS_CONTINUE          1       /* Continue execution */
+-#define EXT2_ERRORS_RO                        2       /* Remount fs read-only */
+-#define EXT2_ERRORS_PANIC             3       /* Panic */
+-#define EXT2_ERRORS_DEFAULT           EXT2_ERRORS_CONTINUE
+-
+-#if (__GNUC__ >= 4)
+-#define ext4_offsetof(TYPE,MEMBER) __builtin_offsetof(TYPE,MEMBER)
+-#else
+-#define ext4_offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+-#endif
+-
+-/*
+- * Structure of the super block
+- */
+-struct ext2_super_block {
+-      __u32   s_inodes_count;         /* Inodes count */
+-      __u32   s_blocks_count;         /* Blocks count */
+-      __u32   s_r_blocks_count;       /* Reserved blocks count */
+-      __u32   s_free_blocks_count;    /* Free blocks count */
+-      __u32   s_free_inodes_count;    /* Free inodes count */
+-      __u32   s_first_data_block;     /* First Data Block */
+-      __u32   s_log_block_size;       /* Block size */
+-      __u32   s_log_cluster_size;     /* Allocation cluster size */
+-      __u32   s_blocks_per_group;     /* # Blocks per group */
+-      __u32   s_clusters_per_group;   /* # Fragments per group */
+-      __u32   s_inodes_per_group;     /* # Inodes per group */
+-      __u32   s_mtime;                /* Mount time */
+-      __u32   s_wtime;                /* Write time */
+-      __u16   s_mnt_count;            /* Mount count */
+-      __s16   s_max_mnt_count;        /* Maximal mount count */
+-      __u16   s_magic;                /* Magic signature */
+-      __u16   s_state;                /* File system state */
+-      __u16   s_errors;               /* Behaviour when detecting errors */
+-      __u16   s_minor_rev_level;      /* minor revision level */
+-      __u32   s_lastcheck;            /* time of last check */
+-      __u32   s_checkinterval;        /* max. time between checks */
+-      __u32   s_creator_os;           /* OS */
+-      __u32   s_rev_level;            /* Revision level */
+-      __u16   s_def_resuid;           /* Default uid for reserved blocks */
+-      __u16   s_def_resgid;           /* Default gid for reserved blocks */
+-      /*
+-       * These fields are for EXT2_DYNAMIC_REV superblocks only.
+-       *
+-       * Note: the difference between the compatible feature set and
+-       * the incompatible feature set is that if there is a bit set
+-       * in the incompatible feature set that the kernel doesn't
+-       * know about, it should refuse to mount the filesystem.
+-       *
+-       * e2fsck's requirements are more strict; if it doesn't know
+-       * about a feature in either the compatible or incompatible
+-       * feature set, it must abort and not try to meddle with
+-       * things it doesn't understand...
+-       */
+-      __u32   s_first_ino;            /* First non-reserved inode */
+-      __u16   s_inode_size;           /* size of inode structure */
+-      __u16   s_block_group_nr;       /* block group # of this superblock */
+-      __u32   s_feature_compat;       /* compatible feature set */
+-      __u32   s_feature_incompat;     /* incompatible feature set */
+-      __u32   s_feature_ro_compat;    /* readonly-compatible feature set */
+-      __u8    s_uuid[16];             /* 128-bit uuid for volume */
+-      char    s_volume_name[16];      /* volume name */
+-      char    s_last_mounted[64];     /* directory where last mounted */
+-      __u32   s_algorithm_usage_bitmap; /* For compression */
+-      /*
+-       * Performance hints.  Directory preallocation should only
+-       * happen if the EXT2_FEATURE_COMPAT_DIR_PREALLOC flag is on.
+-       */
+-      __u8    s_prealloc_blocks;      /* Nr of blocks to try to preallocate*/
+-      __u8    s_prealloc_dir_blocks;  /* Nr to preallocate for dirs */
+-      __u16   s_reserved_gdt_blocks;  /* Per group table for online growth */
+-      /*
+-       * Journaling support valid if EXT2_FEATURE_COMPAT_HAS_JOURNAL set.
+-       */
+-      __u8    s_journal_uuid[16];     /* uuid of journal superblock */
+-      __u32   s_journal_inum;         /* inode number of journal file */
+-      __u32   s_journal_dev;          /* device number of journal file */
+-      __u32   s_last_orphan;          /* start of list of inodes to delete */
+-      __u32   s_hash_seed[4];         /* HTREE hash seed */
+-      __u8    s_def_hash_version;     /* Default hash version to use */
+-      __u8    s_jnl_backup_type;      /* Default type of journal backup */
+-      __u16   s_desc_size;            /* Group desc. size: INCOMPAT_64BIT */
+-      __u32   s_default_mount_opts;
+-      __u32   s_first_meta_bg;        /* First metablock group */
+-      __u32   s_mkfs_time;            /* When the filesystem was created */
+-      __u32   s_jnl_blocks[17];       /* Backup of the journal inode */
+-      __u32   s_blocks_count_hi;      /* Blocks count high 32bits */
+-      __u32   s_r_blocks_count_hi;    /* Reserved blocks count high 32 bits*/
+-      __u32   s_free_blocks_hi;       /* Free blocks count */
+-      __u16   s_min_extra_isize;      /* All inodes have at least # bytes */
+-      __u16   s_want_extra_isize;     /* New inodes should reserve # bytes */
+-      __u32   s_flags;                /* Miscellaneous flags */
+-      __u16   s_raid_stride;          /* RAID stride */
+-      __u16   s_mmp_update_interval;  /* # seconds to wait in MMP checking */
+-      __u64   s_mmp_block;            /* Block for multi-mount protection */
+-      __u32   s_raid_stripe_width;    /* blocks on all data disks (N*stride)*/
+-      __u8    s_log_groups_per_flex;  /* FLEX_BG group size */
+-      __u8    s_reserved_char_pad;
+-      __u16   s_reserved_pad;         /* Padding to next 32bits */
+-      __u64   s_kbytes_written;       /* nr of lifetime kilobytes written */
+-      __u32   s_snapshot_inum;        /* Inode number of active snapshot */
+-      __u32   s_snapshot_id;          /* sequential ID of active snapshot */
+-      __u64   s_snapshot_r_blocks_count; /* reserved blocks for active
+-                                            snapshot's future use */
+-      __u32   s_snapshot_list;        /* inode number of the head of the on-disk snapshot list */
+-#define EXT4_S_ERR_START ext4_offsetof(struct ext2_super_block, s_error_count)
+-      __u32   s_error_count;          /* number of fs errors */
+-      __u32   s_first_error_time;     /* first time an error happened */
+-      __u32   s_first_error_ino;      /* inode involved in first error */
+-      __u64   s_first_error_block;    /* block involved of first error */
+-      __u8    s_first_error_func[32]; /* function where the error happened */
+-      __u32   s_first_error_line;     /* line number where error happened */
+-      __u32   s_last_error_time;      /* most recent time of an error */
+-      __u32   s_last_error_ino;       /* inode involved in last error */
+-      __u32   s_last_error_line;      /* line number where error happened */
+-      __u64   s_last_error_block;     /* block involved of last error */
+-      __u8    s_last_error_func[32];  /* function where the error happened */
+-#define EXT4_S_ERR_END ext4_offsetof(struct ext2_super_block, s_mount_opts)
+-      __u8    s_mount_opts[64];
+-      __u32   s_usr_quota_inum;       /* inode number of user quota file */
+-      __u32   s_grp_quota_inum;       /* inode number of group quota file */
+-      __u32   s_overhead_blocks;      /* overhead blocks/clusters in fs */
+-      __u32   s_reserved[108];        /* Padding to the end of the block */
+-      __u32   s_checksum;             /* crc32c(superblock) */
+-};
+-
+-#define EXT4_S_ERR_LEN (EXT4_S_ERR_END - EXT4_S_ERR_START)
+-
+-/*
+- * Codes for operating systems
+- */
+-#define EXT2_OS_LINUX         0
+-#define EXT2_OS_HURD          1
+-#define EXT2_OBSO_OS_MASIX    2
+-#define EXT2_OS_FREEBSD               3
+-#define EXT2_OS_LITES         4
+-
+-/*
+- * Revision levels
+- */
+-#define EXT2_GOOD_OLD_REV     0       /* The good old (original) format */
+-#define EXT2_DYNAMIC_REV      1       /* V2 format w/ dynamic inode sizes */
+-
+-#define EXT2_CURRENT_REV      EXT2_GOOD_OLD_REV
+-#define EXT2_MAX_SUPP_REV     EXT2_DYNAMIC_REV
+-
+-#define EXT2_GOOD_OLD_INODE_SIZE 128
+-
+-/*
+- * Journal inode backup types
+- */
+-#define EXT3_JNL_BACKUP_BLOCKS        1
+-
+-/*
+- * Feature set definitions
+- */
+-
+-#define EXT2_HAS_COMPAT_FEATURE(sb,mask)                      \
+-      ( EXT2_SB(sb)->s_feature_compat & (mask) )
+-#define EXT2_HAS_RO_COMPAT_FEATURE(sb,mask)                   \
+-      ( EXT2_SB(sb)->s_feature_ro_compat & (mask) )
+-#define EXT2_HAS_INCOMPAT_FEATURE(sb,mask)                    \
+-      ( EXT2_SB(sb)->s_feature_incompat & (mask) )
+-
+-#define EXT2_FEATURE_COMPAT_DIR_PREALLOC      0x0001
+-#define EXT2_FEATURE_COMPAT_IMAGIC_INODES     0x0002
+-#define EXT3_FEATURE_COMPAT_HAS_JOURNAL               0x0004
+-#define EXT2_FEATURE_COMPAT_EXT_ATTR          0x0008
+-#define EXT2_FEATURE_COMPAT_RESIZE_INODE      0x0010
+-#define EXT2_FEATURE_COMPAT_DIR_INDEX         0x0020
+-#define EXT2_FEATURE_COMPAT_LAZY_BG           0x0040
+-/* #define EXT2_FEATURE_COMPAT_EXCLUDE_INODE  0x0080 not used, legacy */
+-#define EXT2_FEATURE_COMPAT_EXCLUDE_BITMAP    0x0100
+-
+-
+-#define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER   0x0001
+-#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE     0x0002
+-/* #define EXT2_FEATURE_RO_COMPAT_BTREE_DIR   0x0004 not used */
+-#define EXT4_FEATURE_RO_COMPAT_HUGE_FILE      0x0008
+-#define EXT4_FEATURE_RO_COMPAT_GDT_CSUM               0x0010
+-#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK      0x0020
+-#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE    0x0040
+-#define EXT4_FEATURE_RO_COMPAT_HAS_SNAPSHOT   0x0080
+-#define EXT4_FEATURE_RO_COMPAT_QUOTA          0x0100
+-#define EXT4_FEATURE_RO_COMPAT_BIGALLOC               0x0200
+-#define EXT4_FEATURE_RO_COMPAT_METADATA_CSUM  0x0400
+-#define EXT4_FEATURE_RO_COMPAT_REPLICA                0x0800
+-
+-#define EXT2_FEATURE_INCOMPAT_COMPRESSION     0x0001
+-#define EXT2_FEATURE_INCOMPAT_FILETYPE                0x0002
+-#define EXT3_FEATURE_INCOMPAT_RECOVER         0x0004 /* Needs recovery */
+-#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV     0x0008 /* Journal device */
+-#define EXT2_FEATURE_INCOMPAT_META_BG         0x0010
+-#define EXT3_FEATURE_INCOMPAT_EXTENTS         0x0040
+-#define EXT4_FEATURE_INCOMPAT_64BIT           0x0080
+-#define EXT4_FEATURE_INCOMPAT_MMP             0x0100
+-#define EXT4_FEATURE_INCOMPAT_FLEX_BG         0x0200
+-#define EXT4_FEATURE_INCOMPAT_EA_INODE                0x0400
+-#define EXT4_FEATURE_INCOMPAT_DIRDATA         0x1000
+-
+-#define EXT2_FEATURE_COMPAT_SUPP      0
+-#define EXT2_FEATURE_INCOMPAT_SUPP    (EXT2_FEATURE_INCOMPAT_FILETYPE| \
+-                                     EXT4_FEATURE_INCOMPAT_MMP)
+-#define EXT2_FEATURE_RO_COMPAT_SUPP   (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
+-                                       EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
+-                                       EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
+-                                       EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
+-
+-/*
+- * Default values for user and/or group using reserved blocks
+- */
+-#define EXT2_DEF_RESUID               0
+-#define EXT2_DEF_RESGID               0
+-
+-/*
+- * Default mount options
+- */
+-#define EXT2_DEFM_DEBUG               0x0001
+-#define EXT2_DEFM_BSDGROUPS   0x0002
+-#define EXT2_DEFM_XATTR_USER  0x0004
+-#define EXT2_DEFM_ACL         0x0008
+-#define EXT2_DEFM_UID16               0x0010
+-#define EXT3_DEFM_JMODE               0x0060
+-#define EXT3_DEFM_JMODE_DATA  0x0020
+-#define EXT3_DEFM_JMODE_ORDERED       0x0040
+-#define EXT3_DEFM_JMODE_WBACK 0x0060
+-#define EXT4_DEFM_NOBARRIER   0x0100
+-#define EXT4_DEFM_BLOCK_VALIDITY 0x0200
+-#define EXT4_DEFM_DISCARD     0x0400
+-#define EXT4_DEFM_NODELALLOC  0x0800
+-
+-/*
+- * Structure of a directory entry
+- */
+-#define EXT2_NAME_LEN 255
+-
+-struct ext2_dir_entry {
+-      __u32   inode;                  /* Inode number */
+-      __u16   rec_len;                /* Directory entry length */
+-      __u16   name_len;               /* Name length */
+-      char    name[EXT2_NAME_LEN];    /* File name */
+-};
+-
+-/*
+- * The new version of the directory entry.  Since EXT2 structures are
+- * stored in intel byte order, and the name_len field could never be
+- * bigger than 255 chars, it's safe to reclaim the extra byte for the
+- * file_type field.
+- */
+-struct ext2_dir_entry_2 {
+-      __u32   inode;                  /* Inode number */
+-      __u16   rec_len;                /* Directory entry length */
+-      __u8    name_len;               /* Name length */
+-      __u8    file_type;
+-      char    name[EXT2_NAME_LEN];    /* File name */
+-};
+-
+-/*
+- * Ext2 directory file types.  Only the low 3 bits are used.  The
+- * other bits are reserved for now.
+- */
+-#define EXT2_FT_UNKNOWN               0
+-#define EXT2_FT_REG_FILE      1
+-#define EXT2_FT_DIR           2
+-#define EXT2_FT_CHRDEV                3
+-#define EXT2_FT_BLKDEV                4
+-#define EXT2_FT_FIFO          5
+-#define EXT2_FT_SOCK          6
+-#define EXT2_FT_SYMLINK               7
+-
+-#define EXT2_FT_MAX           8
+-
+-/*
+- * EXT2_DIR_PAD defines the directory entries boundaries
+- *
+- * NOTE: It must be a multiple of 4
+- */
+-#define EXT2_DIR_PAD                  4
+-#define EXT2_DIR_ROUND                        (EXT2_DIR_PAD - 1)
+-#define EXT2_DIR_REC_LEN(name_len)    (((name_len) + 8 + EXT2_DIR_ROUND) & \
+-                                       ~EXT2_DIR_ROUND)
+-
+-/*
+- * This structure is used for multiple mount protection. It is written
+- * into the block number saved in the s_mmp_block field in the superblock.
+- * Programs that check MMP should assume that if SEQ_FSCK (or any unknown
+- * code above SEQ_MAX) is present then it is NOT safe to use the filesystem,
+- * regardless of how old the timestamp is.
+- *
+- * The timestamp in the MMP structure will be updated by e2fsck at some
+- * arbitary intervals (start of passes, after every few groups of inodes
+- * in pass1 and pass1b).  There is no guarantee that e2fsck is updating
+- * the MMP block in a timely manner, and the updates it does are purely
+- * for the convenience of the sysadmin and not for automatic validation.
+- *
+- * Note: Only the mmp_seq value is used to determine whether the MMP block
+- *    is being updated.  The mmp_time, mmp_nodename, and mmp_bdevname
+- *    fields are only for informational purposes for the administrator,
+- *    due to clock skew between nodes and hostname HA service takeover.
+- */
+-#define EXT4_MMP_MAGIC     0x004D4D50U /* ASCII for MMP */
+-#define EXT4_MMP_SEQ_CLEAN 0xFF4D4D50U /* mmp_seq value for clean unmount */
+-#define EXT4_MMP_SEQ_FSCK  0xE24D4D50U /* mmp_seq value when being fscked */
+-#define EXT4_MMP_SEQ_MAX   0xE24D4D4FU /* maximum valid mmp_seq value */
+-
+-struct mmp_struct {
+-      __u32   mmp_magic;              /* Magic number for MMP */
+-      __u32   mmp_seq;                /* Sequence no. updated periodically */
+-      __u64   mmp_time;               /* Time last updated */
+-      char    mmp_nodename[64];       /* Node which last updated MMP block */
+-      char    mmp_bdevname[32];       /* Bdev which last updated MMP block */
+-      __u16   mmp_check_interval;     /* Changed mmp_check_interval */
+-      __u16   mmp_pad1;
+-      __u32   mmp_pad2[227];
+-};
+-
+-/*
+- * Default interval for MMP update in seconds.
+- */
+-#define EXT4_MMP_UPDATE_INTERVAL      5
+-
+-/*
+- * Maximum interval for MMP update in seconds.
+- */
+-#define EXT4_MMP_MAX_UPDATE_INTERVAL  300
+-
+-/*
+- * Minimum interval for MMP checking in seconds.
+- */
+-#define EXT4_MMP_MIN_CHECK_INTERVAL     5
+-
+-#endif        /* _EXT2FS_EXT2_FS_H */
meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb +2 -2
index d75aa95c1fd..fa7054bc54f 100644
@@ -22,7 +22,8 @@ SRC_URI = "https://www.zytor.com/pub/syslinux/Testing/6.04/syslinux-${PV}.tar.xz
            file://0012-libinstaller-Fix-build-with-glibc-2.36.patch \
            file://0013-remove-clean-script.patch \
            file://0014-Fix-reproducibility-issues.patch \
-"
+           file://0001-ext2_fs.h-do-not-carry-an-outdated-copy.patch \
+           "
 
 SRC_URI[md5sum] = "2b31c78f087f99179feb357da312d7ec"
 SRC_URI[sha256sum] = "4441a5d593f85bb6e8d578cf6653fb4ec30f9e8f4a2315a3d8f2d0a8b3fadf94"
--

2.39.2

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#203624): https://lists.openembedded.org/g/openembedded-core/message/203624
Mute This Topic: https://lists.openembedded.org/mt/108035226/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#9 lore raw

PATCH 9/32 epiphany: upgrade 46.0 -> 46.3

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../epiphany/{epiphany_46.0.bb => epiphany_46.3.bb}           | 2 +-
 .../files/0002-help-meson.build-disable-the-use-of-yelp.patch | 2 +-
 meta/recipes-gnome/epiphany/files/distributor.patch           | 4 ++--
 meta/recipes-gnome/epiphany/files/migrator.patch              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename meta/recipes-gnome/epiphany/{epiphany_46.0.bb => epiphany_46.3.bb} (94%)
meta/recipes-gnome/epiphany/epiphany_46.3.bb renamed from meta/recipes-gnome/epiphany/epiphany_46.0.bb +1 -1
similarity index 94%
rename from meta/recipes-gnome/epiphany/epiphany_46.0.bb
rename to meta/recipes-gnome/epiphany/epiphany_46.3.bb
index 9052fe170bb..d9ad38d6933 100644
@@ -31,7 +31,7 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GN
            file://migrator.patch \
            file://distributor.patch \
            "
-SRC_URI[archive.sha256sum] = "f4348f2cf51c07c0c106d130172d4d23f2cd4068771e1de007b758ca2ade5660"
+SRC_URI[archive.sha256sum] = "a9e1ad206449117fc5ebe4d0177c1d7a2ff503d6b55019072a068ff2ab278656"
 
 # Developer mode enables debugging
 PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false"
meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch +1 -1
index e5054667649..e129d503e82 100644
@@ -1,4 +1,4 @@
-From bd45c75fe691e275d7a7d7e641ac66b153369a1c Mon Sep 17 00:00:00 2001
+From 4ec86871f8c2a854aec9e6955566fa437fd5f09a Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Wed, 31 Jan 2018 15:50:38 +0200
 Subject: [PATCH] help/meson.build: disable the use of yelp
meta/recipes-gnome/epiphany/files/distributor.patch +2 -2
index a2800eb62d6..ba674e4aad8 100644
@@ -1,4 +1,4 @@
-From c297f5b89d7c8e98ac98e1d9a7506df6db6fc025 Mon Sep 17 00:00:00 2001
+From 641c9d5fc0d9f16151a20a5df2f0b4059d1130a1 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <[email protected]>
 Date: Fri, 26 Feb 2021 10:17:52 +0000
 Subject: [PATCH] Don't encode the distro from /etc/os-release into the
@@ -11,7 +11,7 @@ RP 2021/2/26
  1 file changed, 1 insertion(+)
 
 diff --git a/meson.build b/meson.build
-index e416cc7..ee5f7b1 100644
+index 2691828..c466af6 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -15,6 +15,7 @@ if r.returncode() == 0
meta/recipes-gnome/epiphany/files/migrator.patch +1 -1
index 1b4404c8cad..53837f448b2 100644
@@ -1,4 +1,4 @@
-From b38a4ceaeec05efb1b822d52c43590e7fd518113 Mon Sep 17 00:00:00 2001
+From 2fcc2b3c3751b2fb63474ca78b24e4b6375d62a9 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <[email protected]>
 Date: Thu, 25 Feb 2021 14:52:32 +0000
 Subject: [PATCH] epiphany: Fix reproducibility issue
Signature · 1 line
2.39.2
#10 lore raw

PATCH 10/32 gstreamer1.0: upgrade 1.24.5 -> 1.24.6

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../0001-connect-has-a-different-signature-on-musl.patch      | 2 +-
 .../{gst-devtools_1.24.5.bb => gst-devtools_1.24.6.bb}        | 2 +-
 ...reamer1.0-libav_1.24.5.bb => gstreamer1.0-libav_1.24.6.bb} | 2 +-
 ...fix-maybe-uninitialized-warnings-when-compiling-with.patch | 2 +-
 .../0002-avoid-including-sys-poll.h-directly.patch            | 2 +-
 ...opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch | 2 +-
 ...ugins-bad_1.24.5.bb => gstreamer1.0-plugins-bad_1.24.6.bb} | 2 +-
 ...1-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch | 2 +-
 .../0002-ssaparse-enhance-SSA-text-lines-parsing.patch        | 2 +-
 .../0003-viv-fb-Make-sure-config.h-is-included.patch          | 2 +-
 ...ins-base_1.24.5.bb => gstreamer1.0-plugins-base_1.24.6.bb} | 2 +-
 ...ins-good_1.24.5.bb => gstreamer1.0-plugins-good_1.24.6.bb} | 2 +-
 ...ins-ugly_1.24.5.bb => gstreamer1.0-plugins-ugly_1.24.6.bb} | 2 +-
 ...amer1.0-python_1.24.5.bb => gstreamer1.0-python_1.24.6.bb} | 2 +-
 ...sp-server_1.24.5.bb => gstreamer1.0-rtsp-server_1.24.6.bb} | 2 +-
 ...reamer1.0-vaapi_1.24.5.bb => gstreamer1.0-vaapi_1.24.6.bb} | 2 +-
 .../0001-tests-respect-the-idententaion-used-in-meson.patch   | 4 ++--
 .../0002-tests-add-support-for-install-the-tests.patch        | 4 ++--
 .../0003-tests-use-a-dictionaries-for-environment.patch       | 4 ++--
 ...4-tests-add-helper-script-to-run-the-installed_tests.patch | 4 ++--
 .../{gstreamer1.0_1.24.5.bb => gstreamer1.0_1.24.6.bb}        | 2 +-
 21 files changed, 25 insertions(+), 25 deletions(-)
 rename meta/recipes-multimedia/gstreamer/{gst-devtools_1.24.5.bb => gst-devtools_1.24.6.bb} (95%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-libav_1.24.5.bb => gstreamer1.0-libav_1.24.6.bb} (91%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.24.5.bb => gstreamer1.0-plugins-bad_1.24.6.bb} (98%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base_1.24.5.bb => gstreamer1.0-plugins-base_1.24.6.bb} (98%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.24.5.bb => gstreamer1.0-plugins-good_1.24.6.bb} (97%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.24.5.bb => gstreamer1.0-plugins-ugly_1.24.6.bb} (94%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.24.5.bb => gstreamer1.0-python_1.24.6.bb} (91%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.24.5.bb => gstreamer1.0-rtsp-server_1.24.6.bb} (90%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.24.5.bb => gstreamer1.0-vaapi_1.24.6.bb} (95%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.24.5.bb => gstreamer1.0_1.24.6.bb} (97%)
meta/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch +1 -1
index 8520567f177..f2bb664140f 100644
@@ -1,4 +1,4 @@
-From c20894a5e6f52aa9fe3437e733a228b1a0eb6428 Mon Sep 17 00:00:00 2001
+From d0e3b04007d60755cf1c092c1cac29e832290b86 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Sun, 9 Sep 2018 17:38:10 -0700
 Subject: [PATCH] connect has a different signature on musl
meta/recipes-multimedia/gstreamer/gst-devtools_1.24.6.bb renamed from meta/recipes-multimedia/gstreamer/gst-devtools_1.24.5.bb +1 -1
similarity index 95%
rename from meta/recipes-multimedia/gstreamer/gst-devtools_1.24.5.bb
rename to meta/recipes-multimedia/gstreamer/gst-devtools_1.24.6.bb
index d4a81b69a17..1b448f7c558 100644
@@ -12,7 +12,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${PV}
            file://0001-connect-has-a-different-signature-on-musl.patch \
            "
 
-SRC_URI[sha256sum] = "a96675898129a480d05bbf91071ec4e40154dcad6d62f3944154a6cb326045a4"
+SRC_URI[sha256sum] = "8beb9e98ed136c29f4ec10396dd6c8708a5645cdacda90af1b7196057de17672"
 
 DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base"
 RRECOMMENDS:${PN} = "git"
meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.6.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.5.bb +1 -1
similarity index 91%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.5.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.6.bb
index 24c6c792c5f..7a72f9120e8 100644
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
                     "
 
 SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz"
-SRC_URI[sha256sum] = "7fd16bdfa56ed51c40b474648fc35c4edde3e8ac934b12b82b49727b5d703521"
+SRC_URI[sha256sum] = "4bbd08481a390f907e342aa3f25ab885c80ec0a53f3b14244cf733cc8622f2bf"
 
 S = "${WORKDIR}/gst-libav-${PV}"
 
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch +1 -1
index 13a481485ae..da455c8b204 100644
@@ -1,4 +1,4 @@
-From bb7f964d51de6b888b3b7a6d0c3d260fcad24008 Mon Sep 17 00:00:00 2001
+From 653f194c2ce141bbb7a7440f65ea279cf4fe3f78 Mon Sep 17 00:00:00 2001
 From: Andre McCurdy <[email protected]>
 Date: Tue, 26 Jan 2016 15:16:01 -0800
 Subject: [PATCH] fix maybe-uninitialized warnings when compiling with -Os
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch +1 -1
index 298337cb0a0..9b77bfeb487 100644
@@ -1,4 +1,4 @@
-From 25efc5b2d22aed4527470ef93970664b210bf8c5 Mon Sep 17 00:00:00 2001
+From 441b90195aff1ececa9ea6dd228546fa3c16bf84 Mon Sep 17 00:00:00 2001
 From: Andre McCurdy <[email protected]>
 Date: Wed, 3 Feb 2016 18:05:41 -0800
 Subject: [PATCH] avoid including <sys/poll.h> directly
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch +1 -1
index 965053348fd..0214ce3eecf 100644
@@ -1,4 +1,4 @@
-From 39fbcdfc5383bdae95293a3109c847f64d193b54 Mon Sep 17 00:00:00 2001
+From d3121e8febdb5cb00511624983c24e50441b64e8 Mon Sep 17 00:00:00 2001
 From: Andrey Zhizhikin <[email protected]>
 Date: Mon, 27 Jan 2020 10:22:35 +0000
 Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.6.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.5.bb +1 -1
similarity index 98%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.5.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.6.bb
index 75efbad49cd..48e69550397 100644
@@ -10,7 +10,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad
            file://0002-avoid-including-sys-poll.h-directly.patch \
            file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \
            "
-SRC_URI[sha256sum] = "3029bfd7265314d609dc8eab503675a344ea46e8274fd73ab34566c8442dc847"
+SRC_URI[sha256sum] = "8f4d965513e7827c1f547c1e749e4ef2812b371974fe64857fe5029a19c5b64c"
 
 S = "${WORKDIR}/gst-plugins-bad-${PV}"
 
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch +1 -1
index 38d0fbf6bfb..0c2c34aa0db 100644
@@ -1,4 +1,4 @@
-From 5a4d65e13a326103ac02f156c01b6fcbb0269902 Mon Sep 17 00:00:00 2001
+From ffe65c3e4998042b030b91c09a706a03768a1e40 Mon Sep 17 00:00:00 2001
 From: zhouming <[email protected]>
 Date: Wed, 14 May 2014 10:16:20 +0800
 Subject: [PATCH] ENGR00312515: get caps from src pad when query caps
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch +1 -1
index 4090b77c8d4..abca62a4914 100644
@@ -1,4 +1,4 @@
-From 21b8339077f52ec9220e0d3d1f3872e23c7c2e88 Mon Sep 17 00:00:00 2001
+From 1cd4da7d4739dcfa2b66899ef8a49e5ed88d41b8 Mon Sep 17 00:00:00 2001
 From: Mingke Wang <[email protected]>
 Date: Thu, 19 Mar 2015 14:17:10 +0800
 Subject: [PATCH] ssaparse: enhance SSA text lines parsing.
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch +1 -1
index ab46ecee5df..40c91c9df69 100644
@@ -1,4 +1,4 @@
-From 246e6f5ed75696b2e9d9a9ee8cd59252724e1334 Mon Sep 17 00:00:00 2001
+From 48652bcf057b74460eadf8cb943b6381fca4423f Mon Sep 17 00:00:00 2001
 From: Carlos Rafael Giani <[email protected]>
 Date: Tue, 21 May 2019 14:01:11 +0200
 Subject: [PATCH] viv-fb: Make sure config.h is included
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.6.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.5.bb +1 -1
similarity index 98%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.5.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.6.bb
index 9d19ea233da..7c3390d52df 100644
@@ -11,7 +11,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba
            file://0003-viv-fb-Make-sure-config.h-is-included.patch \
            file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \
            "
-SRC_URI[sha256sum] = "0e33ec9b59eef5ef3a6a53bbd55c44340e681d0000910caca12541a73db38a7d"
+SRC_URI[sha256sum] = "cf52b535a0ce7ec974756891818f34f06317c2e136abb24149e18c23ecc229b5"
 
 S = "${WORKDIR}/gst-plugins-base-${PV}"
 
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.6.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.5.bb +1 -1
similarity index 97%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.5.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.6.bb
index 1c33ffde00e..9d93ca09677 100644
@@ -6,7 +6,7 @@ BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues
 
 SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz"
 
-SRC_URI[sha256sum] = "badcfc5292b035bde99a77327d468b2f0b116b40420bc9f25fb8e3970824ba75"
+SRC_URI[sha256sum] = "996b9c8d1d246ed43be304718b6086e5a17d4ae8114d1920aed9ea75b920ba2d"
 
 S = "${WORKDIR}/gst-plugins-good-${PV}"
 
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.6.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.5.bb +1 -1
similarity index 94%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.5.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.6.bb
index 6cae61ed35e..7b7de75dacb 100644
@@ -15,7 +15,7 @@ SRC_URI = " \
             https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \
             "
 
-SRC_URI[sha256sum] = "333267b6e00770440a4a00402910dd59ed8fd619eaebf402815fbe111da7776d"
+SRC_URI[sha256sum] = "5dfdbb2978ab282e637255cd875cf5b7b93fc83db62f8a0b1af02c85c84a75c4"
 
 S = "${WORKDIR}/gst-plugins-ugly-${PV}"
 
meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.6.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.5.bb +1 -1
similarity index 91%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.5.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.6.bb
index a4574f12623..cf38c2b8764 100644
@@ -8,7 +8,7 @@ LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740"
 
 SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "c23570c144e6276efd9e82de2ac0cea46b168a57fb2e436bed96cb285d641bf6"
+SRC_URI[sha256sum] = "692e88820e097b30e5f92d37d0955c709a0a17b27f874a1907405244825bd700"
 
 DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
 RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.6.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.5.bb +1 -1
similarity index 90%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.5.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.6.bb
index 9971eee48ec..cdb74afbfc4 100644
@@ -10,7 +10,7 @@ PNREAL = "gst-rtsp-server"
 
 SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz"
 
-SRC_URI[sha256sum] = "a3062665e41814d3dba3e02b7b06b77326d54d2b6f178ffcb196af9b91a1bfb9"
+SRC_URI[sha256sum] = "b0bdda26173f13f5521c829367963824a74fd0ce8f52bcab674d7e727f74e93c"
 
 S = "${WORKDIR}/${PNREAL}-${PV}"
 
meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.6.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.5.bb +1 -1
similarity index 95%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.5.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.6.bb
index c23794f4b60..015eb86316e 100644
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz"
 
-SRC_URI[sha256sum] = "fdb2da26b23895c56b20c6bad9edcf0faec3a3887765bc62c88f0955ed5b7c72"
+SRC_URI[sha256sum] = "b5caa057e7efc51cd70504a59e5d9c7a5406d8268723c8283dd61be27fd8cacc"
 
 S = "${WORKDIR}/${REALPN}-${PV}"
 DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch +2 -2
index a190370c161..80e6ca3f99c 100644
@@ -1,4 +1,4 @@
-From 381f50a27766c425af36a7203061716497e6603f Mon Sep 17 00:00:00 2001
+From 9c932b1c17d62a3e54c2dc55b1f75dc48d73134c Mon Sep 17 00:00:00 2001
 From: Jose Quaresma <[email protected]>
 Date: Sun, 11 Apr 2021 19:48:13 +0100
 Subject: [PATCH] tests: respect the idententaion used in meson
@@ -11,7 +11,7 @@ Signed-off-by: Jose Quaresma <[email protected]>
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/tests/check/meson.build b/tests/check/meson.build
-index 6540279..e9501fe 100644
+index 7d68212..bf0021f 100644
 --- a/tests/check/meson.build
 +++ b/tests/check/meson.build
 @@ -146,11 +146,11 @@ foreach t : core_tests
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch +2 -2
index 8a0d5bd51bc..4d88706a4aa 100644
@@ -1,4 +1,4 @@
-From 19b1768acde5b30def36f0d1ac2725b265151d13 Mon Sep 17 00:00:00 2001
+From 32707203ac17cd7130224445aa760f36d4cec579 Mon Sep 17 00:00:00 2001
 From: Jose Quaresma <[email protected]>
 Date: Sun, 11 Apr 2021 19:48:13 +0100
 Subject: [PATCH] tests: add support for install the tests
@@ -19,7 +19,7 @@ Signed-off-by: Jose Quaresma <[email protected]>
  create mode 100644 tests/check/template.test.in
 
 diff --git a/meson.build b/meson.build
-index 0809b4c..ffb61c4 100644
+index 1d87075..6aaf23c 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -645,6 +645,10 @@ if bashcomp_dep.found()
meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch +2 -2
index 27623bf96bd..8d0c6dbf34c 100644
@@ -1,4 +1,4 @@
-From 453865e8938c5f50f14409b67246bbbd801fa44d Mon Sep 17 00:00:00 2001
+From fca19b2f5db1be4daef4ea00c60a64120fa08178 Mon Sep 17 00:00:00 2001
 From: Jose Quaresma <[email protected]>
 Date: Sat, 24 Apr 2021 10:34:47 +0100
 Subject: [PATCH] tests: use a dictionaries for environment
@@ -14,7 +14,7 @@ Signed-off-by: Jose Quaresma <[email protected]>
  1 file changed, 13 insertions(+), 8 deletions(-)
 
 diff --git a/tests/check/meson.build b/tests/check/meson.build
-index 08f8fd8..330abaa 100644
+index 9a8c42c..6bb346a 100644
 --- a/tests/check/meson.build
 +++ b/tests/check/meson.build
 @@ -161,14 +161,19 @@ foreach t : core_tests
meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch +2 -2
index 97b056072d6..629b0563f6b 100644
@@ -1,4 +1,4 @@
-From 506ff13a044439a170f770b6663a64c942ae0a05 Mon Sep 17 00:00:00 2001
+From 5f80e65b73fee2d081ff4ffb442f71eb5b0ccfc4 Mon Sep 17 00:00:00 2001
 From: Jose Quaresma <[email protected]>
 Date: Sun, 2 May 2021 01:58:01 +0100
 Subject: [PATCH] tests: add helper script to run the installed_tests
@@ -18,7 +18,7 @@ Signed-off-by: Jose Quaresma <[email protected]>
  create mode 100755 tests/check/template.sh.in
 
 diff --git a/tests/check/meson.build b/tests/check/meson.build
-index 330abaa..5d383b1 100644
+index 6bb346a..fe57935 100644
 --- a/tests/check/meson.build
 +++ b/tests/check/meson.build
 @@ -185,6 +185,23 @@ foreach t : core_tests
meta/recipes-multimedia/gstreamer/gstreamer1.0_1.24.6.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.24.5.bb +1 -1
similarity index 97%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.24.5.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0_1.24.6.bb
index c2da99f7e48..71ff327675b 100644
@@ -22,7 +22,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.x
            file://0003-tests-use-a-dictionaries-for-environment.patch \
            file://0004-tests-add-helper-script-to-run-the-installed_tests.patch \
            "
-SRC_URI[sha256sum] = "2bdef209252bf146351843134b797db6b6e7adb4c00d82e83bd5abe608253a7b"
+SRC_URI[sha256sum] = "64342060d7c6f9e36a35e3be38a4f5ac3b41ed93b0853619be45141ef3cc1b9d"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \
                    check \
Signature · 1 line
2.39.2
#11 lore raw

PATCH 11/32 kmod: upgrade 32 -> 33

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

Disable manpages, as they require scdoc, which is not currently available in core (and adjust a related selftest).

Drop 0001-Use-portable-implementation-for-basename-API.patch as upstream fixed the issue differently.

---
 meta/lib/oeqa/selftest/cases/imagefeatures.py |   8 +-
 ...able-implementation-for-basename-API.patch | 136 ------------------
 .../kmod/kmod/avoid_parallel_tests.patch      |  10 +-
 meta/recipes-kernel/kmod/kmod/gtkdocdir.patch |   9 +-
 .../kmod/{kmod_32.bb => kmod_33.bb}           |   7 +-
 5 files changed, 14 insertions(+), 156 deletions(-)
 delete mode 100644 meta/recipes-kernel/kmod/kmod/0001-Use-portable-implementation-for-basename-API.patch
 rename meta/recipes-kernel/kmod/{kmod_32.bb => kmod_33.bb} (94%)
meta/lib/oeqa/selftest/cases/imagefeatures.py +4 -4
index dc88c222bdc..74811d2c0aa 100644
@@ -319,7 +319,7 @@ SKIP_RECIPE[busybox] = "Don't build this"
         """
         config = """
 DISTRO_FEATURES:append = " api-documentation"
-CORE_IMAGE_EXTRA_INSTALL = "man-pages kmod-doc"
+CORE_IMAGE_EXTRA_INSTALL = "man-pages"
 """
         self.write_config(config)
         bitbake("core-image-minimal")
@@ -330,7 +330,7 @@ CORE_IMAGE_EXTRA_INSTALL = "man-pages kmod-doc"
             self.assertEqual(status, 1, 'Failed to run apropos: %s' % (output))
             self.assertIn("iso_8859_15", output)
 
-            # This manpage is provided by kmod
-            status, output = qemu.run_serial("man --pager=cat modprobe")
+            # This manpage is provided by man-pages
+            status, output = qemu.run_serial("man --pager=cat intro")
             self.assertEqual(status, 1, 'Failed to run man: %s' % (output))
-            self.assertIn("force-modversion", output)
+            self.assertIn("introduction to user commands", output)
meta/recipes-kernel/kmod/kmod/0001-Use-portable-implementation-for-basename-API.patch deleted +0 -136

136 lines not on this page · raw message

meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch +4 -6
index 04a82048153..6db4fa7e97e 100644
@@ -1,4 +1,4 @@
-From be6f82c54f694617c646ca1f8b5bcf93694e20ad Mon Sep 17 00:00:00 2001
+From 7a22abf188e5b688080bb1321a77588474114339 Mon Sep 17 00:00:00 2001
 From: Tudor Florea <[email protected]>
 Date: Fri, 6 Sep 2013 21:11:57 +0000
 Subject: [PATCH] kmod: avoid parallel-tests
@@ -11,16 +11,15 @@ serial-tests is now required
 
 Signed-off-by: Tudor Florea <[email protected]>
 Upstream-Status: Inappropriate (disable feature incompatible with ptest)
-
 ---
  configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index ee72283..60980c0 100644
+index 2f1c525..7056aae 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -14,8 +14,8 @@ AC_USE_SYSTEM_EXTENSIONS
+@@ -14,7 +14,7 @@ AC_USE_SYSTEM_EXTENSIONS
  AC_SYS_LARGEFILE
  AC_PREFIX_DEFAULT([/usr])
  AM_MAINTAINER_MODE([enable])
@@ -28,5 +27,4 @@ index ee72283..60980c0 100644
 +AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules tar-pax no-dist-gzip dist-xz subdir-objects color-tests serial-tests])
  AM_SILENT_RULES([yes])
  LT_INIT([disable-static pic-only])
-
- AS_IF([test "x$enable_static" = "xyes"], [AC_MSG_ERROR([--enable-static is not supported by kmod])])
+ 
meta/recipes-kernel/kmod/kmod/gtkdocdir.patch +3 -6
index a34ea466e8e..91d622b8c7b 100644
@@ -1,4 +1,4 @@
-From dd59095f70f774f6d1e767010e25b35ef6db4c4b Mon Sep 17 00:00:00 2001
+From 90fb7bb85002cde39de3b3d2e2481933390832af Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Fri, 8 Dec 2023 22:35:45 +0000
 Subject: [PATCH] configure: set docdir in GTK_DOC_CHECK
@@ -16,10 +16,10 @@ Signed-off-by: Ross Burton <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index de01e08..67696c4 100644
+index 7056aae..d53a20c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -255,7 +255,7 @@ AS_IF([test "x$enable_coverage" = "xyes"], [
+@@ -236,7 +236,7 @@ AS_IF([test "x$enable_coverage" = "xyes"], [
  AM_CONDITIONAL([ENABLE_COVERAGE], [test "x$enable_coverage" = "xyes"])
  
  m4_ifdef([GTK_DOC_CHECK], [
@@ -28,6 +28,3 @@ index de01e08..67696c4 100644
  ], [
  AM_CONDITIONAL([ENABLE_GTK_DOC], false)])
  
--- 
-2.34.1
-
meta/recipes-kernel/kmod/kmod_33.bb renamed from meta/recipes-kernel/kmod/kmod_32.bb +3 -4
similarity index 94%
rename from meta/recipes-kernel/kmod/kmod_32.bb
rename to meta/recipes-kernel/kmod/kmod_33.bb
index 1c4e5a94db7..15f42766f3b 100644
@@ -13,14 +13,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                     file://libkmod/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                     file://tools/COPYING;md5=751419260aa954499f7abaabaa882bbe \
                    "
-inherit autotools bash-completion gtk-doc pkgconfig manpages update-alternatives
+inherit autotools bash-completion gtk-doc pkgconfig update-alternatives
 
-SRCREV = "41faa59711742c1476d59985011ee0f27ed91d30"
+SRCREV = "e193aeb99a04fb4b63ce47eb2c7f119db59446a0"
 
 SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git;branch=master;protocol=https \
            file://depmod-search.conf \
            file://avoid_parallel_tests.patch \
-           file://0001-Use-portable-implementation-for-basename-API.patch \
            file://gtkdocdir.patch \
            "
 
@@ -31,7 +30,7 @@ EXTRA_OECONF += "--enable-tools"
 PACKAGECONFIG ??= "zlib xz openssl"
 PACKAGECONFIG[debug] = "--enable-debug,--disable-debug"
 PACKAGECONFIG[logging] = " --enable-logging,--disable-logging"
-PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native"
+PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, scdoc-native"
 PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl"
 PACKAGECONFIG[xz] = "--with-xz,--without-xz,xz"
 PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
Signature · 1 line
2.39.2
#12 lore raw

PATCH 12/32 kmscube: upgrade to latest revision

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../0001-cube-gears-Change-header-file-to-GLES3-gl3.h.patch     | 2 +-
 meta/recipes-graphics/kmscube/kmscube_git.bb                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-graphics/kmscube/kmscube/0001-cube-gears-Change-header-file-to-GLES3-gl3.h.patch +1 -1
index f8608d46769..415515b908d 100644
@@ -1,4 +1,4 @@
-From 5f54f067da7ee24a61d6cb41e0636383729e2bad Mon Sep 17 00:00:00 2001
+From 38237aee63d671cc418902951b8945b59a41a4fd Mon Sep 17 00:00:00 2001
 From: Fabio Estevam <[email protected]>
 Date: Mon, 8 Jan 2024 15:00:01 -0300
 Subject: [PATCH] cube-gears: Change header file to <GLES3/gl3.h>
meta/recipes-graphics/kmscube/kmscube_git.bb +1 -1
index 19bbcd195d2..34d5a7d71d7 100644
@@ -10,7 +10,7 @@ DEPENDS = "virtual/libgles3 virtual/libgles2 virtual/egl libdrm virtual/libgbm"
 
 LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb"
 
-SRCREV = "6ab022fdfcfedd28f4b5dbd8d3299414a367746f"
+SRCREV = "467e86c5cbeb2a2051b31ce2c240d6ddf5bc3112"
 SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https \
            file://0001-cube-gears-Change-header-file-to-GLES3-gl3.h.patch \
            "
Signature · 1 line
2.39.2
#13 lore raw

PATCH 13/32 libadwaita: upgrade 1.5.2 -> 1.5.3

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../libadwaita/{libadwaita_1.5.2.bb => libadwaita_1.5.3.bb}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-gnome/libadwaita/{libadwaita_1.5.2.bb => libadwaita_1.5.3.bb} (88%)
meta/recipes-gnome/libadwaita/libadwaita_1.5.3.bb renamed from meta/recipes-gnome/libadwaita/libadwaita_1.5.2.bb +1 -1
similarity index 88%
rename from meta/recipes-gnome/libadwaita/libadwaita_1.5.2.bb
rename to meta/recipes-gnome/libadwaita/libadwaita_1.5.3.bb
index 078f81c677c..2e22211135a 100644
@@ -10,7 +10,7 @@ DEPENDS = " \
 
 inherit gnomebase gobject-introspection gi-docgen vala features_check
 
-SRC_URI[archive.sha256sum] = "c9faee005cb4912bce34f69f1af26b01a364534e12ede5d9bac44d8226d72c16"
+SRC_URI[archive.sha256sum] = "3b358635f7ea455d9fe75101373e34d2fba130d1590bd1a1c87ab1ccfba05f32"
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 REQUIRED_DISTRO_FEATURES = "opengl"
Signature · 1 line
2.39.2
#14 lore raw

PATCH 14/32 libedit: upgrade 20240517-3.1 -> 20240808-3.1

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

history.3 manpage is no longer installed.

---
 .../libedit/libedit/stdc-predef.patch            | 16 ++++++++++++----
 ...t_20240517-3.1.bb => libedit_20240808-3.1.bb} |  8 +-------
 2 files changed, 13 insertions(+), 11 deletions(-)
 rename meta/recipes-devtools/libedit/{libedit_20240517-3.1.bb => libedit_20240808-3.1.bb} (67%)
meta/recipes-devtools/libedit/libedit/stdc-predef.patch +12 -4
index 75ef308fad5..0ce6d127a94 100644
@@ -1,13 +1,21 @@
+From 32918b3a91d9fe4719bba78a44ec3262a2994e68 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Wed, 31 Jul 2019 10:48:19 -0700
+Subject: [PATCH] libedit: Move from meta-oe
+
 __STDC_ISO_10646__ is defined in stdc-predef.h
 therefore include it to see if its there on a platform
 
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <[email protected]>
+---
+ src/chartype.h | 1 +
+ 1 file changed, 1 insertion(+)
 
-Index: libedit-20160903-3.1/src/chartype.h
-===================================================================
---- libedit-20160903-3.1.orig/src/chartype.h
-+++ libedit-20160903-3.1/src/chartype.h
+diff --git a/src/chartype.h b/src/chartype.h
+index bcdb293..92327d3 100644
+--- a/src/chartype.h
++++ b/src/chartype.h
 @@ -29,6 +29,7 @@
  #ifndef _h_chartype_f
  #define _h_chartype_f
meta/recipes-devtools/libedit/libedit_20240808-3.1.bb renamed from meta/recipes-devtools/libedit/libedit_20240517-3.1.bb +1 -7
similarity index 67%
rename from meta/recipes-devtools/libedit/libedit_20240517-3.1.bb
rename to meta/recipes-devtools/libedit/libedit_20240808-3.1.bb
index f8fa871ec98..932e5a1485a 100644
@@ -13,12 +13,6 @@ inherit autotools
 SRC_URI = "http://www.thrysoee.dk/editline/${BP}.tar.gz \
            file://stdc-predef.patch \
           "
-SRC_URI[sha256sum] = "3a489097bb4115495f3bd85ae782852b7097c556d9500088d74b6fa38dbd12ff"
+SRC_URI[sha256sum] = "5f0573349d77c4a48967191cdd6634dd7aa5f6398c6a57fe037cc02696d6099f"
 
 BBCLASSEXTEND = "native nativesdk"
-
-inherit update-alternatives
-
-ALTERNATIVE_PRIORITY = "90"
-ALTERNATIVE:${PN}-doc = "history.3"
-ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3"
Signature · 1 line
2.39.2
#15 lore raw

PATCH 15/32 libnl: upgrade 3.9.0 -> 3.10.0

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

Add a patch to disable a failing test that is proving difficult to investigate.

---
 ...-cksuite-all-netns.c-disable-route_1.patch | 31 +++++++++++++++++++
 .../libnl/{libnl_3.9.0.bb => libnl_3.10.0.bb} |  4 ++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-support/libnl/files/0001-tests-cksuite-all-netns.c-disable-route_1.patch
 rename meta/recipes-support/libnl/{libnl_3.9.0.bb => libnl_3.10.0.bb} (91%)
meta/recipes-support/libnl/files/0001-tests-cksuite-all-netns.c-disable-route_1.patch new file +31 -0
new file mode 100644
index 00000000000..cc5e3890a11
@@ -0,0 +1,31 @@
+From 9e45c8809fc4e0aa1dd2ec2ac3e57352049f1b92 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Tue, 20 Aug 2024 19:01:59 +0200
+Subject: [PATCH] tests/cksuite-all-netns.c: disable route_1
+
+This is a new test added in https://github.com/thom311/libnl/commit/49f7822961f5bc6b18cd2a2d3f3b8d2ab0896d3f
+and while it passes on host Debian, it doesn't inside poky.
+
+Investigation into why is proceeding slowly, and I'm simply
+not skilled enough in AF_NETLINK, so let's disable until the
+core reason for the fail is arrived at.
+
+Upstream-Status: Inappropriate [fail reported and investigated at https://github.com/thom311/libnl/issues/399]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ tests/cksuite-all-netns.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/cksuite-all-netns.c b/tests/cksuite-all-netns.c
+index 5b9d3a5..b2fc46a 100644
+--- a/tests/cksuite-all-netns.c
++++ b/tests/cksuite-all-netns.c
+@@ -341,7 +341,7 @@ Suite *make_nl_netns_suite(void)
+ 				  nltst_netns_fixture_teardown);
+ 	tcase_add_test(tc, cache_and_clone);
+ 	tcase_add_loop_test(tc, test_create_iface, 0, 17);
+-	tcase_add_test(tc, route_1);
++	//tcase_add_test(tc, route_1);
+ 	suite_add_tcase(suite, tc);
+ 
+ 	return suite;
meta/recipes-support/libnl/libnl_3.10.0.bb renamed from meta/recipes-support/libnl/libnl_3.9.0.bb +3 -1
similarity index 91%
rename from meta/recipes-support/libnl/libnl_3.9.0.bb
rename to meta/recipes-support/libnl/libnl_3.10.0.bb
index b2825374cf4..441c847a733 100644
@@ -16,9 +16,10 @@ DEPENDS = "flex-native bison-native"
 
 SRC_URI = "${GITHUB_BASE_URI}/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \
            file://run-ptest \
+           file://0001-tests-cksuite-all-netns.c-disable-route_1.patch \
            "
 
-SRC_URI[sha256sum] = "aed507004d728a5cf11eab48ca4bf9e6e1874444e33939b9d3dfed25018ee9bb"
+SRC_URI[sha256sum] = "49b3e2235fdb58f5910bbb3ed0de8143b71ffc220571540502eb6c2471f204f5"
 
 GITHUB_BASE_URI = "https://github.com/thom311/${BPN}/releases"
 UPSTREAM_CHECK_REGEX = "releases/tag/libnl(?P<pver>.+)"
@@ -52,6 +53,7 @@ RCONFLICTS:${PN}-genl = "libnl-genl2"
 
 DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'libcheck', '', d)}"
 RRECOMMENDS:${PN}-ptest += "kernel-module-dummy kernel-module-bonding"
+RDEPENDS:${PN}-ptest += "iproute2-ip"
 
 do_compile_ptest() {
     oe_runmake ./tests/check-all
Signature · 1 line
2.39.2
#16 lore raw

PATCH 16/32 librepo: upgrade 1.17.0 -> 1.18.1

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 ...me.c-fix-build-errors-with-older-gcc.patch | 36 -------------------
 ...tain-PYTHON_INSTALL_DIR-by-running-p.patch |  2 +-
 ...les-with-pkg-config-not-with-cmake-m.patch |  6 ++--
 .../{librepo_1.17.0.bb => librepo_1.18.1.bb}  |  3 +-
 4 files changed, 5 insertions(+), 42 deletions(-)
 delete mode 100644 meta/recipes-devtools/librepo/librepo/0001-gpg_gpgme.c-fix-build-errors-with-older-gcc.patch
 rename meta/recipes-devtools/librepo/{librepo_1.17.0.bb => librepo_1.18.1.bb} (88%)
meta/recipes-devtools/librepo/librepo/0001-gpg_gpgme.c-fix-build-errors-with-older-gcc.patch deleted +0 -36
deleted file mode 100644
index 8727b181b35..00000000000
@@ -1,36 +0,0 @@
-From b525cdec3051d1c6ff0c3cd38bf3070b18d6fb50 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Wed, 6 Mar 2024 10:13:38 +0100
-Subject: [PATCH] gpg_gpgme.c: fix build errors with older gcc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When selinux is not enabled, older gcc versions error out this way:
-
-| /home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/hosttools/gcc -DG_LOG_DOMAIN=\"librepo\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -Dlibrepo_EXPORTS -I/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/git -I/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/include/libmount -I/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/include/blkid -I/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/include/glib-2.0 -I/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/lib/glib-2.0/include -I/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/include/libxml2 -isystem/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/recipe-sysroot-native/usr/include -O2 -pipe -std=c99 -Wall -fPIC -MD -MT librepo/CMakeFiles/librepo.dir/gpg_gpgme.c.o -MF librepo/CMakeFiles/librepo.dir/gpg_gpgme.c.o.d -o librepo/CMakeFiles/librepo.dir/gpg_gpgme.c.o -c /home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/git/librepo/gpg_gpgme.c
-| /home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/git/librepo/gpg_gpgme.c: In function ‘lr_gpg_ensure_socket_dir_exists’:
-| /home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/git/librepo/gpg_gpgme.c:135:1: error: label at end of compound statement
-|   135 | exit:
-|       | ^~~~
-
-Ensuring the exit: block is not empty fixes the issue.
-
-Upstream-Status: Submitted [https://github.com/rpm-software-management/librepo/pull/300]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- librepo/gpg_gpgme.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/librepo/gpg_gpgme.c b/librepo/gpg_gpgme.c
-index c4addb2..47c3153 100644
---- a/librepo/gpg_gpgme.c
-+++ b/librepo/gpg_gpgme.c
-@@ -144,6 +144,7 @@ exit:
-     }
-     freecon(old_default_context);
- #endif
-+    return;
- }
- 
- static gpgme_ctx_t
meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch +1 -1
index 4a851ad1e28..1425041dad6 100644
@@ -1,4 +1,4 @@
-From 76052aa40c61580869472fd3f009a4ab1620b998 Mon Sep 17 00:00:00 2001
+From e86f562d3cc6cea3e19c4bab77ffa2902f634615 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Fri, 30 Dec 2016 18:05:36 +0200
 Subject: [PATCH] Do not try to obtain PYTHON_INSTALL_DIR by running python.
meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch +3 -3
index fd1df95473d..edee8698d80 100644
@@ -1,4 +1,4 @@
-From b5918f06d790dc346d41de4b3a3ec01f290c1d25 Mon Sep 17 00:00:00 2001
+From 93d3c49dbdf348eec9900d53a152457f6d1cb816 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Fri, 30 Dec 2016 18:23:27 +0200
 Subject: [PATCH] Set gpgme variables with pkg-config, not with cmake module
@@ -11,10 +11,10 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6c00024..a2f57af 100644
+index 68ce953..04f83b9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -37,7 +37,8 @@ PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED)
+@@ -39,7 +39,8 @@ PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED)
  FIND_PACKAGE(CURL 7.52.0 REQUIRED)
  
  IF (USE_GPGME)
meta/recipes-devtools/librepo/librepo_1.18.1.bb renamed from meta/recipes-devtools/librepo/librepo_1.17.0.bb +1 -2
similarity index 88%
rename from meta/recipes-devtools/librepo/librepo_1.17.0.bb
rename to meta/recipes-devtools/librepo/librepo_1.18.1.bb
index 810191459dd..b3bd2812ddb 100644
@@ -8,10 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 SRC_URI = "git://github.com/rpm-software-management/librepo.git;branch=master;protocol=https \
            file://0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch \
            file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \
-           file://0001-gpg_gpgme.c-fix-build-errors-with-older-gcc.patch \
            "
 
-SRCREV = "ae727d99086f70f39fba5695af5460e1da908c1b"
+SRCREV = "9f186ad20936811ba515c5f0345ccc71603459a3"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.39.2
#17 lore raw

PATCH 17/32 libva: upgrade 2.20.0 -> 2.22.0

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../{libva-initial_2.20.0.bb => libva-initial_2.22.0.bb}      | 0
 .../libva/{libva-utils_2.20.1.bb => libva-utils_2.22.0.bb}    | 4 ++--
 meta/recipes-graphics/libva/libva.inc                         | 2 +-
 .../libva/{libva_2.20.0.bb => libva_2.22.0.bb}                | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/libva/{libva-initial_2.20.0.bb => libva-initial_2.22.0.bb} (100%)
 rename meta/recipes-graphics/libva/{libva-utils_2.20.1.bb => libva-utils_2.22.0.bb} (90%)
 rename meta/recipes-graphics/libva/{libva_2.20.0.bb => libva_2.22.0.bb} (100%)
meta/recipes-graphics/libva/libva-initial_2.22.0.bb renamed from meta/recipes-graphics/libva/libva-initial_2.20.0.bb +0 -0
similarity index 100%
rename from meta/recipes-graphics/libva/libva-initial_2.20.0.bb
rename to meta/recipes-graphics/libva/libva-initial_2.22.0.bb
meta/recipes-graphics/libva/libva-utils_2.22.0.bb renamed from meta/recipes-graphics/libva/libva-utils_2.20.1.bb +2 -2
similarity index 90%
rename from meta/recipes-graphics/libva/libva-utils_2.20.1.bb
rename to meta/recipes-graphics/libva/libva-utils_2.22.0.bb
index 3bce9a1e325..078cd7ea0a7 100644
@@ -14,8 +14,8 @@ SECTION = "x11"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e"
 
-SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.20-branch;protocol=https"
-SRCREV = "2ad888bb463dc9bfb3deb512ec9faf78f1d3bfa8"
+SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.22-branch;protocol=https"
+SRCREV = "1a13ae13382b7b548f3a7e8035e1d7df66662c0a"
 S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))$"
meta/recipes-graphics/libva/libva.inc +1 -1
index 486291bcedd..784ab8b79f0 100644
@@ -18,7 +18,7 @@ LICENSE = "MIT"
 
 SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/libva-${PV}.tar.bz2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f"
-SRC_URI[sha256sum] = "f72bdb4f48dfe71ad01f1cbefe069672a2c949a6abd51cf3c4d4784210badc49"
+SRC_URI[sha256sum] = "e3da2250654c8d52b3f59f8cb3f3d8e7fb1a2ee64378dbc400fbc5663de7edb8"
 
 S = "${WORKDIR}/libva-${PV}"
 
meta/recipes-graphics/libva/libva_2.22.0.bb renamed from meta/recipes-graphics/libva/libva_2.20.0.bb +0 -0
similarity index 100%
rename from meta/recipes-graphics/libva/libva_2.20.0.bb
rename to meta/recipes-graphics/libva/libva_2.22.0.bb
Signature · 1 line
2.39.2
#18 lore raw

PATCH 18/32 linux-firmware: upgrade 20240513 -> 20240811

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

License-Update: additional firmwares, new versions

---
 ...inux-firmware_20240513.bb => linux-firmware_20240811.bb} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-kernel/linux-firmware/{linux-firmware_20240513.bb => linux-firmware_20240811.bb} (99%)
meta/recipes-kernel/linux-firmware/linux-firmware_20240811.bb renamed from meta/recipes-kernel/linux-firmware/linux-firmware_20240513.bb +3 -3
similarity index 99%
rename from meta/recipes-kernel/linux-firmware/linux-firmware_20240513.bb
rename to meta/recipes-kernel/linux-firmware/linux-firmware_20240811.bb
index 4a87105d986..b6fb0f9a456 100644
@@ -144,7 +144,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
                     file://LICENCE.rtlwifi_firmware.txt;md5=00d06cfd3eddd5a2698948ead2ad54a5 \
                     file://LICENSE.sdma_firmware;md5=51e8c19ecc2270f4b8ea30341ad63ce9 \
                     file://LICENCE.siano;md5=4556c1bf830067f12ca151ad953ec2a5 \
-                    file://LICENCE.ti-connectivity;md5=c5e02be633f1499c109d1652514d85ec \
+                    file://LICENCE.ti-connectivity;md5=3b1e9cf54aba8146dad4b735777d406f \
                     file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c \
                     file://LICENCE.ueagle-atm4-firmware;md5=4ed7ea6b507ccc583b9d594417714118 \
                     file://LICENCE.via_vt6656;md5=e4159694cba42d4377a912e78a6e850f \
@@ -156,7 +156,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
                     "
 # WHENCE checksum is defined separately to ease overriding it if
 # class-devupstream is selected.
-WHENCE_CHKSUM  = "ae024b46fd393d199f66bbe1f3ff5254"
+WHENCE_CHKSUM  = "60b5abcc986d1660637e913a87e1413c"
 
 # These are not common licenses, set NO_GENERIC_LICENSE for them
 # so that the license files will be copied from fetched source
@@ -244,7 +244,7 @@ SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmw
 # Pin this to the 20220509 release, override this in local.conf
 SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae"
 
-SRC_URI[sha256sum] = "9f05edb99668135d37cedc4fdd18aac2802dc9e4566e086e6c6c2e321f3ecc4e"
+SRC_URI[sha256sum] = "58f1a14b800e3d1967986197d83c81f1ad14b7898a557133c58df0c02c538082"
 
 inherit allarch
 
Signature · 1 line
2.39.2
#19 lore raw

PATCH 19/32 lua: upgrade 5.4.6 -> 5.4.7

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

License-Update: copyright years, formatting

---
 meta/recipes-devtools/lua/{lua_5.4.6.bb => lua_5.4.7.bb} | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/lua/{lua_5.4.6.bb => lua_5.4.7.bb} (87%)
meta/recipes-devtools/lua/lua_5.4.7.bb renamed from meta/recipes-devtools/lua/lua_5.4.6.bb +4 -4
similarity index 87%
rename from meta/recipes-devtools/lua/lua_5.4.6.bb
rename to meta/recipes-devtools/lua/lua_5.4.7.bb
index 17dc8fb17df..6e414a08050 100644
@@ -1,7 +1,7 @@
 SUMMARY = "Lua is a powerful light-weight programming language designed \
 for extending applications."
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://doc/readme.html;beginline=303;endline=324;md5=e05449eb28c092473f854670c6e8375a"
+LIC_FILES_CHKSUM = "file://doc/readme.html;beginline=305;endline=326;md5=344ad98880a7ee9ff6e1498a519a7c76"
 HOMEPAGE = "http://www.lua.org/"
 
 SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz;name=tarballsrc \
@@ -10,10 +10,10 @@ SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz;name=tarballsrc \
            "
 
 # if no test suite matches PV release of Lua exactly, download the suite for the closest Lua release.
-PV_testsuites = "5.4.4"
+PV_testsuites = "${PV}"
 
-SRC_URI[tarballsrc.sha256sum] = "7d5ea1b9cb6aa0b59ca3dde1c6adcb57ef83a1ba8e5432c0ecd06bf439b3ad88"
-SRC_URI[tarballtest.sha256sum] = "04d28355cd67a2299dfe5708b55a0ff221ccb1a3907a3113cc103ccc05ac6aad"
+SRC_URI[tarballsrc.sha256sum] = "9fbf5e28ef86c69858f6d3d34eccc32e911c1a28b4120ff3e84aaa70cfbf1e30"
+SRC_URI[tarballtest.sha256sum] = "8a4898ffe4c7613c8009327a0722db7a41ef861d526c77c5b46114e59ebf811e"
 
 inherit pkgconfig binconfig ptest
 
Signature · 1 line
2.39.2
#20 lore raw

PATCH 20/32 mpg123: upgrade 1.32.6 -> 1.32.7

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../mpg123/{mpg123_1.32.6.bb => mpg123_1.32.7.bb}               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-multimedia/mpg123/{mpg123_1.32.6.bb => mpg123_1.32.7.bb} (96%)
meta/recipes-multimedia/mpg123/mpg123_1.32.7.bb renamed from meta/recipes-multimedia/mpg123/mpg123_1.32.6.bb +1 -1
similarity index 96%
rename from meta/recipes-multimedia/mpg123/mpg123_1.32.6.bb
rename to meta/recipes-multimedia/mpg123/mpg123_1.32.7.bb
index f7786e8588e..5a9a2a0943c 100644
@@ -10,7 +10,7 @@ LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e7b9c15fcfb986abb4cc5e8400a24169"
 
 SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "ccdd1d0abc31d73d8b435fc658c79049d0a905b30669b6a42a03ad169dc609e6"
+SRC_URI[sha256sum] = "3c8919243707951cac0e3c39bbf28653bcaffc43c98ff16801a27350db8f0f21"
 
 UPSTREAM_CHECK_REGEX = "mpg123-(?P<pver>\d+(\.\d+)+)\.tar"
 
Signature · 1 line
2.39.2
#21 lore raw

PATCH 21/32 mtools: upgrade 4.0.43 -> 4.0.44

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../mtools/mtools/clang_UNUSED.patch          | 19 +++++++++++++------
 .../mtools/disable-hardcoded-configs.patch    |  7 +++----
 .../mtools/mtools/mtools-makeinfo.patch       | 11 +++++------
 .../{mtools_4.0.43.bb => mtools_4.0.44.bb}    |  2 +-
 4 files changed, 22 insertions(+), 17 deletions(-)
 rename meta/recipes-devtools/mtools/{mtools_4.0.43.bb => mtools_4.0.44.bb} (93%)
meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch +13 -6
index 6bb9d6a3dae..20a6d1b8b35 100644
@@ -1,12 +1,19 @@
-Undefine UNUSED macros with clang
+From c72d075cb0c3a65ef17621c7ed1ffac35ca3b68e Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Wed, 19 Sep 2018 11:55:41 -0700
+Subject: [PATCH] Undefine UNUSED macros with clang
 
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <[email protected]>
-Index: mtools-4.0.18/sysincludes.h
-===================================================================
---- mtools-4.0.18.orig/sysincludes.h
-+++ mtools-4.0.18/sysincludes.h
-@@ -101,7 +101,7 @@ typedef void *caddr_t;
+---
+ sysincludes.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sysincludes.h b/sysincludes.h
+index e16ab45..8d285d4 100644
+--- a/sysincludes.h
++++ b/sysincludes.h
+@@ -98,7 +98,7 @@ typedef void *caddr_t;
  #if defined __GNUC__ && defined __STDC__
  /* gcc -traditional doesn't have PACKED, UNUSED and NORETURN */
  # define PACKED __attribute__ ((packed))
meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch +3 -4
index 57be9354870..1bed4e76147 100644
@@ -1,4 +1,4 @@
-From 2ef9b371a5cc44e730143e694d71665831fac216 Mon Sep 17 00:00:00 2001
+From 0953b744b0257e26c170fb6d6b4c0f6210e4ae43 Mon Sep 17 00:00:00 2001
 From: Ed Bartosh <[email protected]>
 Date: Tue, 13 Jun 2017 14:55:52 +0300
 Subject: [PATCH] Disabled reading host configs.
@@ -6,16 +6,15 @@ Subject: [PATCH] Disabled reading host configs.
 Upstream-Status: Inappropriate [native]
 
 Signed-off-by: Ed Bartosh <[email protected]>
-
 ---
  config.c | 8 --------
  1 file changed, 8 deletions(-)
 
 diff --git a/config.c b/config.c
-index 2f6a297..3181ed7 100644
+index 358282b..8ebafb4 100644
 --- a/config.c
 +++ b/config.c
-@@ -844,14 +844,6 @@ void read_config(void)
+@@ -868,14 +868,6 @@ void read_config(void)
  	memcpy(devices, const_devices,
  	       nr_const_devices*sizeof(struct device));
  
meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch +5 -6
index 6ae91d6cb9b..3771f94c591 100644
@@ -1,17 +1,16 @@
-From 3cf56b36db78679273f61ba78fbbf7f3fab52f68 Mon Sep 17 00:00:00 2001
+From 184b76e9742ff89f90a066edb0f46b4a150351cf Mon Sep 17 00:00:00 2001
 From: Marcin Juszkiewicz <[email protected]>
 Date: Fri, 8 Jun 2007 08:35:12 +0000
 Subject: [PATCH] mtools: imported from OE
 
 Upstream-Status: Inappropriate [licensing]
-
 ---
  Makefile.in  | 11 ++++++-----
  configure.in | 27 +++++++++++++++++++++++++++
  2 files changed, 33 insertions(+), 5 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 616d59f..85b5b1d 100644
+index 5db50d7..92ad461 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -26,10 +26,11 @@ USERCFLAGS =
@@ -30,7 +29,7 @@ index 616d59f..85b5b1d 100644
  
  
  # do not edit below this line
-@@ -199,7 +200,7 @@ dvi: mtools.dvi
+@@ -185,7 +186,7 @@ dvi: mtools.dvi
  
  ps: mtools.ps
  %.ps: %.dvi
@@ -40,10 +39,10 @@ index 616d59f..85b5b1d 100644
  pdf: mtools.pdf
  %.pdf: %.texi sysconfdir.texi
 diff --git a/configure.in b/configure.in
-index 5ff75c1..c0f7440 100644
+index 1de916e..fd6cb08 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -35,6 +35,33 @@ AC_CANONICAL_SYSTEM
+@@ -32,6 +32,33 @@ AC_CANONICAL_TARGET
  AC_C_CONST
  AC_C_INLINE
  
meta/recipes-devtools/mtools/mtools_4.0.44.bb renamed from meta/recipes-devtools/mtools/mtools_4.0.43.bb +1 -1
similarity index 93%
rename from meta/recipes-devtools/mtools/mtools_4.0.43.bb
rename to meta/recipes-devtools/mtools/mtools_4.0.44.bb
index 859103979ef..d8dd671be26 100644
@@ -24,7 +24,7 @@ RRECOMMENDS:${PN}:libc-glibc = "\
 	glibc-gconv-ibm866 \
 	glibc-gconv-ibm869 \
 	"
-SRC_URI[sha256sum] = "541e179665dc4e272b9602f2074243591a157da89cc47064da8c5829dbd2b339"
+SRC_URI[sha256sum] = "37dc4df022533c3d4b2ec1c78973c27c7e8b585374c2d46ab64c6a3db31eddb8"
 
 SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \
            file://mtools-makeinfo.patch \
Signature · 1 line
2.39.2
#22 lore raw

PATCH 22/32 nghttp2: upgrade 1.62.0 -> 1.62.1

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../nghttp2/{nghttp2_1.62.0.bb => nghttp2_1.62.1.bb}            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/nghttp2/{nghttp2_1.62.0.bb => nghttp2_1.62.1.bb} (91%)
meta/recipes-support/nghttp2/nghttp2_1.62.1.bb renamed from meta/recipes-support/nghttp2/nghttp2_1.62.0.bb +1 -1
similarity index 91%
rename from meta/recipes-support/nghttp2/nghttp2_1.62.0.bb
rename to meta/recipes-support/nghttp2/nghttp2_1.62.1.bb
index 5a820d8cd5a..8ab6b17feb3 100644
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec"
 
 SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/nghttp2-${PV}.tar.xz"
-SRC_URI[sha256sum] = "26798308fa0a12dabdb7ba8c77f74383019d3a0f1f36d25958b836af22474958"
+SRC_URI[sha256sum] = "2345d4dc136fda28ce243e0bb21f2e7e8ef6293d62c799abbf6f633a6887af72"
 
 inherit cmake manpages python3native github-releases
 PACKAGECONFIG[manpages] = ""
Signature · 1 line
2.39.2
#23 lore raw

PATCH 23/32 puzzles: upgrade to latest revision

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 meta/recipes-sato/puzzles/puzzles_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-sato/puzzles/puzzles_git.bb +1 -1
index e9403ee130c..b47d3d3f307 100644
@@ -10,7 +10,7 @@ REQUIRED_DISTRO_FEATURES = "x11"
 SRC_URI = "git://git.tartarus.org/simon/puzzles.git;branch=main;protocol=https"
 
 UPSTREAM_CHECK_COMMITS = "1"
-SRCREV = "80aac3104096aee4057b675c53ece8e60793aa90"
+SRCREV = "1c1899ee1c4e0a83808998359addb1efb66322f8"
 PE = "2"
 PV = "0.0+git"
 
Signature · 1 line
2.39.2
#24 lore raw

PATCH 24/32 python3-dtschema: upgrade 2024.4 -> 2024.5

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../{python3-dtschema_2024.4.bb => python3-dtschema_2024.5.bb}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-dtschema_2024.4.bb => python3-dtschema_2024.5.bb} (85%)
meta/recipes-devtools/python/python3-dtschema_2024.5.bb renamed from meta/recipes-devtools/python/python3-dtschema_2024.4.bb +1 -1
similarity index 85%
rename from meta/recipes-devtools/python/python3-dtschema_2024.4.bb
rename to meta/recipes-devtools/python/python3-dtschema_2024.5.bb
index 9583cd57b96..1eb24eca238 100644
@@ -7,7 +7,7 @@ inherit pypi python_setuptools_build_meta
 
 PYPI_PACKAGE = "dtschema"
 
-SRC_URI[sha256sum] = "18dd1d34b4a5e451291e5444e9ceb4a6febc605871cdaef22673b6f80aa4a131"
+SRC_URI[sha256sum] = "ea259a9ba4d1e1eff44ac8d362950361e46750bdeaf30a437a7ed33159c35fd8"
 
 DEPENDS += "python3-setuptools-scm-native"
 RDEPENDS:${PN} += "\
Signature · 1 line
2.39.2
#25 lore raw

PATCH 25/32 python3-uritools: upgrade 4.0.2 -> 4.0.3

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

License-Update: copyright years

---
 .../{python3-uritools_4.0.2.bb => python3-uritools_4.0.3.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-uritools_4.0.2.bb => python3-uritools_4.0.3.bb} (70%)
meta/recipes-devtools/python/python3-uritools_4.0.3.bb renamed from meta/recipes-devtools/python/python3-uritools_4.0.2.bb +2 -2
similarity index 70%
rename from meta/recipes-devtools/python/python3-uritools_4.0.2.bb
rename to meta/recipes-devtools/python/python3-uritools_4.0.3.bb
index 693d1974be2..640c3f3ab67 100644
@@ -2,9 +2,9 @@ SUMMARY = "URI parsing, classification and composition"
 HOMEPAGE = "https://github.com/tkem/uritools/"
 
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1ec55353c80c662e4255f8889a0ca558"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=539275e657c6b7af026bb908356f7541"
 
-SRC_URI[sha256sum] = "04df2b787d0eb76200e8319382a03562fbfe4741fd66c15506b08d3b8211d573"
+SRC_URI[sha256sum] = "ee06a182a9c849464ce9d5fa917539aacc8edd2a4924d1b7aabeeecabcae3bc2"
 
 SRC_URI += "file://run-ptest"
 
Signature · 1 line
2.39.2
#26 lore raw

PATCH 26/32 python3-webcolors: upgrade 1.13 -> 24.8.0

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

License-Update: copyright years

---
 ...{python3-webcolors_1.13.bb => python3-webcolors_24.8.0.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-webcolors_1.13.bb => python3-webcolors_24.8.0.bb} (77%)
meta/recipes-devtools/python/python3-webcolors_24.8.0.bb renamed from meta/recipes-devtools/python/python3-webcolors_1.13.bb +2 -2
similarity index 77%
rename from meta/recipes-devtools/python/python3-webcolors_1.13.bb
rename to meta/recipes-devtools/python/python3-webcolors_24.8.0.bb
index cea2a971d33..1998cfc4c17 100644
@@ -1,9 +1,9 @@
 SUMMARY = "Simple Python module for working with HTML/CSS color definitions."
 HOMEPAGE = "https://pypi.org/project/webcolors/"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=702b1ef12cf66832a88f24c8f2ee9c19"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=cbaebec43b7d199c7fd8f5411b3b0448"
 
-SRC_URI[sha256sum] = "c225b674c83fa923be93d235330ce0300373d02885cef23238813b0d5668304a"
+SRC_URI[sha256sum] = "08b07af286a01bcd30d583a7acadf629583d1f79bfef27dd2c2c5c263817277d"
 
 inherit pypi python_setuptools_build_meta ptest
 
Signature · 1 line
2.39.2
#27 lore raw

PATCH 27/32 sqlite3: upgrade 3.45.3 -> 3.46.1

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../sqlite/{sqlite3_3.45.3.bb => sqlite3_3.46.1.bb}             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/sqlite/{sqlite3_3.45.3.bb => sqlite3_3.46.1.bb} (69%)
meta/recipes-support/sqlite/sqlite3_3.46.1.bb renamed from meta/recipes-support/sqlite/sqlite3_3.45.3.bb +1 -1
similarity index 69%
rename from meta/recipes-support/sqlite/sqlite3_3.45.3.bb
rename to meta/recipes-support/sqlite/sqlite3_3.46.1.bb
index 03d70bbd386..62ea4a6ba9d 100644
@@ -4,5 +4,5 @@ LICENSE = "PD"
 LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66"
 
 SRC_URI = "http://www.sqlite.org/2024/sqlite-autoconf-${SQLITE_PV}.tar.gz"
-SRC_URI[sha256sum] = "b2809ca53124c19c60f42bf627736eae011afdcc205bb48270a5ee9a38191531"
+SRC_URI[sha256sum] = "67d3fe6d268e6eaddcae3727fce58fcc8e9c53869bdd07a0c61e38ddf2965071"
 
Signature · 1 line
2.39.2
#28 lore raw

PATCH 28/32 stress-ng: upgrade 0.17.08 -> 0.18.02

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../stress-ng/{stress-ng_0.17.08.bb => stress-ng_0.18.02.bb}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/stress-ng/{stress-ng_0.17.08.bb => stress-ng_0.18.02.bb} (94%)
meta/recipes-extended/stress-ng/stress-ng_0.18.02.bb renamed from meta/recipes-extended/stress-ng/stress-ng_0.17.08.bb +1 -1
similarity index 94%
rename from meta/recipes-extended/stress-ng/stress-ng_0.17.08.bb
rename to meta/recipes-extended/stress-ng/stress-ng_0.18.02.bb
index fffe6a1823b..e63a68aa6df 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \
            "
-SRCREV = "b7c7a5877501679a3b0a67d877e6274a801d1e4e"
+SRCREV = "be42d072c0df72dc8136f52d3962e4ba264a100a"
 S = "${WORKDIR}/git"
 
 DEPENDS = "coreutils-native libbsd"
Signature · 1 line
2.39.2
#29 lore raw

PATCH 29/32 webkitgtk: upgrade 2.44.1 -> 2.44.3

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 ...-a-variable-to-control-macro-__PAS_ALWAYS_I.patch |  6 +++---
 ...ctIntrospection.cmake-prefix-variables-obta.patch |  2 +-
 .../30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch   |  2 +-
 .../webkit/webkitgtk/no-musttail-arm.patch           |  6 +++---
 .../webkit/webkitgtk/reproducibility.patch           |  2 +-
 .../webkit/webkitgtk/t6-not-declared.patch           | 12 +++++-------
 .../{webkitgtk_2.44.1.bb => webkitgtk_2.44.3.bb}     |  2 +-
 7 files changed, 15 insertions(+), 17 deletions(-)
 rename meta/recipes-sato/webkit/{webkitgtk_2.44.1.bb => webkitgtk_2.44.3.bb} (99%)
meta/recipes-sato/webkit/webkitgtk/0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch +3 -3
index a819e221272..a19008a41fc 100644
@@ -1,4 +1,4 @@
-From 575b848a3b3c14280679db80d0d518922c83d62a Mon Sep 17 00:00:00 2001
+From 99a21305ae683a216e9299e5dbdd763190a8cfe3 Mon Sep 17 00:00:00 2001
 From: Kai Kang <[email protected]>
 Date: Fri, 11 Aug 2023 14:20:48 +0800
 Subject: [PATCH] Add a variable to control macro
@@ -57,10 +57,10 @@ index 5d5fb38c..a554f700 100644
  #else
  #define __PAS_ALWAYS_INLINE_BUT_NOT_INLINE
 diff --git a/Source/cmake/WebKitCompilerFlags.cmake b/Source/cmake/WebKitCompilerFlags.cmake
-index 9b2fecf9..7cdc2b6a 100644
+index 0732785e..4879ec40 100644
 --- a/Source/cmake/WebKitCompilerFlags.cmake
 +++ b/Source/cmake/WebKitCompilerFlags.cmake
-@@ -453,3 +453,10 @@ endif ()
+@@ -452,3 +452,10 @@ endif ()
  
  # FIXME: Enable pre-compiled headers for all ports <https://webkit.org/b/139438>
  set(CMAKE_DISABLE_PRECOMPILE_HEADERS ON)
meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch +1 -1
index 8e29ce17edf..dda20a7b25b 100644
@@ -1,4 +1,4 @@
-From 6348f91c29e2350ad3fec5264aa57dd4994d4583 Mon Sep 17 00:00:00 2001
+From d1f6a1b6a1298f6ef2f1677e9996aa60a002134a Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Tue, 27 Oct 2015 16:02:19 +0200
 Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained
meta/recipes-sato/webkit/webkitgtk/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch +1 -1
index 76bcb3df99e..0d8976c5020 100644
@@ -1,4 +1,4 @@
-From 1523e00a2a76e285262c8aa3721b5d99f3f2d612 Mon Sep 17 00:00:00 2001
+From 2ee948191de1c561b72ebf462605376cfb3ce7af Mon Sep 17 00:00:00 2001
 From: Thomas Devoogdt <[email protected]>
 Date: Mon, 16 Jan 2023 17:03:30 +0100
 Subject: [PATCH] REGRESSION(257865@main): B3Validate.cpp: fix
meta/recipes-sato/webkit/webkitgtk/no-musttail-arm.patch +3 -3
index 8ce37a01cc0..793be48df2e 100644
@@ -1,4 +1,4 @@
-From a9c874f7418cefbe78f7cd26505ae495cb59bbcf Mon Sep 17 00:00:00 2001
+From 31dca9601888f2a539dfb22693ffd62c22ee8912 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 12 Jan 2024 09:21:39 -0800
 Subject: [PATCH] clang/arm: Do not use MUST_TAIL_CALL
@@ -16,10 +16,10 @@ Signed-off-by: Khem Raj <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h
-index 0ea5cb76..c5480dbc 100644
+index 449ca502..daac29d7 100644
 --- a/Source/WTF/wtf/Compiler.h
 +++ b/Source/WTF/wtf/Compiler.h
-@@ -284,7 +284,7 @@
+@@ -321,7 +321,7 @@
  /* MUST_TAIL_CALL */
  
  #if !defined(MUST_TAIL_CALL) && defined(__cplusplus) && defined(__has_cpp_attribute)
meta/recipes-sato/webkit/webkitgtk/reproducibility.patch +1 -1
index 93a431a0b1e..d614a1ee4f6 100644
@@ -1,4 +1,4 @@
-From d096b945113ddecaf33062296e20b6d5a007cab3 Mon Sep 17 00:00:00 2001
+From cb5458b5d15aafa3543a47a33975609026d45d32 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <[email protected]>
 Date: Mon, 3 Jan 2022 14:18:34 +0000
 Subject: [PATCH] webkitgtk: Add reproducibility fix
meta/recipes-sato/webkit/webkitgtk/t6-not-declared.patch +5 -7
index d4720e4f289..064925dace9 100644
@@ -1,10 +1,9 @@
-From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001
+From 36c092723ec6d4908039341c9d157db8ab1c0a59 Mon Sep 17 00:00:00 2001
 From: Michael Catanzaro <[email protected]>
 Date: Mon, 5 Feb 2024 11:00:49 -0600
-Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?=
- =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?=
- =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?=
- =?UTF-8?q?=3D268739?=
+Subject: [PATCH] =?UTF-8?q?LowLevelInterpreter.cpp:339:21:=20error:=20?=
+ =?UTF-8?q?=E2=80=98t6=E2=80=99=20was=20not=20declared=20in=20this=20scope?=
+ =?UTF-8?q?=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid=3D268739?=
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -22,7 +21,7 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  1 file changed, 2 deletions(-)
 
 diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
-index 5064ead6cd2e7..9a2e2653b1219 100644
+index 75cecbbd..b1020ea4 100644
 --- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
 +++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
 @@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm,
@@ -34,4 +33,3 @@ index 5064ead6cd2e7..9a2e2653b1219 100644
  
      struct StackPointerScope {
          StackPointerScope(CLoopStack& stack)
-
meta/recipes-sato/webkit/webkitgtk_2.44.3.bb renamed from meta/recipes-sato/webkit/webkitgtk_2.44.1.bb +1 -1
similarity index 99%
rename from meta/recipes-sato/webkit/webkitgtk_2.44.1.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.44.3.bb
index d927d81a436..a79a9c38247 100644
@@ -17,7 +17,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
            file://t6-not-declared.patch \
            file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \
            "
-SRC_URI[sha256sum] = "425b1459b0f04d0600c78d1abb5e7edfa3c060a420f8b231e9a6a2d5d29c5561"
+SRC_URI[sha256sum] = "dc82d042ecaca981a4852357c06e5235743319cf10a94cd36ad41b97883a0b54"
 
 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen
 
Signature · 1 line
2.39.2
#30 lore raw

PATCH 30/32 weston: upgrade 13.0.1 -> 13.0.3

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 ...1-libweston-tools-Include-libgen.h-for-basename-signat.patch | 2 +-
 .../wayland/{weston_13.0.1.bb => weston_13.0.3.bb}              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/wayland/{weston_13.0.1.bb => weston_13.0.3.bb} (98%)
meta/recipes-graphics/wayland/weston/0001-libweston-tools-Include-libgen.h-for-basename-signat.patch +1 -1
index fbec9f9d4e5..2a833ee973c 100644
@@ -1,4 +1,4 @@
-From e050830898ea37d30ef1c5339cb1665bdb92dcdc Mon Sep 17 00:00:00 2001
+From 1a2a87013eb6af8e5267ecaf61e17b65a31dc662 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Thu, 14 Dec 2023 09:13:54 -0800
 Subject: [PATCH] libweston,tools: Include libgen.h for basename signature
meta/recipes-graphics/wayland/weston_13.0.3.bb renamed from meta/recipes-graphics/wayland/weston_13.0.1.bb +1 -1
similarity index 98%
rename from meta/recipes-graphics/wayland/weston_13.0.1.bb
rename to meta/recipes-graphics/wayland/weston_13.0.3.bb
index eae13e1c215..e4843d38f71 100644
@@ -14,7 +14,7 @@ SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downlo
            file://systemd-notify.weston-start \
            "
 
-SRC_URI[sha256sum] = "ea1566ab4f5ffce7e9fd4f7a1fca5b30caae4d50023bf459213994094e02b29a"
+SRC_URI[sha256sum] = "27f68d96e3b97d98daadef13a202356524924fa381418fa6716b9136ef099093"
 
 UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/weston/-/tags"
 UPSTREAM_CHECK_REGEX = "releases/(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
Signature · 1 line
2.39.2
#31 lore raw

PATCH 31/32 xkeyboard-config: upgrade 2.41 -> 2.42

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 .../{xkeyboard-config_2.41.bb => xkeyboard-config_2.42.bb}      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/xorg-lib/{xkeyboard-config_2.41.bb => xkeyboard-config_2.42.bb} (92%)
meta/recipes-graphics/xorg-lib/xkeyboard-config_2.42.bb renamed from meta/recipes-graphics/xorg-lib/xkeyboard-config_2.41.bb +1 -1
similarity index 92%
rename from meta/recipes-graphics/xorg-lib/xkeyboard-config_2.41.bb
rename to meta/recipes-graphics/xorg-lib/xkeyboard-config_2.42.bb
index 79ce7dea35f..cdc6422d464 100644
@@ -13,7 +13,7 @@ LICENSE = "MIT & MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8fc8ae699974c360e2e2e883a63ce264"
 
 SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "f02cd6b957295e0d50236a3db15825256c92f67ef1f73bf1c77a4b179edf728f"
+SRC_URI[sha256sum] = "a6b06ebfc1f01fc505f2f05f265f95f67cc8873a54dd247e3c2d754b8f7e0807"
 
 SECTION = "x11/libs"
 DEPENDS = "util-macros libxslt-native"
Signature · 1 line
2.39.2
#32 lore raw

PATCH 32/32 xz: upgrade 5.4.6 -> 5.6.2

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

This is the first post-backdoor release.

These are the release notes:
https://github.com/tukaani-project/xz/releases/

There are also backdoor notes:
https://tukaani.org/xz-backdoor/
"I plan to write an article how the backdoor got into the releases and what can be learned from this." - that'd be most welcome, as it would be first hand information that sets the record straight.

And there's a commit by commit review of Jia Tan's contributions:
https://tukaani.org/xz-backdoor/review.html

Add an option for landlock sandbox (off by default as it clashes with running under pseudo).

License-Update: public domain bits were relicensed under 0BSD license

---
 .../xz/{xz_5.4.6.bb => xz_5.6.2.bb}           | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)
 rename meta/recipes-extended/xz/{xz_5.4.6.bb => xz_5.6.2.bb} (77%)
meta/recipes-extended/xz/xz_5.6.2.bb renamed from meta/recipes-extended/xz/xz_5.4.6.bb +13 -10
similarity index 77%
rename from meta/recipes-extended/xz/xz_5.4.6.bb
rename to meta/recipes-extended/xz/xz_5.6.2.bb
index 3f82e476bf4..96fc691ef7e 100644
@@ -3,31 +3,32 @@ HOMEPAGE = "https://tukaani.org/xz/"
 DESCRIPTION = "XZ Utils is free general-purpose data compression software with a high compression ratio. XZ Utils were written for POSIX-like systems, but also work on some not-so-POSIX systems. XZ Utils are the successor to LZMA Utils."
 SECTION = "base"
 
-# The source includes bits of PD, GPL-2.0, GPL-3.0, LGPL-2.1-or-later, but the
+# The source includes bits of 0BSD, GPL-2.0, GPL-3.0, LGPL-2.1-or-later, but the
 # only file which is GPL-3.0 is an m4 macro which isn't shipped in any of our
 # packages, and the LGPL bits are under lib/, which appears to be used for
 # libgnu, which appears to be used for DOS builds. So we're left with
-# GPL-2.0-or-later and PD.
-LICENSE = "GPL-2.0-or-later & GPL-3.0-with-autoconf-exception & LGPL-2.1-or-later & PD"
-LICENSE:${PN} = "PD & GPL-2.0-or-later"
-LICENSE:${PN}-dev = "PD & GPL-2.0-or-later"
+# GPL-2.0-or-later and 0BSD.
+LICENSE = "GPL-2.0-or-later & GPL-3.0-with-autoconf-exception & LGPL-2.1-or-later & 0BSD"
+LICENSE:${PN} = "0BSD & GPL-2.0-or-later"
+LICENSE:${PN}-dev = "0BSD & GPL-2.0-or-later"
 LICENSE:${PN}-staticdev = "GPL-2.0-or-later"
-LICENSE:${PN}-doc = "PD & GPL-2.0-or-later"
+LICENSE:${PN}-doc = "0BSD & GPL-2.0-or-later"
 LICENSE:${PN}-dbg = "GPL-2.0-or-later"
 LICENSE:${PN}-locale = "GPL-2.0-or-later"
-LICENSE:liblzma = "PD"
+LICENSE:liblzma = "0BSD"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=d4378ea9d5d1fc9ab0ae10d7948827d9 \
+LIC_FILES_CHKSUM = "file://COPYING;md5=c02de712b028a5cc7e22472e8f2b3db1 \
+                    file://COPYING.0BSD;md5=0672c210ce80c83444339b9aa31fee2f \
                     file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://COPYING.GPLv3;md5=1ebbd3e34237af26da5dc08a4e440464 \
                     file://COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \
-                    file://lib/getopt.c;endline=23;md5=2069b0ee710572c03bb3114e4532cd84 \
+                    file://lib/getopt.c;endline=23;md5=3f33e207287bf72834f3ae8c247dfb6a \
                     "
 
 SRC_URI = "https://github.com/tukaani-project/xz/releases/download/v${PV}/xz-${PV}.tar.gz \
            file://run-ptest \
           "
-SRC_URI[sha256sum] = "aeba3e03bf8140ddedf62a0a367158340520f6b384f75ca6045ccc6c0d43fd5c"
+SRC_URI[sha256sum] = "8bfd20c0e1d86f0402f2497cfa71c6ab62d4cd35fd704276e3140bfb71414519"
 UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)"
 UPSTREAM_CHECK_URI = "https://github.com/tukaani-project/xz/releases/"
 
@@ -35,6 +36,8 @@ CACHED_CONFIGUREVARS += "gl_cv_posix_shell=/bin/sh"
 
 inherit autotools gettext ptest
 
+PACKAGECONFIG[landlock] = "--enable-sandbox=landlock,--enable-sandbox=no"
+
 PACKAGES =+ "liblzma"
 
 FILES:liblzma = "${libdir}/liblzma*${SOLIBS}"
Signature · 1 line
2.39.2