[libvirt] [PATCH] Use standard spacing for user/pass prompt
by Cole Robinson
Kind of minor, but it annoys me that the default auth callback
doesn't put a space between the prompt and the input, like a typical
terminal, ssh, etc. This patch changes the current prompt:
Please enter your authentication name:myuser
to
Please enter your authentication name: myuser
Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
---
src/libvirt.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/libvirt.c b/src/libvirt.c
index be17668..9d50c92 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -159,7 +159,7 @@ static int virConnectAuthCallbackDefault(virConnectCredentialPtr cred,
case VIR_CRED_AUTHNAME:
case VIR_CRED_ECHOPROMPT:
case VIR_CRED_REALM:
- if (printf("%s:", cred[i].prompt) < 0)
+ if (printf("%s: ", cred[i].prompt) < 0)
return -1;
if (fflush(stdout) != 0)
return -1;
@@ -178,7 +178,7 @@ static int virConnectAuthCallbackDefault(virConnectCredentialPtr cred,
case VIR_CRED_PASSPHRASE:
case VIR_CRED_NOECHOPROMPT:
- if (printf("%s:", cred[i].prompt) < 0)
+ if (printf("%s: ", cred[i].prompt) < 0)
return -1;
if (fflush(stdout) != 0)
return -1;
--
1.6.5.2
15 years, 1 month
[libvirt] the price we pay for using gettext-0.14
by Jim Meyering
Make distcheck currently fails like this:
make[2]: Entering directory `/t/libvirt-0.7.6/_build/po'
/bin/sh @MKINSTALLDIRS@ /t/libvirt-0.7.6/_inst/share
/bin/sh: @MKINSTALLDIRS@: No such file or directory
make[2]: *** [install-data-yes] Error 127
That is due to our use of a version of gettext that is way too old:
$ grep GETT configure.ac
AM_GNU_GETTEXT_VERSION([0.14.1])
The work-around is to define (via AC_SUBST) the now-obsolete symbol,
MKINSTALLDIRS, so that @MKINSTALLDIRS@ in the autopoint-provided
Makefile.in.in (from the old version of gettext) ends up being
substituted.
As I recall, people insist on using this old version of gettext,
because nothing newer is supplied by RHEL5.x. IMHO, that is RHEL5's
problem, and should not be allowed to cause continuing problems
in upstream projects. It is easy and safe to install a newer version
of gettext, especially since any project using autopoint will
automatically continue to get the same bit-rotting old files:
a gettext installation includes an archive of all older versions
of its files, to provide just this type of backwards compatibility.
We had a similar problem in libguestfs, and it was not trivial to diagnose
there, either, even though I'd seen it at least once or twice before then.
Here's the work-around:
[just realized this requires a comment. adding that now]
>From 16b9418427101a495b7fdd6917f518f254d22720 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering(a)redhat.com>
Date: Wed, 24 Feb 2010 10:53:44 +0100
Subject: [PATCH] build: ensure that MKINSTALLDIRS is AC_SUBST-defined
since we're using gettext-0.14.1, which uses that now-obsolete
automake symbol. Otherwise, make distcheck would fails like this:
make[2]: Entering directory `/t/libvirt-0.7.6/_build/po'
/bin/sh @MKINSTALLDIRS@ /t/libvirt-0.7.6/_inst/share
/bin/sh: @MKINSTALLDIRS@: No such file or directory
make[2]: *** [install-data-yes] Error 127
* configure.ac (MKINSTALLDIRS): Define.
---
configure.ac | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index 117cb20..2f79970 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,6 +49,8 @@ AC_PROG_CPP
AC_OBJEXT
+AC_SUBST([MKINSTALLDIRS], [$ac_aux_dir/mkinstalldirs])
+
dnl gl_INIT uses m4_foreach_w, yet that is not defined in autoconf-2.59.
dnl In order to accommodate developers with such old tools, here's a
dnl replacement definition.
--
1.7.0.367.g566c3
15 years, 1 month
[libvirt] [PATCH] maint: relax git minimum version
by Eric Blake
From: Eric Blake <eblake(a)redhat.com>
Requiring git 1.6.4, just for the optional GNULIB_SRCDIR support,
was too harsh. Resynchronize from gnulib.
* .gnulib: Import from latest gnulib.
* bootstrap: Re-synchronize from .gnulib/build-aux.
* bootstrap.conf: Drop git to 1.5.5.
* README-hacking: Document use of GNULIB_SRCDIR.
---
Chris is currently testing that RHEL 5 with git 1.5.5 can actually
grok this patch.
We don't have a README-prereq (but README-hacking was borrowed
from coreutils, which does). Should we add one? The README-prereq
in coreutils is not quite relevant for a straight-across copy.
.gnulib | 2 +-
README-hacking | 9 +++++++--
bootstrap | 41 +++++++++++++++++++++++++++++++++++------
bootstrap.conf | 2 +-
4 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/.gnulib b/.gnulib
index 11fbc57..108cfb8 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit 11fbc57405a118e6ec9a3ebc19bbf5ececdae4d6
+Subproject commit 108cfb803174abf17eb101e9999b9d1a642ce1ba
diff --git a/README-hacking b/README-hacking
index 4105a3e..80b022c 100644
--- a/README-hacking
+++ b/README-hacking
@@ -12,8 +12,7 @@ requirements on anyone wishing to build from the just-checked-out sources.
Note the requirements to build the released archive are much less and
are just the requirements of the standard ./configure && make procedure.
Specific development tools and versions will be checked for and listed by
-the bootstrap script. See README-prereq for specific notes on obtaining
-these prerequisite tools.
+the bootstrap script.
Valgrind <http://valgrind.org/> is also highly recommended, if
Valgrind supports your architecture. See also README-valgrind.
@@ -28,6 +27,12 @@ You can get a copy of the source repository like this:
$ git clone git://libvirt.org/libvirt
$ cd libvirt
+As an optional step, if you already have a copy of the gnulib git
+repository on your hard drive, then you can use it as a reference to
+reduce download time and disk space requirements:
+
+ $ export GNULIB_SRCDIR=/path/to/gnulib
+
The next step is to get all required pieces from gnulib,
to run autoreconf, and to invoke ./configure:
diff --git a/bootstrap b/bootstrap
index be96444..365a3d9 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,4 +1,6 @@
#! /bin/sh
+# Print a version string.
+scriptversion=2010-02-24.17; # UTC
# Bootstrap this package from checked-out sources.
@@ -17,7 +19,15 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Written by Paul Eggert.
+# Originally written by Paul Eggert. The canonical version of this
+# script is maintained as build-aux/bootstrap in gnulib, however, to
+# be useful to your project, you should place a copy of it under
+# version control in the top-level directory of your project. The
+# intent is that all customization can be done with a bootstrap.conf
+# file also maintained in your version control; gnulib comes with a
+# template build-aux/bootstrap.conf to get you started.
+
+# Please report bugs or propose patches to bug-gnulib(a)gnu.org.
nl='
'
@@ -161,7 +171,6 @@ vc_ignore=auto
# die otherwise.
find_tool ()
{
- # Find sha1sum, named gsha1sum on MacPorts.
find_tool_envvar=$1
shift
find_tool_names=$@
@@ -424,12 +433,28 @@ case ${GNULIB_SRCDIR--} in
GNULIB_SRCDIR=$gnulib_path
;;
*)
- # Use GNULIB_SRCDIR as a reference. Assumes git 1.6.4 or newer.
+ # Use GNULIB_SRCDIR as a reference.
if test -d "$GNULIB_SRCDIR"/.git && \
git_modules_config submodule.gnulib.url >/dev/null; then
echo "$0: getting gnulib files..."
- git submodule update --init --reference "$GNULIB_SRCDIR" \
+ if git submodule --help|grep reference > /dev/null; then
+ # Prefer the one-liner available in git 1.6.4 or newer.
+ git submodule update --init --reference "$GNULIB_SRCDIR" \
"$gnulib_path" || exit $?
+ else
+ # This fallback allows at least git 1.5.5.
+ if test -f "$gnulib_path"/gnulib-tool; then
+ # Since file already exists, assume submodule init already complete.
+ git submodule update || exit $?
+ else
+ # Older git can't clone into an empty directory.
+ rmdir "$gnulib_path" 2>/dev/null
+ git clone --reference "$GNULIB_SRCDIR" \
+ "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \
+ && git submodule init && git submodule update \
+ || exit $?
+ fi
+ fi
GNULIB_SRCDIR=$gnulib_path
fi
;;
@@ -819,6 +844,10 @@ bootstrap_epilogue
echo "$0: done. Now you can run './configure'."
-# Local Variables:
-# indent-tabs-mode: nil
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff --git a/bootstrap.conf b/bootstrap.conf
index d315e04..58ef2ab 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -124,7 +124,7 @@ autoconf 2.59
automake 1.9.6
autopoint -
gettext -
-git 1.6.4
+git 1.5.5
gzip -
libtool -
perl 5.5
--
1.6.6.1
15 years, 1 month
[libvirt] [PATCH v2] libvirtd: Better initscript error reporting
by Cole Robinson
>From time to time I bork my install, and hate it when the initscript
returns no info. This patch removes the sanity check, which lets
the shell give us 'command not found' or 'permission denied' errors.
Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
---
daemon/libvirtd.init.in | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/daemon/libvirtd.init.in b/daemon/libvirtd.init.in
index 071fe2c..b808ab3 100644
--- a/daemon/libvirtd.init.in
+++ b/daemon/libvirtd.init.in
@@ -32,9 +32,6 @@
# pidfile: @localstatedir(a)/run/libvirtd.pid
#
-# Sanity checks.
-[ -x @sbindir@/libvirtd ] || exit 0
-
# Source function library.
. @sysconfdir(a)/rc.d/init.d/functions
--
1.6.5.2
15 years, 1 month
[libvirt] [PATCH] remote: Improve error message when libvirtd isn't running
by Cole Robinson
While this could lead people in the wrong direction, people most commonly
hit this error when libvirtd isn't running, so let's mention a possible
fix.
Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
---
src/remote/remote_driver.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 8914c39..e10312c 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -723,8 +723,8 @@ doRemoteOpen (virConnectPtr conn,
}
}
virReportSystemError(errno,
- _("unable to connect to '%s'"),
- sockname);
+ _("unable to connect to '%s', libvirtd may need to be started"),
+ sockname);
goto failed;
}
--
1.6.5.2
15 years, 1 month
[libvirt] [PATCH] libvirtd: Better initscript error reporting
by Cole Robinson
>From time to time I bork my install, and hate it when the initscript
returns no info. This patch makes things a bit more clear.
Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
---
daemon/libvirtd.init.in | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/daemon/libvirtd.init.in b/daemon/libvirtd.init.in
index 071fe2c..c5d4eee 100644
--- a/daemon/libvirtd.init.in
+++ b/daemon/libvirtd.init.in
@@ -32,8 +32,10 @@
# pidfile: @localstatedir(a)/run/libvirtd.pid
#
+LIBVIRTD_BIN="@sbindir@/libvirtd"
+
# Sanity checks.
-[ -x @sbindir@/libvirtd ] || exit 0
+[ ! -e $LIBVIRTD_BIN ] && echo "$LIBVIRTD_BIN not found." && exit 1
# Source function library.
. @sysconfdir(a)/rc.d/init.d/functions
--
1.6.5.2
15 years, 1 month
[libvirt] [PATCH] conf: storage: Remove iSCSI <auth> parsing
by Cole Robinson
This was never wired up, and even generated broken XML until 0.7.2,
so clearly no one was trying to use it. Dan recommended its removal,
so lets drop it.
Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
---
docs/schemas/storagepool.rng | 19 ---------
src/conf/storage_conf.c | 48 -----------------------
src/conf/storage_conf.h | 18 --------
tests/storagepoolxml2xmlin/pool-iscsi-auth.xml | 17 --------
tests/storagepoolxml2xmlout/pool-iscsi-auth.xml | 20 ---------
tests/storagepoolxml2xmltest.c | 1 -
6 files changed, 0 insertions(+), 123 deletions(-)
delete mode 100644 tests/storagepoolxml2xmlin/pool-iscsi-auth.xml
delete mode 100644 tests/storagepoolxml2xmlout/pool-iscsi-auth.xml
diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng
index 247664e..bcdca62 100644
--- a/docs/schemas/storagepool.rng
+++ b/docs/schemas/storagepool.rng
@@ -234,22 +234,6 @@
</element>
</define>
- <define name='sourceinfoauth'>
- <element name='auth'>
- <attribute name='type'>
- <choice>
- <value>chap</value>
- </choice>
- </attribute>
- <attribute name='login'>
- <text/>
- </attribute>
- <attribute name='passwd'>
- <text/>
- </attribute>
- </element>
- </define>
-
<define name='sourcefmtfs'>
<optional>
<element name='format'>
@@ -374,9 +358,6 @@
<optional>
<ref name='initiatorinfoiqn'/>
</optional>
- <optional>
- <ref name='sourceinfoauth'/>
- </optional>
</element>
</define>
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 19a1db9..dd375b9 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -283,11 +283,6 @@ virStoragePoolSourceFree(virStoragePoolSourcePtr source) {
VIR_FREE(source->name);
VIR_FREE(source->adapter);
VIR_FREE(source->initiator.iqn);
-
- if (source->authType == VIR_STORAGE_POOL_AUTH_CHAP) {
- VIR_FREE(source->auth.chap.login);
- VIR_FREE(source->auth.chap.passwd);
- }
}
void
@@ -363,26 +358,6 @@ virStoragePoolObjRemove(virStoragePoolObjListPtr pools,
static int
-virStoragePoolDefParseAuthChap(xmlXPathContextPtr ctxt,
- virStoragePoolAuthChapPtr auth) {
- auth->login = virXPathString("string(./auth/@login)", ctxt);
- if (auth->login == NULL) {
- virStorageReportError(VIR_ERR_XML_ERROR,
- "%s", _("missing auth host attribute"));
- return -1;
- }
-
- auth->passwd = virXPathString("string(./auth/@passwd)", ctxt);
- if (auth->passwd == NULL) {
- virStorageReportError(VIR_ERR_XML_ERROR,
- "%s", _("missing auth passwd attribute"));
- return -1;
- }
-
- return 0;
-}
-
-static int
virStoragePoolDefParseSource(xmlXPathContextPtr ctxt,
virStoragePoolSourcePtr source,
int pool_type,
@@ -445,25 +420,6 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt,
source->dir = virXPathString("string(./dir/@path)", ctxt);
source->adapter = virXPathString("string(./adapter/@name)", ctxt);
- authType = virXPathString("string(./auth/@type)", ctxt);
- if (authType == NULL) {
- source->authType = VIR_STORAGE_POOL_AUTH_NONE;
- } else {
- if (STREQ(authType, "chap")) {
- source->authType = VIR_STORAGE_POOL_AUTH_CHAP;
- } else {
- virStorageReportError(VIR_ERR_XML_ERROR,
- _("unknown auth type '%s'"),
- (const char *)authType);
- goto cleanup;
- }
- }
-
- if (source->authType == VIR_STORAGE_POOL_AUTH_CHAP) {
- if (virStoragePoolDefParseAuthChap(ctxt, &source->auth.chap) < 0)
- goto cleanup;
- }
-
ret = 0;
cleanup:
ctxt->node = relnode;
@@ -867,10 +823,6 @@ virStoragePoolSourceFormat(virBufferPtr buf,
}
- if (src->authType == VIR_STORAGE_POOL_AUTH_CHAP)
- virBufferVSprintf(buf," <auth type='chap' login='%s' passwd='%s'/>\n",
- src->auth.chap.login,
- src->auth.chap.passwd);
virBufferAddLit(buf," </source>\n");
return 0;
diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index c643984..1408128 100644
--- a/src/conf/storage_conf.h
+++ b/src/conf/storage_conf.h
@@ -134,19 +134,6 @@ enum virStoragePoolDeviceType {
};
-enum virStoragePoolAuthType {
- VIR_STORAGE_POOL_AUTH_NONE,
- VIR_STORAGE_POOL_AUTH_CHAP,
-};
-
-typedef struct _virStoragePoolAuthChap virStoragePoolAuthChap;
-typedef virStoragePoolAuthChap *virStoragePoolAuthChapPtr;
-struct _virStoragePoolAuthChap {
- char *login;
- char *passwd;
-};
-
-
/*
* For remote pools, info on how to reach the host
*/
@@ -232,11 +219,6 @@ struct _virStoragePoolSource {
/* Initiator IQN */
virStoragePoolSourceInitiatorAttr initiator;
- int authType; /* virStoragePoolAuthType */
- union {
- virStoragePoolAuthChap chap;
- } auth;
-
int format; /* Pool type specific format such as filesystem type, or lvm version, etc */
};
diff --git a/tests/storagepoolxml2xmlin/pool-iscsi-auth.xml b/tests/storagepoolxml2xmlin/pool-iscsi-auth.xml
deleted file mode 100644
index f7d4d52..0000000
--- a/tests/storagepoolxml2xmlin/pool-iscsi-auth.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<pool type='iscsi'>
- <name>virtimages</name>
- <uuid>e9392370-2917-565e-692b-d057f46512d6</uuid>
- <source>
- <host name="iscsi.example.com"/>
- <device path="demo-target"/>
- <auth type='chap' login='foobar' passwd='frobbar'/>
- </source>
- <target>
- <path>/dev/disk/by-path</path>
- <permissions>
- <mode>0700</mode>
- <owner>0</owner>
- <group>0</group>
- </permissions>
- </target>
-</pool>
diff --git a/tests/storagepoolxml2xmlout/pool-iscsi-auth.xml b/tests/storagepoolxml2xmlout/pool-iscsi-auth.xml
deleted file mode 100644
index 557295d..0000000
--- a/tests/storagepoolxml2xmlout/pool-iscsi-auth.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<pool type='iscsi'>
- <name>virtimages</name>
- <uuid>e9392370-2917-565e-692b-d057f46512d6</uuid>
- <capacity>0</capacity>
- <allocation>0</allocation>
- <available>0</available>
- <source>
- <host name='iscsi.example.com'/>
- <device path='demo-target'/>
- <auth type='chap' login='foobar' passwd='frobbar'/>
- </source>
- <target>
- <path>/dev/disk/by-path</path>
- <permissions>
- <mode>0700</mode>
- <owner>0</owner>
- <group>0</group>
- </permissions>
- </target>
-</pool>
diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c
index 4550407..1d7094b 100644
--- a/tests/storagepoolxml2xmltest.c
+++ b/tests/storagepoolxml2xmltest.c
@@ -91,7 +91,6 @@ mymain(int argc, char **argv)
DO_TEST("pool-logical-create");
DO_TEST("pool-disk");
DO_TEST("pool-iscsi");
- DO_TEST("pool-iscsi-auth");
DO_TEST("pool-netfs");
DO_TEST("pool-scsi");
DO_TEST("pool-mpath");
--
1.6.6
15 years, 1 month
[libvirt] [PATCH 1/2] build: avoid non-srcdir installation failure (apibuild.py)
by Jim Meyering
Running "make distcheck" from a non-srcdir build was failing like this:
/bin/sh: ./apibuild.py: No such file or directory
Fixed that with the first patch below (the apibuild.py script
is not in ".", but in $(srcdir)).
Then retrying, it got a little further but failed like this:
(../../docs/apibuild.py)
make[3]: *** No rule to make target `sitemap.html.in', needed by `html/index.html'. Stop.
That was because sitemap.html.in was not being distributed.
Adding it to EXTRA_DIST solved that:
>From f0fb87ed1838a9a67d03985e35a4c7625da9d95e Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering(a)redhat.com>
Date: Wed, 24 Feb 2010 14:18:40 +0100
Subject: [PATCH 1/2] build: avoid non-srcdir installation failure (apibuild.py)
* docs/Makefile.am (libvirt-api.xml): Insert missing "$(srcdir)/".
---
docs/Makefile.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/docs/Makefile.am b/docs/Makefile.am
index cce7a48..26b1d29 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -131,7 +131,7 @@ devhelp/index.html devhelp/libvirt.devhelp: libvirt-api.xml $(devhelpxsl)
libvirt-api.xml libvirt-refs.xml: apibuild.py \
$(srcdir)/../include/libvirt/*.h \
$(srcdir)/../src/libvirt.c $(srcdir)/../src/util/virterror.c
- -(./apibuild.py)
+ -($(srcdir)/apibuild.py)
clean-local:
rm -f *~ *.bak *.hierarchy *.signals *-unused.txt
--
1.7.0.367.g566c3
>From 8e948091c4c3b2346be8ede0309ce768136621e9 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering(a)redhat.com>
Date: Wed, 24 Feb 2010 14:15:26 +0100
Subject: [PATCH 2/2] build: avoid non-srcdir installation failure (sitemap.html.in)
* docs/Makefile.am (EXTRA_DIST): Add sitemap.html.in.
---
docs/Makefile.am | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 26b1d29..4828752 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -76,6 +76,7 @@ EXTRA_DIST= \
$(devhelphtml) $(devhelppng) $(devhelpcss) $(devhelpxsl) \
$(xml) $(fig) $(png) \
$(patches) \
+ sitemap.html.in \
ChangeLog.awk
CLEANFILES = $(dot_html) $(apihtml) $(devhelphtml)
--
1.7.0.367.g566c3
15 years, 1 month
[libvirt] [PATCH] build: make git submodule checking more reliable
by Jim Meyering
After investigating some autogen.sh/bootstrap-vs-new-gnulib
problems today, I realized that libvirt's SHA1-comparing code
lacked improvements I'd made in libguestfs, which does the same thing.
AFAIK, this is not related to the problems we've seen today,
but it might well help someone down the road.
Here's the result of that synchronization:
>From fada075bcaf46d1bd0c51165475594544e18ecfd Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering(a)redhat.com>
Date: Wed, 24 Feb 2010 12:01:09 +0100
Subject: [PATCH] build: make git submodule checking more reliable
* cfg.mk (_curr_status): Accommodate leading "+" or "-" in the output
of git submodule status.
* autogen.sh: Likewise.
---
autogen.sh | 2 +-
cfg.mk | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 833b1d1..9ae8d67 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -65,7 +65,7 @@ fi
# Ensure that whenever we pull in a gnulib update or otherwise change to a
# different version (i.e., when switching branches), we also rerun ./bootstrap.
curr_status=.git-module-status
-t=$(git submodule status)
+t=$(git submodule status|sed 's/^[ +-]//;s/ .*//')
if test "$t" = "$(cat $curr_status 2>/dev/null)"; then
: # good, it's up to date, all we need is autoreconf
autoreconf -if
diff --git a/cfg.mk b/cfg.mk
index 17bb341..8317ae2 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -262,7 +262,9 @@ ifeq (0,$(MAKELEVEL))
# submodule name. Contrast these:
# -b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib
# b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib (v0.0-2286-gb653eda)
- _submodule_hash = sed 's/.//;s/ .*//'
+ # $ cat .git-module-status
+ # b653eda3ac4864de205419d9f41eec267cb89eeb
+ _submodule_hash = sed 's/^[ +-]//;s/ .*//'
_update_required := $(shell \
actual=$$(git submodule status | $(_submodule_hash)); \
stamp="$$($(_submodule_hash) $(_curr_status) 2>/dev/null)"; \
--
1.7.0.377.g90adb
15 years, 1 month
