[oe] [meta-python] [PATCH] python-paste: upgrade 3.2.0 -> 3.2.1
Signed-off-by: Zang Ruochen --- .../python/{python-paste_3.2.0.bb => python-paste_3.2.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-python/recipes-devtools/python/{python-paste_3.2.0.bb => python-paste_3.2.1.bb} (71%) diff --git a/meta-python/recipes-devtools/python/python-paste_3.2.0.bb b/meta-python/recipes-devtools/python/python-paste_3.2.1.bb similarity index 71% rename from meta-python/recipes-devtools/python/python-paste_3.2.0.bb rename to meta-python/recipes-devtools/python/python-paste_3.2.1.bb index 92a97d1..6c78598 100644 --- a/meta-python/recipes-devtools/python/python-paste_3.2.0.bb +++ b/meta-python/recipes-devtools/python/python-paste_3.2.1.bb @@ -5,8 +5,8 @@ RDEPENDS_${PN} = "python-six" LIC_FILES_CHKSUM = "file://docs/license.txt;md5=1798f29d55080c60365e6283cb49779c" -SRC_URI[md5sum] = "9225991c1c37a81e0aaac2fb046f3602" -SRC_URI[sha256sum] = "2153da2f1b09a69bce7633d7e3f9aaa802572e85f9ac1ed09ad93ef8599d31b6" +SRC_URI[md5sum] = "4ec8ac6032270daf91ff9621bda019d0" +SRC_URI[sha256sum] = "3d9c9e96a8408777b01976dfce900049e9e8c970e02198534f2c8c1b2cca5dee" PYPI_PACKAGE = "Paste" inherit pypi setuptools -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH v2][meta-oe 2/2] tesseract-lang: update to 4.0.0
Fails on musl https://errors.yoctoproject.org/Errors/Details/272006/ On Wed, Sep 25, 2019 at 5:53 PM Oleksandr Kravchuk wrote: > > Signed-off-by: Oleksandr Kravchuk > --- > .../{tesseract-lang_git.bb => tesseract-lang_4.0.0.bb} | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > rename meta-oe/recipes-graphics/tesseract/{tesseract-lang_git.bb => > tesseract-lang_4.0.0.bb} (82%) > > diff --git a/meta-oe/recipes-graphics/tesseract/tesseract-lang_git.bb > b/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.0.0.bb > similarity index 82% > rename from meta-oe/recipes-graphics/tesseract/tesseract-lang_git.bb > rename to meta-oe/recipes-graphics/tesseract/tesseract-lang_4.0.0.bb > index ac36a91a3..75c2bc00e 100644 > --- a/meta-oe/recipes-graphics/tesseract/tesseract-lang_git.bb > +++ b/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.0.0.bb > @@ -3,16 +3,16 @@ SUMMARY = "tesseract-ocr language files" > LICENSE = "Apache-2.0" > LIC_FILES_CHKSUM = "file://COPYING;md5=9648bd7af63bd3cc4f5ac046d12c49e4" > > -PV = "3.04.00+git${SRCPV}" > -SRCREV = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d" > +SRCREV = "590567f20dc044f6948a8e2c61afc714c360ad0e" > SRC_URI = "git://github.com/tesseract-ocr/tessdata.git" > + > S = "${WORKDIR}/git" > > inherit allarch > > do_install() { > install -d ${D}${datadir}/tessdata > -cp -R --no-dereference --preserve=mode,links -v ${S}/*.traineddata > ${S}/*.cube.* ${S}/*.tesseract_cube.* ${D}${datadir}/tessdata > +cp -R --no-dereference --preserve=mode,links -v ${S}/*.traineddata > ${D}${datadir}/tessdata > } > > python populate_packages_prepend () { > -- > 2.17.1 > > -- > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python] [PATCH] python-alembic: upgrade 1.2.0 -> 1.2.1
Signed-off-by: Zang Ruochen --- meta-python/recipes-devtools/python/python-alembic.inc| 4 ++-- .../python/{python-alembic_1.2.0.bb => python-alembic_1.2.1.bb} | 0 .../python/{python3-alembic_1.2.0.bb => python3-alembic_1.2.1.bb} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename meta-python/recipes-devtools/python/{python-alembic_1.2.0.bb => python-alembic_1.2.1.bb} (100%) rename meta-python/recipes-devtools/python/{python3-alembic_1.2.0.bb => python3-alembic_1.2.1.bb} (100%) diff --git a/meta-python/recipes-devtools/python/python-alembic.inc b/meta-python/recipes-devtools/python/python-alembic.inc index 8c917e3..fa178ce 100644 --- a/meta-python/recipes-devtools/python/python-alembic.inc +++ b/meta-python/recipes-devtools/python/python-alembic.inc @@ -2,8 +2,8 @@ DESCRIPTION = "A database migration tool for SQLAlchemy" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=28aaf14a6592d14dbfb2f4abd597aa27" -SRC_URI[md5sum] = "7cdba960544ecb59fd74e6433d82036c" -SRC_URI[sha256sum] = "5609afbb2ab142a991b15ae436347c475f8a517f1610f2fd1b09cdca7c311f3f" +SRC_URI[md5sum] = "6fe272274fce2641b93998ef9b702b76" +SRC_URI[sha256sum] = "9f907d7e8b286a1cfb22db9084f9ce4fde7ad7956bb496dc7c952e10ac90e36a" PYPI_PACKAGE = "alembic" diff --git a/meta-python/recipes-devtools/python/python-alembic_1.2.0.bb b/meta-python/recipes-devtools/python/python-alembic_1.2.1.bb similarity index 100% rename from meta-python/recipes-devtools/python/python-alembic_1.2.0.bb rename to meta-python/recipes-devtools/python/python-alembic_1.2.1.bb diff --git a/meta-python/recipes-devtools/python/python3-alembic_1.2.0.bb b/meta-python/recipes-devtools/python/python3-alembic_1.2.1.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-alembic_1.2.0.bb rename to meta-python/recipes-devtools/python/python3-alembic_1.2.1.bb -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH v2][meta-oe] proj: update to 6.1.1
I think this is causing this failure https://errors.yoctoproject.org/Errors/Details/271996/ https://errors.yoctoproject.org/Errors/Details/271995/ On Wed, Sep 25, 2019 at 2:14 PM Oleksandr Kravchuk wrote: > > Signed-off-by: Oleksandr Kravchuk > --- > .../proj/{proj_4.9.3.bb => proj_6.1.1.bb} | 6 -- > 1 file changed, 4 insertions(+), 2 deletions(-) > rename meta-oe/recipes-navigation/proj/{proj_4.9.3.bb => proj_6.1.1.bb} (65%) > > diff --git a/meta-oe/recipes-navigation/proj/proj_4.9.3.bb > b/meta-oe/recipes-navigation/proj/proj_6.1.1.bb > similarity index 65% > rename from meta-oe/recipes-navigation/proj/proj_4.9.3.bb > rename to meta-oe/recipes-navigation/proj/proj_6.1.1.bb > index f45f8948d..4f53aa46b 100644 > --- a/meta-oe/recipes-navigation/proj/proj_4.9.3.bb > +++ b/meta-oe/recipes-navigation/proj/proj_6.1.1.bb > @@ -6,9 +6,11 @@ LICENSE = "MIT" > LIC_FILES_CHKSUM = "file://COPYING;md5=74d9aaec5fa0cd734341e8c4dc91b608" > > SRC_URI = "http://download.osgeo.org/proj/proj-${PV}.tar.gz"; > -SRC_URI[md5sum] = "d598336ca834742735137c5674b214a1" > -SRC_URI[sha256sum] = > "6984542fea333488de5c82eea58d699e4aff4b359200a9971537cd7e047185f7" > +SRC_URI[md5sum] = "9a82a3174cacf319d94360a759fbcc8a" > +SRC_URI[sha256sum] = > "5cf0a2360a28b5d724c53edbb87f3f3b14fd96001265411ac4e56f369e2d503f" > > inherit autotools pkgconfig lib_package > > +DEPENDS = "sqlite3 sqlite3-native" > + > FILES_${PN} += "${datadir}/proj" > -- > 2.17.1 > > -- > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH v2][meta-oe 1/2] tesseract: update to 4.1.0
License-Update: file that mentioned licencing information was replaced with an actual license file Signed-off-by: Oleksandr Kravchuk --- .../{tesseract_git.bb => tesseract_4.1.0.bb} | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) rename meta-oe/recipes-graphics/tesseract/{tesseract_git.bb => tesseract_4.1.0.bb} (57%) diff --git a/meta-oe/recipes-graphics/tesseract/tesseract_git.bb b/meta-oe/recipes-graphics/tesseract/tesseract_4.1.0.bb similarity index 57% rename from meta-oe/recipes-graphics/tesseract/tesseract_git.bb rename to meta-oe/recipes-graphics/tesseract/tesseract_4.1.0.bb index 89d09a0f5..fde3bc180 100644 --- a/meta-oe/recipes-graphics/tesseract/tesseract_git.bb +++ b/meta-oe/recipes-graphics/tesseract/tesseract_4.1.0.bb @@ -1,19 +1,20 @@ SUMMARY = "A commercial quality OCR engine " +HOMEPAGE = "https://github.com/tesseract-ocr/tesseract"; +BUGTRACKER = "https://github.com/tesseract-ocr/tesseract/issues"; LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=7ea4f9a43aba9d3c849fe5c203a0ed40" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -BRANCH = "3.05" -PV = "${BRANCH}.01+git${SRCPV}" -SRCREV = "215866151e774972c9502282111b998d7a053562" +BRANCH = "4.1" +SRCREV = "5280bbcade4e2dec5eef439a6e189504c2eadcd9" SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=${BRANCH}" + S = "${WORKDIR}/git" DEPENDS = "leptonica" EXTRA_OECONF += "LIBLEPT_HEADERSDIR=${STAGING_INCDIR}/leptonica" - inherit autotools pkgconfig FILES_${PN} += "${datadir}/tessdata" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH v2][meta-oe 2/2] tesseract-lang: update to 4.0.0
Signed-off-by: Oleksandr Kravchuk --- .../{tesseract-lang_git.bb => tesseract-lang_4.0.0.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-oe/recipes-graphics/tesseract/{tesseract-lang_git.bb => tesseract-lang_4.0.0.bb} (82%) diff --git a/meta-oe/recipes-graphics/tesseract/tesseract-lang_git.bb b/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.0.0.bb similarity index 82% rename from meta-oe/recipes-graphics/tesseract/tesseract-lang_git.bb rename to meta-oe/recipes-graphics/tesseract/tesseract-lang_4.0.0.bb index ac36a91a3..75c2bc00e 100644 --- a/meta-oe/recipes-graphics/tesseract/tesseract-lang_git.bb +++ b/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.0.0.bb @@ -3,16 +3,16 @@ SUMMARY = "tesseract-ocr language files" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=9648bd7af63bd3cc4f5ac046d12c49e4" -PV = "3.04.00+git${SRCPV}" -SRCREV = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d" +SRCREV = "590567f20dc044f6948a8e2c61afc714c360ad0e" SRC_URI = "git://github.com/tesseract-ocr/tessdata.git" + S = "${WORKDIR}/git" inherit allarch do_install() { install -d ${D}${datadir}/tessdata -cp -R --no-dereference --preserve=mode,links -v ${S}/*.traineddata ${S}/*.cube.* ${S}/*.tesseract_cube.* ${D}${datadir}/tessdata +cp -R --no-dereference --preserve=mode,links -v ${S}/*.traineddata ${D}${datadir}/tessdata } python populate_packages_prepend () { -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH][meta-oe 1/2] tesseract: update to 4.1.0
On Wed, Sep 25, 2019 at 4:02 PM Oleksandr Kravchuk wrote: > > On 25/09/2019 23:39, Khem Raj wrote: > > On Wed, Sep 25, 2019 at 2:36 PM Oleksandr Kravchuk > > wrote: > >> Signed-off-by: Oleksandr Kravchuk > >> --- > >> .../{tesseract_git.bb => tesseract_4.1.0.bb} | 11 ++- > >> 1 file changed, 6 insertions(+), 5 deletions(-) > >> rename meta-oe/recipes-graphics/tesseract/{tesseract_git.bb => > >> tesseract_4.1.0.bb} (57%) > >> > >> diff --git a/meta-oe/recipes-graphics/tesseract/tesseract_git.bb > >> b/meta-oe/recipes-graphics/tesseract/tesseract_4.1.0.bb > >> similarity index 57% > >> rename from meta-oe/recipes-graphics/tesseract/tesseract_git.bb > >> rename to meta-oe/recipes-graphics/tesseract/tesseract_4.1.0.bb > >> index 89d09a0f5..fde3bc180 100644 > >> --- a/meta-oe/recipes-graphics/tesseract/tesseract_git.bb > >> +++ b/meta-oe/recipes-graphics/tesseract/tesseract_4.1.0.bb > >> @@ -1,19 +1,20 @@ > >> SUMMARY = "A commercial quality OCR engine " > >> +HOMEPAGE = "https://github.com/tesseract-ocr/tesseract"; > >> +BUGTRACKER = "https://github.com/tesseract-ocr/tesseract/issues"; > >> > >> LICENSE = "Apache-2.0" > >> -LIC_FILES_CHKSUM = "file://COPYING;md5=7ea4f9a43aba9d3c849fe5c203a0ed40" > >> +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" > >> > > what changed ? > > Original COPYING file basically had a statement that code is licensed > under Apache 2.0 > (https://github.com/tesseract-ocr/tesseract/commit/618489290536282a59ed7a71381ca083d9a7586a) > > The new one, LICENSE contains text of the license. > please add such info in commit messages always see https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Describing_license_changes > >> -BRANCH = "3.05" > >> -PV = "${BRANCH}.01+git${SRCPV}" > >> -SRCREV = "215866151e774972c9502282111b998d7a053562" > >> +BRANCH = "4.1" > >> +SRCREV = "5280bbcade4e2dec5eef439a6e189504c2eadcd9" > >> SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=${BRANCH}" > >> + > >> S = "${WORKDIR}/git" > >> > >> DEPENDS = "leptonica" > >> > >> EXTRA_OECONF += "LIBLEPT_HEADERSDIR=${STAGING_INCDIR}/leptonica" > >> > >> - > >> inherit autotools pkgconfig > >> > >> FILES_${PN} += "${datadir}/tessdata" > >> -- > >> 2.17.1 > >> > >> -- > >> ___ > >> Openembedded-devel mailing list > >> Openembedded-devel@lists.openembedded.org > >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH][meta-oe 1/2] tesseract: update to 4.1.0
On 25/09/2019 23:39, Khem Raj wrote: > On Wed, Sep 25, 2019 at 2:36 PM Oleksandr Kravchuk > wrote: >> Signed-off-by: Oleksandr Kravchuk >> --- >> .../{tesseract_git.bb => tesseract_4.1.0.bb} | 11 ++- >> 1 file changed, 6 insertions(+), 5 deletions(-) >> rename meta-oe/recipes-graphics/tesseract/{tesseract_git.bb => >> tesseract_4.1.0.bb} (57%) >> >> diff --git a/meta-oe/recipes-graphics/tesseract/tesseract_git.bb >> b/meta-oe/recipes-graphics/tesseract/tesseract_4.1.0.bb >> similarity index 57% >> rename from meta-oe/recipes-graphics/tesseract/tesseract_git.bb >> rename to meta-oe/recipes-graphics/tesseract/tesseract_4.1.0.bb >> index 89d09a0f5..fde3bc180 100644 >> --- a/meta-oe/recipes-graphics/tesseract/tesseract_git.bb >> +++ b/meta-oe/recipes-graphics/tesseract/tesseract_4.1.0.bb >> @@ -1,19 +1,20 @@ >> SUMMARY = "A commercial quality OCR engine " >> +HOMEPAGE = "https://github.com/tesseract-ocr/tesseract"; >> +BUGTRACKER = "https://github.com/tesseract-ocr/tesseract/issues"; >> >> LICENSE = "Apache-2.0" >> -LIC_FILES_CHKSUM = "file://COPYING;md5=7ea4f9a43aba9d3c849fe5c203a0ed40" >> +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" >> > what changed ? Original COPYING file basically had a statement that code is licensed under Apache 2.0 (https://github.com/tesseract-ocr/tesseract/commit/618489290536282a59ed7a71381ca083d9a7586a) The new one, LICENSE contains text of the license. >> -BRANCH = "3.05" >> -PV = "${BRANCH}.01+git${SRCPV}" >> -SRCREV = "215866151e774972c9502282111b998d7a053562" >> +BRANCH = "4.1" >> +SRCREV = "5280bbcade4e2dec5eef439a6e189504c2eadcd9" >> SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=${BRANCH}" >> + >> S = "${WORKDIR}/git" >> >> DEPENDS = "leptonica" >> >> EXTRA_OECONF += "LIBLEPT_HEADERSDIR=${STAGING_INCDIR}/leptonica" >> >> - >> inherit autotools pkgconfig >> >> FILES_${PN} += "${datadir}/tessdata" >> -- >> 2.17.1 >> >> -- >> ___ >> Openembedded-devel mailing list >> Openembedded-devel@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH][meta-oe 1/2] tesseract: update to 4.1.0
On Wed, Sep 25, 2019 at 2:36 PM Oleksandr Kravchuk wrote: > > Signed-off-by: Oleksandr Kravchuk > --- > .../{tesseract_git.bb => tesseract_4.1.0.bb} | 11 ++- > 1 file changed, 6 insertions(+), 5 deletions(-) > rename meta-oe/recipes-graphics/tesseract/{tesseract_git.bb => > tesseract_4.1.0.bb} (57%) > > diff --git a/meta-oe/recipes-graphics/tesseract/tesseract_git.bb > b/meta-oe/recipes-graphics/tesseract/tesseract_4.1.0.bb > similarity index 57% > rename from meta-oe/recipes-graphics/tesseract/tesseract_git.bb > rename to meta-oe/recipes-graphics/tesseract/tesseract_4.1.0.bb > index 89d09a0f5..fde3bc180 100644 > --- a/meta-oe/recipes-graphics/tesseract/tesseract_git.bb > +++ b/meta-oe/recipes-graphics/tesseract/tesseract_4.1.0.bb > @@ -1,19 +1,20 @@ > SUMMARY = "A commercial quality OCR engine " > +HOMEPAGE = "https://github.com/tesseract-ocr/tesseract"; > +BUGTRACKER = "https://github.com/tesseract-ocr/tesseract/issues"; > > LICENSE = "Apache-2.0" > -LIC_FILES_CHKSUM = "file://COPYING;md5=7ea4f9a43aba9d3c849fe5c203a0ed40" > +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" > what changed ? > -BRANCH = "3.05" > -PV = "${BRANCH}.01+git${SRCPV}" > -SRCREV = "215866151e774972c9502282111b998d7a053562" > +BRANCH = "4.1" > +SRCREV = "5280bbcade4e2dec5eef439a6e189504c2eadcd9" > SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=${BRANCH}" > + > S = "${WORKDIR}/git" > > DEPENDS = "leptonica" > > EXTRA_OECONF += "LIBLEPT_HEADERSDIR=${STAGING_INCDIR}/leptonica" > > - > inherit autotools pkgconfig > > FILES_${PN} += "${datadir}/tessdata" > -- > 2.17.1 > > -- > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-oe 1/2] tesseract: update to 4.1.0
Signed-off-by: Oleksandr Kravchuk --- .../{tesseract_git.bb => tesseract_4.1.0.bb} | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) rename meta-oe/recipes-graphics/tesseract/{tesseract_git.bb => tesseract_4.1.0.bb} (57%) diff --git a/meta-oe/recipes-graphics/tesseract/tesseract_git.bb b/meta-oe/recipes-graphics/tesseract/tesseract_4.1.0.bb similarity index 57% rename from meta-oe/recipes-graphics/tesseract/tesseract_git.bb rename to meta-oe/recipes-graphics/tesseract/tesseract_4.1.0.bb index 89d09a0f5..fde3bc180 100644 --- a/meta-oe/recipes-graphics/tesseract/tesseract_git.bb +++ b/meta-oe/recipes-graphics/tesseract/tesseract_4.1.0.bb @@ -1,19 +1,20 @@ SUMMARY = "A commercial quality OCR engine " +HOMEPAGE = "https://github.com/tesseract-ocr/tesseract"; +BUGTRACKER = "https://github.com/tesseract-ocr/tesseract/issues"; LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=7ea4f9a43aba9d3c849fe5c203a0ed40" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -BRANCH = "3.05" -PV = "${BRANCH}.01+git${SRCPV}" -SRCREV = "215866151e774972c9502282111b998d7a053562" +BRANCH = "4.1" +SRCREV = "5280bbcade4e2dec5eef439a6e189504c2eadcd9" SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=${BRANCH}" + S = "${WORKDIR}/git" DEPENDS = "leptonica" EXTRA_OECONF += "LIBLEPT_HEADERSDIR=${STAGING_INCDIR}/leptonica" - inherit autotools pkgconfig FILES_${PN} += "${datadir}/tessdata" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-oe 2/2] tesseract-lang: update to 4.0.0
Signed-off-by: Oleksandr Kravchuk --- .../{tesseract-lang_git.bb => tesseract-lang_4.0.0.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-oe/recipes-graphics/tesseract/{tesseract-lang_git.bb => tesseract-lang_4.0.0.bb} (82%) diff --git a/meta-oe/recipes-graphics/tesseract/tesseract-lang_git.bb b/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.0.0.bb similarity index 82% rename from meta-oe/recipes-graphics/tesseract/tesseract-lang_git.bb rename to meta-oe/recipes-graphics/tesseract/tesseract-lang_4.0.0.bb index ac36a91a3..75c2bc00e 100644 --- a/meta-oe/recipes-graphics/tesseract/tesseract-lang_git.bb +++ b/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.0.0.bb @@ -3,16 +3,16 @@ SUMMARY = "tesseract-ocr language files" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=9648bd7af63bd3cc4f5ac046d12c49e4" -PV = "3.04.00+git${SRCPV}" -SRCREV = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d" +SRCREV = "590567f20dc044f6948a8e2c61afc714c360ad0e" SRC_URI = "git://github.com/tesseract-ocr/tessdata.git" + S = "${WORKDIR}/git" inherit allarch do_install() { install -d ${D}${datadir}/tessdata -cp -R --no-dereference --preserve=mode,links -v ${S}/*.traineddata ${S}/*.cube.* ${S}/*.tesseract_cube.* ${D}${datadir}/tessdata +cp -R --no-dereference --preserve=mode,links -v ${S}/*.traineddata ${D}${datadir}/tessdata } python populate_packages_prepend () { -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-oe] sanlock: update to 3.6.0
Signed-off-by: Oleksandr Kravchuk --- ...1-fix-compile-failure-with-libc-musl.patch | 80 --- .../{sanlock_3.6.0.bb => sanlock_3.8.0.bb}| 6 +- 2 files changed, 2 insertions(+), 84 deletions(-) delete mode 100644 meta-oe/recipes-extended/sanlock/sanlock/0001-fix-compile-failure-with-libc-musl.patch rename meta-oe/recipes-extended/sanlock/{sanlock_3.6.0.bb => sanlock_3.8.0.bb} (86%) diff --git a/meta-oe/recipes-extended/sanlock/sanlock/0001-fix-compile-failure-with-libc-musl.patch b/meta-oe/recipes-extended/sanlock/sanlock/0001-fix-compile-failure-with-libc-musl.patch deleted file mode 100644 index e4bde80a0..0 --- a/meta-oe/recipes-extended/sanlock/sanlock/0001-fix-compile-failure-with-libc-musl.patch +++ /dev/null @@ -1,80 +0,0 @@ -From c51c2c543f3c78b2a68acc61f786f903f2e0fec8 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Sun, 9 Sep 2018 07:28:09 -0400 -Subject: [PATCH] fix compile failure with libc musl - -The lack of random_r in musl: -[snip] -|main.c:1393:7: warning: implicit declaration of function 'random_r'; -did you mean 'random'? [-Wimplicit-function-declaration] -| rv = random_r(&rand_data, &val); -| ^~~~ -| random -|main.c:1408:30: error: invalid application of 'sizeof' to incomplete -type 'struct random_data' -| memset(&rand_data, 0, sizeof(rand_data)); -[snip] - -s/random_r/random/, s/initstate_r/initstate/ and remove `static struct -random_data rand_data' - -Here is the man of `random_r()': -[snip] -The random_r() function is like random(3), except that instead of using -state information maintained in a global variable -[snip] - -So use random without state information is OK. - -Upstream-Status: Submitted [sanlock-de...@lists.fedorahosted.org] -Signed-off-by: Hongxu Jia - src/main.c | 12 - 1 file changed, 4 insertions(+), 8 deletions(-) - -diff --git a/src/main.c b/src/main.c -index f60b4d3..602c400 100644 a/src/main.c -+++ b/src/main.c -@@ -84,7 +84,6 @@ static char command[COMMAND_MAX]; - static int cmd_argc; - static char **cmd_argv; - static struct thread_pool pool; --static struct random_data rand_data; - static char rand_state[32]; - static pthread_mutex_t rand_mutex = PTHREAD_MUTEX_INITIALIZER; - static const char *run_dir = NULL; -@@ -1386,16 +1385,15 @@ int get_rand(int a, int b); - - int get_rand(int a, int b) - { -- int32_t val; -- int rv; -+ long int rv; - - pthread_mutex_lock(&rand_mutex); -- rv = random_r(&rand_data, &val); -+ rv = random(); - pthread_mutex_unlock(&rand_mutex); - if (rv < 0) - return rv; - -- return a + (int) (((float)(b - a + 1)) * val / (RAND_MAX+1.0)); -+ return a + (int) (((float)(b - a + 1)) * rv / (RAND_MAX+1.0)); - } - - static void setup_host_name(void) -@@ -1405,9 +1403,7 @@ static void setup_host_name(void) - uuid_t uu; - - memset(rand_state, 0, sizeof(rand_state)); -- memset(&rand_data, 0, sizeof(rand_data)); -- -- initstate_r(time(NULL), rand_state, sizeof(rand_state), &rand_data); -+ initstate(time(NULL), rand_state, sizeof(rand_state)); - - /* use host name from command line */ - --- -2.8.1 - diff --git a/meta-oe/recipes-extended/sanlock/sanlock_3.6.0.bb b/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb similarity index 86% rename from meta-oe/recipes-extended/sanlock/sanlock_3.6.0.bb rename to meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb index c51bccce3..9f7ce9c57 100644 --- a/meta-oe/recipes-extended/sanlock/sanlock_3.6.0.bb +++ b/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb @@ -11,10 +11,8 @@ SECTION = "utils" LICENSE = "LGPLv2+ & GPLv2 & GPLv2+" LIC_FILES_CHKSUM = "file://README.license;md5=60487bf0bf429d6b5aa72b6d37a0eb22" -SRC_URI = "git://pagure.io/sanlock.git;protocol=http \ - file://0001-fix-compile-failure-with-libc-musl.patch \ - " -SRCREV = "90b2ffa77edd46bea007b7bb39bfd4d2db2ff7af" +SRC_URI = "git://pagure.io/sanlock.git;protocol=http" +SRCREV = "7afe0e66f5c7f24894896fad20ffa6f39733d80f" S = "${WORKDIR}/git" DEPENDS = "libaio util-linux" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH v2][meta-oe] proj: update to 6.1.1
Signed-off-by: Oleksandr Kravchuk --- .../proj/{proj_4.9.3.bb => proj_6.1.1.bb} | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) rename meta-oe/recipes-navigation/proj/{proj_4.9.3.bb => proj_6.1.1.bb} (65%) diff --git a/meta-oe/recipes-navigation/proj/proj_4.9.3.bb b/meta-oe/recipes-navigation/proj/proj_6.1.1.bb similarity index 65% rename from meta-oe/recipes-navigation/proj/proj_4.9.3.bb rename to meta-oe/recipes-navigation/proj/proj_6.1.1.bb index f45f8948d..4f53aa46b 100644 --- a/meta-oe/recipes-navigation/proj/proj_4.9.3.bb +++ b/meta-oe/recipes-navigation/proj/proj_6.1.1.bb @@ -6,9 +6,11 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=74d9aaec5fa0cd734341e8c4dc91b608" SRC_URI = "http://download.osgeo.org/proj/proj-${PV}.tar.gz"; -SRC_URI[md5sum] = "d598336ca834742735137c5674b214a1" -SRC_URI[sha256sum] = "6984542fea333488de5c82eea58d699e4aff4b359200a9971537cd7e047185f7" +SRC_URI[md5sum] = "9a82a3174cacf319d94360a759fbcc8a" +SRC_URI[sha256sum] = "5cf0a2360a28b5d724c53edbb87f3f3b14fd96001265411ac4e56f369e2d503f" inherit autotools pkgconfig lib_package +DEPENDS = "sqlite3 sqlite3-native" + FILES_${PN} += "${datadir}/proj" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH v2][meta-oe] can-utils: bump to latest revision
On 9/25/19 1:18 PM, Oleksandr Kravchuk wrote: License header was moved due to SPDX-License-Identifier being added to the file. Signed-off-by: Oleksandr Kravchuk --- .../can-utils/0001-Fix-musl-error.patch | 677 ++ ...o-find-SIOCGSTAMP-with-latest-kernel.patch | 106 --- .../socketcan/can-utils_git.bb| 11 +- 3 files changed, 682 insertions(+), 112 deletions(-) create mode 100644 meta-oe/recipes-extended/socketcan/can-utils/0001-Fix-musl-error.patch delete mode 100644 meta-oe/recipes-extended/socketcan/can-utils/0001-fix-include-to-find-SIOCGSTAMP-with-latest-kernel.patch diff --git a/meta-oe/recipes-extended/socketcan/can-utils/0001-Fix-musl-error.patch b/meta-oe/recipes-extended/socketcan/can-utils/0001-Fix-musl-error.patch new file mode 100644 index 0..94f9539be --- /dev/null +++ b/meta-oe/recipes-extended/socketcan/can-utils/0001-Fix-musl-error.patch @@ -0,0 +1,677 @@ +From 9cf678b96644013a30ccb4124bf107af0952816c Mon Sep 17 00:00:00 2001 +From: Oleksandr Kravchuk +Date: Wed, 25 Sep 2019 19:41:13 + +Subject: [PATCH] Fix musl error + +Signed-off-by: Oleksandr Kravchuk +--- + jacd.c | 58 ++--- + jcat.c | 14 ++--- + jspy.c | 26 + jsr.c | 30 +-- + libj1939.c | 4 ++-- + testj1939.c | 26 + 6 files changed, 79 insertions(+), 79 deletions(-) + +diff --git a/jacd.c b/jacd.c +index 83275e2..839895b 100644 +--- a/jacd.c b/jacd.c +@@ -20,7 +20,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include +@@ -155,12 +155,12 @@ static int parse_range(char *str) + for (tok = strtok(str, ",;"); tok; tok = strtok(NULL, ",;")) { + a0 = ae = strtoul(tok, &endp, 0); + if (endp <= tok) +- error(1, 0, "parsing range '%s'", tok); ++ err(1, 0, "parsing range '%s'", tok); + if (*endp == '-') { + tok = endp+1; + ae = strtoul(tok, &endp, 0); + if (endp <= tok) +- error(1, 0, "parsing addr '%s'", tok); ++ err(1, 0, "parsing addr '%s'", tok); + if (ae < a0) + ae = a0; + } +@@ -205,21 +205,21 @@ static int open_socket(const char *device, uint64_t name) + fprintf(stderr, "- socket(PF_CAN, SOCK_DGRAM, CAN_J1939);\n"); + sock = ret = socket(PF_CAN, SOCK_DGRAM, CAN_J1939); + if (ret < 0) +- error(1, errno, "socket(j1939)"); ++ err(1, errno, "socket(j1939)"); + + if (s.verbose) + fprintf(stderr, "- setsockopt(, SOL_SOCKET, SO_BINDTODEVICE, %s, %zd);\n", device, strlen(device)); + ret = setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, + device, strlen(device)); + if (ret < 0) +- error(1, errno, "bindtodevice %s", device); ++ err(1, errno, "bindtodevice %s", device); + + if (s.verbose) + fprintf(stderr, "- setsockopt(, SOL_CAN_J1939, SO_J1939_FILTER, , %zd);\n", sizeof(filt)); + ret = setsockopt(sock, SOL_CAN_J1939, SO_J1939_FILTER, + &filt, sizeof(filt)); + if (ret < 0) +- error(1, errno, "setsockopt filter"); ++ err(1, errno, "setsockopt filter"); + + value = 1; + if (s.verbose) +@@ -227,13 +227,13 @@ static int open_socket(const char *device, uint64_t name) + ret = setsockopt(sock, SOL_SOCKET, SO_BROADCAST, + &value, sizeof(value)); + if (ret < 0) +- error(1, errno, "setsockopt set broadcast"); ++ err(1, errno, "setsockopt set broadcast"); + + if (s.verbose) + fprintf(stderr, "- bind(, %s, %zi);\n", libj1939_addr2str(&saddr), sizeof(saddr)); + ret = bind(sock, (void *)&saddr, sizeof(saddr)); + if (ret < 0) +- error(1, errno, "bind()"); ++ err(1, errno, "bind()"); + return sock; + } + +@@ -258,7 +258,7 @@ static int repeat_address(int sock, uint64_t name) + ret = sendto(sock, dat, sizeof(dat), 0, (const struct sockaddr *)&saddr, +sizeof(saddr)); + if (must_warn(ret)) +- error(1, errno, "send address claim for 0x%02x", s.last_sa); ++ err(1, errno, "send address claim for 0x%02x", s.last_sa); + return ret; + } + static int claim_address(int sock, uint64_t name, int sa) +@@ -278,7 +278,7 @@ static int claim_address(int sock, uint64_t name, int sa) + fprintf(stderr, "- bind(, %s, %zi);\n", libj1939_addr2str(&saddr), sizeof(saddr)); + ret = bind(sock, (void *)&saddr, sizeof(saddr)); + if (ret < 0) +- error(1, errno, "rebind with sa 0x%02x", sa); ++ err(1, e
[oe] [PATCH][meta-oe 2/2] libyui-ncurses: udpate to 2.52.0
Signed-off-by: Oleksandr Kravchuk --- .../0001-Use-override-consistently.patch | 147 -- ...e-in-NCPad-and-fix-param-type-of-Set.patch | 49 -- ...curses_git.bb => libyui-ncurses_2.52.0.bb} | 5 +- 3 files changed, 1 insertion(+), 200 deletions(-) delete mode 100644 meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Use-override-consistently.patch delete mode 100644 meta-oe/recipes-graphics/libyui/libyui-ncurses/0002-Define-own-resize-in-NCPad-and-fix-param-type-of-Set.patch rename meta-oe/recipes-graphics/libyui/{libyui-ncurses_git.bb => libyui-ncurses_2.52.0.bb} (87%) diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Use-override-consistently.patch b/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Use-override-consistently.patch deleted file mode 100644 index 6d4bdc2ab..0 --- a/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Use-override-consistently.patch +++ /dev/null @@ -1,147 +0,0 @@ -From 0acfb67f99fd8d6af323311fee8c08116295b148 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 5 Sep 2018 18:21:19 -0700 -Subject: [PATCH 1/2] Use override consistently - -Make clang++ happy -error: 'setApplicationTitle' overrides a member function but is not marked 'override' [-Werror,-Winconsistent-missing-over ride] - -Upstream-Status: Submitted [https://github.com/libyui/libyui-ncurses/pull/69] -Signed-off-by: Khem Raj - src/NCApplication.h | 46 ++--- - 1 file changed, 23 insertions(+), 23 deletions(-) - -diff --git a/src/NCApplication.h b/src/NCApplication.h -index e24c3eb..09e4708 100644 a/src/NCApplication.h -+++ b/src/NCApplication.h -@@ -60,7 +60,7 @@ public: - * Reimplemented from YApplication. - **/ - virtual void setLanguage( const std::string & language, --const std::string & encoding = std::string() ); -+const std::string & encoding = std::string() ) override; - - /** - * Open a directory selection box and prompt the user for an existing -@@ -77,7 +77,7 @@ public: - * Implemented from YApplication. - **/ - virtual std::string askForExistingDirectory( const std::string & startDir, -- const std::string & headline ); -+ const std::string & headline ) override; - - /** - * Open a file selection box and prompt the user for an existing file. -@@ -97,7 +97,7 @@ public: - **/ - virtual std::string askForExistingFile( const std::string & startWith, - const std::string & filter, -- const std::string & headline ); -+ const std::string & headline ) override; - - /** - * Open a file selection box and prompt the user for a file to save data -@@ -119,28 +119,28 @@ public: - **/ - virtual std::string askForSaveFileName( const std::string & startWith, - const std::string & filter, -- const std::string & headline ); -+ const std::string & headline ) override; - - /** - * Beep. - * - * Reimplemented from YApplication. - **/ --virtual void beep(); -+virtual void beep() override; - - /** - * Redraw the screen. - * - * Reimplemented from YApplication. - **/ --virtual void redrawScreen(); -+virtual void redrawScreen() override; - - /** - * Initialize the (text) console keyboard. - * - * Reimplemented from YApplication. - **/ --virtual void initConsoleKeyboard(); -+virtual void initConsoleKeyboard() override; - - /** - * Set the (text) console font according to the current encoding etc. -@@ -152,7 +152,7 @@ public: -const std::string & font, -const std::string & screen_map, -const std::string & unicode_map, -- const std::string & language ); -+ const std::string & language ) override; - - /** - * Run a shell command (typically an interactive program using NCurses) -@@ -165,7 +165,7 @@ public: - * - * Reimplemented from YApplication. - **/ --virtual int runInTerminal( const std::string & command ); -+virtual int runInTerminal( const std::string & command ) override; - - - /// @{ -@@ -183,33 +183,33 @@ public: - // - // All implemented from YApplication. - --virtual intdisplayWidth(); --virtual intdisplayHeight(); --virtual intdisplayDepth(); --virtual long displayColors(); -+virtual intdisplayWidth() override; -+virtual intdisplayHeight() override; -+virtual intdisplayDepth() override; -+virt
[oe] [PATCH][meta-oe 1/2] libyui: update to 3.6.0
Signed-off-by: Oleksandr Kravchuk --- ...1-Use-curly-braces-for-MAKE-variable.patch | 32 --- .../libyui/{libyui_git.bb => libyui_3.6.0.bb} | 4 +-- 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 meta-oe/recipes-graphics/libyui/libyui/0001-Use-curly-braces-for-MAKE-variable.patch rename meta-oe/recipes-graphics/libyui/{libyui_git.bb => libyui_3.6.0.bb} (89%) diff --git a/meta-oe/recipes-graphics/libyui/libyui/0001-Use-curly-braces-for-MAKE-variable.patch b/meta-oe/recipes-graphics/libyui/libyui/0001-Use-curly-braces-for-MAKE-variable.patch deleted file mode 100644 index dbe241709..0 --- a/meta-oe/recipes-graphics/libyui/libyui/0001-Use-curly-braces-for-MAKE-variable.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4eed37b1a61458fc8e5251f7cb7c6d64e8e9da8d Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 5 Sep 2018 17:48:09 -0700 -Subject: [PATCH] Use curly braces for MAKE variable - -Fixes errors with ninja -| ninja: error: build.ninja:142: bad $-escape (literal $ must be written as $$) - -Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/137] -Signed-off-by: Khem Raj - buildtools/LibyuiCommon.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/buildtools/LibyuiCommon.cmake b/buildtools/LibyuiCommon.cmake -index cb93307..e6fbefd 100644 a/buildtools/LibyuiCommon.cmake -+++ b/buildtools/LibyuiCommon.cmake -@@ -122,8 +122,8 @@ MACRO( SET_BUILD_FLAGS ) # setup compiler-flags depending on CMAKE_BUILD_TYPE - ENABLE_TESTING() - # add a wrapper "tests" target, the builtin "test" cannot be extended :-( - ADD_CUSTOM_TARGET(tests -- $(MAKE) -- COMMAND $(MAKE) test -+ ${MAKE} -+ COMMAND ${MAKE} test - ) - ENDIF ( ENABLE_TESTS OR ENABLE_CODE_COVERAGE) - --- -2.18.0 - diff --git a/meta-oe/recipes-graphics/libyui/libyui_git.bb b/meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb similarity index 89% rename from meta-oe/recipes-graphics/libyui/libyui_git.bb rename to meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb index d313fb02d..d8a921925 100644 --- a/meta-oe/recipes-graphics/libyui/libyui_git.bb +++ b/meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb @@ -7,12 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING.gpl-3;md5=d32239bcb673463ab874e80d47fae504 \ SRC_URI = "git://github.com/libyui/libyui.git \ file://0001-Fix-build-with-clang.patch \ - file://0001-Use-curly-braces-for-MAKE-variable.patch \ file://0001-Use-relative-install-paths-for-CMake.patch \ " -PV = "3.3.3+git" -SRCREV = "50672da835ec9d52766320a44a2677e08a24c99c" +SRCREV = "8459235919f592b1bc099ecf9a947cb6344b6fa5" SRCREV_FORMAT = "default" S = "${WORKDIR}/git" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH v2][meta-oe] can-utils: bump to latest revision
License header was moved due to SPDX-License-Identifier being added to the file. Signed-off-by: Oleksandr Kravchuk --- .../can-utils/0001-Fix-musl-error.patch | 677 ++ ...o-find-SIOCGSTAMP-with-latest-kernel.patch | 106 --- .../socketcan/can-utils_git.bb| 11 +- 3 files changed, 682 insertions(+), 112 deletions(-) create mode 100644 meta-oe/recipes-extended/socketcan/can-utils/0001-Fix-musl-error.patch delete mode 100644 meta-oe/recipes-extended/socketcan/can-utils/0001-fix-include-to-find-SIOCGSTAMP-with-latest-kernel.patch diff --git a/meta-oe/recipes-extended/socketcan/can-utils/0001-Fix-musl-error.patch b/meta-oe/recipes-extended/socketcan/can-utils/0001-Fix-musl-error.patch new file mode 100644 index 0..94f9539be --- /dev/null +++ b/meta-oe/recipes-extended/socketcan/can-utils/0001-Fix-musl-error.patch @@ -0,0 +1,677 @@ +From 9cf678b96644013a30ccb4124bf107af0952816c Mon Sep 17 00:00:00 2001 +From: Oleksandr Kravchuk +Date: Wed, 25 Sep 2019 19:41:13 + +Subject: [PATCH] Fix musl error + +Signed-off-by: Oleksandr Kravchuk +--- + jacd.c | 58 ++--- + jcat.c | 14 ++--- + jspy.c | 26 + jsr.c | 30 +-- + libj1939.c | 4 ++-- + testj1939.c | 26 + 6 files changed, 79 insertions(+), 79 deletions(-) + +diff --git a/jacd.c b/jacd.c +index 83275e2..839895b 100644 +--- a/jacd.c b/jacd.c +@@ -20,7 +20,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include +@@ -155,12 +155,12 @@ static int parse_range(char *str) + for (tok = strtok(str, ",;"); tok; tok = strtok(NULL, ",;")) { + a0 = ae = strtoul(tok, &endp, 0); + if (endp <= tok) +- error(1, 0, "parsing range '%s'", tok); ++ err(1, 0, "parsing range '%s'", tok); + if (*endp == '-') { + tok = endp+1; + ae = strtoul(tok, &endp, 0); + if (endp <= tok) +- error(1, 0, "parsing addr '%s'", tok); ++ err(1, 0, "parsing addr '%s'", tok); + if (ae < a0) + ae = a0; + } +@@ -205,21 +205,21 @@ static int open_socket(const char *device, uint64_t name) + fprintf(stderr, "- socket(PF_CAN, SOCK_DGRAM, CAN_J1939);\n"); + sock = ret = socket(PF_CAN, SOCK_DGRAM, CAN_J1939); + if (ret < 0) +- error(1, errno, "socket(j1939)"); ++ err(1, errno, "socket(j1939)"); + + if (s.verbose) + fprintf(stderr, "- setsockopt(, SOL_SOCKET, SO_BINDTODEVICE, %s, %zd);\n", device, strlen(device)); + ret = setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, + device, strlen(device)); + if (ret < 0) +- error(1, errno, "bindtodevice %s", device); ++ err(1, errno, "bindtodevice %s", device); + + if (s.verbose) + fprintf(stderr, "- setsockopt(, SOL_CAN_J1939, SO_J1939_FILTER, , %zd);\n", sizeof(filt)); + ret = setsockopt(sock, SOL_CAN_J1939, SO_J1939_FILTER, + &filt, sizeof(filt)); + if (ret < 0) +- error(1, errno, "setsockopt filter"); ++ err(1, errno, "setsockopt filter"); + + value = 1; + if (s.verbose) +@@ -227,13 +227,13 @@ static int open_socket(const char *device, uint64_t name) + ret = setsockopt(sock, SOL_SOCKET, SO_BROADCAST, + &value, sizeof(value)); + if (ret < 0) +- error(1, errno, "setsockopt set broadcast"); ++ err(1, errno, "setsockopt set broadcast"); + + if (s.verbose) + fprintf(stderr, "- bind(, %s, %zi);\n", libj1939_addr2str(&saddr), sizeof(saddr)); + ret = bind(sock, (void *)&saddr, sizeof(saddr)); + if (ret < 0) +- error(1, errno, "bind()"); ++ err(1, errno, "bind()"); + return sock; + } + +@@ -258,7 +258,7 @@ static int repeat_address(int sock, uint64_t name) + ret = sendto(sock, dat, sizeof(dat), 0, (const struct sockaddr *)&saddr, +sizeof(saddr)); + if (must_warn(ret)) +- error(1, errno, "send address claim for 0x%02x", s.last_sa); ++ err(1, errno, "send address claim for 0x%02x", s.last_sa); + return ret; + } + static int claim_address(int sock, uint64_t name, int sa) +@@ -278,7 +278,7 @@ static int claim_address(int sock, uint64_t name, int sa) + fprintf(stderr, "- bind(, %s, %zi);\n", libj1939_addr2str(&saddr), sizeof(saddr)); + ret = bind(sock, (void *)&saddr, sizeof(saddr)); + if (ret < 0) +- error(1, errno, "rebind with sa 0x%02x", sa); ++ err(1, errno, "rebind with sa 0x%02x", sa); + s.la
[oe] [meta-oe][PATCH 2/2] uim: Fix cross-builds
riscv is not yet supported to exclude it Signed-off-by: Khem Raj --- ...it-path-from-configure-option-proper.patch | 29 +++ .../uim/0001-fix-bug-for-cross-compile.patch | 24 --- meta-oe/recipes-support/uim/uim_1.8.8.bb | 10 +-- 3 files changed, 36 insertions(+), 27 deletions(-) create mode 100644 meta-oe/recipes-support/uim/uim/0001-Fix-to-set-libedit-path-from-configure-option-proper.patch delete mode 100644 meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch diff --git a/meta-oe/recipes-support/uim/uim/0001-Fix-to-set-libedit-path-from-configure-option-proper.patch b/meta-oe/recipes-support/uim/uim/0001-Fix-to-set-libedit-path-from-configure-option-proper.patch new file mode 100644 index 00..34a1ea0fa2 --- /dev/null +++ b/meta-oe/recipes-support/uim/uim/0001-Fix-to-set-libedit-path-from-configure-option-proper.patch @@ -0,0 +1,29 @@ +From f828a89cc1e956d56498422ec158d284fc97de3f Mon Sep 17 00:00:00 2001 +From: OBATA Akio +Date: Fri, 10 Aug 2018 18:38:18 +0900 +Subject: [PATCH] Fix to set libedit path from configure option properly + +Upstream-Status: Backport [https://github.com/uim/uim/pull/134] +Signed-off-by: Khem Raj + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 00d1b02..9c0a5ec 100644 +--- a/configure.ac b/configure.ac +@@ -1311,8 +1311,8 @@ if test "x$with_libedit" != xno; then + if test "x$with_libedit" = xyes; then + libedit_path=/usr + else +-with_libedit=yes + libedit_path="$with_libedit" ++with_libedit=yes + fi + + saved_CPPFLAGS=$CPPFLAGS +-- +2.23.0 + diff --git a/meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch b/meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch deleted file mode 100644 index 510a8c8407..00 --- a/meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 08b5e51224ed95b1e76e99873b5f9f59840b0a74 Mon Sep 17 00:00:00 2001 -From: Lei Maohui -Date: Fri, 21 Aug 2015 15:58:42 +0900 -Subject: [PATCH] fix bug for cross compile - -Signed-off-by: Lei Maohui - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - a/configure.ac -+++ b/configure.ac -@@ -1317,8 +1317,8 @@ if test "x$with_libedit" != xno; then - - saved_CPPFLAGS=$CPPFLAGS - saved_LDFLAGS=$LDFLAGS -- CPPFLAGS="${CPPFLAGS} -I$libedit_path/include" -- LDFLAGS="${LDFLAGS} -L$libedit_path/lib" -+ CPPFLAGS="${CPPFLAGS}" -+ LDFLAGS="${LDFLAGS}" - AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses", - [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses", - AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...") diff --git a/meta-oe/recipes-support/uim/uim_1.8.8.bb b/meta-oe/recipes-support/uim/uim_1.8.8.bb index cc28e6e8fd..8948ebf30f 100644 --- a/meta-oe/recipes-support/uim/uim_1.8.8.bb +++ b/meta-oe/recipes-support/uim/uim_1.8.8.bb @@ -4,11 +4,11 @@ LICENSE = "BSD-3-Clause & LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=ab2826b41ca0ff4030d38cc39791d1c8" SECTION = "inputmethods" -SRC_URI = "https://github.com/uim/uim/releases/download/${PV}/uim-${PV}.tar.bz2"; - +SRC_URI = "https://github.com/uim/uim/releases/download/${PV}/uim-${PV}.tar.bz2 \ +file://0001-Fix-to-set-libedit-path-from-configure-option-proper.patch \ +" SRC_URI_append_class-target = "\ file://uim-module-manager.patch \ -file://0001-fix-bug-for-cross-compile.patch \ " SRC_URI[md5sum] = "01c7bd5d0d4f3a9f6f5befe6f57a470b" SRC_URI[sha256sum] = "34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225a0fadc" @@ -22,6 +22,9 @@ RDEPENDS_uim-anthy_append_libc-glibc = " glibc-utils glibc-gconv-euc-jp" LEAD_SONAME = "libuim.so.1" +COMPATIBLE_HOST_riscv64 = "null" +COMPATIBLE_HOST_riscv32 = "null" + inherit distro_features_check autotools pkgconfig gettext qemu gtk-immodules-cache REQUIRED_DISTRO_FEATURES = "x11" @@ -29,6 +32,7 @@ REQUIRED_DISTRO_FEATURES = "x11" GTKIMMODULES_PACKAGES = "uim-gtk2.0 uim-gtk3" EXTRA_OECONF += "--disable-emacs \ +--with-libedit=${STAGING_EXECPREFIXDIR} \ --without-scim \ --without-m17nlib \ --without-prime \ -- 2.23.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] mongodb: Remove non building arches from COMPATIBLE_HOST
c++17 is default now so we don't need to edit out c++11 options Signed-off-by: Khem Raj --- meta-oe/recipes-dbs/mongodb/mongodb_git.bb | 10 +- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/meta-oe/recipes-dbs/mongodb/mongodb_git.bb b/meta-oe/recipes-dbs/mongodb/mongodb_git.bb index 3e77ac32f3..e7e03a4e14 100644 --- a/meta-oe/recipes-dbs/mongodb/mongodb_git.bb +++ b/meta-oe/recipes-dbs/mongodb/mongodb_git.bb @@ -36,11 +36,7 @@ SRC_URI_append_toolchain-clang = "\ S = "${WORKDIR}/git" -COMPATIBLE_HOST ?= '(x86_64|i.86|powerpc64|arm|aarch64).*-linux' - -COMPATIBLE_HOST_arm = "null" -COMPATIBLE_HOST_libc-musl_x86 = "null" -COMPATIBLE_HOST_toolchain-clang_x86 = "null" +COMPATIBLE_HOST ?= '(x86_64|powerpc64|aarch64).*-linux' PACKAGECONFIG ??= "tcmalloc" # gperftools compilation fails for arm below v7 because of missing support of @@ -66,10 +62,6 @@ EXTRA_OESCONS = "--prefix=${D}${prefix} \ ${PACKAGECONFIG_CONFARGS} \ core" -do_configure_prepend() { -# tests use hex floats, not supported in plain C++ -sed -e 's|-std=c++11|-std=gnu++11|g' -i ${S}/SConstruct -} scons_do_compile() { ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} ${EXTRA_OESCONS} || \ die "scons build execution failed." -- 2.23.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][thud][PATCH] polkit: Fix CVE-2018-19788
From: Dan Tran Signed-off-by: Dan Tran --- .../polkit/polkit/CVE-2018-19788_p1.patch | 194 ++ .../polkit/polkit/CVE-2018-19788_p2.patch | 153 ++ .../polkit/polkit/CVE-2018-19788_p3.patch | 53 + .../recipes-extended/polkit/polkit_0.115.bb | 3 + 4 files changed, 403 insertions(+) create mode 100644 meta-oe/recipes-extended/polkit/polkit/CVE-2018-19788_p1.patch create mode 100644 meta-oe/recipes-extended/polkit/polkit/CVE-2018-19788_p2.patch create mode 100644 meta-oe/recipes-extended/polkit/polkit/CVE-2018-19788_p3.patch diff --git a/meta-oe/recipes-extended/polkit/polkit/CVE-2018-19788_p1.patch b/meta-oe/recipes-extended/polkit/polkit/CVE-2018-19788_p1.patch new file mode 100644 index 0..32ea0bacc --- /dev/null +++ b/meta-oe/recipes-extended/polkit/polkit/CVE-2018-19788_p1.patch @@ -0,0 +1,194 @@ +From cd80aa29c85745ca073cf0581ccdcf2f80aa30db Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Mon, 3 Dec 2018 10:28:58 +0100 +Subject: [PATCH 1/3] Allow negative uids/gids in PolkitUnixUser and Group + objects + +(uid_t) -1 is still used as placeholder to mean "unset". This is OK, since +there should be no users with such number, see +https://systemd.io/UIDS-GIDS#special-linux-uids. + +(uid_t) -1 is used as the default value in class initialization. + +When a user or group above INT32_MAX is created, the numeric uid or +gid wraps around to negative when the value is assigned to gint, and +polkit gets confused. Let's accept such gids, except for -1. + +A nicer fix would be to change the underlying type to e.g. uint32 to +not have negative values. But this cannot be done without breaking the +API, so likely new functions will have to be added (a +polkit_unix_user_new variant that takes a unsigned, and the same for +_group_new, _set_uid, _get_uid, _set_gid, _get_gid, etc.). This will +require a bigger patch. + +Fixes https://gitlab.freedesktop.org/polkit/polkit/issues/74. + +CVE: CVE-2018-19788 +Upstream-Status: Backport +[https://gitlab.freedesktop.org/polkit/polkit/commit/2cb40c4d5feeaa09325522bd7d97910f1b59e379] + +Signed-off-by: Dan Tran +--- + src/polkit/polkitunixgroup.c | 15 +++ + src/polkit/polkitunixprocess.c | 12 + src/polkit/polkitunixuser.c| 13 ++--- + 3 files changed, 29 insertions(+), 11 deletions(-) + +diff --git a/src/polkit/polkitunixgroup.c b/src/polkit/polkitunixgroup.c +index c57a1aa..309f689 100644 +--- a/src/polkit/polkitunixgroup.c b/src/polkit/polkitunixgroup.c +@@ -71,6 +71,7 @@ G_DEFINE_TYPE_WITH_CODE (PolkitUnixGroup, polkit_unix_group, G_TYPE_OBJECT, + static void + polkit_unix_group_init (PolkitUnixGroup *unix_group) + { ++ unix_group->gid = -1; /* (git_t) -1 is not a valid GID under Linux */ + } + + static void +@@ -100,11 +101,14 @@ polkit_unix_group_set_property (GObject *object, +GParamSpec *pspec) + { + PolkitUnixGroup *unix_group = POLKIT_UNIX_GROUP (object); ++ gint val; + + switch (prop_id) + { + case PROP_GID: +- unix_group->gid = g_value_get_int (value); ++ val = g_value_get_int (value); ++ g_return_if_fail (val != -1); ++ unix_group->gid = val; + break; + + default: +@@ -131,9 +135,9 @@ polkit_unix_group_class_init (PolkitUnixGroupClass *klass) +g_param_spec_int ("gid", + "Group ID", + "The UNIX group ID", +- 0, ++ G_MININT, + G_MAXINT, +- 0, ++ -1, + G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME | +@@ -166,9 +170,10 @@ polkit_unix_group_get_gid (PolkitUnixGroup *group) + */ + void + polkit_unix_group_set_gid (PolkitUnixGroup *group, +- gint gid) ++ gint gid) + { + g_return_if_fail (POLKIT_IS_UNIX_GROUP (group)); ++ g_return_if_fail (gid != -1); + group->gid = gid; + } + +@@ -183,6 +188,8 @@ polkit_unix_group_set_gid (PolkitUnixGroup *group, + PolkitIdentity * + polkit_unix_group_new (gint gid) + { ++ g_return_val_if_fail (gid != -1, NULL); ++ + return POLKIT_IDENTITY (g_object_new (POLKIT_TYPE_UNIX_GROUP, +"gid", gid, +NULL)); +diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c +index 972b777..b02b258 100644 +--- a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c +@@ -159,9 +159,14 @@
Re: [oe] [meta-networking][PATCH] firewalld: update to 0.7.1
Fails https://errors.yoctoproject.org/Errors/Details/271958/ On Wed, Sep 25, 2019 at 12:36 AM Dan Callaghan wrote: > > --- > ...a-separate-directory-outside-the-sou.patch | 68 --- > ...{firewalld_0.6.4.bb => firewalld_0.7.1.bb} | 13 ++-- > 2 files changed, 8 insertions(+), 73 deletions(-) > delete mode 100644 > meta-networking/recipes-connectivity/firewalld/files/0001-fix-building-in-a-separate-directory-outside-the-sou.patch > rename meta-networking/recipes-connectivity/firewalld/{firewalld_0.6.4.bb => > firewalld_0.7.1.bb} (88%) > > diff --git > a/meta-networking/recipes-connectivity/firewalld/files/0001-fix-building-in-a-separate-directory-outside-the-sou.patch > > b/meta-networking/recipes-connectivity/firewalld/files/0001-fix-building-in-a-separate-directory-outside-the-sou.patch > deleted file mode 100644 > index 28d590242..0 > --- > a/meta-networking/recipes-connectivity/firewalld/files/0001-fix-building-in-a-separate-directory-outside-the-sou.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -firewalld: fix building in a separate directory outside the source tree > - > -Upstream-Status: Accepted [https://github.com/firewalld/firewalld/pull/456] > -Signed-off-by: Dan Callaghan > - > a/config/Makefile.am > -+++ b/config/Makefile.am > -@@ -377,11 +377,11 @@ install-config: > - $(MKDIR_P) $(DESTDIR)$(sconfdir)/zones > - $(MKDIR_P) $(DESTDIR)$(sconfdir)/helpers > - $(MKDIR_P) $(DESTDIR)$(prefixlibdir) > -- cp -r icmptypes $(DESTDIR)$(prefixlibdir) > -- cp -r ipsets $(DESTDIR)$(prefixlibdir) > -- cp -r services $(DESTDIR)$(prefixlibdir) > -- cp -r zones $(DESTDIR)$(prefixlibdir) > -- cp -r helpers $(DESTDIR)$(prefixlibdir) > -+ cp -r $(srcdir)/icmptypes $(DESTDIR)$(prefixlibdir) > -+ cp -r $(srcdir)/ipsets $(DESTDIR)$(prefixlibdir) > -+ cp -r $(srcdir)/services $(DESTDIR)$(prefixlibdir) > -+ cp -r $(srcdir)/zones $(DESTDIR)$(prefixlibdir) > -+ cp -r $(srcdir)/helpers $(DESTDIR)$(prefixlibdir) > - > - uninstall-config: > - rmdir $(DESTDIR)$(sconfdir)/icmptypes > a/doc/xml/Makefile.am > -+++ b/doc/xml/Makefile.am > -@@ -69,7 +69,8 @@ edit = sed \ > - -e 's|\@PREFIX\@|$(prefix)|' \ > - -e 's|\@SYSCONFDIR\@|$(sysconfdir)|' \ > - -e 's|\@PACKAGE_STRING\@|$(PACKAGE_STRING)|' \ > -- -e 's|\@IFCFGDIR\@|$(IFCFGDIR)|' > -+ -e 's|\@IFCFGDIR\@|$(IFCFGDIR)|' \ > -+ -e 's|@SRCDIR@|$(srcdir)|' > - > - transform-man.xsl: transform-man.xsl.in > - $(edit) $< >$@ > a/doc/xml/firewall-cmd.xml.in > -+++ b/doc/xml/firewall-cmd.xml.in > -@@ -1,10 +1,10 @@ > - > - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"; > - [ > -- > -- > -- > -- > -+ > -+ > -+ > -+ > - ]> > - > - diff --git > a/meta-networking/recipes-connectivity/firewalld/firewalld_0.6.4.bb > b/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.1.bb > similarity index 88% > rename from meta-networking/recipes-connectivity/firewalld/firewalld_0.6.4.bb > rename to meta-networking/recipes-connectivity/firewalld/firewalld_0.7.1.bb > index 5955072f1..15567f636 100644 > --- a/meta-networking/recipes-connectivity/firewalld/firewalld_0.6.4.bb > +++ b/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.1.bb > @@ -5,11 +5,10 @@ LICENSE = "GPLv2+" > LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" > > SRC_URI = > "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ > - > file://0001-fix-building-in-a-separate-directory-outside-the-sou.patch \ > file://firewalld.init \ > " > -SRC_URI[md5sum] = "e63bdd65a4d2f6338f60b31e91bb5525" > -SRC_URI[sha256sum] = > "5a82a72fd9ad4cbbfb805bae615faa9b91a27855245de0fef3bcb06439394852" > +SRC_URI[md5sum] = "32c16df3f6cc859d0df627baf5ee8401" > +SRC_URI[sha256sum] = > "88bc63a011209ac046fb5d7bfc73ddcc0bc616ddf3013bbb6bf1a421cb497f76" > > # glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from > gsettings.m4 > # xmlto-native is needed to populate /etc/xml/catalog.xml in the sysroot so > that xsltproc finds the docbook xslt > @@ -18,7 +17,9 @@ DEPENDS = "intltool-native glib-2.0-native libxslt-native > docbook-xsl-stylesheet > inherit gettext autotools bash-completion python3native gsettings systemd > update-rc.d > > PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" > -PACKAGECONFIG[systemd] = > "--with-systemd-unitdir=${systemd_unitdir}/system/,--disable-systemd" > +PACKAGECONFIG[systemd] = > "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd" > + > +PACKAGES += "${PN}-zsh-completion" > > # iptables, ip6tables, ebtables, and ipset *should* be unnecessary > # when the nftables backend is available, because nftables supersedes all of > them. > @@ -39,7 +40,7 @@ EXTRA_OECONF = "\ > " > > INITSCRIPT_NAME = "firewalld" > -SYSTEMD_SERVICE = "firewalld.service" > +SYSTEMD_SERVICE_${PN} = "firewalld.service" > > do_install_appen
[oe] [meta-oe][PATCH] libmicrohttpd: backport the fix for building with older gnutls
* with gnutls from meta-gplv2 libmicrohttpd fails to build now: libmicrohttpd-0.9.66/src/microhttpd/daemon.c:2539:7: error: unknown type name 'gnutls_init_flags_t'; did you mean 'gnutls_pin_flag_t'? 2539 | gnutls_init_flags_t flags; backport the fix from master branch * see https://bugs.gnunet.org/view.php?id=5806 Signed-off-by: Martin Jansa --- .../fix-build-with-older-gnutls.patch | 32 +++ .../libmicrohttpd/libmicrohttpd_0.9.66.bb | 4 ++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/libmicrohttpd/libmicrohttpd/fix-build-with-older-gnutls.patch diff --git a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd/fix-build-with-older-gnutls.patch b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd/fix-build-with-older-gnutls.patch new file mode 100644 index 00..61a7ac0a60 --- /dev/null +++ b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd/fix-build-with-older-gnutls.patch @@ -0,0 +1,32 @@ +From b84ee1fa41c53c43aa7ed1583c36af5cb7c77a0f Mon Sep 17 00:00:00 2001 +From: Christian Grothoff +Date: Fri, 2 Aug 2019 15:43:44 +0200 +Subject: trying to fix #5806 + +Upstream-Status: Backport from 0.9.67 [https://git.gnunet.org/libmicrohttpd.git/commit/?id=b84ee1fa41c53c43aa7ed1583c36af5cb7c77a0f] + +--- + src/microhttpd/daemon.c | 7 ++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c +index bf01ba9b..a8fc98c6 100644 +--- a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c +@@ -2536,7 +2536,12 @@ internal_add_connection (struct MHD_Daemon *daemon, + else + { + #ifdef HTTPS_SUPPORT +- gnutls_init_flags_t flags; ++#if (GNUTLS_VERSION_NUMBER+0 >= 0x030500) ++ gnutls_init_flags_t ++#else ++ unsigned int ++#endif ++flags; + + flags = GNUTLS_SERVER; + #if (GNUTLS_VERSION_NUMBER+0 >= 0x030402) +-- +cgit v1.2.1 + diff --git a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.66.bb b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.66.bb index 7d349b94e4..6b54170049 100644 --- a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.66.bb +++ b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.66.bb @@ -6,7 +6,9 @@ SECTION = "net" DEPENDS = "file" -SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz" +SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz \ +file://fix-build-with-older-gnutls.patch \ +" SRC_URI[md5sum] = "ce4050e75cc40d68506e2b403e1a76f9" SRC_URI[sha256sum] = "4e66d4db1574f4912fbd2690d10d227cc9cc56df6a10aa8f4fc2da75cea7ab1b" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] crash: update from 7.2.6 to 7.2.7
Change log: http://people.redhat.com/anderson/crash.changelog.html Signed-off-by: Randy MacLeod --- meta-oe/recipes-kernel/crash/{crash_7.2.6.bb => crash_7.2.7.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-kernel/crash/{crash_7.2.6.bb => crash_7.2.7.bb} (98%) diff --git a/meta-oe/recipes-kernel/crash/crash_7.2.6.bb b/meta-oe/recipes-kernel/crash/crash_7.2.7.bb similarity index 98% rename from meta-oe/recipes-kernel/crash/crash_7.2.6.bb rename to meta-oe/recipes-kernel/crash/crash_7.2.7.bb index 770b99ff0..8098d096e 100644 --- a/meta-oe/recipes-kernel/crash/crash_7.2.6.bb +++ b/meta-oe/recipes-kernel/crash/crash_7.2.7.bb @@ -26,7 +26,7 @@ SRC_URI = "git://github.com/crash-utility/${BPN}.git \ file://0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch \ file://0003-crash-detect-the-sysroot-s-glibc-header-file.patch \ " -SRCREV = "4076ebea6626e3f0a20150602c6ffab999ea5c90" +SRCREV = "5b0e3777ccbb571678791903e93446ccd0aba03a" SRC_URI[gdb.md5sum] = "a9836707337e5f7bf76a009a8904f470" SRC_URI[gdb.sha256sum] = "8070389a5dcc104eb0be483d582729f98ed4d761ad19cedd3f17b5d2502faa36" -- 2.22.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] haveged: upgrade v1.9.4 -> v1.9.6
From: Trevor Gamblin Both of the patches used in v1.9.4 have been incorporated in v1.9.6, so they are no longer required - see upstream commits ceab89ad and f2193587. Signed-off-by: Trevor Gamblin --- .../fix-cpu-cache-size-detection.patch| 20 ...d-Makefile.am-add-missing-dependency.patch | 32 --- .../{haveged_1.9.4.bb => haveged_1.9.6.bb}| 6 ++-- 3 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 meta-oe/recipes-extended/haveged/haveged/fix-cpu-cache-size-detection.patch delete mode 100644 meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch rename meta-oe/recipes-extended/haveged/{haveged_1.9.4.bb => haveged_1.9.6.bb} (88%) diff --git a/meta-oe/recipes-extended/haveged/haveged/fix-cpu-cache-size-detection.patch b/meta-oe/recipes-extended/haveged/haveged/fix-cpu-cache-size-detection.patch deleted file mode 100644 index 5b68f1966..0 --- a/meta-oe/recipes-extended/haveged/haveged/fix-cpu-cache-size-detection.patch +++ /dev/null @@ -1,20 +0,0 @@ -Some ARM cpus does not report the cache size or say it is -1 - -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=866306 - -Upstream-status: Pending - -Index: haveged-1.9.2/src/havegetune.c -=== haveged-1.9.2.orig/src/havegetune.c -+++ haveged-1.9.2/src/havegetune.c -@@ -795,6 +795,9 @@ static int vfs_configInfoCache( - ctype = vfs_configFile(pAnchor, path, vfs_configType); - strcpy(path+plen, "size"); - size = vfs_configFile(pAnchor, path, vfs_configInt); -+ if (size == -1) { -+ size = ctype == 'I' ? GENERIC_ICACHE : GENERIC_DCACHE; -+ } - cfg_cacheAdd(pAnchor, SRC_VFS_INDEX, pArgs[1], level, ctype, size); - } - } diff --git a/meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch b/meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch deleted file mode 100644 index 020ac2c3b..0 --- a/meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b04eeea777df32364df74bd63fc5b7fb05d21c8d Mon Sep 17 00:00:00 2001 -From: Jackie Huang -Date: Tue, 27 Mar 2018 10:21:09 +0800 -Subject: [PATCH] init.d/Makefile.am: add missing dependency - -install-data-hook should depend on install-exec-hook, or the -haveged.service might be installed incorrectly when build -with -j option. - -Upstream-Status: Submitted [https://github.com/jirka-h/haveged/pull/13] - -Signed-off-by: Jackie Huang -Signed-off-by: Khem Raj raj.k...@gmail.com - init.d/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/init.d/Makefile.am b/init.d/Makefile.am -index 5940f78..07bcdf7 100644 a/init.d/Makefile.am -+++ b/init.d/Makefile.am -@@ -33,7 +33,7 @@ if ENABLE_SYSTEMD - install-exec-hook: - $(do_subst) < $(srcdir)/$(src_tmpl) > haveged.service; - --install-data-hook: -+install-data-hook: install-exec-hook - if ENABLE_SYSTEMD_LOOKUP - install -p -D -m644 haveged.service $(DESTDIR)`pkg-config --variable=systemdsystemunitdir systemd`/haveged.service; - else --- -2.11.0 diff --git a/meta-oe/recipes-extended/haveged/haveged_1.9.4.bb b/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb similarity index 88% rename from meta-oe/recipes-extended/haveged/haveged_1.9.4.bb rename to meta-oe/recipes-extended/haveged/haveged_1.9.6.bb index d0e1a29dd..0189e19c0 100644 --- a/meta-oe/recipes-extended/haveged/haveged_1.9.4.bb +++ b/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb @@ -5,11 +5,9 @@ HOMEPAGE = "http://www.issihosts.com/haveged/index.html"; LICENSE = "GPLv3" LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -# v1.9.4 -SRCREV = "faa40ff345af194d3253f5fb030403e3c9831c36" +# v1.9.6 +SRCREV = "1470a82a7f79110c79beea1ca5f2d3b0fd1a4668" SRC_URI = "git://github.com/jirka-h/haveged.git \ - file://haveged-init.d-Makefile.am-add-missing-dependency.patch \ - file://fix-cpu-cache-size-detection.patch \ " S = "${WORKDIR}/git" -- 2.21.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-webserver][PATCH] nginx: fix install paths
On 9/25/19 2:20 AM, Gaylord Charles wrote: > Hello, > > This patch fixes Nginx install paths. I tried to build the native variant > for testing purpose and had errors. > > Regards, > Gaylord Charles > > From b6dc845b645cc8667b2d89412c292c0801de9270 Mon Sep 17 00:00:00 2001 > From: Gaylord CHARLES > Date: Tue, 24 Sep 2019 18:56:45 +0200 > Subject: [PATCH] nginx: fix install paths > > - Use path variable instead of /usr > - Replace the absolute path symlink with a relative one > > Signed-off-by: Gaylord CHARLES > --- > meta-webserver/recipes-httpd/nginx/nginx.inc | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc > b/meta-webserver/recipes-httpd/nginx/nginx.inc > index 29e7efc14..1e9d2e1a4 100644 > --- a/meta-webserver/recipes-httpd/nginx/nginx.inc > +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc > @@ -92,9 +92,9 @@ do_install () { > >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf > fi > install -d ${D}${sysconfdir}/${BPN} > -ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run > +ln -snf ../../var/run/${BPN} ${D}${sysconfdir}/${BPN}/run localstatedir variable could have stayed there, any particular reason to drop it in favor of hardcoding /var > install -d ${D}${NGINX_WWWDIR} > -mv ${D}/usr/html ${D}${NGINX_WWWDIR}/ > +mv ${D}${exec_prefix}/html ${D}${NGINX_WWWDIR}/ > chown ${NGINX_USER}:www-data -R ${D}${NGINX_WWWDIR} > > install -d ${D}${sysconfdir}/init.d > -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 6/8] libnet-dns-sec-perl: Drop broken native
$ bitbake libnet-dns-sec-perl-native ERROR: Nothing RPROVIDES 'libcrypto-native' (but virtual:native:/path/to/meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.10.bb RDEPENDS on or otherwise requires it) It's a broken native recipe which means no ones need it any more, so remove it. Signed-off-by: Robert Yang --- meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.10.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.10.bb b/meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.10.bb index 3fa6294..240ffec 100644 --- a/meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.10.bb +++ b/meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.10.bb @@ -29,5 +29,3 @@ RDEPENDS_${PN} = " \ perl-module-mime-base64 \ perl-module-test-more \ " - -BBCLASSEXTEND = "native" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 7/8] iperf3: Drop broken native
$ bitbake iperf3-native configure: error: --with-openssl was given, but test for OpenSSL failed It's a broken native recipe which means no ones need it any more, so remove it. Signed-off-by: Robert Yang --- meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb b/meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb index 6686a81..d5296d7 100644 --- a/meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb +++ b/meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb @@ -28,5 +28,3 @@ PACKAGECONFIG[lksctp] = "ac_cv_header_netinet_sctp_h=yes,ac_cv_header_netinet_sc CFLAGS += "-D_GNU_SOURCE" EXTRA_OECONF = "--with-openssl=${RECIPE_SYSROOT}${prefix}" - -BBCLASSEXTEND = "native" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 8/8] spice: Drop broken native
$ bitbake spice-native checking whether the C compiler works... no configure: error: in `/path/to/spice-native/0.14.2+gitAUTOINC+7cbd70b931_4fc4c2db36-r0/build': configure: error: C compiler cannot create executables It's a broken native recipe which means no ones need it any more, so remove it. Signed-off-by: Robert Yang --- meta-networking/recipes-support/spice/spice_git.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-networking/recipes-support/spice/spice_git.bb b/meta-networking/recipes-support/spice/spice_git.bb index 552f81d..30e939a 100644 --- a/meta-networking/recipes-support/spice/spice_git.bb +++ b/meta-networking/recipes-support/spice/spice_git.bb @@ -39,7 +39,6 @@ export PYTHONPATH="${PKG_CONFIG_SYSROOT_DIR}${libdir}/python2.7/site-packages" CFLAGS_append = " -Wno-error=address-of-packed-member" -PACKAGECONFIG_class-native = "" PACKAGECONFIG_class-nativesdk = "" PACKAGECONFIG ?= "sasl" @@ -54,6 +53,6 @@ PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama," COMPATIBLE_HOST = '(x86_64|i.86).*-linux' -BBCLASSEXTEND = "native nativesdk" +BBCLASSEXTEND = "nativesdk" EXTRA_OECONF_append_toolchain-clang = " --disable-werror" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 3/8] fuse: Fix installed-vs-shipped for nativesdk
There are two problems: * The /dev is installed to '${D}/dev', not '${D}${base_prefix}' * The /etc is installed ${D}, but should be ${D}${sysconfdir} It works for target is because target's base_prefix is NULL, but it isn't work for native or nativesdk. Fixed: $ bitbake nativesdk-fuse ERROR: nativesdk-fuse-2.9.9-r0 do_package: QA Issue: nativesdk-fuse: Files/directories were installed but not shipped in any package: /dev /etc /etc/init.d /etc/udev /etc/init.d/fuse /etc/udev/rules.d /etc/udev/rules.d/99-fuse.rules Signed-off-by: Robert Yang --- meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb b/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb index c83e7f6..95e8706 100644 --- a/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb +++ b/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb @@ -54,7 +54,7 @@ do_configure_prepend() { } do_install_append() { -rm -rf ${D}${base_prefix}/dev +rm -rf ${D}/dev # systemd class remove the sysv_initddir only if systemd_system_unitdir # contains anything, but it's not needed if sysvinit is not in DISTRO_FEATURES @@ -69,4 +69,10 @@ do_install_append() { fi } +do_install_append_class-nativesdk() { +install -d ${D}${sysconfdir} +mv ${D}/etc/* ${D}${sysconfdir}/ +rmdir ${D}/etc +} + BBCLASSEXTEND = "native nativesdk" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 2/8] python-incremental: Drop broken nativesdk
The nativesdk-python3-incremental doesn't work since lacks of dependencies, and hard to satisfy that, I tried to extend the following ones' nativesdk, but it still didn't work: python-automat python-constantly python-hyperlink python-twisted python-zopeinterface So just drop the broken nativesdk. Signed-off-by: Robert Yang --- meta-python/recipes-devtools/python/python-incremental.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python-incremental.inc b/meta-python/recipes-devtools/python/python-incremental.inc index b63fac9..ef5e903 100644 --- a/meta-python/recipes-devtools/python/python-incremental.inc +++ b/meta-python/recipes-devtools/python/python-incremental.inc @@ -17,4 +17,4 @@ RDEPENDS_${PN} += " \ # prevent a circular dependency. The build apparently does not use the part of # python-incremental which uses python-twisted, so this hack is OK. RDEPENDS_${PYTHON_PN}-incremental-native_remove = "${PYTHON_PN}-twisted-native" -BBCLASSEXTEND = "native nativesdk" +BBCLASSEXTEND = "native" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 4/8] keyutils: Fix installed-vs-shipped for nativesdk
Fixed: $ bitbake nativesdk-keyutils ERROR: nativesdk-keyutils-1.6-r0 do_package: QA Issue: nativesdk-keyutils: Files/directories were installed but not shipped in any package: /usr /etc /usr/share /usr/share/man /usr/share/keyutils [snip] /etc/request-key.conf /etc/request-key.d Signed-off-by: Robert Yang --- meta-oe/recipes-security/keyutils/keyutils_1.6.bb | 12 1 file changed, 12 insertions(+) diff --git a/meta-oe/recipes-security/keyutils/keyutils_1.6.bb b/meta-oe/recipes-security/keyutils/keyutils_1.6.bb index dca86f3..572143a 100644 --- a/meta-oe/recipes-security/keyutils/keyutils_1.6.bb +++ b/meta-oe/recipes-security/keyutils/keyutils_1.6.bb @@ -40,6 +40,18 @@ do_install () { oe_runmake DESTDIR=${D} install } +do_install_append_class-nativesdk() { +install -d ${D}${datadir} +src_dir="${D}${target_datadir}" +mv $src_dir/* ${D}${datadir} +par_dir=`dirname $src_dir` +rmdir $src_dir $par_dir + +install -d ${D}${sysconfdir} +mv ${D}/etc/* ${D}${sysconfdir}/ +rmdir ${D}/etc +} + do_install_ptest () { cp -r ${S}/tests ${D}${PTEST_PATH}/ sed -i -e 's/OSDIST=Unknown/OSDIST=${DISTRO}/' ${D}${PTEST_PATH}/tests/prepare.inc.sh -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 5/8] libnet-ssleay-perl: Drop broken native
$ bitbake libnet-ssleay-perl-native ERROR: Nothing RPROVIDES 'libssl-native' (but virtual:native:/path/to/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.85.bb RDEPENDS on or otherwise requires it) It's a broken native recipe which means no ones need it any more, so remove it. Signed-off-by: Robert Yang --- meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.85.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.85.bb b/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.85.bb index dccef16..50ab5af 100644 --- a/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.85.bb +++ b/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.85.bb @@ -42,8 +42,6 @@ do_install_ptest() { cp -r ${B}/t ${D}${PTEST_PATH} } -BBCLASSEXTEND = "native" - FILES_${PN}-dbg =+ "${libdir}/perl/vendor_perl/*/auto/Net/SSLeay/.debug/" RDEPENDS_${PN}-ptest = " perl" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 1/8] python-asn1crypto: extend to nativesdk
Fixed: $ bitbake nativesdk-python3-cryptography ERROR: Nothing PROVIDES 'nativesdk-python3-asn1crypto' Signed-off-by: Robert Yang --- meta-python/recipes-devtools/python/python-asn1crypto.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python-asn1crypto.inc b/meta-python/recipes-devtools/python/python-asn1crypto.inc index f1f0a3c..e85ce9a 100644 --- a/meta-python/recipes-devtools/python/python-asn1crypto.inc +++ b/meta-python/recipes-devtools/python/python-asn1crypto.inc @@ -20,4 +20,4 @@ RDEPENDS_${PN}_class-target += " \ ${PYTHON_PN}-netclient \ " -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 0/8] [meta-oe][meta-perl][meta-python] Fixes for native and nativesdk
The following changes since commit 466fd78ac6a561ce7b47f2190f0aa3ea6aa3593e: protobuf: upgrade 3.9.1 -> 3.9.2 (2019-09-24 10:35:46 -0700) are available in the git repository at: git://git.openembedded.org/meta-openembedded-contrib rbt/native http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=rbt/native Robert Yang (8): python-asn1crypto: extend to nativesdk python-incremental: Drop broken nativesdk fuse: Fix installed-vs-shipped for nativesdk keyutils: Fix installed-vs-shipped for nativesdk libnet-ssleay-perl: Drop broken native libnet-dns-sec-perl: Drop broken native iperf3: Drop broken native spice: Drop broken native meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb| 8 +++- meta-networking/recipes-support/spice/spice_git.bb | 3 +-- meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb | 2 -- meta-oe/recipes-security/keyutils/keyutils_1.6.bb | 12 meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.10.bb | 2 -- meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.85.bb | 2 -- meta-python/recipes-devtools/python/python-asn1crypto.inc | 2 +- meta-python/recipes-devtools/python/python-incremental.inc | 2 +- 8 files changed, 22 insertions(+), 11 deletions(-) -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH] nginx: fix install paths
Hello, This patch fixes Nginx install paths. I tried to build the native variant for testing purpose and had errors. Regards, Gaylord Charles >From b6dc845b645cc8667b2d89412c292c0801de9270 Mon Sep 17 00:00:00 2001 From: Gaylord CHARLES Date: Tue, 24 Sep 2019 18:56:45 +0200 Subject: [PATCH] nginx: fix install paths - Use path variable instead of /usr - Replace the absolute path symlink with a relative one Signed-off-by: Gaylord CHARLES --- meta-webserver/recipes-httpd/nginx/nginx.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc index 29e7efc14..1e9d2e1a4 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -92,9 +92,9 @@ do_install () { >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf fi install -d ${D}${sysconfdir}/${BPN} -ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run +ln -snf ../../var/run/${BPN} ${D}${sysconfdir}/${BPN}/run install -d ${D}${NGINX_WWWDIR} -mv ${D}/usr/html ${D}${NGINX_WWWDIR}/ +mv ${D}${exec_prefix}/html ${D}${NGINX_WWWDIR}/ chown ${NGINX_USER}:www-data -R ${D}${NGINX_WWWDIR} install -d ${D}${sysconfdir}/init.d -- 2.20.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH] add new recipes for python-lrparsing, python3-lrparsing
The lrparsing library is an LR(1) parsing library for Python. Grammars can be defined using Python expressions. --- .../recipes-devtools/python/python-lrparsing.inc | 16 .../python/python-lrparsing_1.0.16.bb| 2 ++ .../python/python3-lrparsing_1.0.16.bb | 2 ++ 3 files changed, 20 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python-lrparsing.inc create mode 100644 meta-python/recipes-devtools/python/python-lrparsing_1.0.16.bb create mode 100644 meta-python/recipes-devtools/python/python3-lrparsing_1.0.16.bb diff --git a/meta-python/recipes-devtools/python/python-lrparsing.inc b/meta-python/recipes-devtools/python/python-lrparsing.inc new file mode 100644 index 0..d125151cd --- /dev/null +++ b/meta-python/recipes-devtools/python/python-lrparsing.inc @@ -0,0 +1,16 @@ +SUMMARY = "Python LR parsing library" +SECTION = "devel/python" +LICENSE = "AGPL-3.0" +LIC_FILES_CHKSUM = "file://agpl-3.0.txt;md5=73f1eb20517c55bf9493b7dd6e480788" + +HOMEPAGE = "http://lrparsing.sourceforge.net/"; +BUGTRACKER = "https://sourceforge.net/p/lrparsing/tickets/"; +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/lrparsing/files/"; +UPSTREAM_CHECK_REGEX = "lrparsing-(?P\d+(\.\d+)+)" +SRC_URI = "${SOURCEFORGE_MIRROR}/lrparsing/lrparsing-${PV}.tar.gz" +SRC_URI[md5sum] = "34357d69bce87654d792cd8f02d148b2" +SRC_URI[sha256sum] = "b45afda44001dc5ba632934f74c043d40cce653f1a7526cfbcb68f6be055b8d7" + +S = "${WORKDIR}/lrparsing-${PV}" + +BBCLASSEXTEND = "native" diff --git a/meta-python/recipes-devtools/python/python-lrparsing_1.0.16.bb b/meta-python/recipes-devtools/python/python-lrparsing_1.0.16.bb new file mode 100644 index 0..2cfe3012e --- /dev/null +++ b/meta-python/recipes-devtools/python/python-lrparsing_1.0.16.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-lrparsing.inc diff --git a/meta-python/recipes-devtools/python/python3-lrparsing_1.0.16.bb b/meta-python/recipes-devtools/python/python3-lrparsing_1.0.16.bb new file mode 100644 index 0..21a80cde1 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-lrparsing_1.0.16.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-lrparsing.inc -- 2.20.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] firewalld: add UPSTREAM_CHECK_URI
--- .../recipes-connectivity/firewalld/firewalld_0.7.1.bb| 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.1.bb b/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.1.bb index 15567f636..a51c145eb 100644 --- a/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.1.bb +++ b/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.1.bb @@ -1,6 +1,7 @@ SUMMARY = "Dynamic firewall daemon with a D-Bus interface" HOMEPAGE = "https://firewalld.org/"; BUGTRACKER = "https://github.com/firewalld/firewalld/issues"; +UPSTREAM_CHECK_URI = "https://github.com/firewalld/firewalld/releases"; LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -- 2.20.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] firewalld: update to 0.7.1
--- ...a-separate-directory-outside-the-sou.patch | 68 --- ...{firewalld_0.6.4.bb => firewalld_0.7.1.bb} | 13 ++-- 2 files changed, 8 insertions(+), 73 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/firewalld/files/0001-fix-building-in-a-separate-directory-outside-the-sou.patch rename meta-networking/recipes-connectivity/firewalld/{firewalld_0.6.4.bb => firewalld_0.7.1.bb} (88%) diff --git a/meta-networking/recipes-connectivity/firewalld/files/0001-fix-building-in-a-separate-directory-outside-the-sou.patch b/meta-networking/recipes-connectivity/firewalld/files/0001-fix-building-in-a-separate-directory-outside-the-sou.patch deleted file mode 100644 index 28d590242..0 --- a/meta-networking/recipes-connectivity/firewalld/files/0001-fix-building-in-a-separate-directory-outside-the-sou.patch +++ /dev/null @@ -1,68 +0,0 @@ -firewalld: fix building in a separate directory outside the source tree - -Upstream-Status: Accepted [https://github.com/firewalld/firewalld/pull/456] -Signed-off-by: Dan Callaghan - a/config/Makefile.am -+++ b/config/Makefile.am -@@ -377,11 +377,11 @@ install-config: - $(MKDIR_P) $(DESTDIR)$(sconfdir)/zones - $(MKDIR_P) $(DESTDIR)$(sconfdir)/helpers - $(MKDIR_P) $(DESTDIR)$(prefixlibdir) -- cp -r icmptypes $(DESTDIR)$(prefixlibdir) -- cp -r ipsets $(DESTDIR)$(prefixlibdir) -- cp -r services $(DESTDIR)$(prefixlibdir) -- cp -r zones $(DESTDIR)$(prefixlibdir) -- cp -r helpers $(DESTDIR)$(prefixlibdir) -+ cp -r $(srcdir)/icmptypes $(DESTDIR)$(prefixlibdir) -+ cp -r $(srcdir)/ipsets $(DESTDIR)$(prefixlibdir) -+ cp -r $(srcdir)/services $(DESTDIR)$(prefixlibdir) -+ cp -r $(srcdir)/zones $(DESTDIR)$(prefixlibdir) -+ cp -r $(srcdir)/helpers $(DESTDIR)$(prefixlibdir) - - uninstall-config: - rmdir $(DESTDIR)$(sconfdir)/icmptypes a/doc/xml/Makefile.am -+++ b/doc/xml/Makefile.am -@@ -69,7 +69,8 @@ edit = sed \ - -e 's|\@PREFIX\@|$(prefix)|' \ - -e 's|\@SYSCONFDIR\@|$(sysconfdir)|' \ - -e 's|\@PACKAGE_STRING\@|$(PACKAGE_STRING)|' \ -- -e 's|\@IFCFGDIR\@|$(IFCFGDIR)|' -+ -e 's|\@IFCFGDIR\@|$(IFCFGDIR)|' \ -+ -e 's|@SRCDIR@|$(srcdir)|' - - transform-man.xsl: transform-man.xsl.in - $(edit) $< >$@ a/doc/xml/firewall-cmd.xml.in -+++ b/doc/xml/firewall-cmd.xml.in -@@ -1,10 +1,10 @@ - - http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"; - [ -- -- -- -- -+ -+ -+ -+ - ]> - -
[oe] [meta-python] [PATCH] python-protobuf: upgrade 3.9.1 -> 3.9.2
Signed-off-by: Zang Ruochen --- meta-python/recipes-devtools/python/python-protobuf.inc | 4 ++-- .../python/{python-protobuf_3.9.1.bb => python-protobuf_3.9.2.bb} | 0 .../python/{python3-protobuf_3.9.1.bb => python3-protobuf_3.9.2.bb} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename meta-python/recipes-devtools/python/{python-protobuf_3.9.1.bb => python-protobuf_3.9.2.bb} (100%) rename meta-python/recipes-devtools/python/{python3-protobuf_3.9.1.bb => python3-protobuf_3.9.2.bb} (100%) diff --git a/meta-python/recipes-devtools/python/python-protobuf.inc b/meta-python/recipes-devtools/python/python-protobuf.inc index 5058d4b..4061311 100644 --- a/meta-python/recipes-devtools/python/python-protobuf.inc +++ b/meta-python/recipes-devtools/python/python-protobuf.inc @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=19e8f490f9526b1de8 inherit pypi -SRC_URI[md5sum] = "ca881f18795e024a2b935d5bae9b1ebe" -SRC_URI[sha256sum] = "d831b047bd69becaf64019a47179eb22118a50dd008340655266a906c69c6417" +SRC_URI[md5sum] = "d634666c898148e4565ac62f3ba4a2ca" +SRC_URI[sha256sum] = "843f498e98ad1469ad54ecb4a7ccf48605a1c5d2bd26ae799c7a2cddab4a37ec" # http://errors.yoctoproject.org/Errors/Details/184715/ # Can't find required file: ../src/google/protobuf/descriptor.proto diff --git a/meta-python/recipes-devtools/python/python-protobuf_3.9.1.bb b/meta-python/recipes-devtools/python/python-protobuf_3.9.2.bb similarity index 100% rename from meta-python/recipes-devtools/python/python-protobuf_3.9.1.bb rename to meta-python/recipes-devtools/python/python-protobuf_3.9.2.bb diff --git a/meta-python/recipes-devtools/python/python3-protobuf_3.9.1.bb b/meta-python/recipes-devtools/python/python3-protobuf_3.9.2.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-protobuf_3.9.1.bb rename to meta-python/recipes-devtools/python/python3-protobuf_3.9.2.bb -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python] [PATCH] python-cmd2: upgrade 0.9.16 -> 0.9.17
Signed-off-by: Zang Ruochen --- meta-python/recipes-devtools/python/python-cmd2.inc | 4 ++-- .../python/{python-cmd2_0.9.16.bb => python-cmd2_0.9.17.bb} | 0 .../python/{python3-cmd2_0.9.16.bb => python3-cmd2_0.9.17.bb} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename meta-python/recipes-devtools/python/{python-cmd2_0.9.16.bb => python-cmd2_0.9.17.bb} (100%) rename meta-python/recipes-devtools/python/{python3-cmd2_0.9.16.bb => python3-cmd2_0.9.17.bb} (100%) diff --git a/meta-python/recipes-devtools/python/python-cmd2.inc b/meta-python/recipes-devtools/python/python-cmd2.inc index 1a0be77..3afa93a 100644 --- a/meta-python/recipes-devtools/python/python-cmd2.inc +++ b/meta-python/recipes-devtools/python/python-cmd2.inc @@ -3,8 +3,8 @@ HOMEPAGE = "http://packages.python.org/cmd2/"; LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=01aeabea7ae1529a8e4b674b7107d6bc" -SRC_URI[md5sum] = "df35bb2dca8f5e1f6090e1f0aa02960a" -SRC_URI[sha256sum] = "4b78379d53aff811d1deac720bbe71661769822a5fb2d830cd730656d180fb3d" +SRC_URI[md5sum] = "c030c7364422609d16028fe1ea023bfe" +SRC_URI[sha256sum] = "77bea602eb3b553a573188fa9514234bb1e44269d830a0ef8c4357f47aa9e46a" inherit pypi diff --git a/meta-python/recipes-devtools/python/python-cmd2_0.9.16.bb b/meta-python/recipes-devtools/python/python-cmd2_0.9.17.bb similarity index 100% rename from meta-python/recipes-devtools/python/python-cmd2_0.9.16.bb rename to meta-python/recipes-devtools/python/python-cmd2_0.9.17.bb diff --git a/meta-python/recipes-devtools/python/python3-cmd2_0.9.16.bb b/meta-python/recipes-devtools/python/python3-cmd2_0.9.17.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-cmd2_0.9.16.bb rename to meta-python/recipes-devtools/python/python3-cmd2_0.9.17.bb -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel