From: Hugo Villeneuve <hugo@hugovil.com>
Date: Fri, 28 Jun 2013 03:43:49 +0000 (-0400)
Subject: Move Mercurial from stage 3 to 5 (Python dependency)
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=39a19cacbb9a44c5ceadd254463ea87c588a82a3;p=hvlinux.git

Move Mercurial from stage 3 to 5 (Python dependency)
---

diff --git a/config/dependencies b/config/dependencies
index 53a5347..0a0b5a0 100644
--- a/config/dependencies
+++ b/config/dependencies
@@ -173,3 +173,5 @@ ${MYSQL}: ${CMAKE}
 ${LIBX264}: ${YASM}
 
 ${GST_FFMPEG}: ${YASM}
+
+${MERCURIAL}: ${PYTHON}
diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index a3a10da..b6e004d 100755
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -99,7 +99,6 @@ ipkg -m noac ${COLORDIFF}
 ipkg ${INTLTOOL}
 
 ipkg -m acnb ${GIT} "--libexecdir=/usr/lib --with-gitconfig=/etc/gitconfig"
-ipkg -m noac ${MERCURIAL}
 
 ipkg ${DIALOG}
 
diff --git a/stage3/misc/hgrc b/stage3/misc/hgrc
deleted file mode 100644
index bf75b93..0000000
--- a/stage3/misc/hgrc
+++ /dev/null
@@ -1,16 +0,0 @@
-[extensions]
-color =
-rebase =
-
-# extension do display log in graphical way
-graphlog =
-pager =
-
-# extension for paging mercurial output
-[pager]
-pager = LESS='FSRX' less
-attend = annotate, cat, diff, export, log, glog
-
-[alias]
-# Give log output similar to git
-glog = log --template '\033[0;33mcommit {node} [r{rev}]\n\033[0mAuthor: {author}\nDate:   {date|rfc822date}\n\n\t{desc|strip|fill68|tabindent}\n\n'
diff --git a/stage3/packages-update b/stage3/packages-update
index 6b09287..cb99a2e 100755
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -74,7 +74,6 @@ fpkg -e "tar.gz" ${DOSFSTOOLS} "http://fossies.org/linux/misc"
 fpkg -e "tar.gz" ${GIT} "http://git-core.googlecode.com/files"
 fpkg -e "tar.gz" "git-manpages-$(get_pkg_ver ${GIT})" \
     "http://git-core.googlecode.com/files"
-fpkg -e "tar.gz" ${MERCURIAL} "http://mercurial.selenic.com/release"
 
 fpkg -e "tar.gz" ${DIALOG} "ftp://ftp.us.debian.org/debian/pool/main/d/dialog"
 
diff --git a/stage3/pkg/mercurial b/stage3/pkg/mercurial
deleted file mode 100644
index 22dbcde..0000000
--- a/stage3/pkg/mercurial
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-hvbuild()
-{
-    cd ${LFS_TMP}/${PACKAGE}
-
-    make build
-    make PREFIX=/usr install-bin
-}
-
-hvbuild_post()
-{
-    install -dv /etc/mercurial
-    install -v -m644 ${SCRDIR}/misc/hgrc /etc/mercurial
-}
diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 90062f9..4c3b61a 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -229,6 +229,8 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg ${ABIWORD} "--disable-spellcheck"
 fi
 
+ipkg -m noac ${MERCURIAL}
+
 ipkg ${INDENT}
 
 if [ "x${USE_SAMBA}" = "xyes" ]; then
diff --git a/stage5/misc/hgrc b/stage5/misc/hgrc
new file mode 100644
index 0000000..bf75b93
--- /dev/null
+++ b/stage5/misc/hgrc
@@ -0,0 +1,16 @@
+[extensions]
+color =
+rebase =
+
+# extension do display log in graphical way
+graphlog =
+pager =
+
+# extension for paging mercurial output
+[pager]
+pager = LESS='FSRX' less
+attend = annotate, cat, diff, export, log, glog
+
+[alias]
+# Give log output similar to git
+glog = log --template '\033[0;33mcommit {node} [r{rev}]\n\033[0mAuthor: {author}\nDate:   {date|rfc822date}\n\n\t{desc|strip|fill68|tabindent}\n\n'
diff --git a/stage5/packages-update b/stage5/packages-update
index 6da4eb0..7887002 100755
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -171,6 +171,8 @@ fpkg -e "tar.gz" ${SAMBA} "ftp://ftp.samba.org/pub/samba/old-versions"
 
 fpkg ${PHP}   "http://us2.php.net/distributions"
 
+fpkg -e "tar.gz" ${MERCURIAL} "http://mercurial.selenic.com/release"
+
 fpkg -m gnu ${INDENT}
 
 fpkg -e "tgz" ${LTSP_UTILS} "http://ltsp.mirrors.tds.net/pub/ltsp/utils"
diff --git a/stage5/pkg/mercurial b/stage5/pkg/mercurial
new file mode 100644
index 0000000..22dbcde
--- /dev/null
+++ b/stage5/pkg/mercurial
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+hvbuild()
+{
+    cd ${LFS_TMP}/${PACKAGE}
+
+    make build
+    make PREFIX=/usr install-bin
+}
+
+hvbuild_post()
+{
+    install -dv /etc/mercurial
+    install -v -m644 ${SCRDIR}/misc/hgrc /etc/mercurial
+}