##// END OF EJS Templates
Merge branch 'kern5+bullseye' into masterGV
vidal -
r723:771bd807a03d Fusion
parent child
Show More
@@ -19,13 +19,13 sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" "${ETC_DIR}/apt/sources.list"
19
19
20 #Fix for changing path for security updates in testing/bullseye
20 #Fix for changing path for security updates in testing/bullseye
21 if [ "$RELEASE" = "testing" ] ; then
21 if [ "$RELEASE" = "testing" ] ; then
22 sed -i "s,stretch\\/updates,testing-security," "${ETC_DIR}/apt/sources.list"
22 sed -i "s,buster\\/updates,testing-security," "${ETC_DIR}/apt/sources.list"
23 sed -i "s/ stretch/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"
23 sed -i "s/ buster/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"
24 fi
24 fi
25
25
26 if [ -z "$RELEASE" ] ; then
26 if [ -z "$RELEASE" ] ; then
27 # Change release in sources list
27 # Change release in sources list
28 sed -i "s/ stretch/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"
28 sed -i "s/ buster/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"
29 fi
29 fi
30
30
31 # Upgrade package index and update all installed packages and changed dependencies
31 # Upgrade package index and update all installed packages and changed dependencies
@@ -1,5 +1,5
1 #
1 #
2 # Build and Setup RPi2/3 Kernel
2 # Build and Setup RPi2/3/4 Kernel 4.XX 5.XX
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}"
@@ -1,8 +1,8
1 deb http://ftp.debian.org/debian stretch main contrib
1 deb http://ftp.debian.org/debian buster main contrib
2 #deb-src http://ftp.debian.org/debian stretch main contrib
2 #deb-src http://ftp.debian.org/debian buster main contrib
3
3
4 deb http://ftp.debian.org/debian/ stretch-updates main contrib
4 deb http://ftp.debian.org/debian/ buster-updates main contrib
5 #deb-src http://ftp.debian.org/debian/ stretch-updates main contrib
5 #deb-src http://ftp.debian.org/debian/ buster-updates main contrib
6
6
7 deb http://security.debian.org/ stretch/updates main contrib
7 deb http://security.debian.org/ buster/updates main contrib
8 #deb-src http://security.debian.org/ stretch/updates main contrib
8 #deb-src http://security.debian.org/ buster/updates main contrib
General Comments 0
Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant