need some help on this one
i forked ti-linux-kernel-dev
then cloned it local to may desktop
when i run
./build_kernel.sh
i’m getting the following.
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace “git config” with “git config --global” to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation
amf@amf:~/dev/pb2/ti-linux-kernel-dev$ ./build_kernel.sh
+ Detected build host [Ubuntu 22.04.5 LTS]
+ host: [x86_64]
+ git HEAD commit: [be595fce12196a7579aea37826a9f2f6b470a58d]
-----------------------------
xz: xz (XZ Utils) 5.2.5
glibc: 2.35
Using Existing Toolchain: gcc_14_aarch64
-----------------------------
scripts/gcc: Using: aarch64-linux-gcc (GCC) 14.3.0
Copyright (C) 2024 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-----------------------------
CROSS_COMPILE=/home/amf/dev/pb2/ti-linux-kernel-dev/dl/gcc-14.3.0-nolibc/aarch64-linux/bin/aarch64-linux-
ccache [enabled]
scripts/git: [git version 2.34.1]
-----------------------------
scripts/git: LINUX_GIT not defined in system.sh
using default location: /home/amf/dev/pb2/ti-linux-kernel-dev/ignore/linux-src/
-----------------------------
scripts/git: Debug: LINUX_GIT is setup as: [/home/amf/dev/pb2/ti-linux-kernel-dev/ignore/linux-src].
scripts/git: [url=https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux.git]
-----------------------------
fatal: Resolve operation not in progress, we are not resuming.
/usr/bin/git tree is clean...
[v6.12.24-ti-arm64-r41 f1f822db03ba] empty cleanup commit
HEAD is now at f1f822db03ba empty cleanup commit
Updating files: 100% (31504/31504), done.
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
log: [/usr/bin/git pull --no-rebase --no-edit]
Already up to date.
Deleted branch v6.12.24-ti-arm64-r41 (was f1f822db03ba).
Updating files: 100% (31504/31504), done.
Switched to a new branch 'v6.12.24-ti-arm64-r41'
v6.12.24
Starting patch.sh
pulling: [https://github.com/beagleboard/mirror-ti-linux-kernel.git ti-linux-6.12.y]
From https://github.com/beagleboard/mirror-ti-linux-kernel
* branch ti-linux-6.12.y -> FETCH_HEAD
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.
thanks,
spoke to early
as indicated above
rm -rf KERNEL
./build_deb.sh
dpkg-architecture: warning: specified GNU system type aarch64-linux-gnu does not match CC system type aarch64-linux, try setting a correct CC environment variable
dpkg-buildpackage --build=binary --no-pre-clean --unsigned-changes -R’make -f debian/rules’ -j1 -a$(cat debian/arch)
dpkg-buildpackage: info: source package linux-upstream
dpkg-buildpackage: info: source version 1xross
dpkg-buildpackage: info: source distribution jammy
dpkg-buildpackage: info: source changed by amf amf@amf
dpkg-architecture: warning: specified GNU system type aarch64-linux-gnu does not match CC system type aarch64-linux, try setting a correct CC environment variable
dpkg-buildpackage: info: host architecture arm64
dpkg-source --before-build .
dpkg-checkbuilddeps: error: Unmet build dependencies: debhelper-compat (= 12)
dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting
dpkg-buildpackage: warning: (Use -d flag to override.)
make[2]: *** [scripts/Makefile.package:126: bindeb-pkg] Error 3
make[1]: *** [/home/amf/dev/pb2/ti-linux-kernel-dev/KERNEL/Makefile:1568: bindeb-pkg] Error 2
make: *** [Makefile:224: __sub-make] Error 2
SYNC include/config/auto.conf.cmd
UPD include/config/kernel.release
GEN debian
dpkg-architecture: warning: specified GNU system type aarch64-linux-gnu does not match CC system type aarch64-linux, try setting a correct CC environment variable
dpkg-buildpackage --build=binary --no-pre-clean --unsigned-changes -R’make -f debian/rules’ -j1 -a$(cat debian/arch)
dpkg-buildpackage: info: source package linux-upstream
dpkg-buildpackage: info: source version 1xross
dpkg-buildpackage: info: source distribution noble
dpkg-buildpackage: info: source changed by amf amf@amf202404
dpkg-architecture: warning: specified GNU system type aarch64-linux-gnu does not match CC system type aarch64-linux, try setting a correct CC environment variable
dpkg-buildpackage: info: host architecture arm64
dpkg-source --before-build .
dpkg-checkbuilddeps: error: Unmet build dependencies: debhelper-compat (= 12)
dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting
dpkg-buildpackage: warning: (Use -d flag to override.)
make[2]: *** [scripts/Makefile.package:126: bindeb-pkg] Error 3
make[1]: *** [/home/amf/ti-linux-kernel-dev/KERNEL/Makefile:1568: bindeb-pkg] Error 2
make: *** [Makefile:224: __sub-make] Error 2