diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-oe/classes | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/classes')
-rw-r--r-- | meta-openembedded/meta-oe/classes/dos2unix.bbclass | 14 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/classes/scancode.bbclass | 35 |
2 files changed, 35 insertions, 14 deletions
diff --git a/meta-openembedded/meta-oe/classes/dos2unix.bbclass b/meta-openembedded/meta-oe/classes/dos2unix.bbclass deleted file mode 100644 index 1bad998dde..0000000000 --- a/meta-openembedded/meta-oe/classes/dos2unix.bbclass +++ /dev/null @@ -1,14 +0,0 @@ -# Class for use to convert all CRLF line terminators to LF -# provided that some projects are being developed/maintained -# on Windows so they have different line terminators(CRLF) vs -# on Linux(LF), which can cause annoying patching errors during -# git push/checkout processes. - -do_convert_crlf_to_lf[depends] += "dos2unix-native:do_populate_sysroot" - -# Convert CRLF line terminators to LF -do_convert_crlf_to_lf () { - find ${S} -type f -exec dos2unix {} \; -} - -addtask convert_crlf_to_lf after do_unpack before do_patch diff --git a/meta-openembedded/meta-oe/classes/scancode.bbclass b/meta-openembedded/meta-oe/classes/scancode.bbclass new file mode 100644 index 0000000000..701660f578 --- /dev/null +++ b/meta-openembedded/meta-oe/classes/scancode.bbclass @@ -0,0 +1,35 @@ +# We use scancode utlity for extacting licence information. +# scancode itself is an OSS Utlitity. +# For more informaiton https://github.com/nexB/scancode-toolkit + +SCANCODE_FORMAT ?= "html-app" +EXT = "${@'html' if d.getVar('SCANCODE_FORMAT', True) == 'html-app' else 'json'}" +SCANCODE_TOOLKIT = "${@get_scancode_toolkit(d)}" +SCANCODE_TAG = "v2.2.1" +SCANCODE_GIT_LOCATION ?= "https://github.com/nexB/scancode-toolkit.git" +SCANCODE_SRC_LOCATION ?= "${DL_DIR}/scancode" + +def get_scancode_toolkit(d): + lf = bb.utils.lockfile(d.getVar('SCANCODE_SRC_LOCATION', True) + ".lock") + if (not os.path.exists(d.getVar('SCANCODE_SRC_LOCATION', True))): + os.system("git clone %s %s -b %s" % (d.getVar('SCANCODE_GIT_LOCATION', True), d.getVar('SCANCODE_SRC_LOCATION', True), d.getVar('SCANCODE_TAG', True))) + bb.utils.unlockfile(lf) + return (d.getVar('SCANCODE_SRC_LOCATION', True)) + +do_scancode() { + mkdir -p ${DEPLOY_DIR_IMAGE}/scancode + cd ${SCANCODE_TOOLKIT} + if [ -d "${S}" ]; then + ./scancode ${S} --format ${SCANCODE_FORMAT} ${DEPLOY_DIR_IMAGE}/scancode/${PN}.${EXT} + fi +} + +addtask scancode after do_patch + +do_scancode_oss() { + echo "We are done running scancode" +} + +do_scancode_oss[recrdeptask] = "do_scancode_oss do_scancode" +do_scancode_oss[nostamp] = "1" +addtask do_scancode_oss after do_scancode |