diff options
| author | John Klug <john.klug@multitech.com> | 2018-02-08 08:56:03 -0600 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2018-02-08 08:56:03 -0600 |
| commit | 80c04dbc6ee30cef0e928d8d74968e2bcb94b057 (patch) | |
| tree | 0415a8fde1b048ac7325aceaaf3368501fc99cf4 | |
| parent | b8db8c6d0081f096614713fc9ecf5d35194d6bed (diff) | |
| download | mlinux-80c04dbc6ee30cef0e928d8d74968e2bcb94b057.tar.gz mlinux-80c04dbc6ee30cef0e928d8d74968e2bcb94b057.tar.bz2 mlinux-80c04dbc6ee30cef0e928d8d74968e2bcb94b057.zip | |
Allow kernel module patches to have a revision level different from the kernel for opkg
| -rw-r--r-- | patches/oe_core_sub_package_PR.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/patches/oe_core_sub_package_PR.patch b/patches/oe_core_sub_package_PR.patch new file mode 100644 index 0000000..dc0ea10 --- /dev/null +++ b/patches/oe_core_sub_package_PR.patch @@ -0,0 +1,34 @@ +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-02 09:28:24.985891062 -0500 ++++ new/layers/openembedded-core/meta/classes/package_ipk.bbclass 2017-11-01 18:28:14.043490044 -0500 +@@ -20,6 +20,7 @@ + import re, copy + import textwrap + import subprocess ++ import oe.packagedata + + workdir = d.getVar('WORKDIR', True) + outdir = d.getVar('PKGWRITEDIRIPK', True) +@@ -69,6 +70,22 @@ + 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') != "1": + bb.note("Not creating empty archive for %s-%s-%s" % (pkg, localdata.getVar('PKGV', True), localdata.getVar('PKGR', True))) + bb.utils.unlockfile(lf) |