Date: Sat, 27 Mar 2021 18:41:07 -0700 From: Mark Millard <marklmi@yahoo.com> To: tech-lists <tech-lists@zyxst.net> Cc: freebsd-arm@freebsd.org Subject: Re: RPI4 clock speeds and serial port (the ~/fbsd-based-on-what-freebsd-main.sh script again) Message-ID: <AA359B81-7E25-4310-9561-642284E47EB0@yahoo.com> In-Reply-To: <1EF5AB68-4357-455C-AD0F-86FCCD4AC50B@yahoo.com> References: <20210318170053.GA26688@www.zefox.net> <9FFA0A51-C0B7-4121-95CA-B98669809007@yahoo.com> <YFynnhNilLlQSljr@ceres.zyxst.net> <1EF5AB68-4357-455C-AD0F-86FCCD4AC50B@yahoo.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2021-Mar-25, at 10:19, Mark Millard <marklmi at yahoo.com> wrote: > On 2021-Mar-25, at 08:09, tech-lists <tech-lists at zyxst.net> wrote: >=20 >> On Thu, Mar 18, 2021 at 12:05:54PM -0700, Mark Millard via = freebsd-arm wrote: >>=20 >>> # ~/fbsd-based-on-what-freebsd-main.sh >>=20 >> I've seen you reference this more than once. I guess it's a handy = list of git >> commands. Please tell us what's in it/what it does? >>=20 >> The reason I'm asking is i'm still trying to get my head around git. = As >> someone who is much more a sysadmin than a developer, svn did way = more >> for me than git. The commands I miss most are svn info <path> and svn = up -r <version-number> >=20 > I made the possibly-unusual choice to experiment > with having the FreeBSD patches that I use committed > in my FreeBSD git environment (in my own branches > that track FreeBSD updates from freebsd/main). [A > good portion of the patches are tied to using old > PowerMacs.] >=20 > This leads to issues reporting what official FreeBSD > version my context is based on. So I use a script > for the freebsd/main branch that traces back to a > common point and reporting back to that common > point, inclusive of the common point. >=20 > # more ~/fbsd-based-on-what-freebsd-main.sh=20 > #! /bin/sh > base=3D"`git merge-base freebsd/main HEAD`" \ > && echo "merge-base: $base" \ > && base_date=3D"`TZ=3DUTC git log --format=3Dfuller --date=3Diso-local = --no-color $base^..$base | grep CommitDate:`" \ > && echo "merge-base: $base_date" \ > && git log --oneline --no-color $base^..HEAD \ > && uname -apKU >=20 > It results in output like is shown below: >=20 > # ~/fbsd-based-on-what-freebsd-main.sh=20 > merge-base: 7381bbee29df959e88ec59866cf2878263e7f3b2 > merge-base: CommitDate: 2021-03-12 20:29:42 +0000 > def0058cc690 (HEAD -> mm-src) mm-src snapshot for mm's patched build = in git context. > 7381bbee29df (freebsd/main, freebsd/HEAD, pure-src, main) cam: Run all = XPT_ASYNC ccbs in a dedicated thread > FreeBSD RPi4B 14.0-CURRENT FreeBSD 14.0-CURRENT = mm-src-n245445-def0058cc690 GENERIC-NODBG arm64 aarch64 1400005 1400005 >=20 > The "merge-base" lines are about the common point. > The above shows that I've one commit after that > point: my historical patches are bundled into one > commit for how I'm working. If I change the patching, > I might for a time have more than one commit showing > before the merge base commit is listed. I'm experimenting with a different order to the output, uname then newest to oldest, through merge-base, with merge-base well labeled just before its line is printed: # ~/fbsd-based-on-what-freebsd-main.sh FreeBSD FBSDFHUGE 14.0-CURRENT FreeBSD 14.0-CURRENT = mm-src-n245445-def0058cc690 GENERIC-NODBG amd64 amd64 1400005 1400005 def0058cc690 (HEAD -> mm-src) mm-src snapshot for mm's patched build in = git context. merge-base: 7381bbee29df959e88ec59866cf2878263e7f3b2 merge-base: CommitDate: 2021-03-12 20:29:42 +0000 7381bbee29df (freebsd/main, freebsd/HEAD, pure-src, main) cam: Run all = XPT_ASYNC ccbs in a dedicated thread The updated script looks like: # more ~/fbsd-based-on-what-freebsd-main.sh #! /bin/sh uname -apKU \ && base=3D"`git merge-base freebsd/main HEAD`" \ && git log --oneline --no-color $base..HEAD \ && base_date=3D"`TZ=3DUTC git log --format=3Dfuller --date=3Diso-local = --no-color $base^..$base | grep CommitDate:`" \ && echo "merge-base: $base" \ && echo "merge-base: $base_date" \ && git log --oneline --no-color $base^..$base =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AA359B81-7E25-4310-9561-642284E47EB0>