tree 811b4b274bbfb589909938a3817839e94a9c4f9e
parent fca5e2cd88a8581510861c7bc7f9d9a0ca6780b3
author Ross Zwisler <zwisler@google.com> 1659732055 -0600
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> 1665434236 +0000

Revert "CHROMIUM: setlocalversion: check for .scmversion in output dir also"

This reverts commit 04c490675214ddc0afce00f641793c4210d6d184.

Reason for revert: we want to allow locally built 9999 kernels to have
version strings which include the git hash.

Original change's description:
> CHROMIUM: setlocalversion: check for .scmversion in output dir also
>
> Look for .scmversion file in output directory in addition to the kernel
> source tree. This is useful for builds where the output directory is not
> the same as the kernel source directory. In such cases the .scmversion
> file can be added/deleted in the output directory with no changes needed
> in the kernel sources directories.
>
> BUG=chrome-os-partner:40556
> TEST=do kernel build for both cros_workon on and non-cros_workon
> cases and verify that the kernel version is of the form 3.18.0 and
> doesn't include the git hash in the kernel version.
>
> Change-Id: I5d5a0259fe43960d428755205d1db7935b2a7d33
> Signed-off-by: Sameer Nanda <snanda@chromium.org>
> Reviewed-on: https://chromium-review.googlesource.com/273276
> Reviewed-by: Dmitry Torokhov <dtor@chromium.org>
>
> [rebase44(filbranden): Fixed script to cat the .scmversion found.]
> Reviewed-on: https://chromium-review.googlesource.com/333874
> Signed-off-by: Filipe Brandenburger <filbranden@chromium.org>

BUG=b:241589017
TEST=compile local kernel that has been cros_workon'd, install it and
verify that the kernel string has the correct git hash

Change-Id: I496d0d42533ab7ab42c918595409580f7df706ad
Signed-off-by: Ross Zwisler <zwisler@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3814172
Commit-Queue: Brian Norris <briannorris@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Sarthak Kukreti <sarthakkukreti@chromium.org>