diff --git a/VERSION b/VERSION index 1c012c5..ede7e58 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.3-alpha4 +0.3-alpha5 diff --git a/files/board/arpl/make-img.sh b/files/board/arpl/make-img.sh index ca600c6..a653190 100755 --- a/files/board/arpl/make-img.sh +++ b/files/board/arpl/make-img.sh @@ -19,7 +19,7 @@ dd if="/dev/zero" of="${IMAGE_FILE}" bs=1M count=300 conv=sync 2>/dev/null # Copy grub stage1 to image dd if="${BOARD_PATH}/grub.bin" of="${IMAGE_FILE}" conv=notrunc,sync 2>/dev/null # Create partitions on image -echo -e "n\np\n\n\n+150M\na\nt\n\n0b\nn\np\n\n\n+50M\nn\np\n\n\n\nw" | fdisk "${IMAGE_FILE}" >/dev/null +echo -e "n\np\n\n\n+50M\na\nt\n\n0b\nn\np\n\n\n+50M\nn\np\n\n\n\nw" | fdisk "${IMAGE_FILE}" >/dev/null # Force umount, ignore errors sudo umount "${BINARIES_DIR}/p1" 2>/dev/null || true @@ -40,8 +40,8 @@ sudo mount /dev/loop8p1 "${BINARIES_DIR}/p1" sudo mount /dev/loop8p3 "${BINARIES_DIR}/p3" echo "Copying files" -sudo cp "${BINARIES_DIR}/bzImage" "${BINARIES_DIR}/p1/bzImage-arpl" -sudo cp "${BINARIES_DIR}/rootfs.cpio.xz" "${BINARIES_DIR}/p1/initrd-arpl" +sudo cp "${BINARIES_DIR}/bzImage" "${BINARIES_DIR}/p3/bzImage-arpl" +sudo cp "${BINARIES_DIR}/rootfs.cpio.xz" "${BINARIES_DIR}/p3/initrd-arpl" sudo cp -R "${BOARD_PATH}/p1/"* "${BINARIES_DIR}/p1" sudo cp -R "${BOARD_PATH}/p3/"* "${BINARIES_DIR}/p3" sync diff --git a/files/board/arpl/overlayfs/opt/arpl/include/consts.sh b/files/board/arpl/overlayfs/opt/arpl/include/consts.sh index fe4bc55..d2f8c51 100644 --- a/files/board/arpl/overlayfs/opt/arpl/include/consts.sh +++ b/files/board/arpl/overlayfs/opt/arpl/include/consts.sh @@ -1,5 +1,5 @@ -ARPL_VERSION="0.3-alpha4" +ARPL_VERSION="0.3-alpha5" # Define paths TMP_PATH="/tmp" @@ -8,12 +8,14 @@ RAMDISK_PATH="${TMP_PATH}/ramdisk" LOG_FILE="${TMP_PATH}/log.txt" USER_CONFIG_FILE="${BOOTLOADER_PATH}/user-config.yml" -MOD_ZIMAGE_FILE="${BOOTLOADER_PATH}/zImage" -MOD_RDGZ_FILE="${BOOTLOADER_PATH}/rd.gz" ORI_ZIMAGE_FILE="${SLPART_PATH}/zImage" ORI_RDGZ_FILE="${SLPART_PATH}/rd.gz" +ARPL_BZIMAGE_FILE="${CACHE_PATH}/bzImage-arpl" +ARPL_RAMDISK_FILE="${CACHE_PATH}/initrd-arpl" +MOD_ZIMAGE_FILE="${CACHE_PATH}/zImage-dsm" +MOD_RDGZ_FILE="${CACHE_PATH}/initrd-dsm" ADDONS_PATH="${CACHE_PATH}/addons" LKM_PATH="${CACHE_PATH}/lkms" MODULES_PATH="${CACHE_PATH}/modules" diff --git a/files/board/arpl/overlayfs/opt/arpl/menu.sh b/files/board/arpl/overlayfs/opt/arpl/menu.sh index 4597aff..465cf2b 100755 --- a/files/board/arpl/overlayfs/opt/arpl/menu.sh +++ b/files/board/arpl/overlayfs/opt/arpl/menu.sh @@ -770,8 +770,8 @@ function updateMenu() { fi dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \ --infobox "Installing new files" 0 0 - mv /tmp/bzImage /mnt/p1/bzImage-arpl - mv /tmp/rootfs.cpio.xz /mnt/p1/initrd-arpl + mv /tmp/bzImage "${ARPL_BZIMAGE_FILE}" + mv /tmp/rootfs.cpio.xz "${ARPL_RAMDISK_FILE}" dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \ --yesno "Arpl updated with success to ${TAG}!\nReboot?" 0 0 [ $? -ne 0 ] && continue diff --git a/files/board/arpl/p1/grub/grub.cfg b/files/board/arpl/p1/grub/grub.cfg index ec70434..ac81d02 100644 --- a/files/board/arpl/p1/grub/grub.cfg +++ b/files/board/arpl/p1/grub/grub.cfg @@ -51,8 +51,8 @@ if serial --unit=0 --speed=115200; then fi insmod search -search --set=root --label "ARPL1" -if [ -s /zImage -a -s /rd.gz ]; then +search --set=root --label "ARPL3" +if [ -s /zImage-dsm -a -s /initrd-dsm ]; then menuentry 'Boot DSM' --id boot { echo "Loading kernel..." linux /bzImage-arpl console=ttyS0,115200n8 quiet diff --git a/files/board/arpl/p3/lkms/rp-apollolake-4.4.180-dev.ko b/files/board/arpl/p3/lkms/rp-apollolake-4.4.180-dev.ko index 65d1fb3..53ce1e8 100644 Binary files a/files/board/arpl/p3/lkms/rp-apollolake-4.4.180-dev.ko and b/files/board/arpl/p3/lkms/rp-apollolake-4.4.180-dev.ko differ diff --git a/files/board/arpl/p3/lkms/rp-apollolake-4.4.180-prod.ko b/files/board/arpl/p3/lkms/rp-apollolake-4.4.180-prod.ko index 571d4f4..0d07ca5 100644 Binary files a/files/board/arpl/p3/lkms/rp-apollolake-4.4.180-prod.ko and b/files/board/arpl/p3/lkms/rp-apollolake-4.4.180-prod.ko differ diff --git a/files/board/arpl/p3/lkms/rp-broadwell-4.4.180-dev.ko b/files/board/arpl/p3/lkms/rp-broadwell-4.4.180-dev.ko index 701e4f2..f167db8 100644 Binary files a/files/board/arpl/p3/lkms/rp-broadwell-4.4.180-dev.ko and b/files/board/arpl/p3/lkms/rp-broadwell-4.4.180-dev.ko differ diff --git a/files/board/arpl/p3/lkms/rp-broadwell-4.4.180-prod.ko b/files/board/arpl/p3/lkms/rp-broadwell-4.4.180-prod.ko index a7c5124..8308f49 100644 Binary files a/files/board/arpl/p3/lkms/rp-broadwell-4.4.180-prod.ko and b/files/board/arpl/p3/lkms/rp-broadwell-4.4.180-prod.ko differ diff --git a/files/board/arpl/p3/lkms/rp-broadwellnk-4.4.180-dev.ko b/files/board/arpl/p3/lkms/rp-broadwellnk-4.4.180-dev.ko index ba4f4a2..c8fbb2c 100644 Binary files a/files/board/arpl/p3/lkms/rp-broadwellnk-4.4.180-dev.ko and b/files/board/arpl/p3/lkms/rp-broadwellnk-4.4.180-dev.ko differ diff --git a/files/board/arpl/p3/lkms/rp-broadwellnk-4.4.180-prod.ko b/files/board/arpl/p3/lkms/rp-broadwellnk-4.4.180-prod.ko index dc03e29..a55552c 100644 Binary files a/files/board/arpl/p3/lkms/rp-broadwellnk-4.4.180-prod.ko and b/files/board/arpl/p3/lkms/rp-broadwellnk-4.4.180-prod.ko differ diff --git a/files/board/arpl/p3/lkms/rp-bromolow-3.10.108-dev.ko b/files/board/arpl/p3/lkms/rp-bromolow-3.10.108-dev.ko index be1b48a..07ffd0a 100644 Binary files a/files/board/arpl/p3/lkms/rp-bromolow-3.10.108-dev.ko and b/files/board/arpl/p3/lkms/rp-bromolow-3.10.108-dev.ko differ diff --git a/files/board/arpl/p3/lkms/rp-bromolow-3.10.108-prod.ko b/files/board/arpl/p3/lkms/rp-bromolow-3.10.108-prod.ko index fb6e1b6..bf9c39d 100644 Binary files a/files/board/arpl/p3/lkms/rp-bromolow-3.10.108-prod.ko and b/files/board/arpl/p3/lkms/rp-bromolow-3.10.108-prod.ko differ diff --git a/files/board/arpl/p3/lkms/rp-denverton-4.4.180-dev.ko b/files/board/arpl/p3/lkms/rp-denverton-4.4.180-dev.ko index 75ef6dc..e776844 100644 Binary files a/files/board/arpl/p3/lkms/rp-denverton-4.4.180-dev.ko and b/files/board/arpl/p3/lkms/rp-denverton-4.4.180-dev.ko differ diff --git a/files/board/arpl/p3/lkms/rp-denverton-4.4.180-prod.ko b/files/board/arpl/p3/lkms/rp-denverton-4.4.180-prod.ko index d50d8e1..122c96d 100644 Binary files a/files/board/arpl/p3/lkms/rp-denverton-4.4.180-prod.ko and b/files/board/arpl/p3/lkms/rp-denverton-4.4.180-prod.ko differ diff --git a/files/board/arpl/p3/lkms/rp-geminilake-4.4.180-dev.ko b/files/board/arpl/p3/lkms/rp-geminilake-4.4.180-dev.ko index cb07fcb..75166ae 100644 Binary files a/files/board/arpl/p3/lkms/rp-geminilake-4.4.180-dev.ko and b/files/board/arpl/p3/lkms/rp-geminilake-4.4.180-dev.ko differ diff --git a/files/board/arpl/p3/lkms/rp-geminilake-4.4.180-prod.ko b/files/board/arpl/p3/lkms/rp-geminilake-4.4.180-prod.ko index 053bc30..d7faf7d 100644 Binary files a/files/board/arpl/p3/lkms/rp-geminilake-4.4.180-prod.ko and b/files/board/arpl/p3/lkms/rp-geminilake-4.4.180-prod.ko differ diff --git a/files/board/arpl/p3/lkms/rp-v1000-4.4.180-dev.ko b/files/board/arpl/p3/lkms/rp-v1000-4.4.180-dev.ko index ecfb024..c428986 100644 Binary files a/files/board/arpl/p3/lkms/rp-v1000-4.4.180-dev.ko and b/files/board/arpl/p3/lkms/rp-v1000-4.4.180-dev.ko differ diff --git a/files/board/arpl/p3/lkms/rp-v1000-4.4.180-prod.ko b/files/board/arpl/p3/lkms/rp-v1000-4.4.180-prod.ko index 0f69e9e..3edbb65 100644 Binary files a/files/board/arpl/p3/lkms/rp-v1000-4.4.180-prod.ko and b/files/board/arpl/p3/lkms/rp-v1000-4.4.180-prod.ko differ diff --git a/files/board/arpl/p3/modules/apollolake-4.4.180.tgz b/files/board/arpl/p3/modules/apollolake-4.4.180.tgz index 5dce360..17b1c67 100644 Binary files a/files/board/arpl/p3/modules/apollolake-4.4.180.tgz and b/files/board/arpl/p3/modules/apollolake-4.4.180.tgz differ diff --git a/files/board/arpl/p3/modules/broadwell-4.4.180.tgz b/files/board/arpl/p3/modules/broadwell-4.4.180.tgz index 83bbf77..7e0936e 100644 Binary files a/files/board/arpl/p3/modules/broadwell-4.4.180.tgz and b/files/board/arpl/p3/modules/broadwell-4.4.180.tgz differ diff --git a/files/board/arpl/p3/modules/broadwellnk-4.4.180.tgz b/files/board/arpl/p3/modules/broadwellnk-4.4.180.tgz index 1b7b233..a7b6b67 100644 Binary files a/files/board/arpl/p3/modules/broadwellnk-4.4.180.tgz and b/files/board/arpl/p3/modules/broadwellnk-4.4.180.tgz differ diff --git a/files/board/arpl/p3/modules/bromolow-3.10.108.tgz b/files/board/arpl/p3/modules/bromolow-3.10.108.tgz index db61d94..6f88e2f 100644 Binary files a/files/board/arpl/p3/modules/bromolow-3.10.108.tgz and b/files/board/arpl/p3/modules/bromolow-3.10.108.tgz differ diff --git a/files/board/arpl/p3/modules/denverton-4.4.180.tgz b/files/board/arpl/p3/modules/denverton-4.4.180.tgz index e3674d9..d2d473a 100644 Binary files a/files/board/arpl/p3/modules/denverton-4.4.180.tgz and b/files/board/arpl/p3/modules/denverton-4.4.180.tgz differ diff --git a/files/board/arpl/p3/modules/geminilake-4.4.180.tgz b/files/board/arpl/p3/modules/geminilake-4.4.180.tgz index 707d1ae..b93a4ef 100644 Binary files a/files/board/arpl/p3/modules/geminilake-4.4.180.tgz and b/files/board/arpl/p3/modules/geminilake-4.4.180.tgz differ diff --git a/files/board/arpl/p3/modules/v1000-4.4.180.tgz b/files/board/arpl/p3/modules/v1000-4.4.180.tgz index a6e8c01..8674e02 100644 Binary files a/files/board/arpl/p3/modules/v1000-4.4.180.tgz and b/files/board/arpl/p3/modules/v1000-4.4.180.tgz differ