From 76c9ba6b3f7c0aecb00b7d9c0a1aace3f80d8b48 Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Wed, 16 Aug 2017 16:47:10 +0300 Subject: screen: upgrade to 4.6.1 Removed following patch as the parallel make issue was fixed upstream: * fix-parallel-make.patch Signed-off-by: Maxin B. John Signed-off-by: Richard Purdie --- .../screen/screen/fix-parallel-make.patch | 19 -------- meta/recipes-extended/screen/screen_4.6.0.bb | 52 ---------------------- meta/recipes-extended/screen/screen_4.6.1.bb | 51 +++++++++++++++++++++ 3 files changed, 51 insertions(+), 71 deletions(-) delete mode 100644 meta/recipes-extended/screen/screen/fix-parallel-make.patch delete mode 100644 meta/recipes-extended/screen/screen_4.6.0.bb create mode 100644 meta/recipes-extended/screen/screen_4.6.1.bb (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/screen/screen/fix-parallel-make.patch b/meta/recipes-extended/screen/screen/fix-parallel-make.patch deleted file mode 100644 index e0caf5d83e..0000000000 --- a/meta/recipes-extended/screen/screen/fix-parallel-make.patch +++ /dev/null @@ -1,19 +0,0 @@ -This fixes the parallel make install failure - -Upstream-Status: Pending - -Signed-off-by: Saul Wold - -Index: screen-4.0.3/Makefile.in -=================================================================== ---- screen-4.0.3.orig/Makefile.in -+++ screen-4.0.3/Makefile.in -@@ -70,7 +70,7 @@ screen: $(OFILES) - .c.o: - $(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $< - --install_bin: .version screen -+install_bin: .version screen installdirs - -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \ - then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi - $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) diff --git a/meta/recipes-extended/screen/screen_4.6.0.bb b/meta/recipes-extended/screen/screen_4.6.0.bb deleted file mode 100644 index a41efe929e..0000000000 --- a/meta/recipes-extended/screen/screen_4.6.0.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "Multiplexing terminal manager" -DESCRIPTION = "Screen is a full-screen window manager \ -that multiplexes a physical terminal between several \ -processes, typically interactive shells." -HOMEPAGE = "http://www.gnu.org/software/screen/" -BUGTRACKER = "https://savannah.gnu.org/bugs/?func=additem&group=screen" - -SECTION = "console/utils" - -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://screen.h;endline=26;md5=3971142989289a8198a544220703c2bf" - -DEPENDS = "ncurses \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -RDEPENDS_${PN} = "base-files" - -SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \ - file://fix-parallel-make.patch \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://screen.pam', '', d)} \ - file://Remove-redundant-compiler-sanity-checks.patch \ - file://Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch \ - file://Skip-host-file-system-checks-when-cross-compiling.patch \ - file://Avoid-mis-identifying-systems-as-SVR4.patch \ - file://0002-comm.h-now-depends-on-term.h.patch \ - file://0001-fix-for-multijob-build.patch \ - " - -SRC_URI[md5sum] = "af60f716c4ec134712b923ef6cd93848" -SRC_URI[sha256sum] = "9433706b653e941cc4c745f28e252e57be2a141eded923e61cc2c4a09768fed4" - -inherit autotools texinfo - -PACKAGECONFIG ??= "" -PACKAGECONFIG[utempter] = "ac_cv_header_utempter_h=yes,ac_cv_header_utempter_h=no,libutempter," - -EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" - -do_install_append () { - if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then - install -D -m 644 ${WORKDIR}/screen.pam ${D}/${sysconfdir}/pam.d/screen - fi -} - -pkg_postinst_${PN} () { - grep -q "^${bindir}/screen$" $D${sysconfdir}/shells || echo ${bindir}/screen >> $D${sysconfdir}/shells -} - -pkg_postrm_${PN} () { - printf "$(grep -v "^${bindir}/screen$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells -} diff --git a/meta/recipes-extended/screen/screen_4.6.1.bb b/meta/recipes-extended/screen/screen_4.6.1.bb new file mode 100644 index 0000000000..84baae9386 --- /dev/null +++ b/meta/recipes-extended/screen/screen_4.6.1.bb @@ -0,0 +1,51 @@ +SUMMARY = "Multiplexing terminal manager" +DESCRIPTION = "Screen is a full-screen window manager \ +that multiplexes a physical terminal between several \ +processes, typically interactive shells." +HOMEPAGE = "http://www.gnu.org/software/screen/" +BUGTRACKER = "https://savannah.gnu.org/bugs/?func=additem&group=screen" + +SECTION = "console/utils" + +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://screen.h;endline=26;md5=3971142989289a8198a544220703c2bf" + +DEPENDS = "ncurses \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +RDEPENDS_${PN} = "base-files" + +SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://screen.pam', '', d)} \ + file://Remove-redundant-compiler-sanity-checks.patch \ + file://Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch \ + file://Skip-host-file-system-checks-when-cross-compiling.patch \ + file://Avoid-mis-identifying-systems-as-SVR4.patch \ + file://0002-comm.h-now-depends-on-term.h.patch \ + file://0001-fix-for-multijob-build.patch \ + " + +SRC_URI[md5sum] = "132c893aabfaf2020074790215c8cacd" +SRC_URI[sha256sum] = "aba9af66cb626155d6abce4703f45cce0e30a5114a368bd6387c966cbbbb7c64" + +inherit autotools texinfo + +PACKAGECONFIG ??= "" +PACKAGECONFIG[utempter] = "ac_cv_header_utempter_h=yes,ac_cv_header_utempter_h=no,libutempter," + +EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" + +do_install_append () { + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then + install -D -m 644 ${WORKDIR}/screen.pam ${D}/${sysconfdir}/pam.d/screen + fi +} + +pkg_postinst_${PN} () { + grep -q "^${bindir}/screen$" $D${sysconfdir}/shells || echo ${bindir}/screen >> $D${sysconfdir}/shells +} + +pkg_postrm_${PN} () { + printf "$(grep -v "^${bindir}/screen$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells +} -- cgit 1.2.3-korg