Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (8ae7c1b920e42573af92a77d98c0ca21fdfe00a8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (8ae7c1b920e42573af92a77d98c0ca21fdfe00a8)
  • Date: Fri, 27 Mar 2015 10:03:18 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

smgl/castfs/BUILD | 8 +++++---
smgl/castfs/CONFIGURE | 17 ++++++++++++++---
smgl/castfs/DEPENDS | 21 +++++++++++++++++----
smgl/castfs/DETAILS | 17 +++++++----------
smgl/castfs/HISTORY | 10 ++++++++++
smgl/castfs/PRE_BUILD | 7 -------
smgl/castfs/TRIGGERS | 2 +-
smgl/castfs/argc.patch | 30 ------------------------------
8 files changed, 54 insertions(+), 58 deletions(-)

New commits:
commit 8ae7c1b920e42573af92a77d98c0ca21fdfe00a8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

castfs: => 0.6.2

diff --git a/smgl/castfs/BUILD b/smgl/castfs/BUILD
index 5a8a35f..4c8b568 100755
--- a/smgl/castfs/BUILD
+++ b/smgl/castfs/BUILD
@@ -1,5 +1,7 @@
-# fixes static compilation after 2011-05-26 in FUSE
-LDFLAGS="-ldl -lpthread $LDFLAGS" &&
+if list_find "$CASTFS_OPTS" "--enable-debug"; then
+ CFLAGS="${CFLAGS/-O?/}" &&
+ LDFLAGS="${LDFLAGS/-s/}"
+fi &&

-OPTS="$OPTS $STATIC_FUSE" &&
+OPTS="--disable-xattr $CASTFS_OPTS $OPTS" &&
default_build
diff --git a/smgl/castfs/CONFIGURE b/smgl/castfs/CONFIGURE
index dcc1391..4444b97 100755
--- a/smgl/castfs/CONFIGURE
+++ b/smgl/castfs/CONFIGURE
@@ -1,3 +1,14 @@
-config_query_option STATIC_FUSE "Compile against fuse statically?" y \
- "--enable-static-fuse" \
- "--disable-static-fuse"
+# backporting legacy options
+if [[ -n "$STATIC_FUSE" ]]; then
+ persistent_add CASTFS_OPTS &&
+ CASTFS_OPTS="$STATIC_FUSE" &&
+ persistent_remove STATIC_FUSE
+fi &&
+
+config_query_option CASTFS_OPTS "Compile against fuse statically?" y \
+ "--enable-static-fuse" \
+ "--disable-static-fuse" &&
+
+config_query_option CASTFS_OPTS "Enable debug flags?" n \
+ "--enable-debug" \
+ "--disable-debug"
diff --git a/smgl/castfs/DEPENDS b/smgl/castfs/DEPENDS
index 0c698b5..5ab7837 100755
--- a/smgl/castfs/DEPENDS
+++ b/smgl/castfs/DEPENDS
@@ -1,8 +1,21 @@
depends fuse &&
-depends libtool &&
depends pkgconfig &&
-depends texinfo &&
-if [[ $CASTFS_BRANCH == scm ]]
-then
+
+optional_depends perl \
+ "--enable-documentation" \
+ "--disable-documentation" \
+ "to build manual page" &&
+
+if [[ $CASTFS_BRANCH == scm ]]; then
depends git
fi
+
+# disable the xattr functions until they get fixed #14479
+#if is_depends_enabled coreutils attr; then
+# optional_depends attr \
+# "--enable-xattr" \
+# "--disable-xattr" \
+# "for extended attributes support"
+#else
+# list_add "CASTFS_OPTS" "--disable-xattr"
+#fi
diff --git a/smgl/castfs/DETAILS b/smgl/castfs/DETAILS
index 023f802..11c01a9 100755
--- a/smgl/castfs/DETAILS
+++ b/smgl/castfs/DETAILS
@@ -1,31 +1,28 @@
. "$GRIMOIRE/FUNCTIONS"
SPELL=castfs
-if [[ $CASTFS_BRANCH == scm ]]
-then
+if [[ $CASTFS_BRANCH == scm ]]; then
VERSION=$(get_scm_version)
SOURCE=${SPELL}-git.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-git
- SOURCE_URL=git://repo.or.cz/castfs.git
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}-git"
+ SOURCE_URL=git://scm.sourcemage.org/smgl/misc/castfs.git:${SPELL}-git
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
else
- VERSION=0.6.1
- PATCHLEVEL=5
+ VERSION=0.6.2
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE2=${SOURCE}.sig
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}-${VERSION}"
SOURCE_URL=http://download.sourcemage.org/distro/misc/$SOURCE
SOURCE2_URL=http://download.sourcemage.org/distro/misc/$SOURCE2
SOURCE_GPG="gurus.gpg:${SOURCE2}:VERIFIED_UPSTREAM_KEY"
SOURCE2_IGNORE=signature
fi
- DOCS="doc/*.html ${DOCS}"
- DOC_DIRS=""
+ DOC_DIRS="doc/old"
WEB_SITE=http://www.sourcemage.org
ENTERED=20060929
LICENSE[0]=GPL
KEYWORDS="filesystems smgl"
- SHORT="Fuse filesystem used for staging packages."
+ SHORT="FUSE filesystem used for staging packages"
cat << EOF
castfs is a fuse filesystem written in C and is used for capturing
filesystem
calls for your root filesystem and staging any modifications or additions to
diff --git a/smgl/castfs/HISTORY b/smgl/castfs/HISTORY
index 7f8d0cc..f54260b 100644
--- a/smgl/castfs/HISTORY
+++ b/smgl/castfs/HISTORY
@@ -1,3 +1,13 @@
+2015-03-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.6.2; quoting paths; use official git url
+ * CONFIGURE: FUSE_STATIC -> CASTFS_OPTS; added debug options
+ * DEPENDS: removed obsolete dependencies; added perl optional
dependency
+ * BUILD: removed flag hacks (fixed by upstream); do not strip/optimize
+ the binary when compiled with debug flags
+ * TRIGGERS: use CASTFS_OPTS
+ * PRE_BUILD: removed, force disable xattr flag in BUILD instead
+ * argc.patch: removed, fixed by upstream
+
2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Use get_scm_version

diff --git a/smgl/castfs/PRE_BUILD b/smgl/castfs/PRE_BUILD
deleted file mode 100755
index 20c1e58..0000000
--- a/smgl/castfs/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-patch -p0 < "$SPELL_DIRECTORY/argc.patch" &&
-
-# disable the xattr functions until they get fixed #14479
-sed -i 's,setxattr,,' configure
diff --git a/smgl/castfs/TRIGGERS b/smgl/castfs/TRIGGERS
index 6af29bb..ed50308 100755
--- a/smgl/castfs/TRIGGERS
+++ b/smgl/castfs/TRIGGERS
@@ -1,3 +1,3 @@
-if list_find "$STATIC_FUSE" "--enable-static-fuse"; then
+if list_find "$CASTFS_OPTS" "--enable-static-fuse"; then
on_cast fuse cast_self
fi
diff --git a/smgl/castfs/argc.patch b/smgl/castfs/argc.patch
deleted file mode 100644
index a70bc69..0000000
--- a/smgl/castfs/argc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/castfs.c.orig 2010-03-30 09:07:57.000000000 +0400
-+++ src/castfs.c 2012-08-05 16:05:34.667167115 +0400
-@@ -724,6 +724,13 @@
- char *new_argv[argc], *logptr, *dbgptr, deflog[]="/tmp/castfs.log";
- int new_argc = 0;
-
-+ /* Currently, need: `castfs mnt-dir -o stage=stage-dir` */
-+ if (argc < 4) {
-+fprintf(stderr, "castfs: argc wrong\n");
-+ usage();
-+ exit(-1);
-+ }
-+
- /* get environmental vars and open fd's for log file */
- umask(0);
-
-@@ -760,13 +767,6 @@
- dbglvl = dbgdef; // Toggle the needed bits.
- }
-
-- /* Currently, need: `castfs mnt-dir -o stage=stage-dir` */
-- if (argc < 4) {
--fprintf(stderr, "castfs: argc wrong\n");
-- usage();
-- exit(-1);
-- }
--
- /* dump some nice header information in the log file */
- cast_log(CAST_DBG_MAIN, "main\n");
- cast_log(CAST_DBG_MAIN, "logfile %s fd %d\n",
getenv("CASTFS_LOGFILE"),



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (8ae7c1b920e42573af92a77d98c0ca21fdfe00a8), Vlad Glagolev, 03/27/2015

Archive powered by MHonArc 2.6.24.

Top of Page