Ajout colordiff

diff --git a/config/packages-list b/config/packages-list
index 31b66cded91ec7af944c5ec74dd0d357d2eb520a..94145a9fac522bc8c92b10699a89f7d39b061a2a 100644 (file)
--- a/config/packages-list
+++ b/config/packages-list
@@ -40,6 +40,7 @@ CKERMIT="ckermit-8.0.211"
 CHORDPACK="chordpack-0.8.2"
 CLAMAV="clamav-0.93.3"
 CLOOG_PPL="cloog-ppl-0.15.10"
+COLORDIFF="colordiff-1.0.9"
 CONSOLEKIT="ConsoleKit-0.4.1"
 COREUTILS="coreutils-8.9"
 CPIO="cpio-2.11"

diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index 20261102f8ba52590b8d362d1febabba4ef966b9..a6659413b85f679a2f2e407580cfbc7748f7c363 100755 (executable)
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -82,6 +82,7 @@ ipkg -m pm ${PERL_MOD_XML_PARSER}
 
 # Grep alternative
 ipkg -m noac ${ACK}
+ipkg -m noac ${COLORDIFF}
 
 ipkg ${INTLTOOL}
 ipkg ${PYTHON} "--enable-shared"

diff --git a/stage3/packages-update b/stage3/packages-update
index a9cf8b13f9b443acc0fb60718679e8ebe9290a9c..8dc8749e2b603498f93a1f6a9d52cc04712b3d07 100755 (executable)
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -70,7 +70,9 @@ fpkg -m sf -s "pdl" ${PERL_MOD_PDL}
 fpkg -m pm -s "J/JO/JOSEPHW" ${PERL_MOD_XML_WRITER}
 fpkg -m pm -s "C/CH/CHORNY"  ${PERL_MOD_XML_PARSER}
 
+# Utilities
 fpkg -m hv ${ACK}
+fpkg -m hv -e "tar.gz" ${COLORDIFF}
 
 fpkg -m gnome ${INTLTOOL}
 fpkg ${PYTHON} "http://www.python.org/ftp/python/$(get_pkg_ver ${PYTHON})"

diff --git a/stage3/pkg/colordiff b/stage3/pkg/colordiff
new file mode 100644 (file)
index 0000000..7d3d10b
--- /dev/null
+++ b/stage3/pkg/colordiff
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+hvbuild()
+{
+    PREFIX=/usr make -C ${LFS_TMP}/${PACKAGE} install
+}