diff options
| author | Jose Luis Duran <jlduran@gmail.com> | 2023-10-18 15:14:33 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2023-10-18 15:15:18 +0000 |
| commit | 3b5c9845727a1b95098379f66223525e85e8a73f (patch) | |
| tree | 5f187895d727d7ed3425bb8f5806436f33597f15 /usr.bin/mkimg | |
| parent | f2ffadeb03e6a995ea43cabed1d5308c6cd5fb84 (diff) | |
| download | src-3b5c9845727a1b95098379f66223525e85e8a73f.tar.gz src-3b5c9845727a1b95098379f66223525e85e8a73f.zip | |
Remove $FreeBSD$: one line sh-pattern
Remove the $FreeBSD$ pattern added to the tests, as well as fixing the
mkimg_test.sh script to stop adding it when we rebase the tests.
Reviewed by: imp, emaste
Pull Request: https://github.com/freebsd/freebsd-src/pull/870
Diffstat (limited to 'usr.bin/mkimg')
29 files changed, 1 insertions, 31 deletions
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex index ae764c000ae7..ab899b3e5ec2 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 a0 00 |.............B..| 00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex index 7f79015b561f..a2d342d06a42 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 02 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 10 00 00 00 00 00 43 00 00 |.............C..| 00000020 00 00 00 00 00 00 00 01 00 00 00 00 00 01 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex index 32fb00bc17cb..dae6b78a65f8 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex index 01ceaae1963c..0de167c0e198 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| 00000010 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| 00000020 00 02 00 00 57 69 32 6b 00 00 00 00 00 42 f0 00 |....Wi2k.....B..| diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex index 25e961888b80..bd8601eccc50 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex index aadd5841a58e..4d4542d9a686 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 76 68 64 78 66 69 6c 65 00 00 00 00 00 00 00 00 |vhdxfile........| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex index 1ff8880a897b..35b354c7310b 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 4b 44 4d 56 01 00 00 00 03 00 00 00 00 28 00 00 |KDMV.........(..| 00000010 00 00 00 00 10 00 00 00 00 00 00 00 01 00 00 00 |................| 00000020 00 00 00 00 01 00 00 00 00 00 00 00 00 02 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex index 69bed4ff417c..510bbf80e208 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 90 00 |.............B..| 00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex index 7605a6561ee2..9a12f90cb5af 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 02 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 10 00 00 00 00 00 43 00 00 |.............C..| 00000020 00 00 00 00 00 00 00 01 00 00 00 00 00 01 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex index 0d69daf7d37a..b464168daaa4 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex index 857c7ea3e4f0..796166f430ee 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| 00000010 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| 00000020 00 02 00 00 57 69 32 6b 00 00 00 00 00 42 f0 00 |....Wi2k.....B..| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex index 76e76c3155c9..93b291550be0 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex index cde7a4953009..1aef760fa90a 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 76 68 64 78 66 69 6c 65 00 00 00 00 00 00 00 00 |vhdxfile........| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex index 044e0bc66181..51da710db535 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 4b 44 4d 56 01 00 00 00 03 00 00 00 00 28 00 00 |KDMV.........(..| 00000010 00 00 00 00 10 00 00 00 00 00 00 00 01 00 00 00 |................| 00000020 00 00 00 00 01 00 00 00 00 00 00 00 00 02 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex index ae764c000ae7..ab899b3e5ec2 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 a0 00 |.............B..| 00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex index 7f79015b561f..a2d342d06a42 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 02 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 10 00 00 00 00 00 43 00 00 |.............C..| 00000020 00 00 00 00 00 00 00 01 00 00 00 00 00 01 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex index 32fb00bc17cb..dae6b78a65f8 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex index c3b9496e2870..0103906c9fa2 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| 00000010 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| 00000020 00 02 00 00 57 69 32 6b 00 00 00 00 00 7d 82 00 |....Wi2k.....}..| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex index 6b4ec6c575d6..36210d5dd44d 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex index aadd5841a58e..4d4542d9a686 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 76 68 64 78 66 69 6c 65 00 00 00 00 00 00 00 00 |vhdxfile........| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex index 2a44596b10fe..bf6ba8b9560e 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 4b 44 4d 56 01 00 00 00 03 00 00 00 00 28 00 00 |KDMV.........(..| 00000010 00 00 00 00 10 00 00 00 00 00 00 00 01 00 00 00 |................| 00000020 00 00 00 00 01 00 00 00 00 00 00 00 00 02 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex index 69bed4ff417c..510bbf80e208 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 90 00 |.............B..| 00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex index 7605a6561ee2..9a12f90cb5af 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 02 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 10 00 00 00 00 00 43 00 00 |.............C..| 00000020 00 00 00 00 00 00 00 01 00 00 00 00 00 01 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex index 0d69daf7d37a..b464168daaa4 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex index 31451cfb320e..94fbb99cbdb9 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| 00000010 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| 00000020 00 02 00 00 57 69 32 6b 00 00 00 00 00 7d 82 00 |....Wi2k.....}..| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex index dbaed6ce1606..3ee432909549 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex index cde7a4953009..1aef760fa90a 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 76 68 64 78 66 69 6c 65 00 00 00 00 00 00 00 00 |vhdxfile........| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex index 2ec42edb497d..8311d98ee9c0 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 4b 44 4d 56 01 00 00 00 03 00 00 00 00 28 00 00 |KDMV.........(..| 00000010 00 00 00 00 10 00 00 00 00 00 00 00 01 00 00 00 |................| 00000020 00 00 00 00 01 00 00 00 00 00 00 00 00 02 00 00 |................| diff --git a/usr.bin/mkimg/tests/mkimg_test.sh b/usr.bin/mkimg/tests/mkimg_test.sh index 74680c5d2be7..7c6593b219ef 100755 --- a/usr.bin/mkimg/tests/mkimg_test.sh +++ b/usr.bin/mkimg/tests/mkimg_test.sh @@ -86,9 +86,7 @@ mkimg_rebase() fi if test $update = yes; then - # Prevent keyword expansion when writing the keyword. - (echo -n '# $'; echo -n FreeBSD; echo '$') > $baseline - cat $result >> $baseline + cat $result > $baseline fi rm $image $result _tmp-* |