None, thanks for pinging. Now in MUT. Ross
On 8 June 2018 at 20:52, Andre McCurdy <armccu...@gmail.com> wrote: > On Thu, May 24, 2018 at 5:14 PM, Andre McCurdy <armccu...@gmail.com> wrote: >> Merge contents of cpio_v2.inc into the only recipe which uses it. > > Ping. > > Any issues with this (ie the whole series of 3)? > >> Signed-off-by: Andre McCurdy <armccu...@gmail.com> >> --- >> meta/recipes-extended/cpio/cpio_2.12.bb | 40 ++++++++++++++++++++++++++++-- >> meta/recipes-extended/cpio/cpio_v2.inc | 43 >> --------------------------------- >> 2 files changed, 38 insertions(+), 45 deletions(-) >> delete mode 100644 meta/recipes-extended/cpio/cpio_v2.inc >> >> diff --git a/meta/recipes-extended/cpio/cpio_2.12.bb >> b/meta/recipes-extended/cpio/cpio_2.12.bb >> index 405a90e..0b83e9b 100644 >> --- a/meta/recipes-extended/cpio/cpio_2.12.bb >> +++ b/meta/recipes-extended/cpio/cpio_2.12.bb >> @@ -1,8 +1,13 @@ >> -require cpio_v2.inc >> - >> +SUMMARY = "GNU cpio is a program to manage archives of files" >> +DESCRIPTION = "GNU cpio is a tool for creating and extracting archives, or >> copying files from one place to \ >> +another. It handles a number of cpio formats as well as reading and writing >> tar files." >> +HOMEPAGE = "http://www.gnu.org/software/cpio/" >> +SECTION = "base" >> LICENSE = "GPLv3" >> LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" >> >> +DEPENDS = "texinfo-native" >> + >> SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ >> >> file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ >> file://0001-Fix-CVE-2015-1197.patch \ >> @@ -10,3 +15,34 @@ SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ >> >> SRC_URI[md5sum] = "fc207561a86b63862eea4b8300313e86" >> SRC_URI[sha256sum] = >> "08a35e92deb3c85d269a0059a27d4140a9667a6369459299d08c17f713a92e73" >> + >> +inherit autotools gettext texinfo >> + >> +EXTRA_OECONF += "DEFAULT_RMT_DIR=${base_sbindir}" >> + >> +do_install () { >> + autotools_do_install >> + if [ "${base_bindir}" != "${bindir}" ]; then >> + install -d ${D}${base_bindir}/ >> + mv "${D}${bindir}/cpio" "${D}${base_bindir}/cpio" >> + rmdir ${D}${bindir}/ >> + fi >> +} >> + >> +PACKAGES =+ "${PN}-rmt" >> + >> +FILES_${PN}-rmt = "${base_sbindir}/rmt*" >> + >> +inherit update-alternatives >> + >> +ALTERNATIVE_PRIORITY = "100" >> + >> +ALTERNATIVE_${PN} = "cpio" >> +ALTERNATIVE_${PN}-rmt = "rmt" >> + >> +ALTERNATIVE_LINK_NAME[cpio] = "${base_bindir}/cpio" >> + >> +ALTERNATIVE_PRIORITY[rmt] = "50" >> +ALTERNATIVE_LINK_NAME[rmt] = "${base_sbindir}/rmt" >> + >> +BBCLASSEXTEND = "native" >> diff --git a/meta/recipes-extended/cpio/cpio_v2.inc >> b/meta/recipes-extended/cpio/cpio_v2.inc >> deleted file mode 100644 >> index 31adb71..0000000 >> --- a/meta/recipes-extended/cpio/cpio_v2.inc >> +++ /dev/null >> @@ -1,43 +0,0 @@ >> -SUMMARY = "GNU cpio is a program to manage archives of files" >> -DESCRIPTION = "GNU cpio is a tool for creating and extracting archives, or >> copying files from one place to \ >> -another. It handles a number of cpio formats as well as reading and writing >> tar files." >> -HOMEPAGE = "http://www.gnu.org/software/cpio/" >> -SECTION = "base" >> - >> -DEPENDS = "texinfo-native" >> - >> -SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ >> - " >> - >> -inherit autotools gettext texinfo >> - >> -S = "${WORKDIR}/cpio-${PV}" >> - >> -EXTRA_OECONF += "DEFAULT_RMT_DIR=${base_sbindir}" >> - >> -do_install () { >> - autotools_do_install >> - if [ "${base_bindir}" != "${bindir}" ]; then >> - install -d ${D}${base_bindir}/ >> - mv "${D}${bindir}/cpio" "${D}${base_bindir}/cpio" >> - rmdir ${D}${bindir}/ >> - fi >> -} >> - >> -PACKAGES =+ "${PN}-rmt" >> - >> -FILES_${PN}-rmt = "${base_sbindir}/rmt*" >> - >> -inherit update-alternatives >> - >> -ALTERNATIVE_PRIORITY = "100" >> - >> -ALTERNATIVE_${PN} = "cpio" >> -ALTERNATIVE_${PN}-rmt = "rmt" >> - >> -ALTERNATIVE_LINK_NAME[cpio] = "${base_bindir}/cpio" >> - >> -ALTERNATIVE_PRIORITY[rmt] = "50" >> -ALTERNATIVE_LINK_NAME[rmt] = "${base_sbindir}/rmt" >> - >> -BBCLASSEXTEND = "native" >> -- >> 1.9.1 >> > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core