[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [xen master] tools/libfsimage: Add `xen' to .h names and principal .so name

commit 1a814711881beb17f073f5f57e27e5bd4da1b956
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Tue Oct 9 17:02:42 2018 +0100
Commit:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
CommitDate: Mon Oct 15 14:49:33 2018 +0100

    tools/libfsimage: Add `xen' to .h names and principal .so name
    
    `fsimage' is rather general.  And we do not expect this library to be
    very useful out of tree because of its unstable ABI.
    
    So add the word `xen'.  This will avoid naming conflicts with anyone
    else's fsimage library.
    
    Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 tools/libfsimage/Rules.mk                   |  2 +-
 tools/libfsimage/common/Makefile            | 34 ++++++++++++++---------------
 tools/libfsimage/common/fsimage_grub.c      |  2 +-
 tools/libfsimage/common/fsimage_plugin.c    |  2 +-
 tools/libfsimage/common/fsimage_priv.h      |  4 ++--
 tools/libfsimage/common/xenfsimage_grub.h   |  4 ++--
 tools/libfsimage/common/xenfsimage_plugin.h |  2 +-
 tools/libfsimage/ext2fs-lib/ext2fs-lib.c    |  2 +-
 tools/libfsimage/ext2fs/fsys_ext2fs.c       |  2 +-
 tools/libfsimage/fat/fsys_fat.c             |  2 +-
 tools/libfsimage/iso9660/fsys_iso9660.c     |  2 +-
 tools/libfsimage/reiserfs/fsys_reiserfs.c   |  2 +-
 tools/libfsimage/ufs/fsys_ufs.c             |  2 +-
 tools/libfsimage/xfs/fsys_xfs.c             |  2 +-
 tools/libfsimage/zfs/fsi_zfs.c              |  2 +-
 tools/libfsimage/zfs/fsi_zfs.h              |  2 +-
 tools/pygrub/setup.py                       |  2 +-
 tools/pygrub/src/fsimage/fsimage.c          |  2 +-
 18 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/tools/libfsimage/Rules.mk b/tools/libfsimage/Rules.mk
index eab4ecb35e..2a29d9ef2b 100644
--- a/tools/libfsimage/Rules.mk
+++ b/tools/libfsimage/Rules.mk
@@ -26,7 +26,7 @@ fs-uninstall:
        fi
 
 $(FSLIB): $(PIC_OBJS)
-       $(CC) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $^ -lfsimage $(FS_LIBDEPS) 
$(APPEND_LDFLAGS)
+       $(CC) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $^ -lxenfsimage $(FS_LIBDEPS) 
$(APPEND_LDFLAGS)
 
 clean distclean::
        rm -f $(PIC_OBJS) $(FSLIB) $(DEPS_RM)
diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile
index beda8f5f3a..f20e1394a8 100644
--- a/tools/libfsimage/common/Makefile
+++ b/tools/libfsimage/common/Makefile
@@ -15,7 +15,7 @@ LIB_SRCS-y = fsimage.c fsimage_plugin.c fsimage_grub.c
 
 PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
 
-LIB = libfsimage.so libfsimage.so.$(MAJOR) libfsimage.so.$(MAJOR).$(MINOR)
+LIB = libxenfsimage.so libxenfsimage.so.$(MAJOR) 
libxenfsimage.so.$(MAJOR).$(MINOR)
 
 .PHONY: all
 all: $(LIB)
@@ -24,32 +24,32 @@ all: $(LIB)
 install: all
        $(INSTALL_DIR) $(DESTDIR)$(libdir)
        $(INSTALL_DIR) $(DESTDIR)$(includedir)
-       $(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)
-       ln -sf libfsimage.so.$(MAJOR).$(MINOR) 
$(DESTDIR)$(libdir)/libfsimage.so.$(MAJOR)
-       ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(libdir)/libfsimage.so
-       $(INSTALL_DATA) fsimage.h $(DESTDIR)$(includedir)
-       $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(includedir)
-       $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(includedir)
+       $(INSTALL_PROG) libxenfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)
+       ln -sf libxenfsimage.so.$(MAJOR).$(MINOR) 
$(DESTDIR)$(libdir)/libxenfsimage.so.$(MAJOR)
+       ln -sf libxenfsimage.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenfsimage.so
+       $(INSTALL_DATA) xenfsimage.h $(DESTDIR)$(includedir)
+       $(INSTALL_DATA) xenfsimage_plugin.h $(DESTDIR)$(includedir)
+       $(INSTALL_DATA) xenfsimage_grub.h $(DESTDIR)$(includedir)
 
 .PHONY: uninstall
 uninstall:
-       rm -f $(DESTDIR)$(includedir)/fsimage_grub.h
-       rm -f $(DESTDIR)$(includedir)/fsimage_plugin.h
-       rm -f $(DESTDIR)$(includedir)/fsimage.h
-       rm -f $(DESTDIR)$(libdir)/libfsimage.so
-       rm -f $(DESTDIR)$(libdir)/libfsimage.so.$(MAJOR)
-       rm -f $(DESTDIR)$(libdir)/libfsimage.so.$(MAJOR).$(MINOR)
+       rm -f $(DESTDIR)$(includedir)/xenfsimage_grub.h
+       rm -f $(DESTDIR)$(includedir)/xenfsimage_plugin.h
+       rm -f $(DESTDIR)$(includedir)/xenfsimage.h
+       rm -f $(DESTDIR)$(libdir)/libxenfsimage.so
+       rm -f $(DESTDIR)$(libdir)/libxenfsimage.so.$(MAJOR)
+       rm -f $(DESTDIR)$(libdir)/libxenfsimage.so.$(MAJOR).$(MINOR)
 
 clean distclean::
        rm -f $(LIB)
 
-libfsimage.so: libfsimage.so.$(MAJOR)
+libxenfsimage.so: libxenfsimage.so.$(MAJOR)
        ln -sf $< $@
-libfsimage.so.$(MAJOR): libfsimage.so.$(MAJOR).$(MINOR)
+libxenfsimage.so.$(MAJOR): libxenfsimage.so.$(MAJOR).$(MINOR)
        ln -sf $< $@
 
-libfsimage.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
-       $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libfsimage.so.$(MAJOR) 
$(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
+libxenfsimage.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
+       $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenfsimage.so.$(MAJOR) 
$(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
 
 -include $(DEPS_INCLUDE)
 
diff --git a/tools/libfsimage/common/fsimage_grub.c 
b/tools/libfsimage/common/fsimage_grub.c
index ef71d6cceb..258d48bfbb 100644
--- a/tools/libfsimage/common/fsimage_grub.c
+++ b/tools/libfsimage/common/fsimage_grub.c
@@ -28,7 +28,7 @@
 #include <strings.h>
 #include <errno.h>
 
-#include "fsimage_grub.h"
+#include "xenfsimage_grub.h"
 #include "fsimage_priv.h"
 
 static char *disk_read_junk;
diff --git a/tools/libfsimage/common/fsimage_plugin.c 
b/tools/libfsimage/common/fsimage_plugin.c
index 0744e7b3ca..44ebcf3142 100644
--- a/tools/libfsimage/common/fsimage_plugin.c
+++ b/tools/libfsimage/common/fsimage_plugin.c
@@ -29,7 +29,7 @@
 #include <dlfcn.h>
 #include <errno.h>
 
-#include "fsimage_plugin.h"
+#include "xenfsimage_plugin.h"
 #include "fsimage_priv.h"
 
 static fsi_plugin_t *plugins;
diff --git a/tools/libfsimage/common/fsimage_priv.h 
b/tools/libfsimage/common/fsimage_priv.h
index 57a0826dee..2274403557 100644
--- a/tools/libfsimage/common/fsimage_priv.h
+++ b/tools/libfsimage/common/fsimage_priv.h
@@ -30,8 +30,8 @@ extern C {
 
 #include <sys/types.h>
 
-#include "fsimage.h"
-#include "fsimage_plugin.h"
+#include "xenfsimage.h"
+#include "xenfsimage_plugin.h"
 
 struct fsi_plugin {
        const char *fp_name;
diff --git a/tools/libfsimage/common/xenfsimage_grub.h 
b/tools/libfsimage/common/xenfsimage_grub.h
index 534c346b23..38fb4f620e 100644
--- a/tools/libfsimage/common/xenfsimage_grub.h
+++ b/tools/libfsimage/common/xenfsimage_grub.h
@@ -33,8 +33,8 @@ extern C {
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "fsimage.h"
-#include "fsimage_plugin.h"
+#include "xenfsimage.h"
+#include "xenfsimage_plugin.h"
 
 typedef struct fsig_plugin_ops {
        int fpo_version;
diff --git a/tools/libfsimage/common/xenfsimage_plugin.h 
b/tools/libfsimage/common/xenfsimage_plugin.h
index a682719a63..4135769018 100644
--- a/tools/libfsimage/common/xenfsimage_plugin.h
+++ b/tools/libfsimage/common/xenfsimage_plugin.h
@@ -30,7 +30,7 @@ extern C {
 
 #include <sys/types.h>
 
-#include "fsimage.h"
+#include "xenfsimage.h"
 
 #define        FSIMAGE_PLUGIN_VERSION 1
 
diff --git a/tools/libfsimage/ext2fs-lib/ext2fs-lib.c 
b/tools/libfsimage/ext2fs-lib/ext2fs-lib.c
index 84b6d1e9c3..864a15b349 100644
--- a/tools/libfsimage/ext2fs-lib/ext2fs-lib.c
+++ b/tools/libfsimage/ext2fs-lib/ext2fs-lib.c
@@ -21,7 +21,7 @@
  * Use is subject to license terms.
  */
 
-#include <fsimage_plugin.h>
+#include <xenfsimage_plugin.h>
 #include INCLUDE_EXTFS_H
 #include <errno.h>
 #include <inttypes.h>
diff --git a/tools/libfsimage/ext2fs/fsys_ext2fs.c 
b/tools/libfsimage/ext2fs/fsys_ext2fs.c
index ba53ff4ca6..a4ed10419c 100644
--- a/tools/libfsimage/ext2fs/fsys_ext2fs.c
+++ b/tools/libfsimage/ext2fs/fsys_ext2fs.c
@@ -16,7 +16,7 @@
  *  along with this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <fsimage_grub.h>
+#include <xenfsimage_grub.h>
 
 #define        mapblock1 (*fsig_int1(ffi))
 #define        mapblock2 (*fsig_int2(ffi))
diff --git a/tools/libfsimage/fat/fsys_fat.c b/tools/libfsimage/fat/fsys_fat.c
index b8129a8c04..b89354a872 100644
--- a/tools/libfsimage/fat/fsys_fat.c
+++ b/tools/libfsimage/fat/fsys_fat.c
@@ -17,7 +17,7 @@
  */
 
 #include <limits.h>
-#include <fsimage_grub.h>
+#include <xenfsimage_grub.h>
 #include "fat.h"
 
 struct fat_superblock 
diff --git a/tools/libfsimage/iso9660/fsys_iso9660.c 
b/tools/libfsimage/iso9660/fsys_iso9660.c
index 5dbf100dfe..6e767357bf 100644
--- a/tools/libfsimage/iso9660/fsys_iso9660.c
+++ b/tools/libfsimage/iso9660/fsys_iso9660.c
@@ -28,7 +28,7 @@
  *     Leonid Lisovskiy   <lly@xxxxxxxxx>      2003
  */
 
-#include <fsimage_grub.h>
+#include <xenfsimage_grub.h>
 #include <limits.h>
 
 #include "iso9660.h"
diff --git a/tools/libfsimage/reiserfs/fsys_reiserfs.c 
b/tools/libfsimage/reiserfs/fsys_reiserfs.c
index 92c3b2bbfb..916eb15292 100644
--- a/tools/libfsimage/reiserfs/fsys_reiserfs.c
+++ b/tools/libfsimage/reiserfs/fsys_reiserfs.c
@@ -17,7 +17,7 @@
  *  along with this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <fsimage_grub.h>
+#include <xenfsimage_grub.h>
 
 #undef REISERDEBUG
 
diff --git a/tools/libfsimage/ufs/fsys_ufs.c b/tools/libfsimage/ufs/fsys_ufs.c
index cf7e22ad0b..a545bc9f65 100644
--- a/tools/libfsimage/ufs/fsys_ufs.c
+++ b/tools/libfsimage/ufs/fsys_ufs.c
@@ -22,7 +22,7 @@
 
 /* From Solaris usr/src/stand/lib/fs/ufs/ufsops.c */
 
-#include <fsimage_grub.h>
+#include <xenfsimage_grub.h>
 
 #include "ufs.h"
 
diff --git a/tools/libfsimage/xfs/fsys_xfs.c b/tools/libfsimage/xfs/fsys_xfs.c
index f39d096ba2..d735a88e55 100644
--- a/tools/libfsimage/xfs/fsys_xfs.c
+++ b/tools/libfsimage/xfs/fsys_xfs.c
@@ -17,7 +17,7 @@
  *  along with this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <fsimage_grub.h>
+#include <xenfsimage_grub.h>
 #include "xfs.h"
 
 #define MAX_LINK_COUNT 8
diff --git a/tools/libfsimage/zfs/fsi_zfs.c b/tools/libfsimage/zfs/fsi_zfs.c
index 75145875fd..187a8bc6b2 100644
--- a/tools/libfsimage/zfs/fsi_zfs.c
+++ b/tools/libfsimage/zfs/fsi_zfs.c
@@ -22,7 +22,7 @@
 
 #ifdef FSYS_ZFS
 
-#include <fsimage_grub.h>
+#include <xenfsimage_grub.h>
 #include <fsimage_priv.h>
 #include <stdio.h>
 #include <inttypes.h>
diff --git a/tools/libfsimage/zfs/fsi_zfs.h b/tools/libfsimage/zfs/fsi_zfs.h
index fb4dc23bbf..980ce8f304 100644
--- a/tools/libfsimage/zfs/fsi_zfs.h
+++ b/tools/libfsimage/zfs/fsi_zfs.h
@@ -27,7 +27,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
-#include <fsimage_grub.h>
+#include <xenfsimage_grub.h>
 
 
 /*** START FROM shared.h ****/
diff --git a/tools/pygrub/setup.py b/tools/pygrub/setup.py
index 711bbbd499..b58cc1c4e6 100644
--- a/tools/pygrub/setup.py
+++ b/tools/pygrub/setup.py
@@ -11,7 +11,7 @@ fsimage = Extension("fsimage",
     extra_compile_args = extra_compile_args,
     include_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ],
     library_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ],
-    libraries = ["fsimage"],
+    libraries = ["xenfsimage"],
     sources = ["src/fsimage/fsimage.c"])
 
 pkgs = [ 'grub' ]
diff --git a/tools/pygrub/src/fsimage/fsimage.c 
b/tools/pygrub/src/fsimage/fsimage.c
index 8ec0dec346..47940572a8 100644
--- a/tools/pygrub/src/fsimage/fsimage.c
+++ b/tools/pygrub/src/fsimage/fsimage.c
@@ -23,7 +23,7 @@
 
 #include <Python.h>
 
-#include <fsimage.h>
+#include <xenfsimage.h>
 #include <stdlib.h>
 
 #if (PYTHON_API_VERSION >= 1011)
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog

 

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.

Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.