add 7 recipes & upgrade 1 recipe
cover add 7 recipes & upgrade 1 recipe
The following changes since commit 1cbd1bc195017312ba8cf670b340f61a2ac6207b:
unionfs-fuse: 0.26 -> 2.0 (2017-07-14 23:45:53 +0200)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib hongxu/add-recipe2
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=hongxu/add-recipe2
Hongxu Jia (8):
libgnomekbd: 2.32 -> 3.22
python3-pykickstart: add recipe 2.35
python3-meh: add recipe 0.45
usermode: add recipe 1.111
isomd5sum: add recipe 1.2.1
satyr: add recipe 0.23
libtar: add recipe 1.2.20
xmlrpc-c: add recipe 1.31.0
.../gnome-settings-daemon_2.32.1.bb | 3 - .../recipes-gnome/libgnome/libgnomekbd_2.32.0.bb | 20 --- .../recipes-gnome/libgnome/libgnomekbd_3.22.0.bb | 17 +++ .../recipes-support/usermode/usermode_1.111.bb | 25 ++++ .../recipes-devtools/xmlrpc-c/xmlrpc-c_1.31.0.bb | 22 +++ .../files/0001-tweak-install-prefix.patch | 60 ++++++++ .../isomd5sum/files/0002-fix-parallel-error.patch | 33 +++++ .../recipes-extended/isomd5sum/isomd5sum_1.2.1.bb | 35 +++++ .../libtar/files/0002-Do-not-strip-libtar.patch | 25 ++++ .../libtar/files/fix_libtool_sysroot.patch | 19 +++ meta-oe/recipes-support/libtar/libtar_1.2.20.bb | 21 +++ .../satyr/files/0001-do-not-support-python2.patch | 84 ++++++++++++ meta-oe/recipes-support/satyr/satyr_0.23.bb | 32 +++++ .../files/tweak-native-language-support.patch | 44 ++++++ .../python-meh/python3-meh_0.45.bb | 17 +++ ...0001-support-authentication-for-kickstart.patch | 151 +++++++++++++++++++++ ...-parser.py-add-lock-for-readKickstart-and.patch | 76 +++++++++++ ...-sections-shutdown-and-environment-in-gen.patch | 48 +++++++ ...d.py-retry-to-invoke-request-with-timeout.patch | 82 +++++++++++ .../python-pykickstart/python3-pykickstart_2.35.bb | 26 ++++ 20 files changed, 817 insertions(+), 23 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb create mode 100644 meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.22.0.bb create mode 100644 meta-gnome/recipes-support/usermode/usermode_1.111.bb create mode 100644 meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.31.0.bb create mode 100644 meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch create mode 100644 meta-oe/recipes-extended/isomd5sum/files/0002-fix-parallel-error.patch create mode 100644 meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.1.bb create mode 100644 meta-oe/recipes-support/libtar/files/0002-Do-not-strip-libtar.patch create mode 100644 meta-oe/recipes-support/libtar/files/fix_libtool_sysroot.patch create mode 100644 meta-oe/recipes-support/libtar/libtar_1.2.20.bb create mode 100644 meta-oe/recipes-support/satyr/files/0001-do-not-support-python2.patch create mode 100644 meta-oe/recipes-support/satyr/satyr_0.23.bb create mode 100644 meta-python/recipes-extended/python-meh/files/tweak-native-language-support.patch create mode 100644 meta-python/recipes-extended/python-meh/python3-meh_0.45.bb create mode 100644 meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch create mode 100644 meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch create mode 100644 meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch create mode 100644 meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch create mode 100644 meta-python/recipes-extended/python-pykickstart/python3-pykickstart_2.35.bb
Signature · 1 line
2.8.1
PATCH 1/8 libgnomekbd: 2.32 -> 3.22
Remove --disable-schemas-install:
...
|QA Issue: libgnomekbd: configure was passed unrecognised
options: --disable-schemas-install [unknown-configure-option]
...
--- .../gnome-settings-daemon_2.32.1.bb | 3 --- .../recipes-gnome/libgnome/libgnomekbd_2.32.0.bb | 20 -------------------- .../recipes-gnome/libgnome/libgnomekbd_3.22.0.bb | 17 +++++++++++++++++ 3 files changed, 17 insertions(+), 23 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb create mode 100644 meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.22.0.bb
meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb +0 -3
@@ -40,7 +40,4 @@ FILES_${PN}-dbg += "${libdir}/gnome-settings-daemon-2.0/.debug" FILES_${PN}-dev += "${libdir}/gnome-settings-daemon-2.0/*.la" FILES_${PN}-staticdev += "${libdir}/gnome-settings-daemon-2.0/*.a" - -PNBLACKLIST[gnome-settings-daemon] ?= "Depends on blacklisted libgnomekbd - the recipe will be removed on 2017-09-01 unless the issue is fixed" - PNBLACKLIST[gnome-settings-daemon] ?= "Depends on blacklisted gnome-desktop - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb deleted +0 -20
@@ -1,20 +0,0 @@ -SUMMARY = "GNOME keyboard library" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812" - -SECTION = "x11/gnome/libs" - -DEPENDS = "gconf gtk+ glib-2.0 libxklavier intltool-native gnome-common-native" - -inherit gnome - -SRC_URI[archive.md5sum] = "de32a6e3e3464b566eecdc4332bf34bd" -SRC_URI[archive.sha256sum] = "ddd52c4cc7d83ad7ef964a1bcb4db87407e65b00ffc3e70c088ca4ee7383d256" -GNOME_COMPRESS_TYPE="bz2" - -do_configure_append() { - find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g - find ${B} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g -} - -PNBLACKLIST[libgnomekbd] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130608/ - the recipe will be removed on 2017-09-01 unless the issue is fixed"
meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.22.0.bb new file +17 -0
@@ -0,0 +1,17 @@ +SUMMARY = "GNOME keyboard library" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812" + +SECTION = "x11/gnome/libs" + +DEPENDS = "gconf glib-2.0 libxklavier gtk+3 intltool-native" + +inherit gnome gobject-introspection gettext + +GNOME_COMPRESS_TYPE = "xz" + +SRC_URI[archive.md5sum] = "7b1ebf99f4254c99922163c262c7ff04" +SRC_URI[archive.sha256sum] = "340b30dabfebbd4e0e6c0fe34a378966dd5640b5d44595ab8a19b0be255d77df" + +EXTRA_OECONF_remove = "--disable-schemas-install" +
Signature · 1 line
2.8.1
PATCH 2/8 python3-pykickstart: add recipe 2.35
In reply to Hongxu Jia--- ...0001-support-authentication-for-kickstart.patch | 151 +++++++++++++++++++++ ...-parser.py-add-lock-for-readKickstart-and.patch | 76 +++++++++++ ...-sections-shutdown-and-environment-in-gen.patch | 48 +++++++ ...d.py-retry-to-invoke-request-with-timeout.patch | 82 +++++++++++ .../python-pykickstart/python3-pykickstart_2.35.bb | 26 ++++ 5 files changed, 383 insertions(+) create mode 100644 meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch create mode 100644 meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch create mode 100644 meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch create mode 100644 meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch create mode 100644 meta-python/recipes-extended/python-pykickstart/python3-pykickstart_2.35.bb
meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch new file +151 -0
@@ -0,0 +1,151 @@ +From d0d8890b5ef74c315381c9e1cff4b1d32892116b Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Thu, 1 Jun 2017 15:07:36 +0800 +Subject: [PATCH 1/4] support authentication for kickstart + +While download kickstart file from web server, +we support basic/digest authentication. + +Add KickstartAuthError to report authentication failure, +which the invoker could parse this specific error. + +Upstream-Status: inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <[email protected]> +--- + pykickstart/errors.py | 19 +++++++++++++++++++ + pykickstart/load.py | 32 +++++++++++++++++++++++++++----- + pykickstart/parser.py | 4 ++-- + 3 files changed, 48 insertions(+), 7 deletions(-) + +diff --git a/pykickstart/errors.py b/pykickstart/errors.py +index b76e84c..fd81bc8 100644 +--- a/pykickstart/errors.py ++++ b/pykickstart/errors.py +@@ -35,6 +35,10 @@ It also exports several exception classes: + + KickstartVersionError - An exception for errors relating to unsupported + syntax versions. ++ ++ KickstartAuthError - An exception for errors relating to authentication ++ failed while downloading kickstart from web server ++ + """ + import warnings + +@@ -103,3 +107,18 @@ class KickstartVersionError(KickstartError): + + def __str__ (self): + return self.value ++ ++class KickstartAuthError(KickstartError): ++ """An exception for errors relating to authentication failed while ++ downloading kickstart from web server ++ """ ++ def __init__(self, msg): ++ """Create a new KickstartAuthError exception instance with the ++ descriptive message val. val should be the return value of ++ formatErrorMsg. ++ """ ++ KickstartError.__init__(self, msg) ++ ++ def __str__(self): ++ return self.value ++ +diff --git a/pykickstart/load.py b/pykickstart/load.py +index 1f69b9c..0f5741b 100644 +--- a/pykickstart/load.py ++++ b/pykickstart/load.py +@@ -18,10 +18,13 @@ + # with the express permission of Red Hat, Inc. + # + import requests ++from requests.auth import HTTPDigestAuth ++from requests.auth import HTTPBasicAuth ++ + import shutil + import six + +-from pykickstart.errors import KickstartError ++from pykickstart.errors import KickstartError, KickstartAuthError + from pykickstart.i18n import _ + from requests.exceptions import SSLError, RequestException + +@@ -29,7 +32,7 @@ _is_url = lambda location: '://' in location # RFC 3986 + + SSL_VERIFY = True + +-def load_to_str(location): ++def load_to_str(location, user=None, passwd=None): + '''Load a destination URL or file into a string. + Type of input is inferred automatically. + +@@ -40,7 +43,7 @@ def load_to_str(location): + Raises: KickstartError on error reading''' + + if _is_url(location): +- return _load_url(location) ++ return _load_url(location, user=user, passwd=passwd) + else: + return _load_file(location) + +@@ -71,13 +74,32 @@ def load_to_file(location, destination): + _copy_file(location, destination) + return destination + ++def _get_auth(location, user=None, passwd=None): ++ ++ auth = None ++ request = requests.get(location, verify=SSL_VERIFY) ++ if request.status_code == requests.codes.unauthorized: ++ if user is None or passwd is None: ++ log.info("Require Authentication") ++ raise KickstartAuthError("Require Authentication.\nAppend 'ksuser=<username> kspasswd=<password>' to boot command") + ++ reasons = request.headers.get("WWW-Authenticate", "").split() ++ if reasons: ++ auth_type = reasons[0] ++ if auth_type == "Basic": ++ auth = HTTPBasicAuth(user, passwd) ++ elif auth_type == "Digest": ++ auth=HTTPDigestAuth(user, passwd) + +-def _load_url(location): ++ return auth ++ ++def _load_url(location, user=None, passwd=None): + '''Load a location (URL or filename) and return contents as string''' + ++ auth = _get_auth(location, user=user, passwd=passwd) ++ + try: +- request = requests.get(location, verify=SSL_VERIFY) ++ request = requests.get(location, verify=SSL_VERIFY, auth=auth) + except SSLError as e: + raise KickstartError(_('Error securely accessing URL "%s"') % location + ': {e}'.format(e=str(e))) + except RequestException as e: +diff --git a/pykickstart/parser.py b/pykickstart/parser.py +index d2b0fbe..26b5de9 100644 +--- a/pykickstart/parser.py ++++ b/pykickstart/parser.py +@@ -773,7 +773,7 @@ class KickstartParser(object): + i = PutBackIterator(s.splitlines(True) + [""]) + self._stateMachine (i) + +- def readKickstart(self, f, reset=True): ++ def readKickstart(self, f, reset=True, username=None, password=None): + """Process a kickstart file, given by the filename f.""" + if reset: + self._reset() +@@ -794,7 +794,7 @@ class KickstartParser(object): + self.currentdir[self._includeDepth] = cd + + try: +- s = load_to_str(f) ++ s = load_to_str(f, user=username, passwd=password) + except KickstartError as e: + raise KickstartError(formatErrorMsg(0, msg=_("Unable to open input kickstart file: %s") % str(e))) + +-- +2.7.4 +
meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch new file +76 -0
76 lines not on this page · raw message
meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch new file +48 -0
48 lines not on this page · raw message
meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch new file +82 -0
82 lines not on this page · raw message
meta-python/recipes-extended/python-pykickstart/python3-pykickstart_2.35.bb new file +26 -0
@@ -0,0 +1,26 @@ +DESCRIPTION = "A python library for manipulating kickstart files" +HOMEPAGE = "http://fedoraproject.org/wiki/pykickstart" +LICENSE = "GPLv2+" + +LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +DEPENDS = "python3" +RDEPENDS_${PN} = "python3 \ + python3-requests \ + python3-six \ +" + +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/rhinstaller/pykickstart.git;protocol=https;branch=pykickstart-2 \ + file://0001-support-authentication-for-kickstart.patch \ + file://0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch \ + file://0003-comment-out-sections-shutdown-and-environment-in-gen.patch \ + file://0004-load.py-retry-to-invoke-request-with-timeout.patch \ + " +SRCREV = "b2787a818540e678c2f9c5dca0c6bbd65b8b55e5" + +inherit setuptools3 + +PROVIDES = "pykickstart" +RPROVIDES_${PN} = "pykickstart"
Signature · 1 line
2.8.1
PATCH 3/8 python3-meh: add recipe 0.45
In reply to Hongxu Jia--- .../files/tweak-native-language-support.patch | 44 ++++++++++++++++++++++ .../python-meh/python3-meh_0.45.bb | 17 +++++++++ 2 files changed, 61 insertions(+) create mode 100644 meta-python/recipes-extended/python-meh/files/tweak-native-language-support.patch create mode 100644 meta-python/recipes-extended/python-meh/python3-meh_0.45.bb
meta-python/recipes-extended/python-meh/files/tweak-native-language-support.patch new file +44 -0
@@ -0,0 +1,44 @@ +From 6e7689bced8ef56cfb5969560d23706f8e039807 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Mon, 11 Apr 2016 23:01:19 -0400 +Subject: [PATCH] tweak native language support + +- Only support en_GB only. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <[email protected]> +--- + Makefile | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index d0a9784..db152c4 100644 +--- a/Makefile ++++ b/Makefile +@@ -24,7 +24,7 @@ test: + PYTHONPATH=. python $(TESTSUITE) -v + + install: +- python setup.py install --root=$(DESTDIR) ++ python setup.py install --root=$(DESTDIR) --install-lib=${PYTHON_SITEPACKAGES_DIR} --prefix=${prefix} + $(MAKE) -C po install + + ChangeLog: +@@ -61,6 +61,13 @@ rpmlog: + @git log --pretty="format:- %s (%ae)" $(TAG).. |sed -e 's/@.*)/)/' + @echo + ++po-empty: ++ for lingua in "en_GB" ; do \ ++ [ -f po/$$lingua.po ] || \ ++ msginit -i po/$(PKGNAME).pot -o po/$$lingua.po -l $$lingua --no-translator || \ ++ exit 1 ; \ ++ done ++ + potfile: + $(MAKE) -C po potfile + +-- +1.9.1 +
meta-python/recipes-extended/python-meh/python3-meh_0.45.bb new file +17 -0
@@ -0,0 +1,17 @@ +SUMMARY = "A python library for handling exceptions" +DESCRIPTION = "The python-meh package is a python library for handling, saving, and reporting \ +exceptions." +HOMEPAGE = "http://git.fedorahosted.org/git/?p=python-meh.git" +LICENSE = "GPLv2+" + +inherit setuptools3 + +S = "${WORKDIR}/git" + +SRC_URI = "git://github.com/rhinstaller/python-meh.git;protocol=https;branch=master \ +" +SRCREV = "2bfc751fd680515d44f7096945a1e282a1f7d6aa" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +FILES_${PN} += "${datadir}/*" +
Signature · 1 line
2.8.1
PATCH 4/8 usermode: add recipe 1.111
In reply to Hongxu Jia--- .../recipes-support/usermode/usermode_1.111.bb | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 meta-gnome/recipes-support/usermode/usermode_1.111.bb
meta-gnome/recipes-support/usermode/usermode_1.111.bb new file +25 -0
@@ -0,0 +1,25 @@ +DESCRIPTION = "The usermode contains the userhelper program, which can be used to allow configured \ +programs to be run with superuser privileges by ordinary users, and several \ +graphical tools for users: \ +* userinfo allows users to change their finger information. \ +* usermount lets users mount, unmount, and format filesystems. \ +* userpasswd allows users to change their passwords. \ +" +HOMEPAGE = "https://pagure.io/usermode" +LICENSE = "GPLv2+" +DEPENDS = "libuser ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \ + gtk+ desktop-file-utils-native \ + startup-notification intltool-native \ + util-linux \ +" + +SRC_URI = "https://releases.pagure.org/${BPN}/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "28ba510fbd8da9f4e86e57d6c31cff29" +SRC_URI[sha256sum] = "3dd0b9639b5bd396b7ea5fada6aaa694dbfdaa3ad06eb95a6eabcdfd02f875c6" + +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +inherit autotools gettext pkgconfig + +EXTRA_OEMAKE += "INSTALL='install -p'" +
Signature · 1 line
2.8.1
PATCH 5/8 isomd5sum: add recipe 1.2.1
In reply to Hongxu Jia--- .../files/0001-tweak-install-prefix.patch | 60 ++++++++++++++++++++++ .../isomd5sum/files/0002-fix-parallel-error.patch | 33 ++++++++++++ .../recipes-extended/isomd5sum/isomd5sum_1.2.1.bb | 35 +++++++++++++ 3 files changed, 128 insertions(+) create mode 100644 meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch create mode 100644 meta-oe/recipes-extended/isomd5sum/files/0002-fix-parallel-error.patch create mode 100644 meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.1.bb
meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch new file +60 -0
@@ -0,0 +1,60 @@ +From cffe4767f89ea0b54b57e8bf9065a08a9c38d46e Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Tue, 18 Jul 2017 21:53:00 -0400 +Subject: [PATCH] tweak install prefix + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <[email protected]> +--- + Makefile | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/Makefile b/Makefile +index df16a3b..fbdfcb4 100644 +--- a/Makefile ++++ b/Makefile +@@ -39,26 +39,26 @@ pyisomd5sum.so: $(PYOBJS) + install: all install-bin install-python install-devel + + install-bin: +- install -d -m 0755 $(DESTDIR)/usr/bin +- install -d -m 0755 $(DESTDIR)/usr/share/man/man1 +- install -m 0755 implantisomd5 $(DESTDIR)/usr/bin +- install -m 0755 checkisomd5 $(DESTDIR)/usr/bin +- install -m 0644 implantisomd5.1 $(DESTDIR)/usr/share/man/man1 +- install -m 0644 checkisomd5.1 $(DESTDIR)/usr/share/man/man1 ++ install -d -m 0755 $(DESTDIR)$(bindir) ++ install -d -m 0755 $(DESTDIR)$(mandir)/man1 ++ install -m 0755 implantisomd5 $(DESTDIR)$(bindir) ++ install -m 0755 checkisomd5 $(DESTDIR)$(bindir) ++ install -m 0644 implantisomd5.1 $(DESTDIR)$(mandir)/man1 ++ install -m 0644 checkisomd5.1 $(DESTDIR)$(mandir)/man1 + + install-python: + install -d -m 0755 $(DESTDIR)$(PYTHONSITEPACKAGES) + install -m 0755 pyisomd5sum.so $(DESTDIR)$(PYTHONSITEPACKAGES) + + install-devel: +- install -d -m 0755 $(DESTDIR)/usr/include +- install -d -m 0755 $(DESTDIR)/usr/$(LIBDIR) +- install -d -m 0755 $(DESTDIR)/usr/share/pkgconfig +- install -m 0644 libimplantisomd5.h $(DESTDIR)/usr/include/ +- install -m 0644 libcheckisomd5.h $(DESTDIR)/usr/include/ +- install -m 0644 libimplantisomd5.a $(DESTDIR)/usr/$(LIBDIR) +- install -m 0644 libcheckisomd5.a $(DESTDIR)/usr/$(LIBDIR) +- sed "s#@VERSION@#${VERSION}#g; s#@includedir@#${DESTDIR}/usr/include#g; s#@libdir@#${DESTDIR}/usr/${LIBDIR}#g" isomd5sum.pc.in > ${DESTDIR}/usr/share/pkgconfig/isomd5sum.pc ++ install -d -m 0755 $(DESTDIR)$(includedir) ++ install -d -m 0755 $(DESTDIR)$(libdir) ++ install -d -m 0755 $(DESTDIR)${datadir}/pkgconfig ++ install -m 0644 libimplantisomd5.h $(DESTDIR)$(includedir) ++ install -m 0644 libcheckisomd5.h $(DESTDIR)$(includedir) ++ install -m 0644 libimplantisomd5.a $(DESTDIR)$(libdir) ++ install -m 0644 libcheckisomd5.a $(DESTDIR)$(libdir) ++ sed "s#@VERSION@#${VERSION}#g; s#@includedir@#${DESTDIR}/usr/include#g; s#@libdir@#${DESTDIR}/usr/${LIBDIR}#g" isomd5sum.pc.in > ${DESTDIR}${datadir}/pkgconfig/isomd5sum.pc + + clean: + rm -f *.o *.so *.pyc *.a .depend *~ +-- +2.8.1 +
meta-oe/recipes-extended/isomd5sum/files/0002-fix-parallel-error.patch new file +33 -0
@@ -0,0 +1,33 @@ +From 2acce7bc8ab7711e76c7765c84a198fe38f247f3 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Tue, 18 Jul 2017 23:06:41 -0400 +Subject: [PATCH] fix parallel error + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <[email protected]> +--- + Makefile | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index fbdfcb4..2ad3238 100644 +--- a/Makefile ++++ b/Makefile +@@ -29,9 +29,11 @@ implantisomd5: implantisomd5.o libimplantisomd5.a + checkisomd5: checkisomd5.o libcheckisomd5.a + $(CC) $(CPPFLAGS) $(CFLAGS) checkisomd5.o libcheckisomd5.a -lpopt $(LDFLAGS) -o checkisomd5 + +-libimplantisomd5.a: libimplantisomd5.a(libimplantisomd5.o md5.o utilities.o) ++libimplantisomd5.a: libimplantisomd5.o md5.o utilities.o ++ $(AR) rv $@ $^ + +-libcheckisomd5.a: libcheckisomd5.a(libcheckisomd5.o md5.o utilities.o) ++libcheckisomd5.a: libcheckisomd5.o md5.o utilities.o ++ $(AR) rv $@ $^ + + pyisomd5sum.so: $(PYOBJS) + $(CC) $(CPPFLAGS) $(CFLAGS) -shared -g -fpic $(PYOBJS) $(LDFLAGS) -o pyisomd5sum.so +-- +2.8.1 +
meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.1.bb new file +35 -0
@@ -0,0 +1,35 @@ +SUMMARY = "Tools for taking the MD5 sum of ISO images" +DESCRIPTION = "Tools for taking the MD5 sum of ISO images" + +DEPENDS = "popt python3 openssl curl popt-native" +RDEPENDS_${PN} = "openssl curl" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" + +SRC_URI = "git://github.com/rhinstaller/isomd5sum.git;branch=master \ + file://0001-tweak-install-prefix.patch \ + file://0002-fix-parallel-error.patch \ +" + +S = "${WORKDIR}/git" +inherit python3native + +EXTRA_OEMAKE += " \ + DESTDIR='${D}' \ + PYTHONINCLUDE='-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}' \ + PYTHONSITEPACKAGES='${PYTHON_SITEPACKAGES_DIR}' \ +" + +do_install () { + oe_runmake install +} + +PACKAGES += "${PYTHON_PN}-${PN} ${PYTHON_PN}-${PN}-dbg" + +FILES_${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so" +FILES_${PYTHON_PN}-${PN}-dbg = "${PYTHON_SITEPACKAGES_DIR}/.debug/pyisomd5sum.so" + +SRCREV = "69dc036d20761715b734ca9cc59ecc6dc8145026" + +BBCLASSEXTEND = "native"
Signature · 1 line
2.8.1
PATCH 6/8 satyr: add recipe 0.23
In reply to Hongxu Jia--- .../satyr/files/0001-do-not-support-python2.patch | 84 ++++++++++++++++++++++ meta-oe/recipes-support/satyr/satyr_0.23.bb | 32 +++++++++ 2 files changed, 116 insertions(+) create mode 100644 meta-oe/recipes-support/satyr/files/0001-do-not-support-python2.patch create mode 100644 meta-oe/recipes-support/satyr/satyr_0.23.bb
meta-oe/recipes-support/satyr/files/0001-do-not-support-python2.patch new file +84 -0
@@ -0,0 +1,84 @@ +From 206f334d62da17093e784094c9d9e80c853f704f Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Fri, 12 May 2017 03:03:46 -0400 +Subject: [PATCH] do not support python2 + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <[email protected]> +--- + configure.ac | 16 ---------------- + python/Makefile.am | 24 ------------------------ + 2 files changed, 40 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 200a7cc..8431c51 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -22,22 +22,6 @@ AM_MISSING_PROG([AUTOM4TE], [autom4te]) + # Needed by tests/atlocal.in. + AC_SUBST([O0CFLAGS], [`echo $CFLAGS | sed 's/-O[[0-9]] *//'`]) + +-AM_PATH_PYTHON +-AM_CONDITIONAL([HAVE_PYTHON], test -n "$PYTHON") +-[if test -z "$PYTHON"; then] +- [echo "The python interpreter was not found in the search path. The Python language bindings"] +- [echo "will not be built. If you want to build the Python language bindings, please ensure"] +- [echo "that python is installed and its directory is included in the search path."] +- [echo "Then run configure again before attempting to build Satyr."] +-[fi] +- +-# Just PKG_CHECK_MODULES([PYTHON], [python]) works only with python2.7+ +-# Below, if python is not found, we set up for python2.6 w/o checking: +-PKG_CHECK_MODULES([PYTHON], [python2],,[ +- PYTHON_LIBS='-L/usr/lib64 -lpython2.6' +- PYTHON_CFLAGS='-I/usr/include/python2.6' +-]) +- + AC_ARG_ENABLE([python-manpage], + [AS_HELP_STRING([--disable-python-manpage], + [Disable python bindings manpage build])], +diff --git a/python/Makefile.am b/python/Makefile.am +index 36fc2e9..0b73f66 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -1,12 +1,5 @@ + SUBDIRS = . doc + +-py2satyrdir = $(pyexecdir)/satyr +- +-py2satyr_PYTHON = \ +- __init__.py +- +-py2satyr_LTLIBRARIES = _satyr.la +- + PYEXTFILES = \ + py_cluster.h \ + py_cluster.c \ +@@ -75,23 +68,6 @@ PYEXTLDFLAGS = \ + -module \ + -avoid-version + +-_satyr_la_SOURCES = $(PYEXTFILES) +-_satyr_la_CPPFLAGS = \ +- $(PYEXTCPPFLAGS) \ +- $(PYTHON_CFLAGS) +-_satyr_la_LDFLAGS = \ +- $(PYEXTLDFLAGS) \ +- -export-symbols-regex init_satyr +- +-# Depending on the configure option, we either link libsatyr.so dynamically (as +-# is usual), or directly include its object files (by including the +-# convenience library). +-if ENABLE_STATIC_PYTHON_MODULE +-_satyr_la_LIBADD = ../lib/libsatyr_conv.la +-else +-_satyr_la_LIBADD = ../lib/libsatyr.la +-endif +- + if WITH_PYTHON3 + py3satyrdir = $(py3execdir)/satyr + +-- +2.8.1 +
meta-oe/recipes-support/satyr/satyr_0.23.bb new file +32 -0
@@ -0,0 +1,32 @@ +DESCRIPTION = "Satyr is a collection of low-level algorithms for program \ +failure processing, analysis, and reporting supporting kernel space, user \ +space, Python, and Java programs" + +HOMEPAGE = "https://github.com/abrt/satyr" +LICENSE = "GPLv2" + +inherit autotools-brokensep python3native pkgconfig + +SRC_URI = "git://github.com/abrt/satyr.git \ + file://0001-do-not-support-python2.patch \ +" +SRCREV = "4742fd4857c446b96f712d52e2e4cd0b6cfe7398" +S = "${WORKDIR}/git" + +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS += " \ + gdb \ +" + +PACKAGES += "python3-${PN}" +FILES_python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}/${BPN}" + +PACKAGECONFIG ??= "python3 rpm" +PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" +PACKAGECONFIG[pythonmanpage] = "--enable-python-manpage, --disable-python-manpage" +PACKAGECONFIG[rpm] = "--with-rpm, --without-rpm, rpm" + +do_configure_prepend() { + ${S}/gen-version +}
Signature · 1 line
2.8.1
PATCH 7/8 libtar: add recipe 1.2.20
In reply to Hongxu Jia--- .../libtar/files/0002-Do-not-strip-libtar.patch | 25 ++++++++++++++++++++++ .../libtar/files/fix_libtool_sysroot.patch | 19 ++++++++++++++++ meta-oe/recipes-support/libtar/libtar_1.2.20.bb | 21 ++++++++++++++++++ 3 files changed, 65 insertions(+) create mode 100644 meta-oe/recipes-support/libtar/files/0002-Do-not-strip-libtar.patch create mode 100644 meta-oe/recipes-support/libtar/files/fix_libtool_sysroot.patch create mode 100644 meta-oe/recipes-support/libtar/libtar_1.2.20.bb
meta-oe/recipes-support/libtar/files/0002-Do-not-strip-libtar.patch new file +25 -0
@@ -0,0 +1,25 @@ +From e9fee689430af7791b932a1ee3c2cc103ccf290f Mon Sep 17 00:00:00 2001 +From: Stefan Eichenberger <[email protected]> +Date: Wed, 2 Nov 2016 05:43:43 -0400 +Subject: [PATCH] Do not strip libtar. + +--- + libtar/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libtar/Makefile.in b/libtar/Makefile.in +index 7c6f1bc..80bb8d9 100644 +--- a/libtar/Makefile.in ++++ b/libtar/Makefile.in +@@ -20,7 +20,7 @@ SHELL = @SHELL@ + + ### Installation programs and flags + INSTALL = @INSTALL@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ + LN_S = @LN_S@ + MKDIR = @MKDIR@ +-- +2.8.1 +
meta-oe/recipes-support/libtar/files/fix_libtool_sysroot.patch new file +19 -0
@@ -0,0 +1,19 @@ +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 4623100..1c6b43d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -13,6 +13,7 @@ AC_CONFIG_MACRO_DIR([autoconf]) + AM_INIT_AUTOMAKE([dist-bzip2]) + ENCAP_PKG([], [postinstall-encap]) + ++LT_INIT + + dnl ### Load subdirectory modules. ################################## + PSG_MODULE([compat]) +-- +2.8.1 +
meta-oe/recipes-support/libtar/libtar_1.2.20.bb new file +21 -0
@@ -0,0 +1,21 @@ +SUMMARY = "libtar, tar manipulating library" +DESCRIPTION = "libtar is a library for manipulating POSIX tar files" +HOMEPAGE = "http://www.feep.net/libtar" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=61cbac6719ae682ce6cd45b5c11e21af" + +SRC_URI = "${DEBIAN_MIRROR}/main/libt/${BPN}/${BPN}_${PV}.orig.tar.gz \ + file://fix_libtool_sysroot.patch \ + file://0002-Do-not-strip-libtar.patch \ + " + +S = "${WORKDIR}/${BPN}" + +SRC_URI[md5sum] = "6ced95ab3a4b33fbfe2dfb231d156cdb" +SRC_URI[sha256sum] = "50f24c857a7ef1cb092e6508758b86d06f1188508f897f3e6b40c573e8879109" + +inherit autotools-brokensep + +PACKAGECONFIG ??= "zlib" +PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
Signature · 1 line
2.8.1
PATCH 8/8 xmlrpc-c: add recipe 1.31.0
In reply to Hongxu Jia--- .../recipes-devtools/xmlrpc-c/xmlrpc-c_1.31.0.bb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.31.0.bb
meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.31.0.bb new file +22 -0
@@ -0,0 +1,22 @@ +DESCRIPTION = "XML-RPC for C/C++ is programming libraries and related tools to help you \ +write an XML-RPC server or client in C or C++." + +HOMEPAGE = "http://xmlrpc-c.sourceforge.net/" +LICENSE = "BSD & MIT" +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=aefbf81ba0750f02176b6f86752ea951" + +SRC_URI = "git://github.com/ensc/xmlrpc-c.git;branch=master \ +" +SRCREV = "81443a9dc234cc275449dbc17867ad77ae189124" +S = "${WORKDIR}/git" + +DEPENDS = "curl libxml2" +RDEPENDS_${PN} = "curl" + +inherit cmake + +EXTRA_OECMAKE = "-D_lib:STRING=${baselib}" + +BBCLASSEXTEND = "native" + +TARGET_CFLAGS += "-Wno-narrowing"
Signature · 1 line
2.8.1
Re: [meta-gnome][PATCH 1/8] libgnomekbd: 2.32 -> 3.22
In reply to Hongxu JiaQuoted 5 lines · Hongxu Jia
Remove --disable-schemas-install:
...
|QA Issue: libgnomekbd: configure was passed unrecognised
options: --disable-schemas-install [unknown-configure-option]
...
can you also build all these packages on musl and see if they build ?
Quoted 79 lines
Signed-off-by Hongxu Jia <[email protected]>--- .../gnome-settings-daemon_2.32.1.bb | 3 --- .../recipes-gnome/libgnome/libgnomekbd_2.32.0.bb | 20 -------------------- .../recipes-gnome/libgnome/libgnomekbd_3.22.0.bb | 17 +++++++++++++++++ 3 files changed, 17 insertions(+), 23 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb create mode 100644 meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.22.0.bbmeta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb +0
-3@@ -40,7 +40,4 @@ FILES_${PN}-dbg += "${libdir}/gnome-settings-daemon-2.0/.debug" FILES_${PN}-dev += "${libdir}/gnome-settings-daemon-2.0/*.la" FILES_${PN}-staticdev += "${libdir}/gnome-settings-daemon-2.0/*.a" - -PNBLACKLIST[gnome-settings-daemon] ?= "Depends on blacklisted libgnomekbd - the recipe will be removed on 2017-09-01 unless the issue is fixed" - PNBLACKLIST[gnome-settings-daemon] ?= "Depends on blacklisted gnome-desktop - the recipe will be removed on 2017-09-01 unless the issue is fixed"meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb deleted +0
-20@@ -1,20 +0,0 @@ -SUMMARY = "GNOME keyboard library" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812" - -SECTION = "x11/gnome/libs" - -DEPENDS = "gconf gtk+ glib-2.0 libxklavier intltool-native gnome-common-native" - -inherit gnome - -SRC_URI[archive.md5sum] = "de32a6e3e3464b566eecdc4332bf34bd" -SRC_URI[archive.sha256sum] = "ddd52c4cc7d83ad7ef964a1bcb4db87407e65b00ffc3e70c088ca4ee7383d256" -GNOME_COMPRESS_TYPE="bz2" - -do_configure_append() { - find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g - find ${B} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g -} - -PNBLACKLIST[libgnomekbd] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130608/ - the recipe will be removed on 2017-09-01 unless the issue is fixed"meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.22.0.bb new file +17
-1@@ -0,0 +1,17 @@ +SUMMARY = "GNOME keyboard library" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812" + +SECTION = "x11/gnome/libs" + +DEPENDS = "gconf glib-2.0 libxklavier gtk+3 intltool-native" + +inherit gnome gobject-introspection gettext + +GNOME_COMPRESS_TYPE = "xz" + +SRC_URI[archive.md5sum] = "7b1ebf99f4254c99922163c262c7ff04" +SRC_URI[archive.sha256sum] = "340b30dabfebbd4e0e6c0fe34a378966dd5640b5d44595ab8a19b0be255d77df" + +EXTRA_OECONF_remove = "--disable-schemas-install" + --2.8.1
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel