diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2012-11-12 12:57:40 +0000 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2012-11-12 12:57:40 +0000 |
| commit | 73b3de2944208604b3f92930f324eaff8da8d45c (patch) | |
| tree | 278e5ee729eaff1b6e44744a74b67e5bfbf8494a /zfsutils/debian/patches | |
| parent | 6b15597bbb3b6cd784b25839f4f497572414e053 (diff) | |
| download | illumos-packaging-73b3de2944208604b3f92930f324eaff8da8d45c.tar.gz | |
zinject
Diffstat (limited to 'zfsutils/debian/patches')
| -rw-r--r-- | zfsutils/debian/patches/series | 1 | ||||
| -rw-r--r-- | zfsutils/debian/patches/zinject-build.patch | 54 |
2 files changed, 55 insertions, 0 deletions
diff --git a/zfsutils/debian/patches/series b/zfsutils/debian/patches/series index b58223e..a4e515b 100644 --- a/zfsutils/debian/patches/series +++ b/zfsutils/debian/patches/series @@ -17,3 +17,4 @@ libdiskmgt-avoid-meta.h.patch libdiskmgt-time.patch zpool-time.patch zdb-build.patch +zinject-build.patch diff --git a/zfsutils/debian/patches/zinject-build.patch b/zfsutils/debian/patches/zinject-build.patch new file mode 100644 index 0000000..9eb6955 --- /dev/null +++ b/zfsutils/debian/patches/zinject-build.patch @@ -0,0 +1,54 @@ +Index: zfsutils/usr/src/cmd/zinject/Makefile +=================================================================== +--- zfsutils.orig/usr/src/cmd/zinject/Makefile 2012-10-08 00:25:34.000000000 +0000 ++++ zfsutils/usr/src/cmd/zinject/Makefile 2012-11-12 12:52:31.016255908 +0000 +@@ -25,12 +25,11 @@ + # ident "%Z%%M% %I% %E% SMI" + # + +-PROG:sh= basename `pwd` ++PROG = zinject + + include ../Makefile.cmd + + $(INTEL_BLD)SUBDIRS = $(MACH) +-$(BUILD64)SUBDIRS += $(MACH64) + + all := TARGET = all + install := TARGET = install +@@ -40,11 +39,7 @@ + + .KEEP_STATE: + +-all clean clobber lint: $(SUBDIRS) +- +-install: $(SUBDIRS) +- -$(RM) $(ROOTUSRSBINPROG) +- -$(LN) $(ISAEXEC) $(ROOTUSRSBINPROG) ++all clean clobber lint install: $(SUBDIRS) + + $(SUBDIRS): FRC + @cd $@; pwd; $(MAKE) $(TARGET) +Index: zfsutils/usr/src/cmd/zinject/Makefile.com +=================================================================== +--- zfsutils.orig/usr/src/cmd/zinject/Makefile.com 2012-10-08 00:25:34.000000000 +0000 ++++ zfsutils/usr/src/cmd/zinject/Makefile.com 2012-11-12 12:53:05.859804595 +0000 +@@ -23,7 +23,7 @@ + # Use is subject to license terms. + # + +-PROG:sh= cd ..; basename `pwd` ++PROG = zinject + OBJS= $(PROG).o translate.o + SRCS= $(OBJS:%.o=../%.c) + +Index: zfsutils/usr/src/cmd/zinject/i386/Makefile +=================================================================== +--- zfsutils.orig/usr/src/cmd/zinject/i386/Makefile 2012-10-08 00:25:34.000000000 +0000 ++++ zfsutils/usr/src/cmd/zinject/i386/Makefile 2012-11-12 12:53:18.944382054 +0000 +@@ -27,4 +27,4 @@ + + include ../Makefile.com + +-install: all $(ROOTUSRSBINPROG32) ++install: all $(ROOTUSRSBINPROG) |