##// END OF EJS Templates
Merge branch 'kern5+bullseye' into masterGV
vidal -
r716:0c43a16b83b9 Fusion
parent child
Show More
@@ -37,7 +37,7 fi
37 sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" "${ETC_DIR}/apt/sources.list"
37 sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" "${ETC_DIR}/apt/sources.list"
38
38
39 #Fix for changing path for security updates in testing/bullseye
39 #Fix for changing path for security updates in testing/bullseye
40 if [ "$RELEASE" = "testing" ] ; then
40 if [ "$RELEASE" = "testing" ] || [ "$RELEASE" = "bullseye" ]; then
41 sed -i "s,stretch\\/updates,testing-security," "${ETC_DIR}/apt/sources.list"
41 sed -i "s,stretch\\/updates,testing-security," "${ETC_DIR}/apt/sources.list"
42 sed -i "s/ stretch/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"
42 sed -i "s/ stretch/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"
43 fi
43 fi
@@ -1,5 +1,5
1 #
1 #
2 # Build and Setup RPi2/3 Kernel
2 # Build and Setup RPi2/3/4 Kernel
3 #
3 #
4
4
5 # Load utility functions
5 # Load utility functions
@@ -780,7 +780,7 if [ "$BUILD_KERNEL" = true ] ; then
780
780
781 if [ "$ENABLE_UBOOT" = false ] ; then
781 if [ "$ENABLE_UBOOT" = false ] ; then
782 # Convert and copy kernel image to the boot directory
782 # Convert and copy kernel image to the boot directory
783 "${KERNEL_DIR}/scripts/mkknlimg" "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/${KERNEL_BIN_IMAGE}" "${BOOT_DIR}/${KERNEL_IMAGE}"
783 cp "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/${KERNEL_BIN_IMAGE}" "${BOOT_DIR}/${KERNEL_IMAGE}"
784 else
784 else
785 # Copy kernel image to the boot directory
785 # Copy kernel image to the boot directory
786 install_readonly "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/${KERNEL_BIN_IMAGE}" "${BOOT_DIR}/${KERNEL_IMAGE}"
786 install_readonly "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/${KERNEL_BIN_IMAGE}" "${BOOT_DIR}/${KERNEL_IMAGE}"
General Comments 0
Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant