From nobody Thu Oct 19 19:23:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBHgG4hT4z4xnBj; Thu, 19 Oct 2023 19:23:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBHgG1Z9Mz3cjl; Thu, 19 Oct 2023 19:23:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697743386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bvyfNBDH/9gTFemfqzMs1rzUkCMlHVvHIoAQSQFoU18=; b=FE1JgsJBqQGyT01MqvWANRi10duhjORYp+S1cTavd9Y7g9aTHs6QA96TwCUXGD7rqz7rmB C3NGwzJF/yAf6cPJA7nA42Mw/n3R5GofsNsZr5Jhui0du0lIgykkj3OlD2NWn41SZsgFJ0 K6ymZtwHISfWavnryMO31RmRYoxhPnhYNRLsjEWo9WDw5/98HDD12NGeuCugryGZ2N2U9A U3fjw/2LUlfpqeDpnTocXYuQGwNaXlFzI0maMDHe6RmCKmKTPMJM1MFpKGHQv0GtOqKW5r Z4k9N8x0WjuMwqDKAM8lFaOnLKfebg0GxTIGsDQO8lwAEVVbgrv1n6SYstGzxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697743386; a=rsa-sha256; cv=none; b=AU9SXGR5CAw2n563geII1/x351uJ+XKiYK42J7WELrvVIbSpuhaPZ3KyJ5l4cRqryxUgrY JJ/jq3qZrFMQm4jcSmE+ibbJwKbs6eQWPnpLKjc0id2hv+D03XaBsL9uCXD7yArz5HKpGp YbNMnuB+pVp5TsLINRYHbDQ80SjCg4gZEl0jB/+sQjXKii1qNNAN4JXxZ5HnW5NYPMH9Sv +dBhy7/9YpqTfcuP3mt7tUkw5D/0Fr/0BLuPBE8aJTw3LeJL4MdUjx06tH9kuKDbfdH1+U 0ha35NvzTlPP7lJkHKfNdGYPhrQ0TbUdpztFaDpZXpoqKx04YAxyYX+Su38izA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697743386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bvyfNBDH/9gTFemfqzMs1rzUkCMlHVvHIoAQSQFoU18=; b=GaqSdcy/+bRCVJY95C9NUbtwIRvpTt68WSzo41bdo2I7oxuRZ+4tWPAAinDbM+Hg1uvBtk YGPLVRpVp4mmUzRTvnbn4ec3JNBHekvVE+RMPFMVKMED5P2Exi1gBnht4JufyKAmmQvhpm Z/s8RKb0+8ibX7ginXFqkbCqzUqwU/S3uNskQhkF3th7UU9+2wOwk1BScDLDkiI8WbLLwt GAOoxceOMV+ABNcE9eh44FoNmAMYDogmdftUivdqdXf7l7TC+TRM4C/C/KJj+CL8Y4kDOo fOLdqP6yhFDEGkKTmgcj+2TixL+Z7F5kZ1zmuvreIDs80d16fxwSle6K5IScAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBHgG0RBWz12bh; Thu, 19 Oct 2023 19:23:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JJN65C076783; Thu, 19 Oct 2023 19:23:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JJN5HL076780; Thu, 19 Oct 2023 19:23:05 GMT (envelope-from git) Date: Thu, 19 Oct 2023 19:23:05 GMT Message-Id: <202310191923.39JJN5HL076780@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 84b71a48ea41 - releng/14.0 - Remove $FreeBSD$: one line sh-pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 84b71a48ea415e35aad3bbc8c20f137ed4d0dd79 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=84b71a48ea415e35aad3bbc8c20f137ed4d0dd79 commit 84b71a48ea415e35aad3bbc8c20f137ed4d0dd79 Author: Jose Luis Duran AuthorDate: 2023-10-18 15:24:00 +0000 Commit: Warner Losh CommitDate: 2023-10-19 18:37:52 +0000 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 (cherry picked from commit 3b5c9845727a1b95098379f66223525e85e8a73f) (cherry picked from commit 9ed4f43bc4c39dc5ed2ce1bf6003e4dcb4160bfc) Approved-by: re (cperciva) --- usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex | 1 - usr.bin/mkimg/tests/mkimg_test.sh | 4 +--- 29 files changed, 1 insertion(+), 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-*