From 0d8b1244a0c91333d2cc332d9bc5c46a7487db3b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 29 Jan 2020 10:07:37 +0100 Subject: sed: upgrade 4.7 -> 4.8 License-update: copyright years (From OE-Core rev: 9dc9107eca360ea491e37a5bd26432c77b696bee) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-extended/sed/sed_4.7.bb | 64 ----------------------------------- meta/recipes-extended/sed/sed_4.8.bb | 65 ++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 64 deletions(-) delete mode 100644 meta/recipes-extended/sed/sed_4.7.bb create mode 100644 meta/recipes-extended/sed/sed_4.8.bb (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/sed/sed_4.7.bb b/meta/recipes-extended/sed/sed_4.7.bb deleted file mode 100644 index a285941dc4..0000000000 --- a/meta/recipes-extended/sed/sed_4.7.bb +++ /dev/null @@ -1,64 +0,0 @@ -SUMMARY = "Stream EDitor (text filtering utility)" -HOMEPAGE = "http://www.gnu.org/software/sed/" -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \ - file://sed/sed.h;beginline=1;endline=15;md5=e869c874e5472ba89f63f381b0e93475" -SECTION = "console/utils" - -SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.xz \ - file://run-ptest \ -" - -SRC_URI[md5sum] = "777ddfd9d71dd06711fe91f0925e1573" -SRC_URI[sha256sum] = "2885768cd0a29ff8d58a6280a270ff161f6a3deb5690b2be6c49f46d4c67bd6a" - -inherit autotools texinfo update-alternatives gettext ptest - -PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" - -RDEPENDS_${PN}-ptest += "make gawk perl perl-module-filehandle perl-module-file-compare perl-module-file-find perl-module-file-temp perl-module-file-stat" -RRECOMMENDS_${PN}-ptest_append_libc-glibc = " locale-base-ru-ru locale-base-en-us locale-base-el-gr.iso-8859-7" - -EXTRA_OECONF = "--disable-acl \ - " - -do_install () { - autotools_do_install - install -d ${D}${base_bindir} - if [ ! ${D}${bindir} -ef ${D}${base_bindir} ]; then - mv ${D}${bindir}/sed ${D}${base_bindir}/sed - rmdir ${D}${bindir}/ - fi -} - -ALTERNATIVE_${PN} = "sed" -ALTERNATIVE_LINK_NAME[sed] = "${base_bindir}/sed" -ALTERNATIVE_PRIORITY = "100" - -do_compile_ptest() { - oe_runmake testsuite/get-mb-cur-max testsuite/test-mbrtowc -} - -do_install_ptest() { - cp -rf ${S}/testsuite/ ${D}${PTEST_PATH} - cp -rf ${B}/testsuite/* ${D}${PTEST_PATH}/testsuite/ - cp -rf ${S}/build-aux/ ${D}${PTEST_PATH}/ - cp ${B}/Makefile ${D}${PTEST_PATH} - cp ${S}/init.cfg ${D}${PTEST_PATH} - - sed -e 's/^Makefile:/_Makefile:/' -e 's/^srcdir = \(.*\)/srcdir = ./' -e 's/bash/sh/' -i ${D}${PTEST_PATH}/Makefile - for i in `grep -rl "sed/sed" ${D}${PTEST_PATH}`; do sed -e 's/..\/sed\/sed/sed/' -i $i; done - - sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ - -e 's:abs_top_builddir =.*:abs_top_builddir = ..:g' \ - -e 's:abs_top_srcdir =.*:abs_top_srcdir = ..:g' \ - -e 's:abs_srcdir =.*:abs_srcdir = ..:g' \ - -e 's:top_srcdir =.*:top_srcdir = ..:g' \ - -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ - -i ${D}${PTEST_PATH}/Makefile -} - -RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sed', '', d)}" diff --git a/meta/recipes-extended/sed/sed_4.8.bb b/meta/recipes-extended/sed/sed_4.8.bb new file mode 100644 index 0000000000..39e3a61df5 --- /dev/null +++ b/meta/recipes-extended/sed/sed_4.8.bb @@ -0,0 +1,65 @@ +SUMMARY = "Stream EDitor (text filtering utility)" +HOMEPAGE = "http://www.gnu.org/software/sed/" +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \ + file://sed/sed.h;beginline=1;endline=15;md5=fb3c7e6fbca6f66943859153d4be8efe \ + " +SECTION = "console/utils" + +SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.xz \ + file://run-ptest \ +" + +SRC_URI[md5sum] = "6d906edfdb3202304059233f51f9a71d" +SRC_URI[sha256sum] = "f79b0cfea71b37a8eeec8490db6c5f7ae7719c35587f21edb0617f370eeff633" + +inherit autotools texinfo update-alternatives gettext ptest + +PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" + +RDEPENDS_${PN}-ptest += "make gawk perl perl-module-filehandle perl-module-file-compare perl-module-file-find perl-module-file-temp perl-module-file-stat" +RRECOMMENDS_${PN}-ptest_append_libc-glibc = " locale-base-ru-ru locale-base-en-us locale-base-el-gr.iso-8859-7" + +EXTRA_OECONF = "--disable-acl \ + " + +do_install () { + autotools_do_install + install -d ${D}${base_bindir} + if [ ! ${D}${bindir} -ef ${D}${base_bindir} ]; then + mv ${D}${bindir}/sed ${D}${base_bindir}/sed + rmdir ${D}${bindir}/ + fi +} + +ALTERNATIVE_${PN} = "sed" +ALTERNATIVE_LINK_NAME[sed] = "${base_bindir}/sed" +ALTERNATIVE_PRIORITY = "100" + +do_compile_ptest() { + oe_runmake testsuite/get-mb-cur-max testsuite/test-mbrtowc +} + +do_install_ptest() { + cp -rf ${S}/testsuite/ ${D}${PTEST_PATH} + cp -rf ${B}/testsuite/* ${D}${PTEST_PATH}/testsuite/ + cp -rf ${S}/build-aux/ ${D}${PTEST_PATH}/ + cp ${B}/Makefile ${D}${PTEST_PATH} + cp ${S}/init.cfg ${D}${PTEST_PATH} + + sed -e 's/^Makefile:/_Makefile:/' -e 's/^srcdir = \(.*\)/srcdir = ./' -e 's/bash/sh/' -i ${D}${PTEST_PATH}/Makefile + for i in `grep -rl "sed/sed" ${D}${PTEST_PATH}`; do sed -e 's/..\/sed\/sed/sed/' -i $i; done + + sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ + -e 's:abs_top_builddir =.*:abs_top_builddir = ..:g' \ + -e 's:abs_top_srcdir =.*:abs_top_srcdir = ..:g' \ + -e 's:abs_srcdir =.*:abs_srcdir = ..:g' \ + -e 's:top_srcdir =.*:top_srcdir = ..:g' \ + -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ + -i ${D}${PTEST_PATH}/Makefile +} + +RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sed', '', d)}" -- cgit v1.2.3-54-g00ecf