52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
|
changeset: 26083:3fbeb019d522
|
||
|
user: Olaf Hering <olaf@aepfle.de>
|
||
|
date: Thu Oct 18 09:35:04 2012 +0100
|
||
|
files: tools/blktap/lib/Makefile
|
||
|
description:
|
||
|
blktap: fix rpmlint warning spurious-executable-perm
|
||
|
|
||
|
[ 1758s] xen-devel.x86_64: E: spurious-executable-perm (Badness: 50) /usr/lib64/libblktap.a
|
||
|
[ 1758s] The file is installed with executable permissions, but was identified as one
|
||
|
[ 1758s] that probably should not be executable. Verify if the executable bits are
|
||
|
[ 1758s] desired, and remove if not. NOTE: example scripts should be packaged under
|
||
|
[ 1758s] %docdir/examples, which will avoid this warning.
|
||
|
|
||
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
||
|
Acked-by: Ian Campbell <ian.campbell@citrix.com>
|
||
|
Committed-by: Ian Campbell <ian.campbell@citrix.com>
|
||
|
|
||
|
|
||
|
diff -r 8cf26ace9ca0 -r 3fbeb019d522 tools/blktap/lib/Makefile
|
||
|
--- a/tools/blktap/lib/Makefile Thu Oct 18 09:35:03 2012 +0100
|
||
|
+++ b/tools/blktap/lib/Makefile Thu Oct 18 09:35:04 2012 +0100
|
||
|
@@ -23,23 +23,25 @@ OBJS_PIC = $(SRCS:.c=.opic)
|
||
|
OBJS_PIC = $(SRCS:.c=.opic)
|
||
|
IBINS :=
|
||
|
|
||
|
-LIB = libblktap.a libblktap.so.$(MAJOR).$(MINOR)
|
||
|
+LIB = libblktap.a
|
||
|
+LIB_SO = libblktap.so.$(MAJOR).$(MINOR)
|
||
|
|
||
|
.PHONY: all
|
||
|
-all: $(LIB)
|
||
|
+all: $(LIB) $(LIB_SO)
|
||
|
|
||
|
.PHONY: install
|
||
|
install: all
|
||
|
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
|
||
|
$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
|
||
|
- $(INSTALL_PROG) $(LIB) $(DESTDIR)$(LIBDIR)
|
||
|
+ $(INSTALL_PROG) $(LIB_SO) $(DESTDIR)$(LIBDIR)
|
||
|
+ $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)
|
||
|
ln -sf libblktap.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libblktap.so.$(MAJOR)
|
||
|
ln -sf libblktap.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libblktap.so
|
||
|
$(INSTALL_DATA) blktaplib.h $(DESTDIR)$(INCLUDEDIR)
|
||
|
|
||
|
.PHONY: clean
|
||
|
clean:
|
||
|
- rm -rf *.a *.so* *.o *.opic *.rpm $(LIB) *~ $(DEPS) xen TAGS
|
||
|
+ rm -rf *.a *.so* *.o *.opic *.rpm $(LIB) $(LIB_SO) *~ $(DEPS) xen TAGS
|
||
|
|
||
|
libblktap.so.$(MAJOR).$(MINOR): $(OBJS_PIC)
|
||
|
$(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_LDFLAGS) \
|