[pve-devel] [PATCHV2 2/4] Revert commit 18335ece8876f7ef0b745c37de555646314c1943

[Wolfgang Bumiller]

On Wed, Jul 06, 2016 at 10:21:17AM +0200, Wolfgang Link wrote:
> We like to have the dog binaries in /usr/sbin and not in /usr/bin

It would also be nice if the filename hinted at that and followed the
naming convention (.patch suffix) ;-)

Ideally you'd use `git revert` and `git format-patch` on a local clone
and use the file + name produced by `git format-patch` (with the 0001-
prefix optionally removed). That way it would also contain the commit
message. Because, other than this commit message above, a file named
'revert_patch' is a little too little information for my taste.

> ---
>  debian/patches/revert_commit | 26 ++++++++++++++++++++++++++
>  debian/patches/series        |  1 +
>  2 files changed, 27 insertions(+)
>  create mode 100644 debian/patches/revert_commit
> 
> diff --git a/debian/patches/revert_commit b/debian/patches/revert_commit
> new file mode 100644
> index 0000000..c1991c8
> --- /dev/null
> +++ b/debian/patches/revert_commit
> @@ -0,0 +1,26 @@
> +Index: sheepdog.git/dog/Makefile.am
> +===================================================================
> +--- sheepdog.git.orig/dog/Makefile.am
> ++++ sheepdog.git/dog/Makefile.am
> +@@ -21,7 +21,7 @@ AM_CFLAGS		=
> + 
> + AM_CPPFLAGS		= -I$(top_builddir)/include -I$(top_srcdir)/include
> + 
> +-bin_PROGRAMS		= dog
> ++sbin_PROGRAMS		= dog
> + 
> + dog_SOURCES		= farm/object_tree.c farm/sha1_file.c farm/snap.c \
> + 			  farm/trunk.c farm/farm.c farm/slice.c \
> +@@ -49,10 +49,10 @@ dog_LDADD		+= -leq_embed
> + endif
> + 
> + install-exec-hook:
> +-	if [ -z "${DESTDIR}" ];then $(LN_S) -f ${bindir}/dog ${bindir}/collie;fi
> ++	if [ -z "${DESTDIR}" ];then $(LN_S) -f ${sbindir}/dog ${sbindir}/collie;fi
> + 
> + uninstall-hook:
> +-	rm -f ${sbindir}/collie ${sbindir}/dog
> ++	rm -f ${sbindir}/collie
> + 
> + all-local:
> + 	@echo Built dog
> diff --git a/debian/patches/series b/debian/patches/series
> index 4d213d4..7ff4ba3 100644
> --- a/debian/patches/series
> +++ b/debian/patches/series
> @@ -3,3 +3,4 @@ simplify-log-rotation.patch
>  set-no-file-limit.patch
>  cleanup-systemd-service.patch
>  add-service-start-condition.patch
> +revert_commit
> -- 
> 2.1.4
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel at pve.proxmox.com
> http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>