Commit Graph

121 Commits

Author SHA1 Message Date
zhengruoqin
ec5dc1ca0e git: upgrade 2.35.2 -> 2.35.3
Bug fix release:

0f85c4a30b setup: opt-out of check with safe.directory=*
bb50ec3cc3 setup: fix safe.directory key not being checked
e47363e5a8 t0033: add tests for safe.directory

(From OE-Core rev: c3b96e04e91eb9e28bcfe1c84e159193a82d302c)

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 457b5d4dad3e6fa77e80bed66666c36caa452380)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-04-28 17:07:18 +01:00
Konrad Weihmann
0f16595276 git: correct license
by default git pulls in several code fragments not being licensed
under just GPL-2.0-only.

obstack and poll are licensed under GPL-2.0-or-later
reftable being BSD-3-Clause
sha1dc and inet_ntop being MIT
netmalloc being Bosst-1.0 aka BSL-1.0
regex being LGPL-2.1-or-later

(From OE-Core rev: d12513f066baca13a5be0c00792b1bd7d8b07c17)

Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 5184e651651ed949d198882a10f406cef5939b7b)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-04-28 17:07:18 +01:00
Richard Purdie
0674ae7bc4 git: Upgrade 2.35.1 -> 2.35.2
This includes a fix for CVE-2022-24765

(From OE-Core rev: a17dc42d82b12d7f891c903a02a0302b31829c88)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-04-15 17:30:34 +01:00
Richard Purdie
c362c7feef git: Ignore CVE-2022-24975
Everyone I've talked to doesn't see this as a major issue. The CVE
asks for a documentation improvement on the --mirror option to
git clone as deleted content could be leaked into a mirror. For OE's
general users/use cases, we wouldn't build or ship docs so this wouldn't
affect us.

(From OE-Core rev: 5dfe2dd5482c9a446f8e722fe51903d205e6770d)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-04-13 16:52:24 +01:00
Rasmus Villemoes
767a6fb133 git: make expat and curl into PACKAGECONFIG items
It can be useful to use git on target (e.g. with some wrapper like
etckeeper for keeping track of changes to /etc), and for such cases,
it is likely one has no need for pulling from/pushing to http[s]
repositories. From the INSTALL file:

    - "libcurl" library ... If you do not use http:// or https://
      repositories, and do not want to put patches into an IMAP
      mailbox, you do not have to have them (use NO_CURL).

    - "expat" library; git-http-push uses it for remote lock
      management over DAV.  Similar to "curl" above, this is
      optional (with NO_EXPAT).

Setting --without-expat and --without-curl reduces the size of the
installed "git" package from 18M to 12M, in addition to avoiding
pulling those libraries into the rootfs.

(From OE-Core rev: 49f81198c5d233a9a2612c3b8366681dd85bea59)

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-03-31 17:52:58 +01:00
Richard Purdie
b0130fcf91 meta/meta-selftest/meta-skeleton: Update LICENSE variable to use SPDX license identifiers
An automated conversion using scripts/contrib/convert-spdx-licenses.py to
convert to use the standard SPDX license identifiers. Two recipes in meta-selftest
were not converted as they're that way specifically for testing. A change in
linux-firmware was also skipped and may need a more manual tweak.

(From OE-Core rev: ceda3238cdbf1beb216ae9ddb242470d5dfc25e0)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-02-20 16:45:25 +00:00
Alexander Kanavin
a7f7161ff4 git: restore reproducibility on centos 7
(From OE-Core rev: edeb2a1a4cfd16706da6815af198d133a94b5ac6)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-02-08 14:20:18 +00:00
Alexander Kanavin
f67ec4ff8b git: update 2.34.1 -> 2.35.1
(From OE-Core rev: 278efd24b2d15a2ab666d3f255e18768d3bc7709)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-02-03 09:05:14 +00:00
Alexander Kanavin
c82d436201 git: build manpages from source subject to manpages PACKAGECONFIG
This allows automated updates, and better aligns with how
documentation is handled in oe-core.

(From OE-Core rev: 22b267724148144d919b7281cf2250fc2e35a092)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-02-03 09:05:14 +00:00
Alexander Kanavin
177437eea2 git: merge .inc into .bb
(From OE-Core rev: a315afb79964a9a9b6e493bf20eec80af46fd4a6)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-02-03 09:05:14 +00:00
Alexander Kanavin
4ca1132b28 git: upgrade 2.34.0 -> 2.34.1
The issue with COMPUTE_HEADER_DEPENDENCIES
has been reported upstream, as it causes build races:
https://lore.kernel.org/git/20211207113101.69686-1-alex.kanavin@gmail.com/T/#u

(From OE-Core rev: 83635a1925e2d69344ea3f7b66f6b735b48f9eb7)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-12-08 20:22:11 +00:00
Alexander Kanavin
8c0eef0f65 git: update 2.33.1 -> 2.34.0
(From OE-Core rev: b2a6b1b0711a75dada8276bc3d573436ba7051df)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-11-25 21:55:10 +00:00
Alexander Kanavin
6b4741f53e git: upgrade 2.33.0 -> 2.33.1
(From OE-Core rev: c2ccedd1ecb44fbc0711e1be5b4c69b0f78bded3)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-10-23 17:42:25 +01:00
Alexander Kanavin
1280c8191c git: upgrade 2.32.0 -> 2.33.0
(From OE-Core rev: 94ea5d103a8941d710814f6e2c579626b54a40eb)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-08-26 08:07:55 +01:00
Richard Purdie
bb6ddc3691 Convert to new override syntax
This is the result of automated script conversion:

scripts/contrib/convert-overrides.py <oe-core directory>

converting the metadata to use ":" as the override character instead of "_".

(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-08-02 15:44:10 +01:00
wangmy
dc7c123df5 git: upgrade 2.31.1 -> 2.32.0
(From OE-Core rev: 2ed33305c4d3b160a996c4284b881f227111585d)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-06-12 22:54:14 +01:00
Minjae Kim
9eddd432da git: upgrade 2.30.1 -> 2.31.1
Includes a fix for CVE-2021-21300

(From OE-Core rev: c6a3ba282c3bf0d5a81e0eaf6b02a0a138052622)

Signed-off-by: Minjae Kim <flowergom@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-03-31 00:06:23 +01:00
Minjae Kim
d3b1daa7af git: fix CVE-2021-21300
checkout: fix bug that makes checkout follow symlinks in leading path

Upstream-Status: Acepted [684dd4c2b4]
CVE: CVE-2021-21300
(From OE-Core rev: 1b680f6aca14c92d03d32c4974292788140d7a65)

Signed-off-by: Minjae Kim <flowergom@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-03-31 00:06:23 +01:00
Dorinda
8e4567bd5f meta/recipes-devtools: Add HOMEPAGE / DESCRIPTION
Added HOMEPAGE and DESCRIPTION for recipes with missing decriptions or homepage

[YOCTO #13471]

(From OE-Core rev: bb05814335e7101bfd8df0a11dc18a044e867bed)

Signed-off-by: Dorinda Bassey <dorindabassey@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-02-26 15:21:21 +00:00
Richard Purdie
8f5577c6f7 git: Fix determinism issue
(From OE-Core rev: 9ae740939f8315c64fe7571f912404127a29dc89)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-02-18 23:40:01 +00:00
Anuj Mittal
7ab4d41ff6 git: upgrade 2.30.0 -> 2.30.1
(From OE-Core rev: 35cad7ae4f4346d3965243e286f5ac4d43bcfe67)

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-02-18 23:40:00 +00:00
Anuj Mittal
056c8c383b git: upgrade 2.29.2 -> 2.30.0
(From OE-Core rev: 34264c95e6489ee68d06e892aa5a7027b000dd93)

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-01-20 22:46:18 +00:00
Alexander Kanavin
bb986b4207 git: upgrade 2.28.0 -> 2.29.2
(From OE-Core rev: 335ff8e20068c45b6794f6ef5ed302726e5f46f1)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-11-03 08:21:12 +00:00
Oleksandr Kravchuk
bdf966739a git: update 2.28.0
(From OE-Core rev: 260c81dbb85be08150373a6e8571633230a02738)

Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-07-28 12:39:54 +01:00
Alexander Kanavin
56eed2a0fd git: upgrade 2.26.2 -> 2.27.0
(From OE-Core rev: fe43277910532cf4f6623b9c1fcfb285d454608f)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-06-09 13:14:00 +01:00
Alexander Kanavin
de45521723 git: update to 2.26.2
Disable iconv, as configure.ac attempts to run a
cross-compiled test program otherwise.

(From OE-Core rev: 6b18acfbe61aef449743f5ce0dfd77f83f5cb2a5)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-07 12:15:59 +01:00
Jeremy Puhlman
d349d7bb68 nativesdk-git: point to system gitconfig
On a system with selinux turned on, trying to access a directory
that is in a tree that doesn't exist returns the error permission
denined rather then no such file or directory, which causes git
to die.

git clone git://git.yoctoproject.org/poky
Cloning into 'poky'...
fatal: unable to access '/opt/poky/3.0+snapshot/sysroots/x86_64-pokysdk-linux/etc/gitconfig': Permission denied

Switch to using the system gitconfig of the host.

(From OE-Core rev: 5e44fb4dd106e3c4b9f072b25a93e54fa7bb1bce)

Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-03-29 20:04:10 +01:00
Anuj Mittal
44e809c1e6 git: upgrade 2.24.0 -> 2.24.1
Fixes a bunch of CVEs:
53a06cf39b

(From OE-Core rev: 8be3c48a418776c8480dbae2dcb5f46c8fb138ed)

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-12-16 23:25:49 +00:00
Oleksandr Kravchuk
83883e2606 git: update to 2.24.0
(From OE-Core rev: ef5e557cb4eb08e15086c1a5a83135e2725f2b65)

Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-11-05 10:37:12 +00:00
Ross Burton
5c5a58d255 git: cleanup man install
Prettify by using shell loops.

(From OE-Core rev: edb7f0adc6b0846c118ea262bbfaf46050c03fb4)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-10-31 16:09:35 +00:00
Ross Burton
116e9519b6 git: some tools are no longer perl, so move to main recipe
Some tools are not written in Perl anymore, so they should be in PN no PN-perltools.

(From OE-Core rev: 8a2e4dac4f5086fbfc094fb1f16e91108ee1b247)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-10-31 16:09:35 +00:00
Oleksandr Kravchuk
71f9386801 git: update to 2.23.0
(From OE-Core rev: f70d00ff6120602d92fdb353231e763b23a3f42a)

Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-08-21 21:52:59 +01:00
Oleksandr Kravchuk
e7c57f87ce git: update to 2.22.1
(From OE-Core rev: 5b6e7d98f0d1be392d6c1efe2c69fef296d960c0)

Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-08-14 17:33:49 +01:00
Ross Burton
75b4b5d675 git: set CVE vendor to git-scm
There's a Jenkins plugin for Git.

(From OE-Core rev: f2adf5e4d3e9afc6d45665bbe728c69d195a46ef)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-07-18 12:16:19 +01:00
Oleksandr Kravchuk
114342029e git: update to 2.22.0
(From OE-Core rev: 7e4d2d2792b70edf4d0a6c2e3d5278d9138c8709)

Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-06-28 13:28:38 +01:00
Oleksandr Kravchuk
c238dd61e4 git: update to 2.21.0
(From OE-Core rev: 48fbe798546ea279e93257c28e41929d65d58ade)

Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-04-23 23:30:19 +01:00
Robert Yang
9271be4ed2 git: 2.18.1 -> 2.20.1
(From OE-Core rev: 928d97c8972de9221bb02308ac3f2a9b4eb54c44)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-02-15 16:05:37 +00:00
Changqing Li
57fd1c9b66 git: upgrade 2.18.0 -> 2.18.1
Includes a fix for CVE-2018-17456.

(From OE-Core rev: 95a74460f30223e6db9bff068b3ba84c74e1ba63)

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-10-29 17:26:47 +00:00
Robert Yang
5fef9fcd58 git: 2.16.1 -> 2.18.0
* Removed code for "${D}${exec_prefix}/lib/perl-native/perl" since there is no
  such a directory now.
* Fixed perl related code.

(From OE-Core rev: 416a8c241aff0dca6b8b123e52cf8e2d40c74c8d)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-07-05 11:39:06 +01:00
Robert Yang
424ac46c17 git: 2.15.0 -> 2.16.1
Add /usr/share/git-core/templates/hooks/fsmonitor-watchman.sample to PERLTOOLS to fix:
ERROR: git-2.16.1-r0 do_package_qa: QA Issue: /usr/share/git-core/templates/hooks/fsmonitor-watchman.sample contained in package git requires /usr/bin/perl, but no providers found in RDEPENDS_git? [file-rdeps]
ERROR: git-2.16.1-r0 do_package_qa: QA run found fatal errors. Please consider fixing them.

(From OE-Core rev: d8a93d75c75bf8df40f3e167eca2fcef4f76e240)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-03-04 11:35:40 +00:00
Robert Yang
abbc21d82b git: 2.13.3 -> 2.15.0
(From OE-Core rev: d138c3c40206cc4f5d1ff06663ce9c3ea8846563)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-11-21 13:06:13 +00:00
Robert Yang
8dc9cd70e7 git: 2.13.2 -> 2.13.3
(From OE-Core rev: 544d522ff0eb8d57753eb5c237743d2310866fec)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-08-23 08:47:02 +01:00
Peter Kjellerstedt
db0980203b git: Do not install git cvsserver and git svn by default
These git commands require Perl modules that do not exist in OE-Core.
Add PACKAGECONFIGs to enable them. Be aware though that if you enable
them you must also provide the missing dependencies.

(From OE-Core rev: d7909007b2a912ae5adf01edfabaa8b8646369cd)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-08-17 00:21:14 +01:00
Robert Yang
df4d8e3cd3 git: 2.11.1 -> 2.13.2
* Remove git-relink from PERLTOOLS:
  git-2.13.2/Documentation/RelNotes/2.12.0.txt:
  * An ancient script "git relink" has been removed.

(From OE-Core rev: f759420ad2a60d0be4ca15f4c9294086ecc86e59)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-07-17 14:01:38 +01:00
Peter Kjellerstedt
7408dbccb2 git: Add a dependency on perl for gitweb
(From OE-Core rev: db31c837b579dc64bc86553cbc95736bfca97a90)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-06-23 11:44:14 +01:00
Robert Yang
2c97030552 git: 2.11.0 -> 2.11.1
(From OE-Core rev: c0db9b1b3725cd07b3980314112a8d3873c38568)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-02-15 20:06:43 -08:00
Joshua Lock
c4e2c59088 meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.

Search made with the following regex: getVar ?\(( ?[^,()]*), True\)

(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)

Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-12-16 10:23:23 +00:00
Chen Qi
9c9b303463 git: upgrade to 2.11.0
Upgrade git to 2.11.0.

(From OE-Core rev: 963d949cacdd1fed7b2fbe121526da7986a7c758)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-12-07 10:38:06 +00:00
Robert Yang
713b2e5a66 git: 2.9.2 -> 2.9.3
(From OE-Core rev: 91dea2fdb9be2654f1f530138bd8a90901575646)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-08-25 23:03:45 +01:00
Robert Yang
cf0395203a git: 2.8.4 -> 2.9.2
(From OE-Core rev: 084c4c38dd168fe997d45d94bdca0db2608651a1)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-07-26 08:56:26 +01:00