| @@ -13,7 +13,7 if [ "$BUILD_KERNEL" = true ] ; then | |||
|
|
13 | 13 | # Copy existing kernel sources into chroot directory |
|
|
14 | 14 | if [ -n "$KERNELSRC_DIR" ] && [ -d "$KERNELSRC_DIR" ] ; then |
|
|
15 | 15 | # Copy kernel sources |
|
|
16 |
cp -r "${KERNELSRC_DIR}/ |
|
|
|
16 | cp -r "${KERNELSRC_DIR}/"* "${R}/usr/src/linux" | |
|
|
17 | 17 | |
|
|
18 | 18 | # Clean the kernel sources |
|
|
19 | 19 | if [ "$KERNELSRC_CLEAN" = true ] && [ "$KERNELSRC_PREBUILT" = false ] ; then |
| @@ -25,13 +25,13 if [ "$BUILD_KERNEL" = true ] ; then | |||
|
|
25 | 25 | |
|
|
26 | 26 | # Fetch current RPi2/3 kernel sources |
|
|
27 | 27 | if [ -z "${KERNEL_BRANCH}" ] ; then |
|
|
28 |
as_nobody |
|
|
|
28 | as_nobody git -C "${temp_dir}" clone --depth=1 "${KERNEL_URL}" linux | |
|
|
29 | 29 | else |
|
|
30 |
as_nobody |
|
|
|
31 |
|
|
|
|
30 | as_nobody git -C "${temp_dir}" clone --depth=1 --branch "${KERNEL_BRANCH}" "${KERNEL_URL}" linux | |
|
|
31 | fi | |
|
|
32 | 32 | |
|
|
33 | 33 | # Copy downloaded kernel sources |
|
|
34 |
|
|
|
|
34 | cp -r "${temp_dir}/linux/"* "${R}/usr/src/linux/" | |
|
|
35 | 35 | |
|
|
36 | 36 | # Remove temporary directory for kernel sources |
|
|
37 | 37 | rm -fr "${temp_dir}" |
| @@ -214,6 +214,12 CHROOT_SCRIPTS=${CHROOT_SCRIPTS:=""} | |||
|
|
214 | 214 | APT_INCLUDES=${APT_INCLUDES:=""} |
|
|
215 | 215 | APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils" |
|
|
216 | 216 | |
|
|
217 | # Package apt-transport-https has been removed from Debian Buster release | |
|
|
218 | # this induces qemu error 383 which does not prevent building an image | |
|
|
219 | if [ "$RELEASE" = "buster" ] ; then | |
|
|
220 | APT_INCLUDES="$(echo ${APT_INCLUDES} | sed "s/apt-transport-https,//")" | |
|
|
221 | fi | |
|
|
222 | ||
|
|
217 | 223 | # Packages required for bootstrapping |
|
|
218 | 224 | REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc psmisc dbus sudo" |
|
|
219 | 225 | MISSING_PACKAGES="" |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant
