| @@ -30,7 +30,7 if [ "$ENABLE_VIDEOCORE" = true ] ; then | |||||
| 30 | # Create build dir |
|
30 | # Create build dir | |
| 31 | mkdir "${R}"/tmp/userland/build |
|
31 | mkdir "${R}"/tmp/userland/build | |
| 32 | # push us to build directory |
|
32 | # push us to build directory | |
| 33 |
|
|
33 | cd "${R}"/tmp/userland/build | |
| 34 |
|
34 | |||
| 35 | if [ "$RELEASE_ARCH" = "arm64" ] ; then |
|
35 | if [ "$RELEASE_ARCH" = "arm64" ] ; then | |
| 36 | cmake -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_BUILD_TYPE=release -DARM64=ON -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ -DCMAKE_ASM_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE" -DCMAKE_ASM_FLAGS="${CMAKE_ASM_FLAGS} -c" -DVIDEOCORE_BUILD_DIR="${R}" "${R}/tmp/userland" |
|
36 | cmake -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_BUILD_TYPE=release -DARM64=ON -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ -DCMAKE_ASM_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE" -DCMAKE_ASM_FLAGS="${CMAKE_ASM_FLAGS} -c" -DVIDEOCORE_BUILD_DIR="${R}" "${R}/tmp/userland" | |
| @@ -47,5 +47,5 if [ "$ENABLE_VIDEOCORE" = true ] ; then | |||||
| 47 | #build userland |
|
47 | #build userland | |
| 48 | make -j "$(nproc)" |
|
48 | make -j "$(nproc)" | |
| 49 | #pop us out of build dir |
|
49 | #pop us out of build dir | |
| 50 | popd |
|
50 | cd "${WORKDIR}" | |
| 51 | fi |
|
51 | fi | |
| @@ -1,3 +1,4 | |||||
|
|
1 | #!/bin/sh | |||
| 1 | # This file contains utility functions used by rpi23-gen-image.sh |
|
2 | # This file contains utility functions used by rpi23-gen-image.sh | |
| 2 |
|
3 | |||
| 3 | cleanup (){ |
|
4 | cleanup (){ | |
| @@ -79,8 +80,8 chroot_remove_cc() { | |||||
| 79 | #https://github.com/sakaki-/bcmrpi3-kernel-bis/blob/master/conform_config.sh |
|
80 | #https://github.com/sakaki-/bcmrpi3-kernel-bis/blob/master/conform_config.sh | |
| 80 | set_kernel_config() { |
|
81 | set_kernel_config() { | |
| 81 | # flag as $1, value to set as $2, config must exist at "./.config" |
|
82 | # flag as $1, value to set as $2, config must exist at "./.config" | |
| 82 |
|
|
83 | TGT="CONFIG_${1#CONFIG_}" | |
| 83 |
|
|
84 | REP="${2}" | |
| 84 | if grep -q "^${TGT}[^_]" .config; then |
|
85 | if grep -q "^${TGT}[^_]" .config; then | |
| 85 | sed -i "s/^\(${TGT}=.*\|# ${TGT} is not set\)/${TGT}=${REP}/" .config |
|
86 | sed -i "s/^\(${TGT}=.*\|# ${TGT} is not set\)/${TGT}=${REP}/" .config | |
| 86 | else |
|
87 | else | |
| @@ -217,11 +217,6 MISSING_PACKAGES="" | |||||
| 217 | # Packages installed for c/c++ build environment in chroot (keep empty) |
|
217 | # Packages installed for c/c++ build environment in chroot (keep empty) | |
| 218 | COMPILER_PACKAGES="" |
|
218 | COMPILER_PACKAGES="" | |
| 219 |
|
219 | |||
| 220 | #If init and systemd-sysv are wanted e.g. halt/reboot/shutdown scripts |
|
|||
| 221 | if [ "$ENABLE_SYSVINIT" = false ] ; then |
|
|||
| 222 | APT_EXCLUDES="--exclude=${APT_EXCLUDES},init,systemd-sysv" |
|
|||
| 223 | fi |
|
|||
| 224 |
|
||||
| 225 | #Check if apt-cacher-ng has its default port open on and set APT_PROXY |
|
220 | #Check if apt-cacher-ng has its default port open on and set APT_PROXY | |
| 226 | if [ -n "$(lsof -i :3142)" ] ; then |
|
221 | if [ -n "$(lsof -i :3142)" ] ; then | |
| 227 | HTTP_PROXY=http://127.0.0.1:3142/ |
|
222 | HTTP_PROXY=http://127.0.0.1:3142/ | |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant
