| Message ID | 20181004225610.13853-1-daniel.diaz@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [oe,meta-oe] libhugetlbfs: Update to 2.21 | expand |
Hi Daniel On Thu, Oct 4, 2018 at 3:57 PM Daniel Díaz <daniel.diaz@linaro.org> wrote: > > Version 2.21 was released on 9/17 [1]. These changes update > the recipe to use that version. > > Only one of the existing patches had been merged upstream > (as e3928d57 "Force text segment alignment to 0x08000000 for > i386 with gold linker") -- the rest of them is still needed > for proper cross-compilation. > > Upstream commit c3e5cb22 ("Remove bit-rotting scripts") got > rid of the Perl stuff, due to it being "massively out of > date", so the Perl bits in the recipe have gone away too. > > [1] https://github.com/libhugetlbfs/libhugetlbfs/releases/tag/2.21 > > Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org> > --- > .../libhugetlbfs/libhugetlbfs_git.bb | 20 +++++-------------- seems like you forgot to delete the patch file which is removed from src uri > 1 file changed, 5 insertions(+), 15 deletions(-) > > diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb > index 14c909e75..66fd8e21d 100644 > --- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb > +++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb > @@ -3,14 +3,14 @@ HOMEPAGE = "https://github.com/libhugetlbfs/libhugetlbfs" > LICENSE = "LGPLv2.1" > LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1" > > -DEPENDS = "sysfsutils perl" > -RDEPENDS_${PN} += "bash perl python python-io python-lang python-subprocess python-resource ${PN}-perl" > +DEPENDS = "sysfsutils" > +RDEPENDS_${PN} += "bash python python-io python-lang python-subprocess python-resource" > RDEPENDS_${PN}-tests += "bash" > > -PV = "2.20" > +PV = "2.21" > PE = "1" > > -SRCREV = "e44180072b796c0e28e53c4d01ef6279caaa2a99" > +SRCREV = "73d06e69108f231696e9c5c44f4b42690fc5d752" > SRC_URI = " \ > git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https \ > file://skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \ > @@ -18,7 +18,6 @@ SRC_URI = " \ > file://tests-Makefile-install-static-4G-edge-testcases.patch \ > file://0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch \ > file://libhugetlbfs-elf_i386-avoid-search-host-library-path.patch \ > - file://Force-text-segment-alignment-to-0x08000000-for-i386-.patch \ > file://0001-include-stddef.h-for-ptrdiff_t.patch \ > file://0002-Mark-glibc-specific-code-so.patch \ > file://0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch \ > @@ -51,14 +50,6 @@ do_configure() { > if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then > sed -i 's/CUSTOM_LDSCRIPTS = yes/CUSTOM_LDSCRIPTS = no/' Makefile > fi > - > - # fixup perl module directory hardcoded to perl5 > - sed -i 's/perl5/perl/g' Makefile > - > - # fixup to install perl module under $(LIBDIR)/perl/${@get_perl_version(d)}/TLBC > - # to avoid below error > - # Can't locate TLBC/OpCollect.pm in @INC > - sed -i '/^PMDIR/ s:perl:perl/${@get_perl_version(d)}:g' Makefile > } > > do_install() { > @@ -69,11 +60,10 @@ do_install() { > } > > > -PACKAGES =+ "${PN}-perl ${PN}-tests " > +PACKAGES =+ "${PN}-tests " > FILES_${PN} += "${libdir}/*.so" > FILES_${PN}-dev = "${includedir}" > FILES_${PN}-dbg += "${libdir}/libhugetlbfs/tests/obj32/.debug ${libdir}/libhugetlbfs/tests/obj64/.debug" > -FILES_${PN}-perl = "${libdir}/perl" > FILES_${PN}-tests += "${libdir}/libhugetlbfs/tests" > > INSANE_SKIP_${PN} = "dev-so" > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Hello!
On Thu, 4 Oct 2018 at 17:59, Khem Raj <raj.khem@gmail.com> wrote:
> seems like you forgot to delete the patch file which is removed from src uri
Yes, I did. :) V2 coming right up.
Thanks and greetings!
Daniel Díaz
daniel.diaz@linaro.org
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb index 14c909e75..66fd8e21d 100644 --- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb @@ -3,14 +3,14 @@ HOMEPAGE = "https://github.com/libhugetlbfs/libhugetlbfs" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1" -DEPENDS = "sysfsutils perl" -RDEPENDS_${PN} += "bash perl python python-io python-lang python-subprocess python-resource ${PN}-perl" +DEPENDS = "sysfsutils" +RDEPENDS_${PN} += "bash python python-io python-lang python-subprocess python-resource" RDEPENDS_${PN}-tests += "bash" -PV = "2.20" +PV = "2.21" PE = "1" -SRCREV = "e44180072b796c0e28e53c4d01ef6279caaa2a99" +SRCREV = "73d06e69108f231696e9c5c44f4b42690fc5d752" SRC_URI = " \ git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https \ file://skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \ @@ -18,7 +18,6 @@ SRC_URI = " \ file://tests-Makefile-install-static-4G-edge-testcases.patch \ file://0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch \ file://libhugetlbfs-elf_i386-avoid-search-host-library-path.patch \ - file://Force-text-segment-alignment-to-0x08000000-for-i386-.patch \ file://0001-include-stddef.h-for-ptrdiff_t.patch \ file://0002-Mark-glibc-specific-code-so.patch \ file://0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch \ @@ -51,14 +50,6 @@ do_configure() { if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then sed -i 's/CUSTOM_LDSCRIPTS = yes/CUSTOM_LDSCRIPTS = no/' Makefile fi - - # fixup perl module directory hardcoded to perl5 - sed -i 's/perl5/perl/g' Makefile - - # fixup to install perl module under $(LIBDIR)/perl/${@get_perl_version(d)}/TLBC - # to avoid below error - # Can't locate TLBC/OpCollect.pm in @INC - sed -i '/^PMDIR/ s:perl:perl/${@get_perl_version(d)}:g' Makefile } do_install() { @@ -69,11 +60,10 @@ do_install() { } -PACKAGES =+ "${PN}-perl ${PN}-tests " +PACKAGES =+ "${PN}-tests " FILES_${PN} += "${libdir}/*.so" FILES_${PN}-dev = "${includedir}" FILES_${PN}-dbg += "${libdir}/libhugetlbfs/tests/obj32/.debug ${libdir}/libhugetlbfs/tests/obj64/.debug" -FILES_${PN}-perl = "${libdir}/perl" FILES_${PN}-tests += "${libdir}/libhugetlbfs/tests" INSANE_SKIP_${PN} = "dev-so"
Version 2.21 was released on 9/17 [1]. These changes update the recipe to use that version. Only one of the existing patches had been merged upstream (as e3928d57 "Force text segment alignment to 0x08000000 for i386 with gold linker") -- the rest of them is still needed for proper cross-compilation. Upstream commit c3e5cb22 ("Remove bit-rotting scripts") got rid of the Perl stuff, due to it being "massively out of date", so the Perl bits in the recipe have gone away too. [1] https://github.com/libhugetlbfs/libhugetlbfs/releases/tag/2.21 Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org> --- .../libhugetlbfs/libhugetlbfs_git.bb | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-)