diff options
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/bitbake_checksumwarningsuppress.patch | 21 | ||||
| -rw-r--r-- | patches/git-branch-set-upstream-to.patch | 15 | ||||
| -rw-r--r-- | patches/oe_core_sub_package_PR.patch | 33 |
3 files changed, 69 insertions, 0 deletions
diff --git a/patches/bitbake_checksumwarningsuppress.patch b/patches/bitbake_checksumwarningsuppress.patch new file mode 100644 index 0000000..b3b361c --- /dev/null +++ b/patches/bitbake_checksumwarningsuppress.patch @@ -0,0 +1,21 @@ +# +# Suppress repetitive warnings. Thes will sometimes print five or six +# times for each file. If we aren't checking the checksums, why bother? +# +diff -Naru orig/bitbake/lib/bb/fetch2/__init__.py new/bitbake/lib/bb/fetch2/__init__.py +--- orig/bitbake/lib/bb/fetch2/__init__.py 2017-10-24 12:15:19.280615256 -0500 ++++ new/bitbake/lib/bb/fetch2/__init__.py 2017-10-25 11:51:53.166099032 -0500 +@@ -1122,11 +1122,12 @@ + + if ud and isinstance(ud.method, local.Local): + paths = ud.method.localpaths(ud, d) ++ strict = d.getVar("BB_STRICT_CHECKSUM", True) or "0" + for f in paths: + pth = ud.decodedurl + if '*' in pth: + f = os.path.join(os.path.abspath(f), pth) +- if f.startswith(dl_dir): ++ if f.startswith(dl_dir) and (strict == "1"): + # The local fetcher's behaviour is to return a path under DL_DIR if it couldn't find the file anywhere else + if os.path.exists(f): + bb.warn("Getting checksum for %s SRC_URI entry %s: file not found except in DL_DIR" % (d.getVar('PN', True), os.path.basename(f))) diff --git a/patches/git-branch-set-upstream-to.patch b/patches/git-branch-set-upstream-to.patch new file mode 100644 index 0000000..a4c9996 --- /dev/null +++ b/patches/git-branch-set-upstream-to.patch @@ -0,0 +1,15 @@ +# set-upstream was removed from git in change 52668846ea2d41ffbd87cda7cb8e492dea9f2c4d +# on 2017-08-17 and first introduced in 2.15.0: +# https://git.kernel.org/pub/scm/git/git.git/commit/?h=v2.15.0&id=52668846ea2d41ffbd87cda7cb8e492dea9f2c4d +diff -Naru orig/bitbake/lib/bb/fetch2/git.py new/bitbake/lib/bb/fetch2/git.py +--- orig/bitbake/lib/bb/fetch2/git.py 2018-01-05 12:57:04.963756203 -0600 ++++ new/bitbake/lib/bb/fetch2/git.py 2018-01-05 12:57:32.419755391 -0600 +@@ -327,7 +327,7 @@ + branchname = ud.branches[ud.names[0]] + runfetchcmd("%s checkout -B %s %s" % (ud.basecmd, branchname, \ + ud.revisions[ud.names[0]]), d, workdir=destdir) +- runfetchcmd("%s branch --set-upstream %s origin/%s" % (ud.basecmd, branchname, \ ++ runfetchcmd("%s branch --set-upstream-to origin/%s" % (ud.basecmd, \ + branchname), d, workdir=destdir) + else: + runfetchcmd("%s checkout %s" % (ud.basecmd, ud.revisions[ud.names[0]]), d, workdir=destdir) diff --git a/patches/oe_core_sub_package_PR.patch b/patches/oe_core_sub_package_PR.patch new file mode 100644 index 0000000..13ad94f --- /dev/null +++ b/patches/oe_core_sub_package_PR.patch @@ -0,0 +1,33 @@ +diff -Naru orig/layers/openembedded-core/meta/classes/package_ipk.bbclass new/layers/openembedded-core/meta/classes/package_ipk.bbclass +--- orig/layers/openembedded-core/meta/classes/package_ipk.bbclass 2017-11-07 17:07:50.868179146 -0600 ++++ new/layers/openembedded-core/meta/classes/package_ipk.bbclass 2017-11-07 17:10:39.596174151 -0600 +@@ -21,6 +21,7 @@ + import textwrap + import subprocess + import collections ++ import oe.packagedata + + oldcwd = os.getcwd() + +@@ -97,6 +98,21 @@ + cleanupcontrol(root) + from glob import glob + g = glob('*') ++ ++ pkgr = d.getVar('PR_' + pkg, True) ++ if pkgr: ++ try: ++ p = re.compile('r[0-9]+(\.[0-9]+)') ++ m = p.match(d.getVar('PKGR',True)) ++ find_pr = m.group(1) ++ except: ++ find_pr = "" ++ # bb.note('do_package_ipk: find_pr: %s' % find_pr); ++ pkgr = pkgr + find_pr ++ # bb.note('do_package_ipk: PKGR: %s' % d.getVar('PKGR',True)) ++ localdata.setVar('PKGR', pkgr) ++ # bb.note('do_package_ipk: d.pkgr is %s' % pkgr) ++ + if not g and localdata.getVar('ALLOW_EMPTY', False) != "1": + bb.note("Not creating empty archive for %s-%s-%s" % (pkg, localdata.getVar('PKGV', True), localdata.getVar('PKGR', True))) + bb.utils.unlockfile(lf) |