Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (49e69af25267c50bf338c087e44cd871d7b11555)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (49e69af25267c50bf338c087e44cd871d7b11555)
  • Date: Tue, 27 Nov 2012 08:14:26 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

libs/lockdev/BUILD | 2 +-
libs/lockdev/DETAILS | 1 +
libs/lockdev/HISTORY | 4 ++++
libs/lockdev/INSTALL | 3 ++-
utils/schroot/BUILD | 2 +-
utils/schroot/DEPENDS | 2 +-
utils/schroot/DETAILS | 5 +++--
utils/schroot/HISTORY | 5 +++++
utils/schroot/PRE_BUILD | 3 +++
9 files changed, 21 insertions(+), 6 deletions(-)

New commits:
commit 49e69af25267c50bf338c087e44cd871d7b11555
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

lockdev - create a symlink for liblockdev.so

commit f0d699574dc09f313e8e7bcbce7b72bae8ea2712
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

schroot: => 1.6.4

diff --git a/libs/lockdev/BUILD b/libs/lockdev/BUILD
index 51764b6..6dccbc0 100755
--- a/libs/lockdev/BUILD
+++ b/libs/lockdev/BUILD
@@ -1 +1 @@
-make basedir=$INSTALL_ROOT/usr/
+make basedir=$INSTALL_ROOT/usr
diff --git a/libs/lockdev/DETAILS b/libs/lockdev/DETAILS
index b62430b..fd37795 100755
--- a/libs/lockdev/DETAILS
+++ b/libs/lockdev/DETAILS
@@ -1,5 +1,6 @@
SPELL=lockdev
VERSION=1.0.3
+ PATCHLEVEL=1
SOURCE=${SPELL}_$VERSION.orig.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://ftp.de.debian.org/debian/pool/main/l/$SPELL/$SOURCE
diff --git a/libs/lockdev/HISTORY b/libs/lockdev/HISTORY
index 2f2035c..a6f9919 100644
--- a/libs/lockdev/HISTORY
+++ b/libs/lockdev/HISTORY
@@ -1,3 +1,7 @@
+2012-11-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * INSTALL: create a symlink
+
2008-04-12 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS, DEPENDS, PRE_BUILD, BUILD, INSTALL: Created

diff --git a/libs/lockdev/INSTALL b/libs/lockdev/INSTALL
index 7920830..b4129e9 100755
--- a/libs/lockdev/INSTALL
+++ b/libs/lockdev/INSTALL
@@ -1 +1,2 @@
-make basedir=$INSTALL_ROOT/usr/ install
+make basedir=$INSTALL_ROOT/usr install &&
+ln -sf $TRACK_ROOT/usr/lib/liblockdev.1.0.3.so
$INSTALL_ROOT/usr/lib/liblockdev.so
diff --git a/utils/schroot/BUILD b/utils/schroot/BUILD
index 10f70e0..4acf049 100755
--- a/utils/schroot/BUILD
+++ b/utils/schroot/BUILD
@@ -1,2 +1,2 @@
-OPTS+=' --enable-shared' &&
+OPTS+=' --enable-shared --disable--static' &&
default_build
diff --git a/utils/schroot/DEPENDS b/utils/schroot/DEPENDS
index 2bd75cb..f6e1c17 100755
--- a/utils/schroot/DEPENDS
+++ b/utils/schroot/DEPENDS
@@ -1,4 +1,4 @@
-depends -sub "PROGRAM_OPTIONS REGEX" boost &&
+depends -sub "PROGRAM_OPTIONS REGEX IOSTREAMS" boost &&
depends -sub CXX gcc &&
depends lockdev &&

diff --git a/utils/schroot/DETAILS b/utils/schroot/DETAILS
index 76118c4..f885393 100755
--- a/utils/schroot/DETAILS
+++ b/utils/schroot/DETAILS
@@ -1,6 +1,7 @@
SPELL=schroot
- VERSION=1.6.3
-
SOURCE_HASH=sha512:e435715091eed17e1f073218b2cc2355ad529bb702b9f8cfeb58ed3be38b78fa61280713801ce29e5b21c93939f5898e6f6e4f493d3f7d2550a873289a6c22be
+ VERSION=1.6.4
+
SOURCE_HASH=sha512:51ac4c11a2350b0f331563cffbc773272d878129cc3bfc8e47dfece4038c25d67ab63cf5e769d69e8cb8dcbafde7cf343f014a9e5dc6cc8e976d8e8f492fb7d5
+ PATCHLEVEL=1
# SOURCE_GPG=gurus.gpg:$SOURCE.sign:WORKS_FOR_ME
SOURCE=${SPELL}_$VERSION.orig.tar.xz
SOURCE_URL[0]=http://ftp.de.debian.org/debian/pool/main/s/schroot/$SOURCE
diff --git a/utils/schroot/HISTORY b/utils/schroot/HISTORY
index 264fce6..ba794a0 100644
--- a/utils/schroot/HISTORY
+++ b/utils/schroot/HISTORY
@@ -1,3 +1,8 @@
+2012-11-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.5.4
+ * PRE_BUILD: fix compile with gcc-4.7.x
+ * DEPENDS: also needs boost IOSTREAMS
+
2012-11-16 Ismael Luceno <ismael.luceno AT gmail.com>
* BUILD: Fixed OPTS

diff --git a/utils/schroot/PRE_BUILD b/utils/schroot/PRE_BUILD
index 81696da..b67dd00 100755
--- a/utils/schroot/PRE_BUILD
+++ b/utils/schroot/PRE_BUILD
@@ -1,5 +1,8 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+sed -i '/chroot.h/ a\
+#include "sbuild-chroot-block-device-base.h"
+' sbuild/sbuild-chroot-facet-session-clonable.cc &&
if is_depends_enabled $SPELL linux-pam; then
PAM_SCHROOT="$SOURCE_DIRECTORY/etc/pam/schroot" &&
echo "auth required pam_unix.so" >> $PAM_SCHROOT &&



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (49e69af25267c50bf338c087e44cd871d7b11555), Treeve Jelbert, 11/27/2012

Archive powered by MHonArc 2.6.24.

Top of Page