diff --git a/.gitignore b/.gitignore index 183053f1..8cb272c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /pkg/ -/src/ +/src/**/*.img /site/ /dist/ /kvmd.egg-info/ diff --git a/build/build_img.sh b/build/build_img.sh index f4138a8f..a44736b5 100644 --- a/build/build_img.sh +++ b/build/build_img.sh @@ -1,17 +1,6 @@ #!/bin/bash -#File List -#src -#└── image -# ├── cumebox2 -# │ └── Armbian_24.8.1_Khadas-vim1_bookworm_current_6.6.47_minimal.img -# └── onecloud -# ├── AmlImg_v0.3.1_linux_amd64 -# ├── Armbian_by-SilentWind_24.5.0-trunk_Onecloud_bookworm_legacy_5.9.0-rc7_minimal.burn.img -# └── rc.local - - -SRCPATH=../src +SRCPATH=./src ROOTFS=/tmp/rootfs LOOPDEV=/dev/loop10 DATE=241004 @@ -32,7 +21,7 @@ mount_onecloud_rootfs() { mount_cumebox2_rootfs() { cp $SRCPATH/image/cumebox2/Armbian_24.8.1_Khadas-vim1_bookworm_current_6.6.47_minimal.img $SRCPATH/tmp/rootfs.img - dd if=/dev/zero of=/tmp/add.img bs=1M count=1280 && cat /tmp/add.img >> $SRCPATH/tmp/rootfs.img && rm /tmp/add.img + dd if=/dev/zero of=/tmp/add.img bs=1M count=1500&& cat /tmp/add.img >> $SRCPATH/tmp/rootfs.img && rm /tmp/add.img sudo parted -s $SRCPATH/tmp/rootfs.img resizepart 1 100% || exit -1 sudo losetup --offset 4194304 $LOOPDEV $SRCPATH/tmp/rootfs.img || exit -1 #sudo mount -o loop,offset=$((8192*512)) $SRCPATH/tmp/rootfs.img $ROOTFS @@ -61,23 +50,27 @@ umount_cumebox2_rootfs() { } config_file() { - sudo mkdir -p $ROOTFS/etc/kvmd/override.d $ROOTFS/etc/kvmd/vnc $ROOTFS/var/lib/kvmd/msd $ROOTFS/opt/vc/bin $ROOTFS/usr/share/kvmd \ + sudo mkdir -p $ROOTFS/etc/kvmd/override.d $ROOTFS/etc/kvmd/vnc $ROOTFS/var/lib/kvmd/msd $ROOTFS/opt/vc/bin $ROOTFS/usr/share/kvmd $ROOTFS/One-KVM \ $ROOTFS/usr/share/janus/javascript $ROOTFS/usr/lib/ustreamer/janus $ROOTFS/run/kvmd $ROOTFS/var/lib/kvmd/msd/images $ROOTFS/var/lib/kvmd/msd/meta - sudo cp -r ../One-KVM $ROOTFS/ - sudo cp -r $ROOTFS/One-KVM/configs/kvmd/* $ROOTFS/One-KVM/configs/nginx $ROOTFS/One-KVM/configs/janus \ - $ROOTFS/etc/kvmd - sudo cp -r $ROOTFS/One-KVM/web $ROOTFS/One-KVM/extras $ROOTFS/One-KVM/contrib/keymaps $ROOTFS/usr/share/kvmd - sudo cp $ROOTFS/One-KVM/testenv/fakes/vcgencmd $ROOTFS/usr/bin/ - sudo cp -r $ROOTFS/One-KVM/testenv/js/* $ROOTFS/usr/share/janus/javascript/ + sudo rsync -a --exclude={src,.github} . $ROOTFS/One-KVM + sudo cp -r configs/kvmd/* configs/nginx configs/janus $ROOTFS/etc/kvmd + sudo cp -r web extras contrib/keymaps $ROOTFS/usr/share/kvmd + sudo cp testenv/fakes/vcgencmd $ROOTFS/usr/bin/ + sudo cp -r testenv/js/* $ROOTFS/usr/share/janus/javascript/ } config_onecloud_file() { sudo cp $SRCPATH/image/onecloud/rc.local $ROOTFS/etc/ - sudo cp $ROOTFS/One-KVM/build/platform/onecloud $ROOTFS/usr/share/kvmd/platform + sudo cp build/platform/onecloud $ROOTFS/usr/share/kvmd/platform } config_cumebox2_file() { - sudo cp $ROOTFS/One-KVM/build/platform/cumebox2 $ROOTFS/usr/share/kvmd/platform + sudo mkdir $ROOTFS/etc/oled + sudo cp build/platform/cumebox2 $ROOTFS/usr/share/kvmd/platform + sudo cp $SRCPATH/image/cumebox2/v-fix.dtb $ROOTFS/boot/dtb/amlogic/meson-gxl-s905x-khadas-vim.dtb + sudo cp $SRCPATH/image/cumebox2/rc.local $ROOTFS/etc/ + sudo cp $SRCPATH/image/cumebox2/ssd $ROOTFS/usr/bin/ + sudo cp $SRCPATH/image/cumebox2/config.json $ROOTFS/etc/oled/config.json } @@ -94,7 +87,7 @@ instal_one-kvm() { python3-serial python3-zstandard python3-dbus-next \ && apt install -y nginx python3-pip python3-dev python3-build net-tools tesseract-ocr tesseract-ocr-eng tesseract-ocr-chi-sim \ git gpiod libxkbcommon0 build-essential janus-dev libssl-dev libffi-dev libevent-dev libjpeg-dev libbsd-dev libudev-dev \ - pkg-config libx264-dev libyuv-dev libasound2-dev libsndfile-dev libspeexdsp-dev cpufrequtils iptables\ + pkg-config libx264-dev libyuv-dev libasound2-dev libsndfile-dev libspeexdsp-dev cpufrequtils iptables network-manager \ && apt clean " sudo chroot --userspec "root:root" $ROOTFS bash -c " \ @@ -232,3 +225,8 @@ case $1 in esac +#开发计划 +#深度适配私家云二代 +#修改dtb 修复玩客云/sys/class/usb_role不存在 +#x86 禁用MSD :通过docker环境变量判断替换配置文件 +#添加msd文件夹配置选项 diff --git a/src/image/cumebox2/config.json b/src/image/cumebox2/config.json new file mode 100755 index 00000000..1f206a1a --- /dev/null +++ b/src/image/cumebox2/config.json @@ -0,0 +1,38 @@ +{ + "seting":{ + "pixel":12864, + "dev":"/dev/i2c-0", + "addr":60 + }, + "draw1":{ + "seting":{ + "cycle":5,"time":40,"page":1 + }, + "display":[ + {"type":"r_rect","x0":2,"y0":2,"w":124,"h":60,"r":30,"fill":0,"color":1,"en":1}, + {"type":"str","data":"One-KVM","x0":23,"y0":9,"size":2,"color":1,"en":1} , + {"type":"str","data":"CumeBox","x0":20,"y0":33,"size":2,"color":1,"en":1} + ] + }, + "Temp":{ + "seting":{ + "cycle":5,"time":20,"page":2 + }, + "display":[ + {"type":"str","data":"Temp","x0":30,"y0":4,"size":3,"color":2,"en":1}, + {"type":"str","data":"'C","x0":90,"y0":36,"size":2,"color":2,"en":1}, + {"type":"base","func":2,"x0":30,"y0":36,"base":4,"class":0,"size":2,"color":1,"en":1} + + ] + }, + + "IP":{ + "seting":{ + "cycle":5,"time":20,"page":3 + }, + "display":[ + {"type":"base","func":4,"x0":0,"y0":0,"port":"end0","base":15,"size":2,"color":1,"en":1} , + {"type":"base","func":4,"x0":0,"y0":28,"port":"wlan0","base":15,"size":2,"color":1,"en":1} + ] + } +} diff --git a/src/image/cumebox2/rc.local b/src/image/cumebox2/rc.local new file mode 100755 index 00000000..d84f653c --- /dev/null +++ b/src/image/cumebox2/rc.local @@ -0,0 +1,8 @@ +#!/bin/bash +echo 4500 > /sys/class/hwmon/hwmon0/fan1_target +echo 0 > /sys/class/leds/red/brightness +echo 0 > /sys/class/leds/blue/brightness +echo 1 > /sys/class/leds/green/brightness +#https://github.com/bearcatl/SSD1306_OLED_json +nohup /usr/bin/ssd > /var/log/ssd.log 2>&1 & +exit 0 diff --git a/src/image/cumebox2/ssd b/src/image/cumebox2/ssd new file mode 100755 index 00000000..bdd12585 Binary files /dev/null and b/src/image/cumebox2/ssd differ diff --git a/src/image/cumebox2/v-fix.dtb b/src/image/cumebox2/v-fix.dtb new file mode 100644 index 00000000..8bd2070e Binary files /dev/null and b/src/image/cumebox2/v-fix.dtb differ diff --git a/src/image/onecloud/AmlImg_v0.3.1_linux_amd64 b/src/image/onecloud/AmlImg_v0.3.1_linux_amd64 new file mode 100755 index 00000000..1e1501a2 Binary files /dev/null and b/src/image/onecloud/AmlImg_v0.3.1_linux_amd64 differ diff --git a/src/image/onecloud/rc.local b/src/image/onecloud/rc.local new file mode 100755 index 00000000..d7378ed4 --- /dev/null +++ b/src/image/onecloud/rc.local @@ -0,0 +1,4 @@ +#!/bin/bash +green_on +echo device > /sys/class/usb_role/c9040000.usb-role-switch/role +exit 0