[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-398-g02bd745

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  02bd745f0d86e383abe195c2f0499903b09eb895 (commit)
      from  abfbc11207a224eb91baa75a7165451bff617deb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 02bd745f0d86e383abe195c2f0499903b09eb895
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Mon Apr 16 16:51:22 2018 +0200

    [BUILDROOT] 2017.02/2018.02: forces unbuffer tool installation when expect package is selected

-----------------------------------------------------------------------

Summary of changes:
 ...madeus-expect-forces-unbuffer-instalation.patch | 23 ++++++++++++++++++++++
 patches/buildroot/2017.02/cleanup_buildroot.sh     |  1 +
 ...madeus-expect-forces-unbuffer-instalation.patch | 23 ++++++++++++++++++++++
 patches/buildroot/2018.02/cleanup_buildroot.sh     |  1 +
 4 files changed, 48 insertions(+)
 create mode 100644 patches/buildroot/2017.02/044-armadeus-expect-forces-unbuffer-instalation.patch
 create mode 100644 patches/buildroot/2018.02/044-armadeus-expect-forces-unbuffer-instalation.patch

diff --git a/patches/buildroot/2017.02/044-armadeus-expect-forces-unbuffer-instalation.patch b/patches/buildroot/2017.02/044-armadeus-expect-forces-unbuffer-instalation.patch
new file mode 100644
index 0000000..35297b2
--- /dev/null
+++ b/patches/buildroot/2017.02/044-armadeus-expect-forces-unbuffer-instalation.patch
@@ -0,0 +1,23 @@
+Forces unbuffer tool installation when expect package is selected and
+TCL shell interpreter is present.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+diff --git a/package/expect/expect.mk b/package/expect/expect.mk
+index d78ff6c..d88f00f 100644
+--- a/package/expect/expect.mk
++++ b/package/expect/expect.mk
+@@ -17,4 +17,13 @@ EXPECT_CONF_OPTS = --with-tcl=$(BUILD_DIR)/tcl-$(TCL_VERSION)/unix
+ # Since we don't want examples installed
+ EXPECT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR)  install-binaries
+ 
++# unbuffer requires TCL_SH interpreter
++ifneq ($(BR2_PACKAGE_TCL_SHLIB_ONLY),y)
++define EXPECT_INSTALL_UNBUFFER
++	$(INSTALL) -m 0755 -D $(@D)/example/unbuffer $(TARGET_DIR)/usr/bin/unbuffer
++endef
++
++EXPECT_POST_INSTALL_TARGET_HOOKS += EXPECT_INSTALL_UNBUFFER
++endif
++
+ $(eval $(autotools-package))
diff --git a/patches/buildroot/2017.02/cleanup_buildroot.sh b/patches/buildroot/2017.02/cleanup_buildroot.sh
index 3cfe48d..c83cc6c 100755
--- a/patches/buildroot/2017.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2017.02/cleanup_buildroot.sh
@@ -40,6 +40,7 @@ rm -rf buildroot/package/dbus/dbus.hash
 rm -rf buildroot/package/dbus/dbus.mk
 rm -rf buildroot/package/e-uae/Config.in
 rm -rf buildroot/package/e-uae/e-uae.mk
+rm -rf buildroot/package/expect/expect.mk
 rm -rf buildroot/package/fb-test-app/001-fixes-tty-vc-config-on-fb-test-exit.patch
 rm -rf buildroot/package/fbgrab/0002-fix-1.3-version.patch
 rm -rf buildroot/package/freescale-imx/Config.in
diff --git a/patches/buildroot/2018.02/044-armadeus-expect-forces-unbuffer-instalation.patch b/patches/buildroot/2018.02/044-armadeus-expect-forces-unbuffer-instalation.patch
new file mode 100644
index 0000000..35297b2
--- /dev/null
+++ b/patches/buildroot/2018.02/044-armadeus-expect-forces-unbuffer-instalation.patch
@@ -0,0 +1,23 @@
+Forces unbuffer tool installation when expect package is selected and
+TCL shell interpreter is present.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+diff --git a/package/expect/expect.mk b/package/expect/expect.mk
+index d78ff6c..d88f00f 100644
+--- a/package/expect/expect.mk
++++ b/package/expect/expect.mk
+@@ -17,4 +17,13 @@ EXPECT_CONF_OPTS = --with-tcl=$(BUILD_DIR)/tcl-$(TCL_VERSION)/unix
+ # Since we don't want examples installed
+ EXPECT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR)  install-binaries
+ 
++# unbuffer requires TCL_SH interpreter
++ifneq ($(BR2_PACKAGE_TCL_SHLIB_ONLY),y)
++define EXPECT_INSTALL_UNBUFFER
++	$(INSTALL) -m 0755 -D $(@D)/example/unbuffer $(TARGET_DIR)/usr/bin/unbuffer
++endef
++
++EXPECT_POST_INSTALL_TARGET_HOOKS += EXPECT_INSTALL_UNBUFFER
++endif
++
+ $(eval $(autotools-package))
diff --git a/patches/buildroot/2018.02/cleanup_buildroot.sh b/patches/buildroot/2018.02/cleanup_buildroot.sh
index 341ddba..ed39471 100755
--- a/patches/buildroot/2018.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2018.02/cleanup_buildroot.sh
@@ -37,6 +37,7 @@ rm -rf buildroot/package/cunit/Config.in
 rm -rf buildroot/package/cunit/cunit.mk
 rm -rf buildroot/package/e-uae/Config.in
 rm -rf buildroot/package/e-uae/e-uae.mk
+rm -rf buildroot/package/expect/expect.mk
 rm -rf buildroot/package/fb-test-app/001-fixes-tty-vc-config-on-fb-test-exit.patch
 rm -rf buildroot/package/fbgrab/0002-fix-1.3-version.patch
 rm -rf buildroot/package/gnash/Config.in


hooks/post-receive
-- 
armadeus