[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: [Glibc-bsd-commits] r5582 - in trunk/freebsd-libs/debian: . patches



Hi Petr,

On 16:47, ps-guest@alioth.debian.org wrote:
>    trunk/freebsd-libs/debian/patches/02_libcam.diff
>    trunk/freebsd-libs/debian/patches/04_libkvm.diff
>    trunk/freebsd-libs/debian/patches/05_libipx.diff
>    trunk/freebsd-libs/debian/patches/08_libdevstat.diff
>    trunk/freebsd-libs/debian/patches/12_usb.diff
>    trunk/freebsd-libs/debian/patches/13_jail.diff
>    trunk/freebsd-libs/debian/patches/14_alias.diff
>    trunk/freebsd-libs/debian/patches/assume_default_login_class.diff
>    trunk/freebsd-libs/debian/patches/cdefs_macros.diff
>    trunk/freebsd-libs/debian/patches/dwarf.diff
>    trunk/freebsd-libs/debian/patches/elf.diff
>    trunk/freebsd-libs/debian/patches/kvm_size_t_kludge.diff
>    trunk/freebsd-libs/debian/patches/libbsd_nlist.diff
>    trunk/freebsd-libs/debian/patches/libdwarf_off64_t.diff
>    trunk/freebsd-libs/debian/patches/libusb_backward.diff
>    trunk/freebsd-libs/debian/patches/libusb_pthread_condattr_setclock.diff
>    trunk/freebsd-libs/debian/patches/makefiles.diff
>    trunk/freebsd-libs/debian/patches/pty_decls.diff
>    trunk/freebsd-libs/debian/patches/rlimit.diff
>    trunk/freebsd-libs/debian/patches/sysconf_cpuset_size.diff

A lot of those patches didn't need to be refreshed, we have a lot of
noise caused only by:

> -@@ -6,8 +6,7 @@
> +@@ -6,8 +6,7 @@ SRCS=		camlib.c scsi_cmdparse.c scsi_all

> -@@ -8,7 +8,7 @@
> +@@ -8,7 +8,7 @@ SRCS=	devstat.c

> -@@ -31,7 +31,7 @@
> +@@ -31,7 +31,7 @@ MLINKS+=devstat.3 buildmatch.3

This is mostly not useful to have in the patches.  And reviewing the
diff-of-diffs to see what changed is made more difficult by this.

Do you know how to turn that off?  I don't seem to get that, with
quilt 0.60-10 when I do:
$ quilt refresh -pab --no-index --no-timestamp


I'm glad we have cleaned up these patches to use "a/" and "b/" paths.
Sometimes the directory name contains an upstream version and it 
changes needlessly when refreshed:

> ---- freebsd-libs.orig/lib/libipx/Makefile
> -+++ freebsd-libs/lib/libipx/Makefile
> +--- a/lib/libipx/Makefile
> ++++ b/lib/libipx/Makefile

I've also added --ignore-keywords to get-orig-source, so that this
shouldn't change any more in future:

> - # $FreeBSD: stable/10/lib/libipx/Makefile 201381 2010-01-02 09:58:07Z ed $
> + # $FreeBSD$

Regards,
-- 
Steven Chamberlain
steven@pyro.eu.org


Reply to: