summaryrefslogtreecommitdiff
path: root/poky/meta/recipes-devtools/git
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2021-02-19 21:26:16 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2021-02-25 23:15:06 +0300
commit9b4d8b0ea6b5862f279fab62e6ccee3bd51ddcc2 (patch)
tree3766042390932e4b7cb839d6ed617bbb1a7a29b9 /poky/meta/recipes-devtools/git
parentd1e894976442c78577f52fe7b169812d00289120 (diff)
downloadopenbmc-9b4d8b0ea6b5862f279fab62e6ccee3bd51ddcc2.tar.xz
poky: subtree update:9294bc4bb4..488e39b623
Alejandro Hernandez Samaniego (1): sstate.bbclass: Split sstate summary into locally and network found artifacts Alexander Kanavin (1): selftest/reproducible: track unusued entries in the exclusion list Andrei Gherzan (1): oe/recipeutils: Fix copying patches when BBLAYERS entries are not normalised Anthony Bagwell (1): kernel-fitimage: fix dtbo support for fit images Anuj Mittal (38): git: upgrade 2.30.0 -> 2.30.1 glib-2.0: upgrade 2.66.4 -> 2.66.7 help2man: upgrade 1.47.16 -> 1.48.1 libevdev: upgrade 1.10.1 -> 1.11.0 stress-ng: upgrade 0.12.02 -> 0.12.03 vte: upgrade 0.62.1 -> 0.62.2 x264: upgrade to latest revision createrepo-c: upgrade 0.16.2 -> 0.17.0 libuv: upgrade 1.40.0 -> 1.41.0 piglit: upgrade to latest revision pigz: upgrade 2.4 -> 2.6 python3-git: upgrade 3.1.12 -> 3.1.13 sysstat: upgrade 12.4.2 -> 12.4.3 python3-hypothesis: upgrade 6.0.2 -> 6.2.0 python3-more-itertools: upgrade 8.6.0 -> 8.7.0 python3-numpy: upgrade 1.20.0 -> 1.20.1 python3-pygments: upgrade 2.7.4 -> 2.8.0 python3-pytest: upgrade 6.2.1 -> 6.2.2 python3-setuptools: upgrade 52.0.0 -> 53.0.0 psmisc: upgrade 23.3 -> 23.4 gtk+3: upgrade 3.24.24 -> 3.24.25 lighttpd: upgrade 1.4.58 -> 1.4.59 libwebp: upgrade 1.1.0 -> 1.2.0 libcap: upgrade 2.47 -> 2.48 libxt: upgrade 1.2.0 -> 1.2.1 sysklogd: upgrade 2.1.2 -> 2.2.1 cmake: upgrade 3.19.3 -> 3.19.5 curl: upgrade 7.74.0 -> 7.75.0 diffoscope: upgrade 164 -> 166 libfm-extra: upgrade 1.3.1 -> 1.3.2 pcmanfm: upgrade 1.3.1 -> 1.3.2 json-glib: upgrade 1.6.0 -> 1.6.2 mesa: upgrade 20.3.2 -> 20.3.4 kmscube: upgrade to latest revision btrfs-tools: upgrade 5.10 -> 5.10.1 man-db: upgrade 2.9.3 -> 2.9.4 asciidoc: fix upstream check linux-yocto: update genericx86* to v5.4.94 Bruce Ashfield (6): linux-yocto-rt/5.10: update to -rt25 linux-yocto/5.10: update to v5.10.14 linux-yocto/5.4: update to v5.4.96 linux-yocto/5.10: update to v5.10.16 linux-yocto/5.4: update to v5.4.98 linux-yocto-dev: bump version to v5.11+ Jan-Simon Möller (2): oe-selftests: add rpm to reproducible build selftest package_rpm: Enable use_source_date_epoch_as_buildtime in package_rpm class Jose Quaresma (5): spirv-tools: disable tests spirv-tools: build all libaries as shared glslang: generate glslang pkg-config glslang: add comment about unversioned libraries shaderc: remove the receipe configure hack and use a patch for that Joshua Watt (7): libomxil: Fix up commercial license flag weston: remoting backend requires GStreamer base plugins oeqa: reproducible: Fix SSTATE_MIRRORS variable oeqa: reproducible: Add more logging bitbake: contrib: Add Dockerfile for building hash server bison: Fix up file name mapping acpica: Fix reproducibility issues Khem Raj (8): tcf-agent: Fix build on riscv32 security_flags.inc: Add same O<level> as in SELECTED_OPTIMIZATION autoconf: Add missing perl modules to rdeps gdb: Drop SIGRTMIN definition patch musl: Update to latest master go: Update to 1.15.8 ruby: Do not use ucontext implementation for coroutines on musl/riscv libunwind: Disable for riscv Konrad Weihmann (1): cmake: set CMAKE_EXPORT_NO_PACKAGE_REGISTRY Luca Boccassi (1): systemd: add hostname fallback when polkit is not available Marek Vasut (1): weston-init: Fix weston-keyboard path in weston.ini Michael Halstead (1): yocto-uninative.inc: version 3.0 incorporate seccomp filter workaround Oleksandr Kravchuk (2): cryptodev: upgrade to 1.12 tar: update to 1.34 Richard Purdie (31): pseudo: Update for rename and faccessat fixes nativesdk-buildtools-perl-dummy: Add new autoconf dependencies selftest/reproducible: Sort the unused exclusion list selftest/reproducible: Remove no longer needed exclusions pseudo: Update to include fixes for glibc 2.33 bitbake: bitbake-worker/runqueue: Add support for BB_DEFAULT_UMASK bitbake: bitbake: Bump version to 1.49.2 systemd: Simplify mount error patch bitbake.conf: Set as default task umask of 022 classes: Drop now unneeded umask flags cwautomacros: Ensure version is set deterministically vim: Improve determinism vim: Fix a race over creation of the desktop files package_manager/deb: Fix image generation with package removal quilt: Be determnistic about column presence buildtools-extended-tarball: Add glibc-gconvs needed for build watchdog: Fix determinism issue from sendmail host path watchdog: Avoid reproducibility failures after fixing build xorg-fonts-minimal: Fix reproducibility xmlto: Fix reproducibility selftest/reproducible: Update exclusions distutils3-base: Fix after native packaging changes subversion: upgrade 1.14.0 -> 1.14.1 python3-jinja2: upgrade 2.11.2 -> 2.11.3 systemd: Drop unneeded musl patches qemu: Refresh mmap fixes patch status/content Revert "oe-selftests: add rpm to reproducible build selftest" local.conf.sample.extended: Bring back into sync with OE-Core xorg-minimal-fonts: Really fix determinism git: Fix determinism issue groff: Fix determinism issue Ross Burton (2): glibc: add workaround for faccessat2 being blocked by seccomp filters rootfs_deb: handle aarch64 SDK_ARCH Suji Velupillai (1): ffmpeg: move ffmpeg config into packageconfig Teoh Jay Shen (1): oeqa/runlevel : add test for runlevels Thomas Viehweger (1): mtd-utils: Remove duplicate assignments to alternative link names Tomasz Dziendzielski (1): bitbake: event: Prevent bitbake from executing event handler for wrong multiconfig target Vivien Didelot (2): local.conf.sample.extended: fix double 'of' typo local.conf.sample.extended: prefer INIT_MANAGER Wes Lindauer (1): df.py: Add feature check for read-only-rootfs Yi Fan Yu (2): valgrind: Disable ptest nlcontrolc for x86-64 valgrind: Remove reference to non-existent ptests Yoann Congal (1): npm.bbclass: avoid building target nodejs for native npm recipes akuster (1): connman: update to 1.39 Revert "libpam: remove unused code" This reverts commit e5b5c38a76bbf3f56353954bdc65fa8736ed76bf. This is needed for the backported libpam support Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: Ia802c1f09ccbd2967e01098edb059e72ee670ad8
Diffstat (limited to 'poky/meta/recipes-devtools/git')
-rw-r--r--poky/meta/recipes-devtools/git/git.inc3
-rw-r--r--poky/meta/recipes-devtools/git/git/fixsort.patch31
-rw-r--r--poky/meta/recipes-devtools/git/git_2.30.1.bb (renamed from poky/meta/recipes-devtools/git/git_2.30.0.bb)4
3 files changed, 35 insertions, 3 deletions
diff --git a/poky/meta/recipes-devtools/git/git.inc b/poky/meta/recipes-devtools/git/git.inc
index 544e23c84..586a305b2 100644
--- a/poky/meta/recipes-devtools/git/git.inc
+++ b/poky/meta/recipes-devtools/git/git.inc
@@ -7,7 +7,8 @@ DEPENDS = "openssl curl zlib expat"
PROVIDES_append_class-native = " git-replacement-native"
SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \
- ${KERNELORG_MIRROR}/software/scm/git/git-manpages-${PV}.tar.gz;name=manpages"
+ ${KERNELORG_MIRROR}/software/scm/git/git-manpages-${PV}.tar.gz;name=manpages \
+ file://fixsort.patch"
S = "${WORKDIR}/git-${PV}"
diff --git a/poky/meta/recipes-devtools/git/git/fixsort.patch b/poky/meta/recipes-devtools/git/git/fixsort.patch
new file mode 100644
index 000000000..07a487e8c
--- /dev/null
+++ b/poky/meta/recipes-devtools/git/git/fixsort.patch
@@ -0,0 +1,31 @@
+[PATCH] generate-configlist.sh: Fix determinism issue
+
+Currently git binaries are not entirely reproducible, at least partly
+due to config-list.h differing in order depending on the system's
+locale settings. Under different locales, the entries:
+
+"sendemail.identity",
+"sendemail.<identity>.*",
+
+would differ in order for example and this leads to differences in
+the debug symbols for the binaries.
+
+This can be fixed by specifying the C locale for the sort in the
+shell script generating the header.
+
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+Upstream-Status: Submitted [https://public-inbox.org/git/f029a942dd3d50d85e60bd37d8e454524987842f.camel@linuxfoundation.org/T/#u]
+
+Index: git-2.30.0/generate-configlist.sh
+===================================================================
+--- git-2.30.0.orig/generate-configlist.sh
++++ git-2.30.0/generate-configlist.sh
+@@ -9,7 +9,7 @@ static const char *config_name_list[] =
+ EOF
+ grep -h '^[a-zA-Z].*\..*::$' Documentation/*config.txt Documentation/config/*.txt |
+ sed '/deprecated/d; s/::$//; s/, */\n/g' |
+- sort |
++ LC_ALL=C sort |
+ sed 's/^.*$/ "&",/'
+ cat <<EOF
+ NULL,
diff --git a/poky/meta/recipes-devtools/git/git_2.30.0.bb b/poky/meta/recipes-devtools/git/git_2.30.1.bb
index 93f8ed298..bc1635ada 100644
--- a/poky/meta/recipes-devtools/git/git_2.30.0.bb
+++ b/poky/meta/recipes-devtools/git/git_2.30.1.bb
@@ -5,5 +5,5 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
"
EXTRA_OEMAKE += "NO_GETTEXT=1"
-SRC_URI[tarball.sha256sum] = "d24c4fa2a658318c2e66e25ab67cc30038a35696d2d39e6b12ceccf024de1e5e"
-SRC_URI[manpages.sha256sum] = "e23035ae232c9a5eda57db258bc3b7f1c1060cfd66920f92c7d388b6439773a6"
+SRC_URI[tarball.sha256sum] = "23a3e53f0d2dd3e62a8147b24a1a91d6ffe95b92123ef4dbae04e9a6205e71c0"
+SRC_URI[manpages.sha256sum] = "db323e1b242e9d0337363b1e538c8b879e4c46eedbf94d3bee9e65dab6d49138"