diff options
36 files changed, 0 insertions, 1961 deletions
diff --git a/classes/dosocs.bbclass b/classes/dosocs.bbclass deleted file mode 100644 index 659496c..0000000 --- a/classes/dosocs.bbclass +++ /dev/null @@ -1,150 +0,0 @@ -# This class integrates real-time license scanning, generation of SPDX standard -# output and verifiying license info during the building process. -# It is a combination of efforts from the OE-Core, SPDX and DoSOCSv2 projects. -# -# For more information on DoSOCSv2: -# https://github.com/DoSOCSv2 -# -# For more information on SPDX: -# http://www.spdx.org -# -# Note: -# 1) Make sure fossdriver has beed installed in your host -# 2) By default,spdx files will be output to the path which is defined as[SPDX_DEPLOY_DIR] -# By default, SPDX_DEPLOY_DIR is tmp/deploy -# -inherit spdx-common - -SPDXEPENDENCY += "python3-dosocs2-init-native:do_dosocs2_init" -SPDXEPENDENCY += "python3-dosocs2-native:do_populate_sysroot" - -LICENSELISTVERSION = "2.6" -CREATOR_TOOL = "dosocs.bbclass in meta-spdxscanner" - -python do_spdx () { - import os, sys, json, shutil - - pn = d.getVar('PN') - assume_provided = (d.getVar("ASSUME_PROVIDED") or "").split() - if pn in assume_provided: - for p in d.getVar("PROVIDES").split(): - if p != pn: - pn = p - break - - # glibc-locale: do_fetch, do_unpack and do_patch tasks have been deleted, - # so avoid archiving source here. - if pn.startswith('glibc-locale'): - return - if (d.getVar('BPN') == "linux-yocto"): - return - if (d.getVar('PN') == "libtool-cross"): - return - if (d.getVar('PN') == "libgcc-initial"): - return - if (d.getVar('PN') == "shadow-sysroot"): - return - - - # We just archive gcc-source for all the gcc related recipes - if d.getVar('BPN') in ['gcc', 'libgcc']: - bb.debug(1, 'spdx: There is bug in scan of %s is, do nothing' % pn) - return - - spdx_outdir = d.getVar('SPDX_OUTDIR') - spdx_workdir = d.getVar('SPDX_WORKDIR') - spdx_temp_dir = os.path.join(spdx_workdir, "temp") - temp_dir = os.path.join(d.getVar('WORKDIR'), "temp") - - info = {} - info['workdir'] = (d.getVar('WORKDIR', True) or "") - info['pn'] = (d.getVar( 'PN', True ) or "") - info['pv'] = (d.getVar( 'PV', True ) or "") - info['package_download_location'] = (d.getVar( 'SRC_URI', True ) or "") - if info['package_download_location'] != "": - info['package_download_location'] = info['package_download_location'].split()[0] - info['spdx_version'] = (d.getVar('SPDX_VERSION', True) or '') - info['data_license'] = (d.getVar('DATA_LICENSE', True) or '') - info['creator'] = {} - info['creator']['Tool'] = (d.getVar('CREATOR_TOOL', True) or '') - info['license_list_version'] = (d.getVar('LICENSELISTVERSION', True) or '') - info['package_homepage'] = (d.getVar('HOMEPAGE', True) or "") - info['package_summary'] = (d.getVar('SUMMARY', True) or "") - info['package_summary'] = info['package_summary'].replace("\n","") - info['package_summary'] = info['package_summary'].replace("'"," ") - info['package_contains'] = (d.getVar('CONTAINED', True) or "") - info['package_static_link'] = (d.getVar('STATIC_LINK', True) or "") - info['modified'] = "false" - srcuri = d.getVar("SRC_URI", False).split() - length = len("file://") - for item in srcuri: - if item.startswith("file://"): - item = item[length:] - if item.endswith(".patch") or item.endswith(".diff"): - info['modified'] = "true" - - manifest_dir = (d.getVar('SPDX_DEPLOY_DIR', True) or "") - if not os.path.exists( manifest_dir ): - bb.utils.mkdirhier( manifest_dir ) - info['outfile'] = os.path.join(manifest_dir, info['pn'] + "-" + info['pv'] + ".spdx" ) - sstatefile = os.path.join(spdx_outdir, info['pn'] + "-" + info['pv'] + ".spdx" ) - - # if spdx has been exist - if os.path.exists(info['outfile']): - bb.note(info['pn'] + "spdx file has been exist, do nothing") - return - if os.path.exists( sstatefile ): - bb.note(info['pn'] + "spdx file has been exist, do nothing") - create_manifest(info,sstatefile) - return - - spdx_get_src(d) - - bb.note('SPDX: Archiving the patched source...') - if os.path.isdir(spdx_temp_dir): - for f_dir, f in list_files(spdx_temp_dir): - temp_file = os.path.join(spdx_temp_dir,f_dir,f) - shutil.copy(temp_file, temp_dir) - shutil.rmtree(spdx_temp_dir) - if not os.path.exists(spdx_outdir): - bb.utils.mkdirhier(spdx_outdir) - cur_ver_code = get_ver_code(spdx_workdir).split()[0] - ## Get spdx file - bb.note(' run dosocsv2 ...... ') - d.setVar('WORKDIR', d.getVar('SPDX_WORKDIR', True)) - info['sourcedir'] = spdx_workdir - git_path = "%s/.git" % info['sourcedir'] - if os.path.exists(git_path): - remove_dir_tree(git_path) - invoke_dosocs2(info['sourcedir'],sstatefile) - if get_cached_spdx(sstatefile) != None: - write_cached_spdx( info,sstatefile,cur_ver_code ) - ## CREATE MANIFEST(write to outfile ) - create_manifest(info,sstatefile) - else: - bb.warn('Can\'t get the spdx file ' + info['pn'] + '. Please check your.') -} - -def invoke_dosocs2( OSS_src_dir, spdx_file): - import subprocess - import string - import json - import codecs - - path = os.getenv('PATH') - dosocs2_cmd = bb.utils.which(os.getenv('PATH'), "dosocs2") - dosocs2_oneshot_cmd = dosocs2_cmd + " oneshot " + OSS_src_dir - print(dosocs2_oneshot_cmd) - try: - dosocs2_output = subprocess.check_output(dosocs2_oneshot_cmd, - stderr=subprocess.STDOUT, - shell=True) - except subprocess.CalledProcessError as e: - bb.fatal("Could not invoke dosocs2 oneshot Command " - "'%s' returned %d:\n%s" % (dosocs2_oneshot_cmd, e.returncode, e.output)) - dosocs2_output = dosocs2_output.decode('utf-8') - - f = codecs.open(spdx_file,'w','utf-8') - f.write(dosocs2_output) - -EXPORT_FUNCTIONS do_spdx diff --git a/conf/include/security_flags.inc b/conf/include/security_flags.inc deleted file mode 100644 index 8c5fbea..0000000 --- a/conf/include/security_flags.inc +++ /dev/null @@ -1 +0,0 @@ -SECURITY_CFLAGS_pn-fossology-nomos = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/conf/lid-scan.conf b/conf/lid-scan.conf deleted file mode 100644 index 1426380..0000000 --- a/conf/lid-scan.conf +++ /dev/null @@ -1,3 +0,0 @@ -LID_TEMP_DIR ?= "${WORKDIR}/spdx_temp" -LID_DEPLOY_DIR ?= "/home/yocto/lid_scans" - diff --git a/conf/spdx-dosocs.conf b/conf/spdx-dosocs.conf deleted file mode 100644 index 55fbd0a..0000000 --- a/conf/spdx-dosocs.conf +++ /dev/null @@ -1,5 +0,0 @@ -SPDX_TEMP_DIR ?= "${WORKDIR}/spdx_temp" -SPDX_DEPLOY_DIR ?= "/home/yocto/spdx_scans" - -ASSUME_PROVIDED_remove = "file-native" - diff --git a/recipes-devtools/file/file/0001-magic.py-modified-for-dosocs2.patch b/recipes-devtools/file/file/0001-magic.py-modified-for-dosocs2.patch deleted file mode 100644 index 0d2bb40..0000000 --- a/recipes-devtools/file/file/0001-magic.py-modified-for-dosocs2.patch +++ /dev/null @@ -1,501 +0,0 @@ -From e983220202c3c7fcc36ba2719ed2cdaa33e3d38c Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Wed, 15 Feb 2017 11:46:05 +0900 -Subject: [PATCH] magic.py: modified for dosocs2 - -Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> ---- - python/magic.py | 462 ++++++++++++++++++++++++++++++++------------------------ - 1 file changed, 262 insertions(+), 200 deletions(-) - -diff --git a/python/magic.py b/python/magic.py -index a17e8da..c6142a7 100644 ---- a/python/magic.py -+++ b/python/magic.py -@@ -1,221 +1,283 @@ --#!/usr/bin/env python --''' --Python bindings for libmagic --''' -+""" -+magic is a wrapper around the libmagic file identification library. - --import ctypes -+See README for more information. - --from ctypes import * --from ctypes.util import find_library -+Usage: - -+>>> import magic -+>>> magic.from_file("testdata/test.pdf") -+'PDF document, version 1.2' -+>>> magic.from_file("testdata/test.pdf", mime=True) -+'application/pdf' -+>>> magic.from_buffer(open("testdata/test.pdf").read(1024)) -+'PDF document, version 1.2' -+>>> - --def _init(): -- """ -- Loads the shared library through ctypes and returns a library -- L{ctypes.CDLL} instance -- """ -- return ctypes.cdll.LoadLibrary(find_library('magic')) -- --_libraries = {} --_libraries['magic'] = _init() -- --# Flag constants for open and setflags --MAGIC_NONE = NONE = 0 --MAGIC_DEBUG = DEBUG = 1 --MAGIC_SYMLINK = SYMLINK = 2 --MAGIC_COMPRESS = COMPRESS = 4 --MAGIC_DEVICES = DEVICES = 8 --MAGIC_MIME_TYPE = MIME_TYPE = 16 --MAGIC_CONTINUE = CONTINUE = 32 --MAGIC_CHECK = CHECK = 64 --MAGIC_PRESERVE_ATIME = PRESERVE_ATIME = 128 --MAGIC_RAW = RAW = 256 --MAGIC_ERROR = ERROR = 512 --MAGIC_MIME_ENCODING = MIME_ENCODING = 1024 --MAGIC_MIME = MIME = 1040 --MAGIC_APPLE = APPLE = 2048 -- --MAGIC_NO_CHECK_COMPRESS = NO_CHECK_COMPRESS = 4096 --MAGIC_NO_CHECK_TAR = NO_CHECK_TAR = 8192 --MAGIC_NO_CHECK_SOFT = NO_CHECK_SOFT = 16384 --MAGIC_NO_CHECK_APPTYPE = NO_CHECK_APPTYPE = 32768 --MAGIC_NO_CHECK_ELF = NO_CHECK_ELF = 65536 --MAGIC_NO_CHECK_TEXT = NO_CHECK_TEXT = 131072 --MAGIC_NO_CHECK_CDF = NO_CHECK_CDF = 262144 --MAGIC_NO_CHECK_TOKENS = NO_CHECK_TOKENS = 1048576 --MAGIC_NO_CHECK_ENCODING = NO_CHECK_ENCODING = 2097152 -- --MAGIC_NO_CHECK_BUILTIN = NO_CHECK_BUILTIN = 4173824 -- -- --class magic_set(Structure): -- pass --magic_set._fields_ = [] --magic_t = POINTER(magic_set) -- --_open = _libraries['magic'].magic_open --_open.restype = magic_t --_open.argtypes = [c_int] -- --_close = _libraries['magic'].magic_close --_close.restype = None --_close.argtypes = [magic_t] -- --_file = _libraries['magic'].magic_file --_file.restype = c_char_p --_file.argtypes = [magic_t, c_char_p] -- --_descriptor = _libraries['magic'].magic_descriptor --_descriptor.restype = c_char_p --_descriptor.argtypes = [magic_t, c_int] -- --_buffer = _libraries['magic'].magic_buffer --_buffer.restype = c_char_p --_buffer.argtypes = [magic_t, c_void_p, c_size_t] -- --_error = _libraries['magic'].magic_error --_error.restype = c_char_p --_error.argtypes = [magic_t] -- --_setflags = _libraries['magic'].magic_setflags --_setflags.restype = c_int --_setflags.argtypes = [magic_t, c_int] -- --_load = _libraries['magic'].magic_load --_load.restype = c_int --_load.argtypes = [magic_t, c_char_p] -- --_compile = _libraries['magic'].magic_compile --_compile.restype = c_int --_compile.argtypes = [magic_t, c_char_p] -- --_check = _libraries['magic'].magic_check --_check.restype = c_int --_check.argtypes = [magic_t, c_char_p] -- --_list = _libraries['magic'].magic_list --_list.restype = c_int --_list.argtypes = [magic_t, c_char_p] -- --_errno = _libraries['magic'].magic_errno --_errno.restype = c_int --_errno.argtypes = [magic_t] -- -- --class Magic(object): -- def __init__(self, ms): -- self._magic_t = ms -- -- def close(self): -- """ -- Closes the magic database and deallocates any resources used. -- """ -- _close(self._magic_t) - -- def file(self, filename): -- """ -- Returns a textual description of the contents of the argument passed -- as a filename or None if an error occurred and the MAGIC_ERROR flag -- is set. A call to errno() will return the numeric error code. -- """ -- try: # attempt python3 approach first -- if isinstance(filename, bytes): -- bi = filename -- else: -- bi = bytes(filename, 'utf-8') -- return str(_file(self._magic_t, bi), 'utf-8') -- except: -- return _file(self._magic_t, filename.encode('utf-8')) -- -- def descriptor(self, fd): -- """ -- Like the file method, but the argument is a file descriptor. -- """ -- return _descriptor(self._magic_t, fd) -+""" - -- def buffer(self, buf): -- """ -- Returns a textual description of the contents of the argument passed -- as a buffer or None if an error occurred and the MAGIC_ERROR flag -- is set. A call to errno() will return the numeric error code. -- """ -- try: # attempt python3 approach first -- return str(_buffer(self._magic_t, buf, len(buf)), 'utf-8') -- except: -- return _buffer(self._magic_t, buf, len(buf)) -+import sys -+import glob -+import os.path -+import ctypes -+import ctypes.util -+import threading - -- def error(self): -- """ -- Returns a textual explanation of the last error or None -- if there was no error. -- """ -- try: # attempt python3 approach first -- return str(_error(self._magic_t), 'utf-8') -- except: -- return _error(self._magic_t) -+from ctypes import c_char_p, c_int, c_size_t, c_void_p - -- def setflags(self, flags): -- """ -- Set flags on the magic object which determine how magic checking -- behaves; a bitwise OR of the flags described in libmagic(3), but -- without the MAGIC_ prefix. - -- Returns -1 on systems that don't support utime(2) or utimes(2) -- when PRESERVE_ATIME is set. -- """ -- return _setflags(self._magic_t, flags) -+class MagicException(Exception): -+ def __init__(self, message): -+ super(MagicException, self).__init__(message) -+ self.message = message - -- def load(self, filename=None): -- """ -- Must be called to load entries in the colon separated list of database -- files passed as argument or the default database file if no argument -- before any magic queries can be performed. - -- Returns 0 on success and -1 on failure. -- """ -- return _load(self._magic_t, filename) -+class Magic: -+ """ -+ Magic is a wrapper around the libmagic C library. - -- def compile(self, dbs): -- """ -- Compile entries in the colon separated list of database files -- passed as argument or the default database file if no argument. -- Returns 0 on success and -1 on failure. -- The compiled files created are named from the basename(1) of each file -- argument with ".mgc" appended to it. -- """ -- return _compile(self._magic_t, dbs) -+ """ - -- def check(self, dbs): -- """ -- Check the validity of entries in the colon separated list of -- database files passed as argument or the default database file -- if no argument. -- Returns 0 on success and -1 on failure. -+ def __init__(self, mime=False, magic_file=None, mime_encoding=False, -+ keep_going=False, uncompress=False): - """ -- return _check(self._magic_t, dbs) -+ Create a new libmagic wrapper. - -- def list(self, dbs): -+ mime - if True, mimetypes are returned instead of textual descriptions -+ mime_encoding - if True, codec is returned -+ magic_file - use a mime database other than the system default -+ keep_going - don't stop at the first match, keep going -+ uncompress - Try to look inside compressed files. - """ -- Check the validity of entries in the colon separated list of -- database files passed as argument or the default database file -- if no argument. -- Returns 0 on success and -1 on failure. -- """ -- return _list(self._magic_t, dbs) -- -- def errno(self): -+ self.flags = MAGIC_NONE -+ if mime: -+ self.flags |= MAGIC_MIME -+ elif mime_encoding: -+ self.flags |= MAGIC_MIME_ENCODING -+ if keep_going: -+ self.flags |= MAGIC_CONTINUE -+ -+ if uncompress: -+ self.flags |= MAGIC_COMPRESS -+ -+ self.cookie = magic_open(self.flags) -+ self.lock = threading.Lock() -+ -+ magic_load(self.cookie, magic_file) -+ -+ def from_buffer(self, buf): - """ -- Returns a numeric error code. If return value is 0, an internal -- magic error occurred. If return value is non-zero, the value is -- an OS error code. Use the errno module or os.strerror() can be used -- to provide detailed error information. -+ Identify the contents of `buf` - """ -- return _errno(self._magic_t) -- -+ with self.lock: -+ try: -+ return magic_buffer(self.cookie, buf) -+ except MagicException as e: -+ return self._handle509Bug(e) -+ -+ def from_file(self, filename): -+ # raise FileNotFoundException or IOError if the file does not exist -+ with open(filename): -+ pass -+ with self.lock: -+ try: -+ return magic_file(self.cookie, filename) -+ except MagicException as e: -+ return self._handle509Bug(e) -+ -+ def _handle509Bug(self, e): -+ # libmagic 5.09 has a bug where it might fail to identify the -+ # mimetype of a file and returns null from magic_file (and -+ # likely _buffer), but also does not return an error message. -+ if e.message is None and (self.flags & MAGIC_MIME): -+ return "application/octet-stream" -+ -+ def __del__(self): -+ # no _thread_check here because there can be no other -+ # references to this object at this point. -+ -+ # during shutdown magic_close may have been cleared already so -+ # make sure it exists before using it. -+ -+ # the self.cookie check should be unnecessary and was an -+ # incorrect fix for a threading problem, however I'm leaving -+ # it in because it's harmless and I'm slightly afraid to -+ # remove it. -+ if self.cookie and magic_close: -+ magic_close(self.cookie) -+ self.cookie = None -+ -+_instances = {} -+ -+def _get_magic_type(mime): -+ i = _instances.get(mime) -+ if i is None: -+ i = _instances[mime] = Magic(mime=mime) -+ return i -+ -+def from_file(filename, mime=False): -+ """" -+ Accepts a filename and returns the detected filetype. Return -+ value is the mimetype if mime=True, otherwise a human readable -+ name. -+ -+ >>> magic.from_file("testdata/test.pdf", mime=True) -+ 'application/pdf' -+ """ -+ m = _get_magic_type(mime) -+ return m.from_file(filename) - --def open(flags): -+def from_buffer(buffer, mime=False): - """ -- Returns a magic object on success and None on failure. -- Flags argument as for setflags. -+ Accepts a binary string and returns the detected filetype. Return -+ value is the mimetype if mime=True, otherwise a human readable -+ name. -+ -+ >>> magic.from_buffer(open("testdata/test.pdf").read(1024)) -+ 'PDF document, version 1.2' - """ -- return Magic(_open(flags)) -+ m = _get_magic_type(mime) -+ return m.from_buffer(buffer) -+ -+ -+ -+ -+libmagic = None -+# Let's try to find magic or magic1 -+dll = ctypes.util.find_library('magic') or ctypes.util.find_library('magic1') or ctypes.util.find_library('cygmagic-1') -+ -+# This is necessary because find_library returns None if it doesn't find the library -+if dll: -+ libmagic = ctypes.CDLL(dll) -+ -+if not libmagic or not libmagic._name: -+ windows_dlls = ['magic1.dll','cygmagic-1.dll'] -+ platform_to_lib = {'darwin': ['/opt/local/lib/libmagic.dylib', -+ '/usr/local/lib/libmagic.dylib'] + -+ # Assumes there will only be one version installed -+ glob.glob('/usr/local/Cellar/libmagic/*/lib/libmagic.dylib'), -+ 'win32': windows_dlls, -+ 'cygwin': windows_dlls } -+ for dll in platform_to_lib.get(sys.platform, []): -+ try: -+ libmagic = ctypes.CDLL(dll) -+ break -+ except OSError: -+ pass -+ -+if not libmagic or not libmagic._name: -+ # It is better to raise an ImportError since we are importing magic module -+ raise ImportError('failed to find libmagic. Check your installation') -+ -+magic_t = ctypes.c_void_p -+ -+def errorcheck_null(result, func, args): -+ if result is None: -+ err = magic_error(args[0]) -+ raise MagicException(err) -+ else: -+ return result -+ -+def errorcheck_negative_one(result, func, args): -+ if result is -1: -+ err = magic_error(args[0]) -+ raise MagicException(err) -+ else: -+ return result -+ -+ -+def coerce_filename(filename): -+ if filename is None: -+ return None -+ -+ # ctypes will implicitly convert unicode strings to bytes with -+ # .encode('ascii'). If you use the filesystem encoding -+ # then you'll get inconsistent behavior (crashes) depending on the user's -+ # LANG environment variable -+ is_unicode = (sys.version_info[0] <= 2 and -+ isinstance(filename, unicode)) or \ -+ (sys.version_info[0] >= 3 and -+ isinstance(filename, str)) -+ if is_unicode: -+ return filename.encode('utf-8') -+ else: -+ return filename -+ -+magic_open = libmagic.magic_open -+magic_open.restype = magic_t -+magic_open.argtypes = [c_int] -+ -+magic_close = libmagic.magic_close -+magic_close.restype = None -+magic_close.argtypes = [magic_t] -+ -+magic_error = libmagic.magic_error -+magic_error.restype = c_char_p -+magic_error.argtypes = [magic_t] -+ -+magic_errno = libmagic.magic_errno -+magic_errno.restype = c_int -+magic_errno.argtypes = [magic_t] -+ -+_magic_file = libmagic.magic_file -+_magic_file.restype = c_char_p -+_magic_file.argtypes = [magic_t, c_char_p] -+_magic_file.errcheck = errorcheck_null -+ -+def magic_file(cookie, filename): -+ return _magic_file(cookie, coerce_filename(filename)) -+ -+_magic_buffer = libmagic.magic_buffer -+_magic_buffer.restype = c_char_p -+_magic_buffer.argtypes = [magic_t, c_void_p, c_size_t] -+_magic_buffer.errcheck = errorcheck_null -+ -+def magic_buffer(cookie, buf): -+ return _magic_buffer(cookie, buf, len(buf)) -+ -+ -+_magic_load = libmagic.magic_load -+_magic_load.restype = c_int -+_magic_load.argtypes = [magic_t, c_char_p] -+_magic_load.errcheck = errorcheck_negative_one -+ -+def magic_load(cookie, filename): -+ return _magic_load(cookie, coerce_filename(filename)) -+ -+magic_setflags = libmagic.magic_setflags -+magic_setflags.restype = c_int -+magic_setflags.argtypes = [magic_t, c_int] -+ -+magic_check = libmagic.magic_check -+magic_check.restype = c_int -+magic_check.argtypes = [magic_t, c_char_p] -+ -+magic_compile = libmagic.magic_compile -+magic_compile.restype = c_int -+magic_compile.argtypes = [magic_t, c_char_p] -+ -+ -+ -+MAGIC_NONE = 0x000000 # No flags -+MAGIC_DEBUG = 0x000001 # Turn on debugging -+MAGIC_SYMLINK = 0x000002 # Follow symlinks -+MAGIC_COMPRESS = 0x000004 # Check inside compressed files -+MAGIC_DEVICES = 0x000008 # Look at the contents of devices -+MAGIC_MIME = 0x000010 # Return a mime string -+MAGIC_MIME_ENCODING = 0x000400 # Return the MIME encoding -+MAGIC_CONTINUE = 0x000020 # Return all matches -+MAGIC_CHECK = 0x000040 # Print warnings to stderr -+MAGIC_PRESERVE_ATIME = 0x000080 # Restore access time on exit -+MAGIC_RAW = 0x000100 # Don't translate unprintable chars -+MAGIC_ERROR = 0x000200 # Handle ENOENT etc as real errors -+ -+MAGIC_NO_CHECK_COMPRESS = 0x001000 # Don't check for compressed files -+MAGIC_NO_CHECK_TAR = 0x002000 # Don't check for tar files -+MAGIC_NO_CHECK_SOFT = 0x004000 # Don't check magic entries -+MAGIC_NO_CHECK_APPTYPE = 0x008000 # Don't check application type -+MAGIC_NO_CHECK_ELF = 0x010000 # Don't check for elf details -+MAGIC_NO_CHECK_ASCII = 0x020000 # Don't check for ascii files -+MAGIC_NO_CHECK_TROFF = 0x040000 # Don't check ascii/troff -+MAGIC_NO_CHECK_FORTRAN = 0x080000 # Don't check ascii/fortran -+MAGIC_NO_CHECK_TOKENS = 0x100000 # Don't check ascii/tokens --- -1.8.4.2 - diff --git a/recipes-devtools/file/file_%.bbappend b/recipes-devtools/file/file_%.bbappend deleted file mode 100644 index 8bb8199..0000000 --- a/recipes-devtools/file/file_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -SRC_URI_native += " 0001-magic.py-modified-for-dosocs2.patch \ - " - diff --git a/recipes-devtools/fossology/fossology-nomos-native_git.bb b/recipes-devtools/fossology/fossology-nomos-native_git.bb deleted file mode 100644 index d7d2fd3..0000000 --- a/recipes-devtools/fossology/fossology-nomos-native_git.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "SPDX 2.0 document creation and storage" -HOMEPAGE = "https://github.com/DoSOCSv2/DoSOCSv2" -SECTION = "devel/python" -LICENSE = "GPLv2" - -LIC_FILES_CHKSUM = "file://GenCodeCopyright;md5=7296ec131dbd040718b64fb843d63048" -DEPENDS = "glib-2.0-native libpcre-native json-c-native" - -SRCREV = "bd076cff2c235502055ecc020d44783ce5907051" -BRANCH = "release/${PV}/master" -SRC_URI = "git://github.com/fossology/fossology.git \ - " - -S = "${WORKDIR}/git/src/nomos/agent" - -inherit native - -do_compile() { - cp ${S}/Makefile.sa ${S}/Makefile -f - make -} - -do_install() { - oe_runmake install \ - DESTDIR="${D}" \ - PREFIX="${prefix}" \ - SBINDIR="${D}${sbindir}" -} diff --git a/recipes-devtools/fossology/fossology-nomos/0001-Add-rpath-to-fix-error-as-following.patch b/recipes-devtools/fossology/fossology-nomos/0001-Add-rpath-to-fix-error-as-following.patch deleted file mode 100644 index 4052b1c..0000000 --- a/recipes-devtools/fossology/fossology-nomos/0001-Add-rpath-to-fix-error-as-following.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b81cced8566406c85b38a1c3c71858982a3dd4a5 Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Wed, 1 Mar 2017 10:23:03 +0900 -Subject: [PATCH] Add rpath to fix error as following: - -/usr/bin/ld: warning: libpcre.so.1, needed by tmp/sysroots/x86_64-linux/usr/lib/libglib-2.0.so, not found (try using -rpath or -rpath-link) - -Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> ---- - Makefile.sa | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.sa b/Makefile.sa -index 24a16ca..f39bdd6 100644 ---- a/Makefile.sa -+++ b/Makefile.sa -@@ -26,7 +26,7 @@ all: encode nomos - debug: nomos-gl - - nomos: nomos.o $(OBJS) $(GENOBJS) -- $(CC) nomos.o $(OBJS) $(GENOBJS) $(CFLAGS_LOCAL) -o $(EXE) -+ $(CC) nomos.o $(OBJS) $(GENOBJS) $(CFLAGS_LOCAL) -o $(EXE) -Wl,-rpath,${libdir} - - nomos.o: nomos.c $(HDRS) $(DB) $(REPO) $(AGENTLIB) $(VARS) - $(CC) -c $< $(CFLAGS_LOCAL) $(DEFS) --- -1.8.4.2 - diff --git a/recipes-devtools/python/files/0001-Delete-the-version-limit-for-dosocs2.patch b/recipes-devtools/python/files/0001-Delete-the-version-limit-for-dosocs2.patch deleted file mode 100644 index 5773b8b..0000000 --- a/recipes-devtools/python/files/0001-Delete-the-version-limit-for-dosocs2.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3e3bef6aff2563e4bb206c1169b783a1c61308e5 Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Fri, 25 Aug 2017 03:03:06 +0900 -Subject: [PATCH] Delete the version limit for dosocs2. - -Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index b35863f..1bae161 100644 ---- a/setup.py -+++ b/setup.py -@@ -1,6 +1,6 @@ - from setuptools import setup - --_dosocs2_version = '0.16.1' -+_dosocs2_version = '' - - install_requires=[ - ] --- -2.7.4 - diff --git a/recipes-devtools/python/files/0001-Deleted-version-limit-for-dosocs2.patch b/recipes-devtools/python/files/0001-Deleted-version-limit-for-dosocs2.patch deleted file mode 100644 index 4daab5e..0000000 --- a/recipes-devtools/python/files/0001-Deleted-version-limit-for-dosocs2.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f9b27dee4dc01dafec111957a1ad411f20bcb644 Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Fri, 25 Aug 2017 03:17:19 +0900 -Subject: [PATCH] Deleted version limit for dosocs2. - -Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> ---- - setup.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/setup.py b/setup.py -index b35863f..9be6cd7 100644 ---- a/setup.py -+++ b/setup.py -@@ -10,7 +10,6 @@ tests_require=[ - - setup( - name='dosocs2', -- version=_dosocs2_version, - description='SPDX 2.0 document creation and storage', - long_description='', - url='https://github.com/DoSOCSv2/DoSOCSv2', --- -2.7.4 - diff --git a/recipes-devtools/python/files/0001-setup-py-delete-the-depends-install.patch b/recipes-devtools/python/files/0001-setup-py-delete-the-depends-install.patch deleted file mode 100644 index 41f6bb2..0000000 --- a/recipes-devtools/python/files/0001-setup-py-delete-the-depends-install.patch +++ /dev/null @@ -1,34 +0,0 @@ -From d282ba074625922d12615af676ac1f0e922db88f Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Wed, 15 Feb 2017 23:23:53 +0900 -Subject: [PATCH] setup.py: delete the depends install - -Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> ---- - setup.py | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/setup.py b/setup.py -index 527b161..b35863f 100644 ---- a/setup.py -+++ b/setup.py -@@ -3,16 +3,9 @@ from setuptools import setup - _dosocs2_version = '0.16.1' - - install_requires=[ -- 'jinja2', -- 'python-magic', -- 'docopt', -- 'SQLAlchemy', -- 'psycopg2' - ] - - tests_require=[ -- 'pytest', -- 'mock' - ] - - setup( --- -1.8.4.2 - diff --git a/recipes-devtools/python/python-futures/python-futures_%.bbappend b/recipes-devtools/python/python-futures/python-futures_%.bbappend deleted file mode 100644 index d3267ac..0000000 --- a/recipes-devtools/python/python-futures/python-futures_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -BBCLASSEXTEND = "native" diff --git a/recipes-devtools/python/python-lid_git.bb b/recipes-devtools/python/python-lid_git.bb deleted file mode 100644 index 1897f46..0000000 --- a/recipes-devtools/python/python-lid_git.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Identify OS licenses and OS license text in source code." -HOMEPAGE = "https://source.codeaurora.org/external/qostg/lid/" -SECTION = "devel/python" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3dd6f349067c9c1c473ae3f54efeb2e0" - -SRC_URI = "git://source.codeaurora.org/external/qostg/lid;protocol=https \ - " - -S = "${WORKDIR}/git" - -SRCREV = "d4ec360b51f34e8e73dcad7b0539fc0029eb7a20" -BRANCH = "master" -PV = "1" - -inherit distutils pythonnative setuptools python-dir - -DEPENDS += "python-pyyaml-native \ - python-future-native \ - python-nltk-native \ - python-six-native \ - python-chardet \ - " - -BBCLASSEXTEND = "native" diff --git a/recipes-devtools/python/python-nltk_3.0.3.bb b/recipes-devtools/python/python-nltk_3.0.3.bb deleted file mode 100644 index 0c9e5d2..0000000 --- a/recipes-devtools/python/python-nltk_3.0.3.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Natural Language Toolkit" -DESCRIPTION = "NLTK is a leading platform for building Python programs \ -to work with human language data." -HOMEPAGE = "http://www.nltk.org/" -SECTION = "libs" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=dda944de6d6a9ad8f6bb436dffdade1b" - -SRC_URI = "https://pypi.python.org/packages/source/n/nltk/nltk-${PV}.tar.gz \ - " - -SRC_URI[md5sum] = "7bda53f59051337554d243bef904a5e9" -SRC_URI[sha256sum] = "28d6175984445b9cdcc719f36701f034320edbecb78b69a37d1edc876843ea93" - -inherit distutils pythonnative setuptools python-dir - -S="${WORKDIR}/nltk-3.0.3" - -BBCLASSEXTEND = "native" - - diff --git a/recipes-devtools/python/python-whatthepatch_0.0.5.bb b/recipes-devtools/python/python-whatthepatch_0.0.5.bb deleted file mode 100644 index b9ba7c6..0000000 --- a/recipes-devtools/python/python-whatthepatch_0.0.5.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "A patch parsing library" -DESCRIPTION = "What The Patch!? is a library for parsing patch files. \ -Its only purpose is to read a patch file and get it into some usable form by other programs." -HOMEPAGE = "https://pypi.python.org/pypi/whatthepatch" -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://setup.py;md5=a6377e466f612f442bbc6bb2e91eee5d" - -SRC_URI = "https://pypi.python.org/packages/64/1e/7a63cba8a0d70245b9ab1c03694dabe36476fa65ee546e6dff6c8660434c/whatthepatch-0.0.5.tar.gz \ - " - -SRC_URI[md5sum] = "80d7c24de99ca9501f07b42e88d6f7c1" -SRC_URI[sha256sum] = "494a2ec6c05b80f9ed1bd773f5ac9411298e1af6f0385f179840b5d60d001aa6" - -S="${WORKDIR}/whatthepatch-0.0.5" -PYTHON_INHERIT = "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'pythonnative', '', d)}" -PYTHON_INHERIT = "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)}" - -inherit distutils ${PYTHON_INHERIT} setuptools python-dir - -BBCLASSEXTEND = "native" diff --git a/recipes-devtools/python/python3-docopt_0.6.2.bb b/recipes-devtools/python/python3-docopt_0.6.2.bb deleted file mode 100644 index 2b1dd0a..0000000 --- a/recipes-devtools/python/python3-docopt_0.6.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Pythonic command line arguments parser, that will make you smile http://docopt.org" -HOMEPAGE = "http://docopt.org" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=09b77fb74986791a3d4a0e746a37d88f" - -SRC_NAME = "docopt" -SRC_URI = "https://github.com/docopt/docopt/archive/${PV}.tar.gz;downloadfilename=${SRC_NAME}-${PV}.tar.gz" - -S = "${WORKDIR}/${SRC_NAME}-${PV}/" - -SRC_URI[md5sum] = "a6c44155426fd0f7def8b2551d02fef6" -SRC_URI[sha256sum] = "2113eed1e7fbbcd43fb7ee6a977fb02d0b482753586c9dc1a8e3b7d541426e99" - -inherit setuptools3 python3-dir - -BBCLASSEXTEND = "native" diff --git a/recipes-devtools/python/python3-dosocs2-init_git.bb b/recipes-devtools/python/python3-dosocs2-init_git.bb deleted file mode 100644 index d84ad45..0000000 --- a/recipes-devtools/python/python3-dosocs2-init_git.bb +++ /dev/null @@ -1,46 +0,0 @@ -DESCRIPTION = "SPDX 2.0 document creation and storage" -HOMEPAGE = "https://github.com/DoSOCSv2/DoSOCSv2" -SECTION = "devel/python" -LICENSE = "GPLv2" - -SRCREV = "97140a1fc2905ca646220dace1692e0ede475e3e" -BRANCH = "master" -PV = "0.16.1" - -addtask do_dosocs2_init before do_populate_sysroot - -do_dosocs2_init[depends] += "python3-dosocs2-native:do_populate_sysroot" - -DEPENDS = "python3-dosocs2-native" - -BBCLASSEXTEND = "native" - -inherit distutils3 python3native setuptools3 python3-dir - -python do_dosocs2_init() { - - import os - import subprocess - import bb - import oe.utils - import oe.path - import string - - path = os.getenv('PATH') - dosocs2_cmd = bb.utils.which(os.getenv('PATH'), "dosocs2") - dosocs2_init_cmd = dosocs2_cmd + " dbinit --no-confirm" - try: - complementary_pkgs = subprocess.check_output(dosocs2_init_cmd, - stderr=subprocess.STDOUT, - shell=True) - return - except subprocess.CalledProcessError as e: - bb.fatal("Could not invoke dosocs2 dbinit Command " - "'%s' returned %d:\n%s" % (dosocs2_init_cmd, e.returncode, e.output)) -} -deltask do_fetch -deltask do_unpack -deltask do_patch -deltask do_configure -deltask do_compile -deltask do_install diff --git a/recipes-devtools/python/python3-dosocs2/0001-Fix-a-error-as-fowllowing.patch b/recipes-devtools/python/python3-dosocs2/0001-Fix-a-error-as-fowllowing.patch deleted file mode 100644 index 870201d..0000000 --- a/recipes-devtools/python/python3-dosocs2/0001-Fix-a-error-as-fowllowing.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 957574355fe80e0dfb86d7318cdd105e472294a4 Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Sun, 12 Nov 2017 00:37:10 +0900 -Subject: [PATCH] Fix a error as fowllowing: - -" TypeError: cannot use a string pattern on a bytes-like object" - -Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> ---- - dosocs2/scanners/nomos.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dosocs2/scanners/nomos.py b/dosocs2/scanners/nomos.py -index e4f2901..ebdde74 100644 ---- a/dosocs2/scanners/nomos.py -+++ b/dosocs2/scanners/nomos.py -@@ -34,6 +34,7 @@ class Nomos(scannerbase.FileLicenseScanner): - return '' - - def _get_licenses(self, file, nomos_output): -+ nomos_output = nomos_output.decode('utf-8') - parsed_output = [ - Nomos.Evidence(*item) - for item in re.findall(self.search_pattern, nomos_output) --- -2.7.4 - diff --git a/recipes-devtools/python/python3-dosocs2/0001-Fix-a-magic-error-as-following.patch b/recipes-devtools/python/python3-dosocs2/0001-Fix-a-magic-error-as-following.patch deleted file mode 100644 index 4b1e397..0000000 --- a/recipes-devtools/python/python3-dosocs2/0001-Fix-a-magic-error-as-following.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c4ae0f2eb4a2a03329089419fe6f1b0cd05548f9 Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Mon, 13 Nov 2017 15:43:51 +0900 -Subject: [PATCH] Fix a magic error as following: - -could not find any valid magic files! ---- - dosocs2/util.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dosocs2/util.py b/dosocs2/util.py -index aba864c..200688e 100644 ---- a/dosocs2/util.py -+++ b/dosocs2/util.py -@@ -30,7 +30,7 @@ import uuid - import zipfile - - import magic -- -+magic = magic.Magic(magic_file="path_to_magic_file") - - def bool_from_str(s): - if s.lower() == 'true': --- -2.7.4 - diff --git a/recipes-devtools/python/python3-dosocs2/0001-Fix-bugs-because-python-from-2.x-to-3.x.patch b/recipes-devtools/python/python3-dosocs2/0001-Fix-bugs-because-python-from-2.x-to-3.x.patch deleted file mode 100644 index f648d50..0000000 --- a/recipes-devtools/python/python3-dosocs2/0001-Fix-bugs-because-python-from-2.x-to-3.x.patch +++ /dev/null @@ -1,142 +0,0 @@ -From dbea8f1cf03b986ce98d50faa39f8721048b280e Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Thu, 26 Oct 2017 16:08:39 +0900 -Subject: [PATCH] Fix bugs because python from 2.x to 3.x. - -Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> ---- - dosocs2/render.py | 4 ++-- - dosocs2/scannerbase.py | 6 +++--- - dosocs2/spdxdb.py | 2 +- - dosocs2/util.py | 30 +++++++++++++++--------------- - 4 files changed, 21 insertions(+), 21 deletions(-) - -diff --git a/dosocs2/render.py b/dosocs2/render.py -index 7118e3d..434bb5b 100644 ---- a/dosocs2/render.py -+++ b/dosocs2/render.py -@@ -54,7 +54,7 @@ def get_row(conn, query): - - - def get_rows(conn, query): -- return list(sorted(dict(**row) for row in conn.execute(query))) -+ return list(dict(**row) for row in conn.execute(query)) - - - def render_template(templatefile, context): -@@ -77,7 +77,7 @@ def render_document(conn, docid, template_file): - query = queries.relationships(document['document_namespace_id'], package['id_string']) - package['relationships'] = get_rows(conn, query) - package['files'] = get_rows(conn, queries.documents_files(docid, package['package_id'])) -- for file in sorted(package['files']): -+ for file in package['files']: - file['license_info'] = get_rows(conn, queries.files_licenses(file['file_id'])) - file['contributors'] = get_rows(conn, queries.file_contributors(file['file_id'])) - file['annotations'] = get_rows(conn, queries.annotations(docid, file['id_string'])) -diff --git a/dosocs2/scannerbase.py b/dosocs2/scannerbase.py -index d7a38b6..a54dce7 100644 ---- a/dosocs2/scannerbase.py -+++ b/dosocs2/scannerbase.py -@@ -274,8 +274,8 @@ class FileLicenseScanner(Scanner): - - Return the new or existing license object in any case. - ''' -- transtable = string.maketrans('()[]<>', '------') -- short_name = string.translate(short_name, transtable) -+ transtable = str.maketrans('()[]<>', '------') -+ short_name = str.translate(short_name, transtable) - existing_license = FileLicenseScanner.lookup_license(conn, short_name) - if existing_license is not None: - return existing_license -@@ -311,7 +311,7 @@ class FileLicenseScanner(Scanner): - - def store_results(self, processed_files): - licenses_to_add = [] -- for (file, licenses_extracted) in processed_files.iteritems(): -+ for (file, licenses_extracted) in processed_files.items(): - licenses = [] - for license_name in licenses_extracted: - license_kwargs = { -diff --git a/dosocs2/spdxdb.py b/dosocs2/spdxdb.py -index a8d3fd6..b8aef5f 100644 ---- a/dosocs2/spdxdb.py -+++ b/dosocs2/spdxdb.py -@@ -135,7 +135,7 @@ def register_package(conn, package_root, name=None, version=None, comment=None, - package['package_id'] = insert(conn, db.packages, package) - # Create packages_files rows - row_params = [] -- for (file_path, file_sha256) in hashes.iteritems(): -+ for (file_path, file_sha256) in hashes.items(): - fileobj = register_file(conn, file_path, known_sha256=file_sha256) - package_file_params = { - 'package_id': package['package_id'], -diff --git a/dosocs2/util.py b/dosocs2/util.py -index 5670f67..aba864c 100644 ---- a/dosocs2/util.py -+++ b/dosocs2/util.py -@@ -43,23 +43,23 @@ def bool_from_str(s): - - def is_source(magic_string): - return ( -- ' source' in magic_string and ' text' in magic_string or -- ' script' in magic_string and ' text' in magic_string or -- ' program' in magic_string and ' text' in magic_string or -- ' shell script' in magic_string or -- ' text executable' in magic_string or -- 'HTML' in magic_string and 'text' in magic_string or -- 'XML' in magic_string and 'text' in magic_string -+ b' source' in magic_string and b' text' in magic_string or -+ b' script' in magic_string and b' text' in magic_string or -+ b' program' in magic_string and b' text' in magic_string or -+ b' shell script' in magic_string or -+ b' text executable' in magic_string or -+ b'HTML' in magic_string and b'text' in magic_string or -+ b'XML' in magic_string and b'text' in magic_string - ) - - - def is_binary(magic_string): - return ( -- ' executable' in magic_string or -- ' relocatable' in magic_string or -- ' shared object' in magic_string or -- ' dynamically linked' in magic_string or -- ' ar archive' in magic_string -+ b' executable' in magic_string or -+ b' relocatable' in magic_string or -+ b' shared object' in magic_string or -+ b' dynamically linked' in magic_string or -+ b' ar archive' in magic_string - ) - - -@@ -70,7 +70,7 @@ def spdx_filetype(filename): - return 'SOURCE' - if is_binary(magic_string): - return 'BINARY' -- if 'archive' in magic_string: -+ if b'archive' in magic_string: - return 'ARCHIVE' - return 'OTHER' - -@@ -158,7 +158,7 @@ def gen_ver_code(hashes, excluded_hashes=None): - excluded_hashes = set() - hashes_less_excluded = (h for h in hashes if h not in excluded_hashes) - hashblob = ''.join(sorted(hashes_less_excluded)) -- return hashlib.sha256(hashblob).hexdigest() -+ return hashlib.sha256((hashblob).encode('utf-8')).hexdigest() - - - def get_dir_hashes(path, excluded_hashes=None): -@@ -184,7 +184,7 @@ def get_dir_hashes(path, excluded_hashes=None): - and hashes.get(abspath) not in excluded_hashes - ) - rel_listing_hashes = ( -- hashlib.sha256(relpath).hexdigest() -+ hashlib.sha256((relpath).encode('utf-8')).hexdigest() - for relpath in sorted(relative_listing) - ) - return (gen_ver_code(hashes.values(), excluded_hashes), --- -2.7.4 - diff --git a/recipes-devtools/python/python3-dosocs2_git.bb b/recipes-devtools/python/python3-dosocs2_git.bb deleted file mode 100644 index 5409628..0000000 --- a/recipes-devtools/python/python3-dosocs2_git.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "SPDX 2.0 document creation and storage" -HOMEPAGE = "https://github.com/DoSOCSv2/DoSOCSv2" -SECTION = "devel/python" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "git://github.com/DoSOCSv2/DoSOCSv2.git;branch=dev \ - file://0001-setup-py-delete-the-depends-install.patch \ - file://0001-Fix-bugs-because-python-from-2.x-to-3.x.patch \ - file://0001-Fix-a-error-as-fowllowing.patch \ - file://0001-Fix-a-magic-error-as-following.patch \ - " - -S = "${WORKDIR}/git" - -SRCREV = "aa84166694913bf1d2cce416f1c2bff120c3ba3b" -BRANCH = "dev" -PV = "0.16.1" - -inherit distutils3 python3native setuptools3 python3-dir - -DEPENDS += "python3-jinja2-native \ - python3-docopt-native \ - python3-sqlalchemy-native \ - file-native \ - fossology-nomos-native \ - python3-markupsafe-native \ - python3-magic-native " - -do_install_append() { - sed -i "s|scanner_nomos_path = /usr/local/|scanner_nomos_path = ${STAGING_DIR_NATIVE}/usr/|g" ${D}${PYTHON_SITEPACKAGES_DIR}/dosocs2/configtools.py - sed -i "s,path_to_magic_file,${STAGING_DATADIR_NATIVE}/misc/magic," ${D}${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/dosocs2/util.py -} - -BBCLASSEXTEND = "native" diff --git a/recipes-devtools/python/python3-jinja2_%.bbappend b/recipes-devtools/python/python3-jinja2_%.bbappend deleted file mode 100644 index 3eecfad..0000000 --- a/recipes-devtools/python/python3-jinja2_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -BBCLASSEXTEND = "native" - -RDEPENDS_${PN} = "python3-sphinx python3-markupsafe" diff --git a/recipes-devtools/python/python3-lid_git.bb b/recipes-devtools/python/python3-lid_git.bb deleted file mode 100644 index c93e86d..0000000 --- a/recipes-devtools/python/python3-lid_git.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Identify OS licenses and OS license text in source code." -HOMEPAGE = "https://source.codeaurora.org/external/qostg/lid/" -SECTION = "devel/python" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3dd6f349067c9c1c473ae3f54efeb2e0" - -SRC_URI = "git://source.codeaurora.org/external/qostg/lid;protocol=https \ - " - -S = "${WORKDIR}/git" - -SRCREV = "d4ec360b51f34e8e73dcad7b0539fc0029eb7a20" -BRANCH = "master" -PV = "0.16.1" - -inherit distutils pythonnative setuptools python-dir - -DEPENDS += "python-pyyaml-native \ - python-future-native \ - python-nltk-native \ - python-six-native \ - python-chardet-native \ - " - -BBCLASSEXTEND = "native" diff --git a/recipes-devtools/python/python3-magic-5.25/0001-Modified-the-magic.py-for-dosocs2-to-fix-the-error-a.patch b/recipes-devtools/python/python3-magic-5.25/0001-Modified-the-magic.py-for-dosocs2-to-fix-the-error-a.patch deleted file mode 100644 index 1383df4..0000000 --- a/recipes-devtools/python/python3-magic-5.25/0001-Modified-the-magic.py-for-dosocs2-to-fix-the-error-a.patch +++ /dev/null @@ -1,504 +0,0 @@ -From ef5ad90f3aba98ae3e222f6b076377701997585b Mon Sep 17 00:00:00 2001 -From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> -Date: Fri, 5 May 2017 02:23:24 +0900 -Subject: [PATCH] Modified the magic.py for dosocs2 to fix the error as - fowllowing. - -AttributeError: 'module' object has no attribute 'from_file' - -Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> ---- - magic.py | 462 ++++++++++++++++++++++++++++++++------------------------ - 1 file changed, 262 insertions(+), 200 deletions(-) - -diff --git a/magic.py b/magic.py -index a17e8da..c6142a7 100644 ---- a/magic.py -+++ b/magic.py -@@ -1,221 +1,283 @@ --#!/usr/bin/env python --''' --Python bindings for libmagic --''' -+""" -+magic is a wrapper around the libmagic file identification library. - --import ctypes -+See README for more information. - --from ctypes import * --from ctypes.util import find_library -+Usage: - -+>>> import magic -+>>> magic.from_file("testdata/test.pdf") -+'PDF document, version 1.2' -+>>> magic.from_file("testdata/test.pdf", mime=True) -+'application/pdf' -+>>> magic.from_buffer(open("testdata/test.pdf").read(1024)) -+'PDF document, version 1.2' -+>>> - --def _init(): -- """ -- Loads the shared library through ctypes and returns a library -- L{ctypes.CDLL} instance -- """ -- return ctypes.cdll.LoadLibrary(find_library('magic')) -- --_libraries = {} --_libraries['magic'] = _init() -- --# Flag constants for open and setflags --MAGIC_NONE = NONE = 0 --MAGIC_DEBUG = DEBUG = 1 --MAGIC_SYMLINK = SYMLINK = 2 --MAGIC_COMPRESS = COMPRESS = 4 --MAGIC_DEVICES = DEVICES = 8 --MAGIC_MIME_TYPE = MIME_TYPE = 16 --MAGIC_CONTINUE = CONTINUE = 32 --MAGIC_CHECK = CHECK = 64 --MAGIC_PRESERVE_ATIME = PRESERVE_ATIME = 128 --MAGIC_RAW = RAW = 256 --MAGIC_ERROR = ERROR = 512 --MAGIC_MIME_ENCODING = MIME_ENCODING = 1024 --MAGIC_MIME = MIME = 1040 --MAGIC_APPLE = APPLE = 2048 -- --MAGIC_NO_CHECK_COMPRESS = NO_CHECK_COMPRESS = 4096 --MAGIC_NO_CHECK_TAR = NO_CHECK_TAR = 8192 --MAGIC_NO_CHECK_SOFT = NO_CHECK_SOFT = 16384 --MAGIC_NO_CHECK_APPTYPE = NO_CHECK_APPTYPE = 32768 --MAGIC_NO_CHECK_ELF = NO_CHECK_ELF = 65536 --MAGIC_NO_CHECK_TEXT = NO_CHECK_TEXT = 131072 --MAGIC_NO_CHECK_CDF = NO_CHECK_CDF = 262144 --MAGIC_NO_CHECK_TOKENS = NO_CHECK_TOKENS = 1048576 --MAGIC_NO_CHECK_ENCODING = NO_CHECK_ENCODING = 2097152 -- --MAGIC_NO_CHECK_BUILTIN = NO_CHECK_BUILTIN = 4173824 -- -- --class magic_set(Structure): -- pass --magic_set._fields_ = [] --magic_t = POINTER(magic_set) -- --_open = _libraries['magic'].magic_open --_open.restype = magic_t --_open.argtypes = [c_int] -- --_close = _libraries['magic'].magic_close --_close.restype = None --_close.argtypes = [magic_t] -- --_file = _libraries['magic'].magic_file --_file.restype = c_char_p --_file.argtypes = [magic_t, c_char_p] -- --_descriptor = _libraries['magic'].magic_descriptor --_descriptor.restype = c_char_p --_descriptor.argtypes = [magic_t, c_int] -- --_buffer = _libraries['magic'].magic_buffer --_buffer.restype = c_char_p --_buffer.argtypes = [magic_t, c_void_p, c_size_t] -- --_error = _libraries['magic'].magic_error --_error.restype = c_char_p --_error.argtypes = [magic_t] -- --_setflags = _libraries['magic'].magic_setflags --_setflags.restype = c_int --_setflags.argtypes = [magic_t, c_int] -- --_load = _libraries['magic'].magic_load --_load.restype = c_int --_load.argtypes = [magic_t, c_char_p] -- --_compile = _libraries['magic'].magic_compile --_compile.restype = c_int --_compile.argtypes = [magic_t, c_char_p] -- --_check = _libraries['magic'].magic_check --_check.restype = c_int --_check.argtypes = [magic_t, c_char_p] -- --_list = _libraries['magic'].magic_list --_list.restype = c_int --_list.argtypes = [magic_t, c_char_p] -- --_errno = _libraries['magic'].magic_errno --_errno.restype = c_int --_errno.argtypes = [magic_t] -- -- --class Magic(object): -- def __init__(self, ms): -- self._magic_t = ms -- -- def close(self): -- """ -- Closes the magic database and deallocates any resources used. -- """ -- _close(self._magic_t) - -- def file(self, filename): -- """ -- Returns a textual description of the contents of the argument passed -- as a filename or None if an error occurred and the MAGIC_ERROR flag -- is set. A call to errno() will return the numeric error code. -- """ -- try: # attempt python3 approach first -- if isinstance(filename, bytes): -- bi = filename -- else: -- bi = bytes(filename, 'utf-8') -- return str(_file(self._magic_t, bi), 'utf-8') -- except: -- return _file(self._magic_t, filename.encode('utf-8')) -- -- def descriptor(self, fd): -- """ -- Like the file method, but the argument is a file descriptor. -- """ -- return _descriptor(self._magic_t, fd) -+""" - -- def buffer(self, buf): -- """ -- Returns a textual description of the contents of the argument passed -- as a buffer or None if an error occurred and the MAGIC_ERROR flag -- is set. A call to errno() will return the numeric error code. -- """ -- try: # attempt python3 approach first -- return str(_buffer(self._magic_t, buf, len(buf)), 'utf-8') -- except: -- return _buffer(self._magic_t, buf, len(buf)) -+import sys -+import glob -+import os.path -+import ctypes -+import ctypes.util -+import threading - -- def error(self): -- """ -- Returns a textual explanation of the last error or None -- if there was no error. -- """ -- try: # attempt python3 approach first -- return str(_error(self._magic_t), 'utf-8') -- except: -- return _error(self._magic_t) -+from ctypes import c_char_p, c_int, c_size_t, c_void_p - -- def setflags(self, flags): -- """ -- Set flags on the magic object which determine how magic checking -- behaves; a bitwise OR of the flags described in libmagic(3), but -- without the MAGIC_ prefix. - -- Returns -1 on systems that don't support utime(2) or utimes(2) -- when PRESERVE_ATIME is set. -- """ -- return _setflags(self._magic_t, flags) -+class MagicException(Exception): -+ def __init__(self, message): -+ super(MagicException, self).__init__(message) -+ self.message = message - -- def load(self, filename=None): -- """ -- Must be called to load entries in the colon separated list of database -- files passed as argument or the default database file if no argument -- before any magic queries can be performed. - -- Returns 0 on success and -1 on failure. -- """ -- return _load(self._magic_t, filename) -+class Magic: -+ """ -+ Magic is a wrapper around the libmagic C library. - -- def compile(self, dbs): -- """ -- Compile entries in the colon separated list of database files -- passed as argument or the default database file if no argument. -- Returns 0 on success and -1 on failure. -- The compiled files created are named from the basename(1) of each file -- argument with ".mgc" appended to it. -- """ -- return _compile(self._magic_t, dbs) -+ """ - -- def check(self, dbs): -- """ -- Check the validity of entries in the colon separated list of -- database files passed as argument or the default database file -- if no argument. -- Returns 0 on success and -1 on failure. -+ def __init__(self, mime=False, magic_file=None, mime_encoding=False, -+ keep_going=False, uncompress=False): - """ -- return _check(self._magic_t, dbs) -+ Create a new libmagic wrapper. - -- def list(self, dbs): -+ mime - if True, mimetypes are returned instead of textual descriptions -+ mime_encoding - if True, codec is returned -+ magic_file - use a mime database other than the system default -+ keep_going - don't stop at the first match, keep going -+ uncompress - Try to look inside compressed files. - """ -- Check the validity of entries in the colon separated list of -- database files passed as argument or the default database file -- if no argument. -- Returns 0 on success and -1 on failure. -- """ -- return _list(self._magic_t, dbs) -- -- def errno(self): -+ self.flags = MAGIC_NONE -+ if mime: -+ self.flags |= MAGIC_MIME -+ elif mime_encoding: -+ self.flags |= MAGIC_MIME_ENCODING -+ if keep_going: -+ self.flags |= MAGIC_CONTINUE -+ -+ if uncompress: -+ self.flags |= MAGIC_COMPRESS -+ -+ self.cookie = magic_open(self.flags) -+ self.lock = threading.Lock() -+ -+ magic_load(self.cookie, magic_file) -+ -+ def from_buffer(self, buf): - """ -- Returns a numeric error code. If return value is 0, an internal -- magic error occurred. If return value is non-zero, the value is -- an OS error code. Use the errno module or os.strerror() can be used -- to provide detailed error information. -+ Identify the contents of `buf` - """ -- return _errno(self._magic_t) -- -+ with self.lock: -+ try: -+ return magic_buffer(self.cookie, buf) -+ except MagicException as e: -+ return self._handle509Bug(e) -+ -+ def from_file(self, filename): -+ # raise FileNotFoundException or IOError if the file does not exist -+ with open(filename): -+ pass -+ with self.lock: -+ try: -+ return magic_file(self.cookie, filename) -+ except MagicException as e: -+ return self._handle509Bug(e) -+ -+ def _handle509Bug(self, e): -+ # libmagic 5.09 has a bug where it might fail to identify the -+ # mimetype of a file and returns null from magic_file (and -+ # likely _buffer), but also does not return an error message. -+ if e.message is None and (self.flags & MAGIC_MIME): -+ return "application/octet-stream" -+ -+ def __del__(self): -+ # no _thread_check here because there can be no other -+ # references to this object at this point. -+ -+ # during shutdown magic_close may have been cleared already so -+ # make sure it exists before using it. -+ -+ # the self.cookie check should be unnecessary and was an -+ # incorrect fix for a threading problem, however I'm leaving -+ # it in because it's harmless and I'm slightly afraid to -+ # remove it. -+ if self.cookie and magic_close: -+ magic_close(self.cookie) -+ self.cookie = None -+ -+_instances = {} -+ -+def _get_magic_type(mime): -+ i = _instances.get(mime) -+ if i is None: -+ i = _instances[mime] = Magic(mime=mime) -+ return i -+ -+def from_file(filename, mime=False): -+ """" -+ Accepts a filename and returns the detected filetype. Return -+ value is the mimetype if mime=True, otherwise a human readable -+ name. -+ -+ >>> magic.from_file("testdata/test.pdf", mime=True) -+ 'application/pdf' -+ """ -+ m = _get_magic_type(mime) -+ return m.from_file(filename) - --def open(flags): -+def from_buffer(buffer, mime=False): - """ -- Returns a magic object on success and None on failure. -- Flags argument as for setflags. -+ Accepts a binary string and returns the detected filetype. Return -+ value is the mimetype if mime=True, otherwise a human readable -+ name. -+ -+ >>> magic.from_buffer(open("testdata/test.pdf").read(1024)) -+ 'PDF document, version 1.2' - """ -- return Magic(_open(flags)) -+ m = _get_magic_type(mime) -+ return m.from_buffer(buffer) -+ -+ -+ -+ -+libmagic = None -+# Let's try to find magic or magic1 -+dll = ctypes.util.find_library('magic') or ctypes.util.find_library('magic1') or ctypes.util.find_library('cygmagic-1') -+ -+# This is necessary because find_library returns None if it doesn't find the library -+if dll: -+ libmagic = ctypes.CDLL(dll) -+ -+if not libmagic or not libmagic._name: -+ windows_dlls = ['magic1.dll','cygmagic-1.dll'] -+ platform_to_lib = {'darwin': ['/opt/local/lib/libmagic.dylib', -+ '/usr/local/lib/libmagic.dylib'] + -+ # Assumes there will only be one version installed -+ glob.glob('/usr/local/Cellar/libmagic/*/lib/libmagic.dylib'), -+ 'win32': windows_dlls, -+ 'cygwin': windows_dlls } -+ for dll in platform_to_lib.get(sys.platform, []): -+ try: -+ libmagic = ctypes.CDLL(dll) -+ break -+ except OSError: -+ pass -+ -+if not libmagic or not libmagic._name: -+ # It is better to raise an ImportError since we are importing magic module -+ raise ImportError('failed to find libmagic. Check your installation') -+ -+magic_t = ctypes.c_void_p -+ -+def errorcheck_null(result, func, args): -+ if result is None: -+ err = magic_error(args[0]) -+ raise MagicException(err) -+ else: -+ return result -+ -+def errorcheck_negative_one(result, func, args): -+ if result is -1: -+ err = magic_error(args[0]) -+ raise MagicException(err) -+ else: -+ return result -+ -+ -+def coerce_filename(filename): -+ if filename is None: -+ return None -+ -+ # ctypes will implicitly convert unicode strings to bytes with -+ # .encode('ascii'). If you use the filesystem encoding -+ # then you'll get inconsistent behavior (crashes) depending on the user's -+ # LANG environment variable -+ is_unicode = (sys.version_info[0] <= 2 and -+ isinstance(filename, unicode)) or \ -+ (sys.version_info[0] >= 3 and -+ isinstance(filename, str)) -+ if is_unicode: -+ return filename.encode('utf-8') -+ else: -+ return filename -+ -+magic_open = libmagic.magic_open -+magic_open.restype = magic_t -+magic_open.argtypes = [c_int] -+ -+magic_close = libmagic.magic_close -+magic_close.restype = None -+magic_close.argtypes = [magic_t] -+ -+magic_error = libmagic.magic_error -+magic_error.restype = c_char_p -+magic_error.argtypes = [magic_t] -+ -+magic_errno = libmagic.magic_errno -+magic_errno.restype = c_int -+magic_errno.argtypes = [magic_t] -+ -+_magic_file = libmagic.magic_file -+_magic_file.restype = c_char_p -+_magic_file.argtypes = [magic_t, c_char_p] -+_magic_file.errcheck = errorcheck_null -+ -+def magic_file(cookie, filename): -+ return _magic_file(cookie, coerce_filename(filename)) -+ -+_magic_buffer = libmagic.magic_buffer -+_magic_buffer.restype = c_char_p -+_magic_buffer.argtypes = [magic_t, c_void_p, c_size_t] -+_magic_buffer.errcheck = errorcheck_null -+ -+def magic_buffer(cookie, buf): -+ return _magic_buffer(cookie, buf, len(buf)) -+ -+ -+_magic_load = libmagic.magic_load -+_magic_load.restype = c_int -+_magic_load.argtypes = [magic_t, c_char_p] -+_magic_load.errcheck = errorcheck_negative_one -+ -+def magic_load(cookie, filename): -+ return _magic_load(cookie, coerce_filename(filename)) -+ -+magic_setflags = libmagic.magic_setflags -+magic_setflags.restype = c_int -+magic_setflags.argtypes = [magic_t, c_int] -+ -+magic_check = libmagic.magic_check -+magic_check.restype = c_int -+magic_check.argtypes = [magic_t, c_char_p] -+ -+magic_compile = libmagic.magic_compile -+magic_compile.restype = c_int -+magic_compile.argtypes = [magic_t, c_char_p] -+ -+ -+ -+MAGIC_NONE = 0x000000 # No flags -+MAGIC_DEBUG = 0x000001 # Turn on debugging -+MAGIC_SYMLINK = 0x000002 # Follow symlinks -+MAGIC_COMPRESS = 0x000004 # Check inside compressed files -+MAGIC_DEVICES = 0x000008 # Look at the contents of devices -+MAGIC_MIME = 0x000010 # Return a mime string -+MAGIC_MIME_ENCODING = 0x000400 # Return the MIME encoding -+MAGIC_CONTINUE = 0x000020 # Return all matches -+MAGIC_CHECK = 0x000040 # Print warnings to stderr -+MAGIC_PRESERVE_ATIME = 0x000080 # Restore access time on exit -+MAGIC_RAW = 0x000100 # Don't translate unprintable chars -+MAGIC_ERROR = 0x000200 # Handle ENOENT etc as real errors -+ -+MAGIC_NO_CHECK_COMPRESS = 0x001000 # Don't check for compressed files -+MAGIC_NO_CHECK_TAR = 0x002000 # Don't check for tar files -+MAGIC_NO_CHECK_SOFT = 0x004000 # Don't check magic entries -+MAGIC_NO_CHECK_APPTYPE = 0x008000 # Don't check application type -+MAGIC_NO_CHECK_ELF = 0x010000 # Don't check for elf details -+MAGIC_NO_CHECK_ASCII = 0x020000 # Don't check for ascii files -+MAGIC_NO_CHECK_TROFF = 0x040000 # Don't check ascii/troff -+MAGIC_NO_CHECK_FORTRAN = 0x080000 # Don't check ascii/fortran -+MAGIC_NO_CHECK_TOKENS = 0x100000 # Don't check ascii/tokens --- -1.8.4.2 - diff --git a/recipes-devtools/python/python3-magic_5.25.bb b/recipes-devtools/python/python3-magic_5.25.bb deleted file mode 100644 index edc815c..0000000 --- a/recipes-devtools/python/python3-magic_5.25.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "File classification tool: python-magic" -DESCRIPTION = "File attempts to classify files depending \ -on their contents and prints a description if a match is found." -HOMEPAGE = "http://www.darwinsys.com/file/" -SECTION = "console/utils" - -# two clause BSD -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://setup.py;md5=1cf0577ca152455b257b815fcc8517de" - -SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \ - file://0001-Modified-the-magic.py-for-dosocs2-to-fix-the-error-a.patch \ - " - -SRC_URI[md5sum] = "e6a972d4e10d9e76407a432f4a63cd4c" -SRC_URI[sha256sum] = "3735381563f69fb4239470b8c51b876a80425348b8285a7cded8b61d6b890eca" - -S="${WORKDIR}/file-${PV}/python" - -inherit setuptools3 python3-dir - -BBCLASSEXTEND = "native" - -do_install_append(){ - install -d ${D}${datadir}/misc/ - install -m 644 ${WORKDIR}/file-${PV}/magic/Magdir/magic ${D}${datadir}/misc/magic -} diff --git a/recipes-devtools/python/python3-markupsafe_%.bbappend b/recipes-devtools/python/python3-markupsafe_%.bbappend deleted file mode 100644 index d3267ac..0000000 --- a/recipes-devtools/python/python3-markupsafe_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -BBCLASSEXTEND = "native" diff --git a/recipes-devtools/python/python3-nltk_3.0.3.bb b/recipes-devtools/python/python3-nltk_3.0.3.bb deleted file mode 100644 index 0c9e5d2..0000000 --- a/recipes-devtools/python/python3-nltk_3.0.3.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Natural Language Toolkit" -DESCRIPTION = "NLTK is a leading platform for building Python programs \ -to work with human language data." -HOMEPAGE = "http://www.nltk.org/" -SECTION = "libs" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=dda944de6d6a9ad8f6bb436dffdade1b" - -SRC_URI = "https://pypi.python.org/packages/source/n/nltk/nltk-${PV}.tar.gz \ - " - -SRC_URI[md5sum] = "7bda53f59051337554d243bef904a5e9" -SRC_URI[sha256sum] = "28d6175984445b9cdcc719f36701f034320edbecb78b69a37d1edc876843ea93" - -inherit distutils pythonnative setuptools python-dir - -S="${WORKDIR}/nltk-3.0.3" - -BBCLASSEXTEND = "native" - - diff --git a/recipes-devtools/python/python3-psycopg2-native_2.6.1.bb b/recipes-devtools/python/python3-psycopg2-native_2.6.1.bb deleted file mode 100644 index 9f7f7b0..0000000 --- a/recipes-devtools/python/python3-psycopg2-native_2.6.1.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Python-PostgreSQL Database Adapter" -HOMEPAGE = "http://initd.org/psycopg/" -SECTION = "devel/python" -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2c9872d13fa571e7ba6de95055da1fe2" - -PR = "r0" -SRCNAME = "psycopg2" - -DEPENDS += "postgresql-native" - -inherit native python3native - -SRC_URI = "https://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ - " - -SRC_URI[md5sum] = "842b44f8c95517ed5b792081a2370da1" -SRC_URI[sha256sum] = "6acf9abbbe757ef75dc2ecd9d91ba749547941abaffbe69ff2086a9e37d4904c" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils3 - diff --git a/recipes-devtools/python/python3-six_1.10.0.bb b/recipes-devtools/python/python3-six_1.10.0.bb deleted file mode 100644 index 5fd2918..0000000 --- a/recipes-devtools/python/python3-six_1.10.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "python3 compatibility library" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6f00d4a50713fa859858dd9abaa35b21" - -SRC_URI[md5sum] = "34eed507548117b2ab523ab14b2f8b55" -SRC_URI[sha256sum] = "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a" - -RDEPENDS_${PN} += "${PYTHON_PN}-io" - -inherit pypi setuptools3 distutils3 python3native python3-dir - -BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/python/python3-sphinx-native_1.6.6.bb b/recipes-devtools/python/python3-sphinx-native_1.6.6.bb deleted file mode 100644 index b72dad8..0000000 --- a/recipes-devtools/python/python3-sphinx-native_1.6.6.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Python documentation generator" -HOMEPAGE = "http://sphinx-doc.org/" -SECTION = "devel/python" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d5575c977f2e4659ece47f731f2b8319" - -PR = "r0" -SRCNAME = "sphinx" - -SRC_URI = "git://github.com/sphinx-doc/sphinx.git" - -SRCREV = "739022730295c4968ecc212bbb80b03981eeced3" -S = "${WORKDIR}/git" - -inherit setuptools3 native python3native - diff --git a/recipes-devtools/python/python3-sqlalchemy_%.bbappend b/recipes-devtools/python/python3-sqlalchemy_%.bbappend deleted file mode 100644 index c5e10df..0000000 --- a/recipes-devtools/python/python3-sqlalchemy_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -BBCLASSEXTEND = "native" - -RDEPENDS_${PN}_remove = "python3-numbers python3-misc" diff --git a/recipes-devtools/python/python3-whatthepatch_0.0.5.bb b/recipes-devtools/python/python3-whatthepatch_0.0.5.bb deleted file mode 100644 index c0b7682..0000000 --- a/recipes-devtools/python/python3-whatthepatch_0.0.5.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "A patch parsing library" -DESCRIPTION = "What The Patch!? is a library for parsing patch files. \ -Its only purpose is to read a patch file and get it into some usable form by other programs." -HOMEPAGE = "https://pypi.python.org/pypi/whatthepatch" -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://setup.py;md5=a6377e466f612f442bbc6bb2e91eee5d" - -SRC_URI = "https://pypi.python.org/packages/64/1e/7a63cba8a0d70245b9ab1c03694dabe36476fa65ee546e6dff6c8660434c/whatthepatch-0.0.5.tar.gz \ - " - -SRC_URI[md5sum] = "80d7c24de99ca9501f07b42e88d6f7c1" -SRC_URI[sha256sum] = "494a2ec6c05b80f9ed1bd773f5ac9411298e1af6f0385f179840b5d60d001aa6" - -S="${WORKDIR}/whatthepatch-0.0.5" - -inherit distutils3 python3native setuptools3 python3-dir - -BBCLASSEXTEND = "native" - - diff --git a/recipes-extended/glib-2.0/glib-2.0_%.bbappend b/recipes-extended/glib-2.0/glib-2.0_%.bbappend deleted file mode 100644 index fdc1027..0000000 --- a/recipes-extended/glib-2.0/glib-2.0_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -STATIC_LINK = "${@bb.utils.contains('PACKAGECONFIG', 'system-pcre', 'system-pcre', '', d)}" diff --git a/recipes-extended/perl/perl_%.bbappend b/recipes-extended/perl/perl_%.bbappend deleted file mode 100644 index 0042c86..0000000 --- a/recipes-extended/perl/perl_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -CONTAINED=" File-Path-2.12 " diff --git a/recipes-support/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch b/recipes-support/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch deleted file mode 100644 index d08ec6a..0000000 --- a/recipes-support/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d52e330be895bb8c5f0fb3e2884766acbd942a85 Mon Sep 17 00:00:00 2001 -From: Philip Balister <philip@balister.org> -Date: Tue, 1 Jul 2014 09:40:44 -0400 -Subject: [PATCH] Use pkg-config for libxml2 detection. - -Upstream-Status: Inappropriate [configuration] - -xml2-config does not work. Use pkgconfig to set CPPFLAGS and LIBS. - -Signed-off-by: Philip Balister <philip@balister.org> ---- - configure.in | 15 ++------------- - 1 file changed, 2 insertions(+), 13 deletions(-) - -diff --git a/configure.in b/configure.in -index f8bf466..1f4fabf 100644 ---- a/configure.in -+++ b/configure.in -@@ -734,19 +734,8 @@ PGAC_ARG_BOOL(with, libxml, no, [build with XML support], - [AC_DEFINE([USE_LIBXML], 1, [Define to 1 to build with XML support. (--with-libxml)])]) - - if test "$with_libxml" = yes ; then -- AC_CHECK_PROGS(XML2_CONFIG, xml2-config) -- if test -n "$XML2_CONFIG"; then -- for pgac_option in `$XML2_CONFIG --cflags`; do -- case $pgac_option in -- -I*|-D*) CPPFLAGS="$CPPFLAGS $pgac_option";; -- esac -- done -- for pgac_option in `$XML2_CONFIG --libs`; do -- case $pgac_option in -- -L*) LDFLAGS="$LDFLAGS $pgac_option";; -- esac -- done -- fi -+ CPPFLAGS="$CPPFLAGS `pkg-config --short-errors --print-errors --cflags "libxml-2.0" 2>&1`" -+ LIBS="`pkg-config --short-errors --print-errors --libs "libxml-2.0" 2>&1` $LIBS" - fi - - AC_SUBST(with_libxml) --- -1.8.3.1 - diff --git a/recipes-support/postgresql/postgresql-native_9.4.11.bb b/recipes-support/postgresql/postgresql-native_9.4.11.bb deleted file mode 100644 index 0bd6990..0000000 --- a/recipes-support/postgresql/postgresql-native_9.4.11.bb +++ /dev/null @@ -1,91 +0,0 @@ -SUMMARY = "PostgreSQL is a powerful, open source relational database system." -DESCRIPTION = "\ - PostgreSQL is an advanced Object-Relational database management system \ - (DBMS) that supports almost all SQL constructs (including \ - transactions, subselects and user-defined types and functions). The \ - postgresql package includes the client programs and libraries that \ - you'll need to access a PostgreSQL DBMS server. These PostgreSQL \ - client programs are programs that directly manipulate the internal \ - structure of PostgreSQL databases on a PostgreSQL server. These client \ - programs can be located on the same machine with the PostgreSQL \ - server, or may be on a remote machine which accesses a PostgreSQL \ - server over a network connection. This package contains the docs \ - in HTML for the whole package, as well as command-line utilities for \ - managing PostgreSQL databases on a PostgreSQL server. \ - \ - If you want to manipulate a PostgreSQL database on a local or remote \ - PostgreSQL server, you need this package. You also need to install \ - this package if you're installing the postgresql-server package. \ -" -HOMEPAGE = "http://www.postgresql.com" -LICENSE = "BSD" -DEPENDS = "tcl-native libxml2-native libxslt-native perl-native" - -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=81b69ddb31a8be66baafd14a90146ee2" - -SRC_URI[md5sum] = "2fee03f2034034dbfcb3321a0bb0f829" -SRC_URI[sha256sum] = "e3eb51d045c180b03d2de1f0c3af9356e10be49448e966ca01dfc2c6d1cc9d23" - -SRC_URI = "http://ftp.postgresql.org/pub/source/v${PV}/${BP}.tar.bz2 \ - file://0001-Use-pkg-config-for-libxml2-detection.patch \ -" - -LEAD_SONAME = "libpq.so" - -# LDFLAGS for shared libraries -export LDFLAGS_SL = "${LDFLAGS}" - -inherit autotools-brokensep pkgconfig perlnative native python3-dir - -CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR} -I${STAGING_INCDIR}/tcl8.6" - -EXTRA_OECONF = " --with-tclconfig=${STAGING_LIBDIR_NATIVE} \ - --with-includes=${STAGING_INCDIR_NATIVE}/tcl${TCL_VER} \ -" - -EXTRA_OECONF_append = " \ - --with-tcl --with-openssl --with-perl \ - --with-libxml --with-libxslt \ - ${COMMON_CONFIGURE_FLAGS} \ -" - -do_configure_append() { - test -d build_py3 || mkdir build_py3 - cd build_py3 - ../configure --host=${HOST_SYS} \ - --build=${BUILD_SYS} \ - --target=${TARGET_SYS} \ - ${COMMON_CONFIGURE_FLAGS} - cd ${S} -} - -do_compile_append() { - oe_runmake -C contrib all - cd build_py3 - #cp ${S}/src/pl/plpython/*.o ${S}/build_py3/src/pl/plpython - oe_runmake -C src/backend/ submake-errcodes - oe_runmake -C src/pl/plpython -} - -# server needs to configure user and group -usernum = "28" -groupnum = "28" -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "-M -g postgres -o -r -d ${localstatedir}/lib/${BPN} \ - -s /bin/bash -c 'PostgreSQL Server' -u ${usernum} postgres" -GROUPADD_PARAM_${PN} = "-g ${groupnum} -o -r postgres" - -do_install_append() { - # Follow Deian, some files belong to /usr/bin - install -d ${D}${bindir} - oe_runmake -C ${S}/contrib install DESTDIR=${D} - install -m 0644 ${S}/src/pl/plpython/plpython3u* \ - ${D}${datadir}/${MAJOR_VER}/extension/ - #install -m 0755 ${S}/build_py3/src/pl/plpython/plpython3.so ${D}${libdir}/${MAJOR_VER}/lib - - # Remove the the absolute path to sysroot - sed -i -e "s|${STAGING_LIBDIR}|${libdir}|" \ - ${D}${libdir}/pkgconfig/*.pc -} - -SSTATE_SCAN_FILES += "Makefile.global" |