Hello Hiro, On Sat, Apr 10, 2021 at 08:36:04AM -0400, Yoshihiro Ota wrote: >Hi, > >How about these now? >These include extra improvements to other parts of systat. > >These patches create new files. >If you already applies previosly, please check and clean up new files. Sorry to report that for the 13.0-RELENG patch, it didn't apply cleanly. I've not tried the others yet. I saved the attatchment, and then uploaded it to a pristine 13-RELENG vm. This vm was made from https://download.freebsd.org/ftp/releases/ISO-IMAGES/13.0/FreeBSD-13.0-RELEASE-amd64-dvd1.iso.xz Once installed to a 256GB vm, spun the vm up and did the following: 1. install git from packages 2. cd /usr && git clone ssh://anongit_at_git.freebsd.org/src.git 3. cd src && git checkout releng/13.0 Then copied systat-swap-releng13.0.diff to /usr/src, then ran the following in /usr/src: patch < systat-swap-releng13.0.diff output follows: [...] Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile |index ca3f7ed72ce..bfbe1336d29 100644 |--- a/usr.bin/systat/Makefile |+++ b/usr.bin/systat/Makefile -------------------------- Patching file usr.bin/systat/Makefile using Plan A... Hunk #1 failed at 5. Hunk #2 failed at 16. 2 out of 2 hunks failed--saving rejects to usr.bin/systat/Makefile.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/usr.bin/systat/devs.c b/usr.bin/systat/devs.c |index b293796c2c7..87d04f989ea 100644 |--- a/usr.bin/systat/devs.c |+++ b/usr.bin/systat/devs.c -------------------------- Patching file usr.bin/systat/devs.c using Plan A... Hunk #1 failed at 426. Hunk #2 failed at 433. 2 out of 2 hunks failed--saving rejects to usr.bin/systat/devs.c.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/usr.bin/systat/devs.h b/usr.bin/systat/devs.h |index cbedd844290..79a44a6c3f5 100644 |--- a/usr.bin/systat/devs.h |+++ b/usr.bin/systat/devs.h -------------------------- Patching file usr.bin/systat/devs.h using Plan A... Hunk #1 failed at 2. Hunk #2 failed at 34. 2 out of 2 hunks failed--saving rejects to usr.bin/systat/devs.h.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/usr.bin/systat/extern.h b/usr.bin/systat/extern.h |index 6e3117bece4..322065f7931 100644 |--- a/usr.bin/systat/extern.h |+++ b/usr.bin/systat/extern.h -------------------------- Patching file usr.bin/systat/extern.h using Plan A... Hunk #1 failed at 168. 1 out of 1 hunks failed--saving rejects to usr.bin/systat/extern.h.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c |index b5a19d381ad..b84351379f4 100644 |--- a/usr.bin/systat/main.c |+++ b/usr.bin/systat/main.c -------------------------- Patching file usr.bin/systat/main.c using Plan A... Hunk #1 failed at 135. Hunk #2 failed at 206. 2 out of 2 hunks failed--saving rejects to usr.bin/systat/main.c.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/usr.bin/systat/pigs.c b/usr.bin/systat/pigs.c |index d9f3f8d4ad1..879f6548d86 100644 |--- a/usr.bin/systat/pigs.c |+++ b/usr.bin/systat/pigs.c -------------------------- Patching file usr.bin/systat/pigs.c using Plan A... Hunk #1 failed at 56. Hunk #2 failed at 90. Hunk #3 failed at 146. 3 out of 3 hunks failed--saving rejects to usr.bin/systat/pigs.c.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/usr.bin/systat/proc.c b/usr.bin/systat/proc.c |new file mode 100644 |index 00000000000..0def660d2dc |--- /dev/null |+++ b/usr.bin/systat/proc.c -------------------------- (Creating file usr.bin/systat/proc.c...) Patching file usr.bin/systat/proc.c using Plan A... Empty context always matches. Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/usr.bin/systat/subs.h b/usr.bin/systat/subs.h |new file mode 100644 |index 00000000000..e4184be8dae |--- /dev/null |+++ b/usr.bin/systat/subs.h -------------------------- (Creating file usr.bin/systat/subs.h...) Patching file usr.bin/systat/subs.h using Plan A... Empty context always matches. Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/usr.bin/systat/swap.c b/usr.bin/systat/swap.c |index fc44db7d7d4..44a321a5705 100644 |--- a/usr.bin/systat/swap.c |+++ b/usr.bin/systat/swap.c -------------------------- Patching file usr.bin/systat/swap.c using Plan A... Hunk #1 failed at 3. Hunk #2 failed at 57. Hunk #3 failed at 90. Hunk #4 failed at 98. Hunk #5 failed at 113. Hunk #6 failed at 127. 6 out of 6 hunks failed--saving rejects to usr.bin/systat/swap.c.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/usr.bin/systat/sysput.c b/usr.bin/systat/sysput.c |index 31c9127a83b..64a9699e45e 100644 |--- a/usr.bin/systat/sysput.c |+++ b/usr.bin/systat/sysput.c -------------------------- Patching file usr.bin/systat/sysput.c using Plan A... Hunk #1 failed at 1. Hunk #2 failed at 42. Hunk #3 failed at 122. Hunk #4 failed at 139. 4 out of 4 hunks failed--saving rejects to usr.bin/systat/sysput.c.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1 |index d2eeb285481..bc57d89cf06 100644 |--- a/usr.bin/systat/systat.1 |+++ b/usr.bin/systat/systat.1 -------------------------- Patching file usr.bin/systat/systat.1 using Plan A... Hunk #1 failed at 297. 1 out of 1 hunks failed--saving rejects to usr.bin/systat/systat.1.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/usr.bin/systat/systat.h b/usr.bin/systat/systat.h |index 92233e05817..661e3f2043b 100644 |--- a/usr.bin/systat/systat.h |+++ b/usr.bin/systat/systat.h -------------------------- Patching file usr.bin/systat/systat.h using Plan A... Hunk #1 failed at 33. Hunk #2 failed at 70. 2 out of 2 hunks failed--saving rejects to usr.bin/systat/systat.h.rej done [...] -- J.
This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:41:28 UTC