瀏覽代碼

fix arm64

侠义书生 3 年之前
父節點
當前提交
1442e3db8a

+ 4 - 4
meta-isar/conf/distro/kylin-v101.list

@@ -1,5 +1,5 @@
-deb http://archive.launchpad.dev/kylin v101 main restricted universe multiverse
-deb-src http://archive.launchpad.dev/kylin v101 main restricted universe multiverse
+# deb http://archive.launchpad.dev/kylin v101 main restricted universe multiverse
+# deb-src http://archive.launchpad.dev/kylin v101 main restricted universe multiverse
 
-# deb http://172.29.220.242/kylin v101 main restricted universe multiverse
-# deb-src http://172.29.220.242/kylin v101 main restricted universe multiverse
+deb http://172.29.220.242/kylin v101 main restricted universe multiverse
+deb-src http://172.29.220.242/kylin v101 main restricted universe multiverse

+ 6 - 1
meta-isar/conf/machine/qemuarm64.conf

@@ -6,10 +6,15 @@ DISTRO_ARCH ?= "arm64"
 KERNEL_NAME ?= "generic"
 KERNEL_NAME_ubuntu-focal ?= "generic"
 
-IMAGE_FSTYPES ?= "ext4-img"
+# IMAGE_FSTYPES ?= "ext4-img"
+IMAGE_FSTYPES ?= "wic-img"
+WKS_FILE ?= "sdimage-efi"
+IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
 
 QEMU_ROOTFS_DEV ?= "vda"
 
+IMAGE_INSTALL += "sshd-regen-keys"
+
 QEMU_ARCH ?= "aarch64"
 QEMU_MACHINE ?= "virt"
 QEMU_CPU ?= "cortex-a57"

+ 2 - 1
meta-isar/conf/multiconfig/qemuarm64-v101.conf

@@ -1,4 +1,5 @@
 MACHINE ?= "qemuarm64"
 DISTRO ?= "kylin-v101"
 
-IMAGE_FSTYPES ?= "wic-img ext4-img"
+# IMAGE_FSTYPES ?= "targz-img"
+IMAGE_FSTYPES ?= "wic-img ext4-img targz-img"

+ 2 - 1
meta/classes/ext4-img.bbclass

@@ -11,7 +11,8 @@ MKE2FS_ARGS ?=  "-t ext4"
 do_ext4_image() {
     rm -f '${DEPLOY_DIR_IMAGE}/${EXT4_IMAGE_FILE}'
 
-    truncate -s ${ROOTFS_SIZE}K '${DEPLOY_DIR_IMAGE}/${EXT4_IMAGE_FILE}'
+    # truncate -s ${ROOTFS_SIZE}K '${DEPLOY_DIR_IMAGE}/${EXT4_IMAGE_FILE}'
+    truncate -s 10240K '${DEPLOY_DIR_IMAGE}/${EXT4_IMAGE_FILE}'
 
     image_do_mounts