From 87b3cb8045d81fae0a99f13817bfa0c28c9b3576 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 15 Nov 2019 16:35:37 -0500 Subject: meta-openembedded: subtree update:3a9262866d..55de2d06ad MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adrian Bunk (1): python-more-itertools: Add PE Andreas Müller (1): Add gnome help packages to image according to IMAGE_LINGUAS Andreas Oberritter (2): live555: Move test progams out of main package pugixml: Update to version 1.10 André Draszik (7): gyp: update to fcd686f1880f gyp: provide a python2 version of gyp as gyp-py2 nodejs: ensure to use correct compiler & flags always nodejs: delete all bundled deps in do_unpack() if needed nodejs: allow use of system gyp nodejs: use OE-provided compiler flags (arm) nodejs: support long directory names for ${B} / ${S} Denys Dmytriyenko (1): mbedtls: upgrade 2.16.2 -> 2.16.3 Fabio Berton (5): python-importlib-metadata: Add native and nativesdk to BBCLASSEXTEND python-more-itertools: Add native and nativesdk to BBCLASSEXTEND python-pathlib2: Add native and nativesdk to BBCLASSEXTEND python-zipp: Add native and nativesdk to BBCLASSEXTEND python3-importlib-metadata: RDEPEND python3-misc only for target and nativesdk Khem Raj (13): sip: Upgrade to 4.19.19 cherokee: Update to latest cherokee: Fix build when time_t is 64bit tvheadend: Update to tip of master lowpan-tools: Blacklist as its deprecated use wpan-tools instead pidgin-sipe: Fix build when time_t is 64bit open-vm-tools: Enable tirpc explicitly, fix build with 64bit time_t python-systemd: Include endian.h for htobe16 tvheadend: Fix build with 64bit time_t tvheadend: Set CLEANBROKEN layer.conf: Add ttf-roboto->fontconfig to SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS layer.conf: Add phpmyadmin->php dep to SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS python-six: Update to 1.13.0 Michael Scott (1): modemmanager: Upgrade 1.10.6 -> 1.10.8 Nicola Lunghi (5): python3-gmqtt: add recipe python-backports-abc: update to 0.5.0 python-rfc3339-validator: add recipe python-rfc3986-validator: add recipe python-dbus-next: fix recipe position Peace Lee (1): guider: upgrade 3.9.4 -> 3.9.6 Trevor Gamblin (4): python3-werkzeug: upgrade from 0.14.1 to 0.16.0 python3-flask: upgrade from 1.0.2 to 1.1.1 python3-itsdangerous: upgrade from 0.24 to 1.1.0 zabbix: upgrade 4.2.8 -> 4.4.1 Yi Zhao (1): python-ipy: add recipes Zang Ruochen (15): fuse3: upgrade 3.7.0 -> 3.8.0 python-alembic: upgrade 1.2.1 -> 1.3.0 python-astroid: upgrade 2.3.2 -> 2.3.3 python-bitarray: upgrade 1.0.1 -> 1.1.0 python-cffi: upgrade 1.13.1 -> 1.13.2 python-dateutil: upgrade 2.8.0 -> 2.8.1 python-psutil: upgrade 5.6.3 -> 5.6.5 python-pycryptodome: upgrade 3.9.0 -> 3.9.3 python-pyparsing: upgrade 2.4.2 -> 2.4.5 python-pytest-helpers-namespace: upgrade 2016.7.10 -> 2019.1.8 python-pytest-runner: upgrade 5.1 -> 5.2 python-pytest-tempdir: upgrade 2016.8.20 -> 2019.10.12 python-requests-oauthlib: upgrade 0.8.0 -> 1.3.0 python-tornado: upgrade 5.1 -> 6.0.3 python-tqdm: upgrade 4.31.1 -> 4.38.0 Zheng Ruoqin (1): f2fs-tools: Update Homepage Change-Id: Ifc2d7bac36a719f2a4ead82b491d9817f212c56f Signed-off-by: Brad Bishop --- .../recipes-devtools/guider/guider_3.9.4.bb | 35 ------- .../recipes-devtools/guider/guider_3.9.6.bb | 35 +++++++ .../nodejs/nodejs/0006-Use-target-ldflags.patch | 24 ----- .../nodejs/0007-v8-don-t-override-ARM-CFLAGS.patch | 102 +++++++++++++++++++++ .../recipes-devtools/nodejs/nodejs_10.17.0.bb | 38 +++++++- .../recipes-devtools/pugixml/pugixml_1.10.bb | 20 ++++ .../recipes-devtools/pugixml/pugixml_1.9.bb | 20 ---- .../recipes-devtools/python/python-six_1.12.0.bb | 2 - .../recipes-devtools/python/python-six_1.13.0.bb | 2 + .../meta-oe/recipes-devtools/sip/sip.inc | 6 +- .../meta-oe/recipes-devtools/sip/sip3_4.19.16.bb | 11 --- .../meta-oe/recipes-devtools/sip/sip3_4.19.19.bb | 11 +++ .../meta-oe/recipes-devtools/sip/sip_4.19.16.bb | 11 --- .../meta-oe/recipes-devtools/sip/sip_4.19.19.bb | 11 +++ 14 files changed, 219 insertions(+), 109 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.6.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0007-v8-don-t-override-ARM-CFLAGS.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.10.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.9.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/python/python-six_1.12.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/python/python-six_1.13.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.16.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.19.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/sip/sip_4.19.16.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/sip/sip_4.19.19.bb (limited to 'meta-openembedded/meta-oe/recipes-devtools') diff --git a/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.4.bb b/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.4.bb deleted file mode 100644 index 1a413452a..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.4.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "runtime performance analyzer" -HOMEPAGE = "https://github.com/iipeace/guider" -BUGTRACKER = "https://github.com/iipeace/guider/issues" -AUTHOR = "Peace Lee " - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2" - -PV = "3.9.4+git${SRCPV}" -PR = "r0" - -SRC_URI = "git://github.com/iipeace/${BPN}" -#SRCREV = "${AUTOREV}" -SRCREV = "b433f3805674ef4588c1a161986c74eeac6a48e7" - -S = "${WORKDIR}/git" -R = "${RECIPE_SYSROOT}" - -inherit distutils - -GUIDER_OBJ = "guider.pyc" -GUIDER_SCRIPT = "guider" - -do_install() { - python ${S}/setup.py install - - install -d ${D}${bindir} - install -v -m 0755 ${STAGING_BINDIR_NATIVE}/${GUIDER_SCRIPT} ${D}${bindir}/${GUIDER_SCRIPT} - - install -d ${D}${datadir}/${BPN} - install -v -m 0755 ${STAGING_LIBDIR_NATIVE}/python${PYTHON_BASEVERSION}/site-packages/${BPN}/${GUIDER_OBJ} ${D}${datadir}/${BPN}/${GUIDER_OBJ} -} - -RDEPENDS_${PN} = "python-ctypes python-shell \ - python-json python-subprocess" diff --git a/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.6.bb b/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.6.bb new file mode 100644 index 000000000..0057db661 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.6.bb @@ -0,0 +1,35 @@ +SUMMARY = "runtime performance analyzer" +HOMEPAGE = "https://github.com/iipeace/guider" +BUGTRACKER = "https://github.com/iipeace/guider/issues" +AUTHOR = "Peace Lee " + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2" + +PV = "3.9.6+git${SRCPV}" +PR = "r0" + +SRC_URI = "git://github.com/iipeace/${BPN}" +#SRCREV = "${AUTOREV}" +SRCREV = "fef25c41efb9bde0614ea477d0b90bd9565ae0b4" + +S = "${WORKDIR}/git" +R = "${RECIPE_SYSROOT}" + +inherit distutils + +GUIDER_OBJ = "guider.pyc" +GUIDER_SCRIPT = "guider" + +do_install() { + python ${S}/setup.py install + + install -d ${D}${bindir} + install -v -m 0755 ${STAGING_BINDIR_NATIVE}/${GUIDER_SCRIPT} ${D}${bindir}/${GUIDER_SCRIPT} + + install -d ${D}${datadir}/${BPN} + install -v -m 0755 ${STAGING_LIBDIR_NATIVE}/python${PYTHON_BASEVERSION}/site-packages/${BPN}/${GUIDER_OBJ} ${D}${datadir}/${BPN}/${GUIDER_OBJ} +} + +RDEPENDS_${PN} = "python-ctypes python-shell \ + python-json python-subprocess" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch deleted file mode 100644 index f6569cd57..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch +++ /dev/null @@ -1,24 +0,0 @@ -The target LDFLAGS have been ignored. Tools like torque -have been loaded from system libraries, even if a native -one was the target. -|$ ldd torque -| libz.so.1 => /lib/x86_64-linux-gnu/libz.so.1 -| libcrypto.so.1.1 => /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 -| libssl.so.1.1 => /usr/lib/x86_64-linux-gnu/libssl.so.1.1 -| libicui18n.so.63 => not found -| libicuuc.so.63 => not found -... - -Signed-off-by: Andrej Valek - -diff -Naur node-v10.15.1/deps/v8/gypfiles/toolchain.gypi node-v10.15.1/deps/v8/gypfiles/toolchain.gypi ---- node-v10.15.1/deps/v8/gypfiles/toolchain.gypi 2019-03-18 15:01:39.000000000 +0100 -+++ node-v10.15.1/deps/v8/gypfiles/toolchain.gypi 2019-03-18 15:04:08.628361308 +0100 -@@ -1106,6 +1106,7 @@ - 'cflags': [ '-fno-strict-aliasing' ], - }], - ], # conditions -+ 'ldflags+': [ '$(LDFLAGS)' ], - }], - ['OS=="solaris"', { - 'defines': [ '__C99FEATURES__=1' ], # isinf() etc. diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0007-v8-don-t-override-ARM-CFLAGS.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0007-v8-don-t-override-ARM-CFLAGS.patch new file mode 100644 index 000000000..eb2cbfb8b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0007-v8-don-t-override-ARM-CFLAGS.patch @@ -0,0 +1,102 @@ +From 47ee5cc5501289205d3e8e9f27ea9daf18cebac1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= +Date: Sat, 9 Nov 2019 14:45:30 +0000 +Subject: [PATCH] v8: don't override ARM CFLAGS +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This overrides yocto-provided build flags with its own, e.g we get + arm-poky-linux-musleabi-g++ -mthumb -mfpu=neon -mfloat-abi=hard -mcpu=cortex-a7 \ + ... \ + -march=armv7-a -mfpu=neon -mfloat-abi=hard -marm + +Causing the latter to override the former, and compiler warnings: + cc1plus: warning: switch '-mcpu=cortex-a7' conflicts with '-march=armv7-a' switch + +Patch this out, so that yocto-provided flags take precedence. +Note that in reality the same should probably be done for all the other +supported architectures, too. + +Note that this also switches to Thumb(2) mode (in my case). No obvious +problems have been noted during compilation or runtime. + +Upstream-Status: Inappropriate [oe-specific] +Signed-off-by: André Draszik +--- + deps/v8/gypfiles/toolchain.gypi | 52 ++------------------------------- + 1 file changed, 2 insertions(+), 50 deletions(-) + +diff --git a/deps/v8/gypfiles/toolchain.gypi b/deps/v8/gypfiles/toolchain.gypi +index 910a212..1390b15 100644 +--- a/deps/v8/gypfiles/toolchain.gypi ++++ b/deps/v8/gypfiles/toolchain.gypi +@@ -199,31 +199,7 @@ + 'target_conditions': [ + ['_toolset=="host"', { + 'conditions': [ +- ['v8_target_arch==host_arch', { +- # Host built with an Arm CXX compiler. +- 'conditions': [ +- [ 'arm_version==7', { +- 'cflags': ['-march=armv7-a',], +- }], +- [ 'arm_version==7 or arm_version=="default"', { +- 'conditions': [ +- [ 'arm_fpu!="default"', { +- 'cflags': ['-mfpu=<(arm_fpu)',], +- }], +- ], +- }], +- [ 'arm_float_abi!="default"', { +- 'cflags': ['-mfloat-abi=<(arm_float_abi)',], +- }], +- [ 'arm_thumb==1', { +- 'cflags': ['-mthumb',], +- }], +- [ 'arm_thumb==0', { +- 'cflags': ['-marm',], +- }], +- ], +- }, { +- # 'v8_target_arch!=host_arch' ++ ['v8_target_arch!=host_arch', { + # Host not built with an Arm CXX compiler (simulator build). + 'conditions': [ + [ 'arm_float_abi=="hard"', { +@@ -242,31 +218,7 @@ + }], # _toolset=="host" + ['_toolset=="target"', { + 'conditions': [ +- ['v8_target_arch==target_arch', { +- # Target built with an Arm CXX compiler. +- 'conditions': [ +- [ 'arm_version==7', { +- 'cflags': ['-march=armv7-a',], +- }], +- [ 'arm_version==7 or arm_version=="default"', { +- 'conditions': [ +- [ 'arm_fpu!="default"', { +- 'cflags': ['-mfpu=<(arm_fpu)',], +- }], +- ], +- }], +- [ 'arm_float_abi!="default"', { +- 'cflags': ['-mfloat-abi=<(arm_float_abi)',], +- }], +- [ 'arm_thumb==1', { +- 'cflags': ['-mthumb',], +- }], +- [ 'arm_thumb==0', { +- 'cflags': ['-marm',], +- }], +- ], +- }, { +- # 'v8_target_arch!=target_arch' ++ ['v8_target_arch!=target_arch', { + # Target not built with an Arm CXX compiler (simulator build). + 'conditions': [ + [ 'arm_float_abi=="hard"', { +-- +2.23.0.rc1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb index 4013c6931..8c690ae7d 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=be980eb7ccafe287cb438076a65e888c" DEPENDS = "openssl" DEPENDS_append_class-target = " nodejs-native" -inherit pkgconfig +inherit pkgconfig pythonnative COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*" COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*" @@ -19,7 +19,7 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ file://0004-Make-compatibility-with-gcc-4.8.patch \ file://0005-Link-atomic-library.patch \ - file://0006-Use-target-ldflags.patch \ + file://0007-v8-don-t-override-ARM-CFLAGS.patch \ " SRC_URI_append_class-target = " \ file://0002-Using-native-torque.patch \ @@ -53,14 +53,46 @@ ARCHFLAGS ?= "" PACKAGECONFIG ??= "ares icu libuv zlib" PACKAGECONFIG[ares] = "--shared-cares,,c-ares" +PACKAGECONFIG[gyp] = ",,gyp-py2-native" PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" PACKAGECONFIG[libuv] = "--shared-libuv,,libuv" PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2" PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" +# We don't want to cross-compile during target compile, +# and we need to use the right flags during host compile, +# too. +EXTRA_OEMAKE = "\ + CC.host='${CC}' \ + CFLAGS.host='${CPPFLAGS} ${CFLAGS}' \ + CXX.host='${CXX}' \ + CXXFLAGS.host='${CPPFLAGS} ${CXXFLAGS}' \ + LDFLAGS.host='${LDFLAGS}' \ + AR.host='${AR}' \ + \ + builddir_name=./ \ +" + +python do_unpack() { + import shutil + + bb.build.exec_func('base_do_unpack', d) + + shutil.rmtree(d.getVar('S') + '/deps/openssl', True) + if 'ares' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/cares', True) + if 'gyp' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/tools/gyp', True) + if 'libuv' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/uv', True) + if 'nghttp2' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/nghttp2', True) + if 'zlib' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/zlib', True) +} + # Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi do_configure () { - rm -rf ${S}/deps/openssl export LD="${CXX}" GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES # $TARGET_ARCH settings don't match --dest-cpu settings diff --git a/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.10.bb b/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.10.bb new file mode 100644 index 000000000..d48ad3751 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.10.bb @@ -0,0 +1,20 @@ +SUMMARY = "Light-weight C++ XML Processing Library" +DESCRIPTION = "pugixml is a C++ XML processing library, which consists of a \ +DOM-like interface with rich traversal/modification capabilities, \ +an extremely fast XML parser which constructs the DOM tree from \ +n XML file/buffer, and an XPath 1.0 implementation for complex \ +data-driven tree queries." +HOMPAGE = "https://pugixml.org/" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://readme.txt;beginline=29;endline=52;md5=d5ee91fb74cbb64223b3693fd64eb169" + +SRC_URI = "https://github.com/zeux/${BPN}/releases/download/v${PV}/${BP}.tar.gz" +SRC_URI[md5sum] = "f97237e9908201c6d8536210747b66af" +SRC_URI[sha256sum] = "55f399fbb470942410d348584dc953bcaec926415d3462f471ef350f29b5870a" + +inherit cmake + +EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON \ + -DCMAKE_BUILD_TYPE=Release \ + " diff --git a/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.9.bb b/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.9.bb deleted file mode 100644 index ad45f87ec..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.9.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Light-weight C++ XML Processing Library" -DESCRIPTION = "pugixml is a C++ XML processing library, which consists of a \ -DOM-like interface with rich traversal/modification capabilities, \ -an extremely fast XML parser which constructs the DOM tree from \ -n XML file/buffer, and an XPath 1.0 implementation for complex \ -data-driven tree queries." -HOMPAGE = "https://pugixml.org/" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://readme.txt;beginline=29;endline=52;md5=1d569c2ed59c94ddd9586051f8c67da6" - -SRC_URI = "https://github.com/zeux/${BPN}/releases/download/v${PV}/${BP}.tar.gz" -SRC_URI[md5sum] = "7286ee2ed11376b6b780ced19fae0b64" -SRC_URI[sha256sum] = "d156d35b83f680e40fd6412c4455fdd03544339779134617b9b28d19e11fdba6" - -inherit cmake - -EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON \ - -DCMAKE_BUILD_TYPE=Release \ - " diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python-six_1.12.0.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python-six_1.12.0.bb deleted file mode 100644 index af26e83d6..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/python/python-six_1.12.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools -require recipes-devtools/python/python-six.inc diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python-six_1.13.0.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python-six_1.13.0.bb new file mode 100644 index 000000000..af26e83d6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/python/python-six_1.13.0.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require recipes-devtools/python/python-six.inc diff --git a/meta-openembedded/meta-oe/recipes-devtools/sip/sip.inc b/meta-openembedded/meta-oe/recipes-devtools/sip/sip.inc index 092531b32..d8e32a768 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/sip/sip.inc +++ b/meta-openembedded/meta-oe/recipes-devtools/sip/sip.inc @@ -5,9 +5,9 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303" SRC_URI = "https://www.riverbankcomputing.com/static/Downloads/sip/${PV}/sip-${PV}.tar.gz \ - " -SRC_URI[md5sum] = "7e854b0da395ddc8fb5da82d0321994d" -SRC_URI[sha256sum] = "184c790d58e9527fc6bdac2bbf8638f3d1b41dea922cad8eb83172b4ba70c620" +" +SRC_URI[md5sum] = "98111479309dc472410f26080d6d4a88" +SRC_URI[sha256sum] = "5436b61a78f48c7e8078e93a6b59453ad33780f80c644e5f3af39f94be1ede44" S = "${WORKDIR}/sip-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.16.bb b/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.16.bb deleted file mode 100644 index 010fa30fe..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.16.bb +++ /dev/null @@ -1,11 +0,0 @@ -require sip.inc - -DEPENDS = "python3" - -inherit python3-dir python3native - -PACKAGES += "python3-sip3" - -FILES_python3-sip3 = "${libdir}/${PYTHON_DIR}/site-packages/" -FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug" - diff --git a/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.19.bb b/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.19.bb new file mode 100644 index 000000000..010fa30fe --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.19.bb @@ -0,0 +1,11 @@ +require sip.inc + +DEPENDS = "python3" + +inherit python3-dir python3native + +PACKAGES += "python3-sip3" + +FILES_python3-sip3 = "${libdir}/${PYTHON_DIR}/site-packages/" +FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug" + diff --git a/meta-openembedded/meta-oe/recipes-devtools/sip/sip_4.19.16.bb b/meta-openembedded/meta-oe/recipes-devtools/sip/sip_4.19.16.bb deleted file mode 100644 index 3da15b842..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/sip/sip_4.19.16.bb +++ /dev/null @@ -1,11 +0,0 @@ -require sip.inc - -DEPENDS = "python" - -inherit python-dir pythonnative - -PACKAGES += "python-sip" - -FILES_python-sip = "${libdir}/${PYTHON_DIR}/site-packages/" -FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug" - diff --git a/meta-openembedded/meta-oe/recipes-devtools/sip/sip_4.19.19.bb b/meta-openembedded/meta-oe/recipes-devtools/sip/sip_4.19.19.bb new file mode 100644 index 000000000..3da15b842 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/sip/sip_4.19.19.bb @@ -0,0 +1,11 @@ +require sip.inc + +DEPENDS = "python" + +inherit python-dir pythonnative + +PACKAGES += "python-sip" + +FILES_python-sip = "${libdir}/${PYTHON_DIR}/site-packages/" +FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug" + -- cgit v1.2.3