From: Jeremy Katz Subject: [PATCH] Rename xsls Date: Wed, 18 Jan 2006 12:44:17 -0500 Message-ID: <1137606257.22846.9.camel@bree.local.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-TkDRuUcwAOI+xczcsgeu" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: "xen-devel@lists.xensource.com" List-Id: xen-devel@lists.xenproject.org --=-TkDRuUcwAOI+xczcsgeu Content-Type: text/plain Content-Transfer-Encoding: 7bit Having /usr/bin/xsls conflicts with xsls as distributed in scalapack (http://www.netlib.org/scalapack/). It should probably be xenstore-ls a) for namespacing and b) to match up with the other xenstore commands better. Signed-off-by: Jeremy Katz Jeremy --=-TkDRuUcwAOI+xczcsgeu Content-Disposition: attachment; filename=xen-xsls.patch Content-Type: text/x-patch; name=xen-xsls.patch; charset=UTF-8 Content-Transfer-Encoding: 7bit diff -r da7873110bbb tools/xenstore/Makefile --- a/tools/xenstore/Makefile Mon Jan 9 18:46:46 2006 +++ b/tools/xenstore/Makefile Wed Jan 18 12:41:42 2006 @@ -27,7 +27,7 @@ CLIENTS += xenstore-write CLIENTS_OBJS := $(patsubst xenstore-%,xenstore_%.o,$(CLIENTS)) -all: libxenstore.so xenstored $(CLIENTS) xs_tdb_dump xsls +all: libxenstore.so xenstored $(CLIENTS) xs_tdb_dump xenstore-ls testcode: xs_test xenstored_test xs_random @@ -40,7 +40,7 @@ $(CLIENTS_OBJS): xenstore_%.o: xenstore_client.c $(COMPILE.c) -DCLIENT_$(*F) -o $@ $< -xsls: xsls.o libxenstore.so +xenstore-ls: xsls.o libxenstore.so $(LINK.o) $< $(LOADLIBES) $(LDLIBS) -lxenctrl -L. -lxenstore -o $@ xenstored_test: xenstored_core_test.o xenstored_watch_test.o xenstored_domain_test.o xenstored_transaction_test.o xs_lib.o talloc_test.o fake_libxc.o utils.o tdb.o @@ -77,7 +77,7 @@ clean: testsuite-clean rm -f *.o *.opic *.so rm -f xenstored xs_random xs_stress xs_crashme - rm -f xs_test xenstored_test xs_tdb_dump xsls $(CLIENTS) + rm -f xs_test xenstored_test xs_tdb_dump xenstore-ls $(CLIENTS) $(RM) $(PROG_DEP) print-dir: @@ -129,7 +129,7 @@ tarball: clean cd .. && tar -c -j -v -h -f xenstore.tar.bz2 xenstore/ -install: libxenstore.so xenstored xsls $(CLIENTS) +install: libxenstore.so xenstored xenstore-ls $(CLIENTS) $(INSTALL_DIR) -p $(DESTDIR)/var/run/xenstored $(INSTALL_DIR) -p $(DESTDIR)/var/lib/xenstored $(INSTALL_DIR) -p $(DESTDIR)/usr/bin @@ -137,7 +137,7 @@ $(INSTALL_DIR) -p $(DESTDIR)/usr/include $(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin - $(INSTALL_PROG) xsls $(DESTDIR)/usr/bin + $(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR) $(INSTALL_DATA) libxenstore.so $(DESTDIR)/usr/$(LIBDIR) $(INSTALL_DATA) xs.h $(DESTDIR)/usr/include --=-TkDRuUcwAOI+xczcsgeu Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --=-TkDRuUcwAOI+xczcsgeu--