diff options
| author | Maxin B. John <maxin.john@intel.com> | 2017-08-16 16:47:10 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-17 10:04:30 +0100 |
| commit | 76c9ba6b3f7c0aecb00b7d9c0a1aace3f80d8b48 (patch) | |
| tree | de2db4da9f2e16ab0b2213760eb637c43496aeb8 | |
| parent | 9db907a0bd331c47c4882b82f9f1d2a7ef1f6d1f (diff) | |
| download | openembedded-core-76c9ba6b3f7c0aecb00b7d9c0a1aace3f80d8b48.tar.gz openembedded-core-76c9ba6b3f7c0aecb00b7d9c0a1aace3f80d8b48.tar.bz2 openembedded-core-76c9ba6b3f7c0aecb00b7d9c0a1aace3f80d8b48.zip | |
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 <maxin.john@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-extended/screen/screen/fix-parallel-make.patch | 19 | ||||
| -rw-r--r-- | meta/recipes-extended/screen/screen_4.6.1.bb (renamed from meta/recipes-extended/screen/screen_4.6.0.bb) | 5 |
2 files changed, 2 insertions, 22 deletions
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 <sgw@linux.intel.com> - -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.1.bb index a41efe929e..84baae9386 100644 --- a/meta/recipes-extended/screen/screen_4.6.0.bb +++ b/meta/recipes-extended/screen/screen_4.6.1.bb @@ -16,7 +16,6 @@ DEPENDS = "ncurses \ 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 \ @@ -26,8 +25,8 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \ file://0001-fix-for-multijob-build.patch \ " -SRC_URI[md5sum] = "af60f716c4ec134712b923ef6cd93848" -SRC_URI[sha256sum] = "9433706b653e941cc4c745f28e252e57be2a141eded923e61cc2c4a09768fed4" +SRC_URI[md5sum] = "132c893aabfaf2020074790215c8cacd" +SRC_URI[sha256sum] = "aba9af66cb626155d6abce4703f45cce0e30a5114a368bd6387c966cbbbb7c64" inherit autotools texinfo |