Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Align default revision with Android version #8

Open
wants to merge 4 commits into
base: arpi-5.10
Choose a base branch
from

Conversation

icedieler
Copy link

Certain projects may move forward on their master branch breaking
compatibility with other Android-version-specific projects. This happend
e.g. with the 'kernel/build' project where on the master branch certain
path' and locations have changed.

Thus we have to pin the default revision to the Android and kernel
version we want to build for. This also fixes issue #7.

Change-Id: Icf22094caf3521d506acaeb9a3c3f9265d1a877f

metti and others added 4 commits March 11, 2021 15:19
Bug: 181627166
Signed-off-by: Matthias Maennich <[email protected]>
Change-Id: I7645927e1b377a0fb1b70fd51a279da9c84a862e
Step 9/Final Step of:
https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+/master/BINUTILS_KERNEL_DEPRECATION.md

Bug: 141693040
Signed-off-by: Nick Desaulniers <[email protected]>
Change-Id: I54f595c592b0320d8446c69ac5919acecbcfc818
Change-Id: Ia5e8877db40ad3fdd0c62e76a6160b36bbe462a1
Certain projects may move forward on their master branch breaking
compatibility with other Android-version-specific projects. This happend
e.g. with the 'kernel/build' project where on the master branch certain
path' and locations have changed.

Thus we have to pin the default revision to the Android and kernel
version we want to build for. This also fixes issue android-rpi#7.

Change-Id: Icf22094caf3521d506acaeb9a3c3f9265d1a877f
@peyo-hd peyo-hd force-pushed the arpi-5.10 branch 2 times, most recently from 533852d to 0fd746a Compare March 20, 2022 13:39
@peyo-hd
Copy link
Member

peyo-hd commented Mar 20, 2022

Thanks for pointing out the problem.
Now I have rebased arpi-5.10 to common-android12-5.10-lts of aosp kernel/manifest.
It will fix the revision to master-kernel-build-2021 like your PR.

Since android-rpi/kernel_arpi has been based on android12-5.10-lts for several months,
the manifest rebase might be proper re-alignment.

@mse6cob
Copy link

mse6cob commented Mar 22, 2022

@peyo-hd ,

Thanks for the input. I have re based again with latest arpi-5.10.
But still i facing the below error.

merged configuration written to /data2/ci04hi/remote/workspace/android_kernel/common/arch/arm64/configs/arpi_defconfig (needs make)

  • set +x
  • cd common
  • make LLVM=1 LLVM_IAS=1 DEPMOD=depmod DTC=dtc O=/data2/ci04hi/remote/workspace/android_kernel/out/arpi-5.10/common arpi_defconfig
    make[1]: Entering directory '/data2/ci04hi/remote/workspace/android_kernel/out/arpi-5.10/common'

*** The source tree is not clean, please run 'make mrproper'
*** in /data2/ci04hi/remote/workspace/android_kernel/common


make[1]: *** [/data2/ci04hi/remote/workspace/android_kernel/common/Makefile:562: outputmakefile] Error 1
make[1]: Leaving directory '/data2/ci04hi/remote/workspace/android_kernel/out/arpi-5.10/common'
make: *** [Makefile:185: __sub-make] Error 2

So I have tried with (https://github.com/MaJiu/kernel_manifest) . It is working fine.

android-rpi/device_arpi_rpi4#96 (comment)

Thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants