diff --git a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/download_system_tftp/download.sh b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/download_system_tftp/download.sh index b817caf7..316631be 100755 --- a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/download_system_tftp/download.sh +++ b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/download_system_tftp/download.sh @@ -22,6 +22,29 @@ backup_partition="/dev/sda4" ###2 dont delete +install_target_type=0 + +check_cmdline_ins_target() +{ + install_target_type=0 + # install_target_type=$(cat /proc/cmdline | grep ins_target="scsi") #default is scsi + install_target_type=$(cat /proc/cmdline | grep ins_target=mmc) + if [ ! -z "$install_target_type" ]; then + install_target_type=1 + root_partition="/dev/mmcblk0p1" + data_partition="/dev/mmcblk0p2" + swap_partition="/dev/mmcblk0p3" + backup_partition="/dev/mmcblk0p4" + return 0 + fi + + root_partition="/dev/sda1" + data_partition="/dev/sda2" + swap_partition="/dev/sda3" + backup_partition="/dev/sda4" + install_target_type=0 +} + error_inf_print() { echo ""; @@ -85,5 +108,6 @@ download_system() return $? } +check_cmdline_ins_target download_system exit $? diff --git a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/download_system_tftp/download_fdisk.sh b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/download_system_tftp/download_fdisk.sh index 3ba2ed09..acb60eac 100755 --- a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/download_system_tftp/download_fdisk.sh +++ b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/download_system_tftp/download_fdisk.sh @@ -6,6 +6,8 @@ fdisk_name=fdisk.txt disk_config="null" +disk_path="/dev/sda" + root_partition="/dev/sda1" data_partition="/dev/sda2" swap_partition="/dev/sda3" @@ -19,10 +21,42 @@ backup_mount_point="/mnt/usb4" download_partition="/dev/sda4" download_mount_point="/mnt/usb4" -head_line_target=`ifconfig -a | grep "lo" | tr -s ' ' | cut -d ' ' -f2` +download_partition_bak="/dev/sda1" +download_mount_point_bak="/mnt/usb1" + +head_line_target=`ifconfig -a | grep "lo" | tr -s ' ' | cut -d ' ' -f2`" "`ifconfig -a | grep "lo" | tr -s ' ' | cut -d ' ' -f3 | cut -d ':' -f1` dev_list_size=0 eth_dev_name="" +install_target_type=0 + +check_cmdline_ins_target() +{ + install_target_type=0 + # install_target_type=$(cat /proc/cmdline | grep ins_target="scsi") #default is scsi + install_target_type=$(cat /proc/cmdline | grep ins_target=mmc) + if [ ! -z "$install_target_type" ]; then + install_target_type=1 + disk_path="/dev/mmcblk0" + root_partition="/dev/mmcblk0p1" + data_partition="/dev/mmcblk0p2" + swap_partition="/dev/mmcblk0p3" + backup_partition="/dev/mmcblk0p4" + download_partition="/dev/mmcblk0p4" + download_partition_bak="/dev/mmcblk0p1" + return 0 + fi + + disk_path="/dev/sda" + root_partition="/dev/sda1" + data_partition="/dev/sda2" + swap_partition="/dev/sda3" + backup_partition="/dev/sda4" + download_partition="/dev/sda4" + download_partition_bak="/dev/sda1" + install_target_type=0 +} + error_inf_print() { echo ""; @@ -38,7 +72,7 @@ error_inf_print() get_eth_dev_name() { - eth_dev_name=`ifconfig -a | grep $head_line_target | grep -v lo | grep -v can | grep -v usb | grep -v sit | tr -s ' ' | cut -d ' ' -f1 | head -$1 | tail -1` + eth_dev_name=`ifconfig -a | grep "$head_line_target" | grep -v dummy | grep -v lo | grep -v can | grep -v usb | grep -v sit | tr -s ' ' | cut -d ' ' -f1 | head -$1 | tail -1` } get_up_eth() @@ -67,7 +101,7 @@ get_up_eth() connect_tftp_server() { - dev_list_size=`ifconfig -a | grep $head_line_target | grep -v lo | grep -v can | grep -v usb | grep -v sit | wc -l` + dev_list_size=`ifconfig -a | grep "$head_line_target" | grep -v dummy | grep -v lo | grep -v can | grep -v usb | grep -v sit | wc -l` cur_test_eth_num=1 while [ $cur_test_eth_num -le $dev_list_size ] do @@ -108,7 +142,7 @@ run() sync; #查看分区表的变化 echo "" - fdisk -l | grep "/dev/sda"; + fdisk -l | grep "$disk_path"; sleep 1; /home/install_format_all_disk.sh @@ -117,8 +151,8 @@ run() fi if [ ! -e $download_partition ]; then - download_partition="/dev/sda1" - download_mount_point="/mnt/usb1" + download_partition=$download_partition_bak + download_mount_point=$download_mount_point_bak fi mount $download_partition $download_mount_point @@ -128,5 +162,6 @@ run() return $result } +check_cmdline_ins_target run $1 $2; exit $?; \ No newline at end of file diff --git a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/fdisk_mmc.txt b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/fdisk_mmc.txt new file mode 100644 index 00000000..19162a61 --- /dev/null +++ b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/fdisk_mmc.txt @@ -0,0 +1,19 @@ +d +1 +d +2 +d +3 +d +4 + +n +p +1 + + + + +p + +w diff --git a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/fstab/update_device_name.sh b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/fstab/update_device_name.sh new file mode 100755 index 00000000..1bd95dfa --- /dev/null +++ b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/fstab/update_device_name.sh @@ -0,0 +1,5 @@ +#! /bin/bash + +new_device_name=$1 + +sed -i 's|/dev/sda|'"$new_device_name"'|g' ./* diff --git a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/handle_judge.sh b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/handle_judge.sh index e0f599bc..5be2e878 100755 --- a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/handle_judge.sh +++ b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/handle_judge.sh @@ -3,6 +3,28 @@ # 0 install 1 recover handle_type=0 +check_cmdline_ins_target() +{ + install_target_type=0 + # install_target_type=$(cat /proc/cmdline | grep ins_target="scsi") #default is scsi + install_target_type=$(cat /proc/cmdline | grep ins_target=mmc) + if [ ! -z "$install_target_type" ]; then + old_path=$PWD + cd /home/fstab + ./update_device_name.sh "/dev/mmcblk0p" + cd $old_path + return 0 + fi + install_target_type=$(cat /proc/cmdline | grep rec_target=mmc) + if [ ! -z "$install_target_type" ]; then + old_path=$PWD + cd /home/fstab + ./update_device_name.sh "/dev/mmcblk0p" + cd $old_path + return 0 + fi +} + judge_cmdline() { temp_str=$(cat /proc/cmdline | grep ins_way) @@ -24,6 +46,7 @@ judge_cmdline() start() { + check_cmdline_ins_target judge_cmdline res=$? if [ $res -eq 1 ]; then diff --git a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/install_disk.sh b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/install_disk.sh index cfc27ad2..1a1c9dee 100755 --- a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/install_disk.sh +++ b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/install_disk.sh @@ -19,6 +19,34 @@ data_mount_point="/mnt/usb2" swap_mount_point="/mnt/usb3" backup_mount_point="/mnt/usb4" +install_target_type=0 + +check_cmdline_ins_target() +{ + install_target_type=0 + # install_target_type=$(cat /proc/cmdline | grep ins_target="scsi") #default is scsi + install_target_type=$(cat /proc/cmdline | grep ins_target=mmc) + if [ ! -z "$install_target_type" ]; then + install_target_type=1 + + usb_partition="/dev/sda1" + usb_partition_bak="/dev/sda" + root_partition="/dev/mmcblk0p1" + data_partition="/dev/mmcblk0p2" + swap_partition="/dev/mmcblk0p3" + backup_partition="/dev/mmcblk0p4" + return 0 + fi + + usb_partition="/dev/sdb1" + usb_partition_bak="/dev/sdb" + root_partition="/dev/sda1" + data_partition="/dev/sda2" + swap_partition="/dev/sda3" + backup_partition="/dev/sda4" + install_target_type=0 +} + #错误信息输出到usb的install文件夹里的error.log #注意安装系统时install文件夹不要存放error.log #否则会先改名error.log.bak,多次执行后,这样可能会造成数据丢失 @@ -242,7 +270,7 @@ check_usb_name() ###################start########################## ###################start########################## - +check_cmdline_ins_target #防止第一个阶段因未知原因而导致没有解除挂载 if [ $# -eq 1 ]; then usb_partition=$1 diff --git a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/install_fdisk.sh b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/install_fdisk.sh index 75675b59..a01b3cec 100755 --- a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/install_fdisk.sh +++ b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/install_fdisk.sh @@ -15,10 +15,30 @@ backup_exist=1 fdisk_part_total=0 +install_disk_blk="/dev/sda" + +check_cmdline_ins_target() +{ + install_target_type=0 + # install_target_type=$(cat /proc/cmdline | grep ins_target="scsi") #default is scsi + install_target_type=$(cat /proc/cmdline | grep ins_target=mmc) + if [ ! -z "$install_target_type" ]; then + install_disk_blk="/dev/mmcblk0" + return 0 + fi + + install_disk_blk="/dev/sda" +} + #读取SSD的大小 read_disk_size() { - disk_size=$(fdisk -l | grep "Disk /dev/sda" | head -n1 | cut -d ' ' -f3); + disk_size=$(fdisk -l | grep "Disk $install_disk_blk" | head -n1 | cut -d ' ' -f3); + fdisk -l | grep "Disk" | head -n1 | grep GB >/dev/null + # if just MB size + if [ $? -eq 1 ]; then + disk_size=$(($disk_size/1024)) + fi disk_size_ex_swap=$(($disk_size-$disk_size_swap)); } @@ -74,7 +94,7 @@ split_root_and_data() #注意分区的数字需要参数传入,否则不能识别 fdisk_run_four_part() { - fdisk /dev/sda >/dev/null << ! + fdisk $install_disk_blk >/dev/null << ! d 1 d @@ -122,7 +142,7 @@ w #注意分区的数字需要参数传入,否则不能识别 fdisk_run_three_part_without_data() { - fdisk /dev/sda >/dev/null << ! + fdisk $install_disk_blk >/dev/null << ! d 1 d @@ -162,7 +182,7 @@ w fdisk_run_three_part() { - fdisk /dev/sda >/dev/null << ! + fdisk $install_disk_blk >/dev/null << ! d 1 d @@ -275,14 +295,20 @@ fdisk_run_func() fdisk_run_set_part 4 $disk_size_backup fi fdisk_run_end_file; - fdisk /dev/sda < $temp_fdisk_name >/dev/null + fdisk $install_disk_blk < $temp_fdisk_name >/dev/null } #分析4分区, 不包括乒乓系统 analy_four_part() { #16G的特别对待,保证root能装满系统 - if [ $disk_size -le 16 ]; then + if [ $disk_size -le 8 ]; then + disk_size_root=2 + disk_size_data=3 + disk_size_swap=1 + disk_size_root_and_data=5 + disk_size_root_and_data_bak=5 + elif [ $disk_size -le 16 ]; then disk_size_root=6 disk_size_data=3 disk_size_root_and_data=9 @@ -297,7 +323,13 @@ analy_four_part() #分析4分区,包括乒乓系统 analy_pingpang() { - if [ $disk_size -le 16 ]; then + if [ $disk_size -le 8 ]; then + disk_size_root=2 + disk_size_data=1 + disk_size_swap=1 + disk_size_root_and_data=3 + disk_size_root_and_data_bak=3 + elif [ $disk_size -le 16 ]; then disk_size_root=4 disk_size_data=2 disk_size_root_and_data=6 @@ -332,6 +364,7 @@ fdisk_three_pingpang() { read_disk_size; analy_pingpang; + echo $disk_size_root_and_data_bak $disk_size_swap fdisk_run_three_part_without_data $disk_size_root_and_data_bak $disk_size_swap; } @@ -402,6 +435,8 @@ fidks_by_ratio() fdisk_by_ratio_other_part $1 $2 $4 } +check_cmdline_ins_target + if [ $1 -eq 0 ]; then fdisk_four_part; elif [ $1 -eq 1 ]; then diff --git a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/install_fdisk_analysis.sh b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/install_fdisk_analysis.sh index dd8aebe5..3d651188 100755 --- a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/install_fdisk_analysis.sh +++ b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/install_fdisk_analysis.sh @@ -1,5 +1,23 @@ #! /bin/sh +install_disk_blk="/dev/sda" +install_target_type=0 + +check_cmdline_ins_target() +{ + install_target_type=0 + # install_target_type=$(cat /proc/cmdline | grep ins_target="scsi") #default is scsi + install_target_type=$(cat /proc/cmdline | grep ins_target=mmc) + if [ ! -z "$install_target_type" ]; then + install_target_type=1 + install_disk_blk="/dev/mmcblk0" + return 0 + fi + + install_target_type=0 + install_disk_blk="/dev/sda" +} + check_num() { result=$(echo $num1 | grep '^-*[1-9][0-9]*$') @@ -65,9 +83,15 @@ check_dev_part_num_list() fidsk_default_2_part() { echo "" - echo "would split sda to 2 partition! /dev/sda1 and /dev/sda3" - sleep 1; - fdisk /dev/sda < /home/fdisk.txt >/dev/null; + if [ $install_target_type -eq 1 ]; then + echo "would split $install_disk_blk to 1 partition! rootfs part" + sleep 1; + fdisk $install_disk_blk < /home/fdisk_mmc.txt >/dev/null; + else + echo "would split $install_disk_blk to 2 partition! rootfs and swap part" + sleep 1; + fdisk $install_disk_blk < /home/fdisk.txt >/dev/null; + fi } fdisk_config_analy() @@ -102,7 +126,7 @@ fdisk_file_analy() first_line="$(cat $1 | head -1)" if [ "$first_line" == "d" ]; then - fdisk /dev/sda < $1 >/dev/null; + fdisk $install_disk_blk < $1 >/dev/null; else fdisk_config_analy "$first_line" fi @@ -123,6 +147,7 @@ analy_start() fi } +check_cmdline_ins_target if [ $# -eq 2 ]; then analy_start $1 $2 else diff --git a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/install_format_all_disk.sh b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/install_format_all_disk.sh index 78340189..f4ad6ec1 100755 --- a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/install_format_all_disk.sh +++ b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/install_format_all_disk.sh @@ -6,6 +6,29 @@ swap_partition="/dev/sda3" backup_partition="/dev/sda4" +# 0 ssd (sdax) +# 1 mmc (mmcblkx) +install_target_type=0 + +check_cmdline_ins_target() +{ + install_target_type=0 + # install_target_type=$(cat /proc/cmdline | grep ins_target="scsi") #default is scsi + install_target_type=$(cat /proc/cmdline | grep ins_target=mmc) + if [ ! -z "$install_target_type" ]; then + root_partition="/dev/mmcblk0p1" + data_partition="/dev/mmcblk0p2" + swap_partition="/dev/mmcblk0p3" + backup_partition="/dev/mmcblk0p4" + return 0 + fi + + root_partition="/dev/sda1" + data_partition="/dev/sda2" + swap_partition="/dev/sda3" + backup_partition="/dev/sda4" +} + error_inf_print() { echo ""; @@ -79,5 +102,6 @@ format_all_partition() return 0; } +check_cmdline_ins_target format_all_partition; exit $? \ No newline at end of file diff --git a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/install_reboot.sh b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/install_reboot.sh index acbcf7b1..f5a08778 100755 --- a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/install_reboot.sh +++ b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/install_reboot.sh @@ -10,6 +10,23 @@ echo " "; # sda3 swap usb3 # sda4 backup usb4 +# 0 ssd +# 1 mmc +# 2 nand +boot_device_type=0 +boot_device_num=1 + +check_cmdline_ins_target() +{ + install_target_type=0 + # install_target_type=$(cat /proc/cmdline | grep ins_target="scsi") #default is scsi + install_target_type=$(cat /proc/cmdline | grep ins_target=mmc) + if [ ! -z "$install_target_type" ]; then + boot_device_type=1 + return 0 + fi +} + #防止前面的脚本出现错误,导致没有解除挂载一些已经挂载的分区。 check_and_umount_for_safe() { @@ -24,8 +41,9 @@ check_and_umount_for_safe() } #防止前面的脚本出现错误,导致没有解除挂载一些已经挂载的分区。 +check_cmdline_ins_target check_and_umount_for_safe; -/home/sys_config_tool +/home/sys_config_tool $boot_device_type 0 $boot_device_num echo "-------------> stage3 install system finish! please reboot or shutdowm! <-------------" reboot -f diff --git a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/install_usb.sh b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/install_usb.sh index 11901be9..6cd629d1 100755 --- a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/install_usb.sh +++ b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/install_usb.sh @@ -30,6 +30,34 @@ install_way=0 stage1_result=0; +# 0 ssd (sdax) +# 1 mmc (mmcblkx) +install_target_type=0 + +check_cmdline_ins_target() +{ + install_target_type=0 + # install_target_type=$(cat /proc/cmdline | grep ins_target="scsi") #default is scsi + install_target_type=$(cat /proc/cmdline | grep ins_target=mmc) + if [ ! -z "$install_target_type" ]; then + root_partition="/dev/mmcblk0p1" + data_partition="/dev/mmcblk0p2" + swap_partition="/dev/mmcblk0p3" + backup_partition="/dev/mmcblk0p4" + + usb_partition="/dev/sda1" + usb_partition_bak="/dev/sda" + + mmc_partition="/dev/mmcblk1p1" + mmc_partition_bak="/dev/mmcblk1" + return 0 + fi + + root_partition="/dev/sda1" + data_partition="/dev/sda2" + swap_partition="/dev/sda3" + backup_partition="/dev/sda4" +} create_all_mount_point() { @@ -177,8 +205,8 @@ format_all_partition() sync fi - echo "-------------> stage1.2 format swap partition --- start <-------------" if [ -e $swap_partition ]; then + echo "-------------> stage1.2 format swap partition --- start <-------------" mkswap $swap_partition >/dev/null; if [ $? -eq 0 ]; then echo "-------------> stage1.2 format swap partition --- success <-------------" @@ -353,6 +381,7 @@ check_cmdline() stage1_entrance() { + check_cmdline_ins_target check_cmdline if [ $uboot_install_fix -eq 1 ]; then diff --git a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/ramdisk-master-839f588304 b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/ramdisk-master-839f588304 new file mode 100644 index 00000000..e69de29b diff --git a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/ramdisk_sys_config_tool_ver b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/ramdisk_sys_config_tool_ver index d02081ec..91b1f5d1 100644 --- a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/ramdisk_sys_config_tool_ver +++ b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/ramdisk_sys_config_tool_ver @@ -1 +1 @@ -master-db0d730a +master-e0bff8e537 diff --git a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/recover_backup.sh b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/recover_backup.sh index ccfdfac9..eb056b70 100755 --- a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/recover_backup.sh +++ b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/recover_backup.sh @@ -16,6 +16,25 @@ data_mount_point="/mnt/usb2" swap_mount_point="/mnt/usb3" backup_mount_point="/mnt/usb4" +check_cmdline_ins_target() +{ + install_target_type=0 + # install_target_type=$(cat /proc/cmdline | grep ins_target="scsi") #default is scsi + install_target_type=$(cat /proc/cmdline | grep rec_target=mmc) + if [ ! -z "$install_target_type" ]; then + root_partition="/dev/mmcblk0p1" + data_partition="/dev/mmcblk0p2" + swap_partition="/dev/mmcblk0p3" + backup_partition="/dev/mmcblk0p4" + return 0 + fi + + root_partition="/dev/sda1" + data_partition="/dev/sda2" + swap_partition="/dev/sda3" + backup_partition="/dev/sda4" +} + create_all_mount_point() { if [ ! -d $root_mount_point ]; then @@ -147,6 +166,7 @@ start_stage1() { sleep 1; sync; + check_cmdline_ins_target create_all_mount_point; mount $backup_partition $backup_mount_point; if mountpoint -q $backup_mount_point; then diff --git a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/recover_disk.sh b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/recover_disk.sh index 84afef83..4eae8cad 100755 --- a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/recover_disk.sh +++ b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/recover_disk.sh @@ -16,6 +16,25 @@ data_mount_point="/mnt/usb2" swap_mount_point="/mnt/usb3" backup_mount_point="/mnt/usb4" +check_cmdline_ins_target() +{ + install_target_type=0 + # install_target_type=$(cat /proc/cmdline | grep ins_target="scsi") #default is scsi + install_target_type=$(cat /proc/cmdline | grep rec_target=mmc) + if [ ! -z "$install_target_type" ]; then + root_partition="/dev/mmcblk0p1" + data_partition="/dev/mmcblk0p2" + swap_partition="/dev/mmcblk0p3" + backup_partition="/dev/mmcblk0p4" + return 0 + fi + + root_partition="/dev/sda1" + data_partition="/dev/sda2" + swap_partition="/dev/sda3" + backup_partition="/dev/sda4" +} + check_and_umount_for_safe() { for i in /mnt/usb*; do @@ -108,6 +127,7 @@ copy_uimage_to_boot() mount $backup_partition $backup_mount_point; sync; + mkdir -p $root_mount_point/boot/ cp -a $backup_mount_point/uImage $root_mount_point/boot/; if [ $? -ne 0 ]; then error_inf_print "Error! copy uImage to /boot/ failed!" @@ -196,6 +216,15 @@ copy_file_to_data() rm -r $root_mount_point/opt; sync; + rm -r $root_mount_point/root; + sync; + + mkdir -p $root_mount_point/var + mkdir -p $root_mount_point/home + mkdir -p $root_mount_point/opt + mkdir -p $root_mount_point/root + mkdir -p $root_mount_point/data + check_and_umount_for_safe; } @@ -203,6 +232,7 @@ copy_file_to_data() #backup分区 start_stage2() { + check_cmdline_ins_target #执行三个阶段的操作 uzip_rootfs; copy_uimage_to_boot; diff --git a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/recover_reboot.sh b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/recover_reboot.sh index 70db3c6f..3cd42988 100755 --- a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/recover_reboot.sh +++ b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/recover_reboot.sh @@ -10,6 +10,20 @@ echo " "; # sda3 swap usb3 # sda4 backup usb4 +boot_device_type=0 +boot_device_num=1 + +check_cmdline_ins_target() +{ + install_target_type=0 + # install_target_type=$(cat /proc/cmdline | grep ins_target="scsi") #default is scsi + install_target_type=$(cat /proc/cmdline | grep rec_target=mmc) + if [ ! -z "$install_target_type" ]; then + boot_device_type=1 + return 0 + fi +} + #防止前面的脚本出现错误,导致没有解除挂载一些已经挂载的分区。 check_and_umount_for_safe() { @@ -26,8 +40,9 @@ check_and_umount_for_safe() } #防止前面的脚本出现错误,导致没有解除挂载一些已经挂载的分区。 +check_cmdline_ins_target check_and_umount_for_safe; -/home/sys_config_tool +/home/sys_config_tool $boot_device_type 0 $boot_device_num echo "-------------> stage3 reboot system <-------------" #检查是否有错误记录文件,则之前的脚本执行时出错 diff --git a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/sys_config_tool b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/sys_config_tool index 4811ccbf..113c1f0c 100755 Binary files a/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/sys_config_tool and b/board/loongson/ls2k1000la/rootfs_ramdisk_overlay/home/sys_config_tool differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt2561.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt2561.bin new file mode 100644 index 00000000..b14bad3f Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt2561.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt2561s.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt2561s.bin new file mode 100644 index 00000000..b0f79505 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt2561s.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt2661.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt2661.bin new file mode 100644 index 00000000..fe52a0b1 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt2661.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt2860.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt2860.bin new file mode 100644 index 00000000..888c20c9 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt2860.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt2870.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt2870.bin new file mode 100644 index 00000000..9ddac4a4 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt2870.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt3070.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt3070.bin new file mode 120000 index 00000000..d233a1d5 --- /dev/null +++ b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt3070.bin @@ -0,0 +1 @@ +rt2870.bin \ No newline at end of file diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt3071.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt3071.bin new file mode 100644 index 00000000..df12e5fd Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt3071.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt3090.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt3090.bin new file mode 120000 index 00000000..c5a9ab01 --- /dev/null +++ b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt3090.bin @@ -0,0 +1 @@ +rt2860.bin \ No newline at end of file diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt3290.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt3290.bin new file mode 100644 index 00000000..6ca33a59 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt3290.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt73.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt73.bin new file mode 100644 index 00000000..1e395dd6 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rt73.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8188efw.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8188efw.bin new file mode 100644 index 00000000..ac9a430a Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8188efw.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8188eufw.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8188eufw.bin new file mode 100644 index 00000000..4ae7e1c5 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8188eufw.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192cfw.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192cfw.bin new file mode 100644 index 00000000..77eb1ebe Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192cfw.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192cfwU.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192cfwU.bin new file mode 100644 index 00000000..b231e1d6 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192cfwU.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192cfwU_B.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192cfwU_B.bin new file mode 100644 index 00000000..3a3e3867 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192cfwU_B.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192cufw.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192cufw.bin new file mode 100644 index 00000000..3aa75065 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192cufw.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192cufw_A.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192cufw_A.bin new file mode 100644 index 00000000..9569d0a2 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192cufw_A.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192cufw_B.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192cufw_B.bin new file mode 100644 index 00000000..96089c4c Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192cufw_B.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192cufw_TMSC.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192cufw_TMSC.bin new file mode 100644 index 00000000..d1b84d48 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192cufw_TMSC.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192defw.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192defw.bin new file mode 100644 index 00000000..cbb4b887 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192defw.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192eefw.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192eefw.bin new file mode 100644 index 00000000..4a034d3a Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192eefw.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192eu_ap_wowlan.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192eu_ap_wowlan.bin new file mode 100644 index 00000000..f68d10c6 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192eu_ap_wowlan.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192eu_nic.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192eu_nic.bin new file mode 100644 index 00000000..4a034d3a Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192eu_nic.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192eu_wowlan.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192eu_wowlan.bin new file mode 100644 index 00000000..aebcffc3 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192eu_wowlan.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192sefw.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192sefw.bin new file mode 100644 index 00000000..ed4afe85 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8192sefw.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8712u.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8712u.bin new file mode 100644 index 00000000..3f965a65 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8712u.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723aufw_A.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723aufw_A.bin new file mode 100644 index 00000000..7accded7 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723aufw_A.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723aufw_B.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723aufw_B.bin new file mode 100644 index 00000000..5c374000 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723aufw_B.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723aufw_B_NoBT.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723aufw_B_NoBT.bin new file mode 100644 index 00000000..8e9952cb Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723aufw_B_NoBT.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723befw.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723befw.bin new file mode 100644 index 00000000..25e183cb Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723befw.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723befw_36.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723befw_36.bin new file mode 100644 index 00000000..1bb9b9c8 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723befw_36.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723bs_ap_wowlan.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723bs_ap_wowlan.bin new file mode 100644 index 00000000..944bc16c Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723bs_ap_wowlan.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723bs_bt.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723bs_bt.bin new file mode 100644 index 00000000..f29df42f Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723bs_bt.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723bs_nic.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723bs_nic.bin new file mode 100644 index 00000000..8d534053 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723bs_nic.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723bs_wowlan.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723bs_wowlan.bin new file mode 100644 index 00000000..473e29c3 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723bs_wowlan.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723bu_ap_wowlan.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723bu_ap_wowlan.bin new file mode 100644 index 00000000..944bc16c Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723bu_ap_wowlan.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723bu_nic.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723bu_nic.bin new file mode 100644 index 00000000..8d534053 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723bu_nic.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723bu_wowlan.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723bu_wowlan.bin new file mode 100644 index 00000000..473e29c3 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723bu_wowlan.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723defw.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723defw.bin new file mode 100644 index 00000000..6d2c9539 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723defw.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723fw.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723fw.bin new file mode 100644 index 00000000..725f2138 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723fw.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723fw_B.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723fw_B.bin new file mode 100644 index 00000000..993c7f6e Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8723fw_B.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8812aefw.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8812aefw.bin new file mode 100644 index 00000000..90a04098 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8812aefw.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8812aefw_wowlan.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8812aefw_wowlan.bin new file mode 100644 index 00000000..4d0cc358 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8812aefw_wowlan.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8821aefw.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8821aefw.bin new file mode 100644 index 00000000..4f84cf94 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8821aefw.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8821aefw_29.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8821aefw_29.bin new file mode 100644 index 00000000..f0acde46 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8821aefw_29.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8821aefw_wowlan.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8821aefw_wowlan.bin new file mode 100644 index 00000000..115d49f1 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8821aefw_wowlan.bin differ diff --git a/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8822befw.bin b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8822befw.bin new file mode 100644 index 00000000..1fcdbeb2 Binary files /dev/null and b/board/loongson/ls2k300/rootfs_overlay/usr/lib/firmware/rtlwifi/rtl8822befw.bin differ diff --git a/configs/loongson2k1000_jinlong_defconfig b/configs/loongson2k1000_jinlong_defconfig index 4751b303..debf072f 100644 --- a/configs/loongson2k1000_jinlong_defconfig +++ b/configs/loongson2k1000_jinlong_defconfig @@ -154,7 +154,7 @@ BR2_PACKAGE_TOUCH_SCREEN_MAP_VALUE=y BR2_PACKAGE_LS_DEFAULT_ETH_CONFIG=y BR2_PACKAGE_LS_DEFAULT_ETH_NAME="eth0 eth1" BR2_PACKAGE_LS_DEFAULT_ETH_IP="192.168.1.10 192.168.2.11" -BR2_TARGET_ROOTFS_TAR_GZIP=y +BR2_TARGET_ROOTFS_TAR_PIGZ=y BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y diff --git a/configs/loongson2k1000la_jinlong_defconfig b/configs/loongson2k1000la_jinlong_defconfig index 73541c23..ee62ec8c 100644 --- a/configs/loongson2k1000la_jinlong_defconfig +++ b/configs/loongson2k1000la_jinlong_defconfig @@ -285,7 +285,7 @@ BR2_PACKAGE_LS_DEFAULT_ETH_IP="192.168.1.10 192.168.2.11" BR2_PACKAGE_LIBGO_LA=y BR2_PACKAGE_LS3_SYSTEM_TOOL=y BR2_PACKAGE_LS3_SYSTEM_TOOL_QT=y -BR2_TARGET_ROOTFS_TAR_GZIP=y +BR2_TARGET_ROOTFS_TAR_PIGZ=y BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y diff --git a/configs/loongson2k1000la_jinlong_fastboot_defconfig b/configs/loongson2k1000la_jinlong_fastboot_defconfig index b5672f73..cbb67e0a 100644 --- a/configs/loongson2k1000la_jinlong_fastboot_defconfig +++ b/configs/loongson2k1000la_jinlong_fastboot_defconfig @@ -165,7 +165,7 @@ BR2_PACKAGE_LS_DEFAULT_ETH_CONFIG=y BR2_PACKAGE_LS_DEFAULT_ETH_NAME="eth0 eth1" BR2_PACKAGE_LS_DEFAULT_ETH_IP="192.168.1.10 192.168.2.11" BR2_PACKAGE_FASTBOOT_BUSYBOX=y -BR2_TARGET_ROOTFS_TAR_GZIP=y +BR2_TARGET_ROOTFS_TAR_PIGZ=y BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y diff --git a/configs/loongson2k1000la_jinlong_mini_defconfig b/configs/loongson2k1000la_jinlong_mini_defconfig index adcebe38..2e10de04 100644 --- a/configs/loongson2k1000la_jinlong_mini_defconfig +++ b/configs/loongson2k1000la_jinlong_mini_defconfig @@ -64,7 +64,7 @@ BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=y BR2_PACKAGE_BOOT_RUN=y BR2_PACKAGE_LVGL_KIT=y BR2_PACKAGE_TOUCH_SCREEN_MAP_VALUE=y -BR2_TARGET_ROOTFS_TAR_GZIP=y +BR2_TARGET_ROOTFS_TAR_PIGZ=y BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y diff --git a/configs/loongson2k1000la_jinlong_pure_busybox_defconfig b/configs/loongson2k1000la_jinlong_pure_busybox_defconfig index 82f735a0..b18a55d2 100644 --- a/configs/loongson2k1000la_jinlong_pure_busybox_defconfig +++ b/configs/loongson2k1000la_jinlong_pure_busybox_defconfig @@ -26,7 +26,7 @@ BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS=y BR2_PACKAGE_UTIL_LINUX_FSCK=y BR2_PACKAGE_UTIL_LINUX_MOUNT=y # BR2_PACKAGE_LS2_SYS_CONFIG_TOOL is not set -BR2_TARGET_ROOTFS_TAR_GZIP=y +BR2_TARGET_ROOTFS_TAR_PIGZ=y BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y diff --git a/configs/loongson2k1000la_jinlong_py3_defconfig b/configs/loongson2k1000la_jinlong_py3_defconfig index 04ade26e..25bbfc83 100644 --- a/configs/loongson2k1000la_jinlong_py3_defconfig +++ b/configs/loongson2k1000la_jinlong_py3_defconfig @@ -448,10 +448,11 @@ BR2_PACKAGE_LOONGSON_KERNEL=y BR2_PACKAGE_LOONGSON_KERNEL_PATH="~/tmp/bsp/test/2K1000LA/kernel/all/" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_IMG_WITH_PARTITION_SIZE=2048 BR2_TARGET_ROOTFS_EXT2_SIZE="2048M" BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit -O ^metadata_csum" -BR2_TARGET_ROOTFS_EXT2_GZIP=y -BR2_TARGET_ROOTFS_TAR_GZIP=y +BR2_TARGET_ROOTFS_EXT2_PIGZ=y +BR2_TARGET_ROOTFS_TAR_PIGZ=y BR2_PACKAGE_HOST_CMAKE=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/loongson2k1000la_jinlong_ramdisk_defconfig b/configs/loongson2k1000la_jinlong_ramdisk_defconfig index 8f961597..80978074 100644 --- a/configs/loongson2k1000la_jinlong_ramdisk_defconfig +++ b/configs/loongson2k1000la_jinlong_ramdisk_defconfig @@ -15,6 +15,9 @@ BR2_ROOTFS_MERGED_USR=y BR2_SYSTEM_DEFAULT_PATH="/bin:/sbin:/usr/bin:/usr/sbin" # BR2_ENABLE_LOCALE_PURGE is not set BR2_ROOTFS_OVERLAY="board/loongson/ls2k1000la/rootfs_ramdisk_overlay" +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_GZIP=y +BR2_PACKAGE_PIGZ=y BR2_PACKAGE_PV=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_ETHTOOL=y @@ -22,10 +25,12 @@ BR2_PACKAGE_ETHTOOL=y BR2_PACKAGE_IPROUTE2=y BR2_PACKAGE_RSYNC=y # BR2_PACKAGE_URANDOM_SCRIPTS is not set +BR2_PACKAGE_BASH=y BR2_PACKAGE_UTIL_LINUX_LIBFDISK=y -BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS=y BR2_PACKAGE_UTIL_LINUX_FSCK=y +BR2_PACKAGE_UTIL_LINUX_LOSETUP=y BR2_PACKAGE_UTIL_LINUX_MOUNT=y +BR2_PACKAGE_UTIL_LINUX_PARTX=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_SIZE="32M" BR2_TARGET_ROOTFS_EXT2_GZIP=y diff --git a/configs/loongson2k1000la_nand_4k_defconfig b/configs/loongson2k1000la_nand_4k_defconfig index eb346b39..11b54aaf 100644 --- a/configs/loongson2k1000la_nand_4k_defconfig +++ b/configs/loongson2k1000la_nand_4k_defconfig @@ -186,7 +186,7 @@ BR2_PACKAGE_LVGL_KIT=y BR2_PACKAGE_LS_DEFAULT_ETH_CONFIG=y BR2_PACKAGE_QT_USE_TSLIB=y BR2_PACKAGE_LIBGO_LA=y -BR2_TARGET_ROOTFS_TAR_GZIP=y +BR2_TARGET_ROOTFS_TAR_PIGZ=y BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x40000 BR2_TARGET_ROOTFS_UBI_SUBSIZE=4096 diff --git a/configs/loongson2k1000la_rt_defconfig b/configs/loongson2k1000la_rt_defconfig index 655e0a08..0b09c022 100644 --- a/configs/loongson2k1000la_rt_defconfig +++ b/configs/loongson2k1000la_rt_defconfig @@ -52,7 +52,7 @@ BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS=y BR2_PACKAGE_UTIL_LINUX_FSCK=y BR2_PACKAGE_UTIL_LINUX_MOUNT=y # BR2_PACKAGE_LS2_SYS_CONFIG_TOOL is not set -BR2_TARGET_ROOTFS_TAR_GZIP=y +BR2_TARGET_ROOTFS_TAR_PIGZ=y BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y diff --git a/configs/loongson2k1000la_test_defconfig b/configs/loongson2k1000la_test_defconfig index 0b0888ab..ce7a0482 100644 --- a/configs/loongson2k1000la_test_defconfig +++ b/configs/loongson2k1000la_test_defconfig @@ -181,7 +181,7 @@ BR2_PACKAGE_LS_DEFAULT_ETH_NAME="eth0 eth1" BR2_PACKAGE_LS_DEFAULT_ETH_IP="192.168.1.10 192.168.2.11" BR2_PACKAGE_LIBGO_LA=y BR2_PACKAGE_AUTOREBOOT=y -BR2_TARGET_ROOTFS_TAR_GZIP=y +BR2_TARGET_ROOTFS_TAR_PIGZ=y BR2_PACKAGE_HOST_CMAKE=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y diff --git a/configs/loongson2k300_defconfig b/configs/loongson2k300_defconfig index b7d1b660..43539765 100644 --- a/configs/loongson2k300_defconfig +++ b/configs/loongson2k300_defconfig @@ -81,8 +81,14 @@ BR2_PACKAGE_QT5BASE_DBUS=y BR2_PACKAGE_QT5BASE_TSLIB=y BR2_PACKAGE_QT5CHARTS=y BR2_PACKAGE_QT5MQTT=y +BR2_PACKAGE_QT5QUICKCONTROLS=y +BR2_PACKAGE_QT5QUICKCONTROLS2=y BR2_PACKAGE_QT5SENSORS=y BR2_PACKAGE_QT5SERIALBUS=y +BR2_PACKAGE_QT5VIRTUALKEYBOARD=y +BR2_PACKAGE_QT5VIRTUALKEYBOARD_HANDWRITING=y +BR2_PACKAGE_QT5VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION=y +BR2_PACKAGE_QT5WEBSOCKETS=y BR2_PACKAGE_QT5XMLPATTERNS=y BR2_PACKAGE_QWT=y BR2_PACKAGE_QWT_SVG=y @@ -463,10 +469,11 @@ BR2_PACKAGE_LOONGSON_BUILD_ESSENTIAL=y BR2_PACKAGE_LOONGSON_BUILD_ESSENTIAL_CMAKE_GDB=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_IMG_WITH_PARTITION_SIZE=2048 BR2_TARGET_ROOTFS_EXT2_SIZE="2048M" BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit -O ^metadata_csum" -BR2_TARGET_ROOTFS_EXT2_GZIP=y -BR2_TARGET_ROOTFS_TAR_GZIP=y +BR2_TARGET_ROOTFS_EXT2_PIGZ=y +BR2_TARGET_ROOTFS_TAR_PIGZ=y BR2_PACKAGE_HOST_CMAKE=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/loongson2k300_mini_dp_defconfig b/configs/loongson2k300_mini_dp_defconfig index 2f3f1ee2..2143e646 100644 --- a/configs/loongson2k300_mini_dp_defconfig +++ b/configs/loongson2k300_mini_dp_defconfig @@ -20,9 +20,11 @@ BR2_ROOTFS_OVERLAY="board/loongson/ls2k300/rootfs_overlay" BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_AMIXER=y BR2_PACKAGE_ALSA_UTILS_APLAY=y +BR2_PACKAGE_FFMPEG=y BR2_PACKAGE_FFMPEG_GPL=y BR2_PACKAGE_FFMPEG_FFPLAY=y BR2_PACKAGE_FFMPEG_FFPROBE=y +BR2_PACKAGE_FFMPEG_AVRESAMPLE=y BR2_PACKAGE_FFMPEG_POSTPROC=y BR2_PACKAGE_V4L2GRAB=y BR2_PACKAGE_GZIP=y @@ -38,8 +40,6 @@ BR2_PACKAGE_RT_TESTS=y BR2_PACKAGE_STRESS=y BR2_PACKAGE_STRESS_NG=y BR2_PACKAGE_STRESSAPPTEST=y -BR2_PACKAGE_FLEX=y -BR2_PACKAGE_MAKE=y BR2_PACKAGE_TREE=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y @@ -59,6 +59,7 @@ BR2_PACKAGE_SDL2_MIXER=y BR2_PACKAGE_SDL2_NET=y BR2_PACKAGE_SDL2_TTF=y BR2_PACKAGE_QT5=y +BR2_PACKAGE_QT5BASE_CONCURRENT=y BR2_PACKAGE_QT5BASE_MYSQL=y BR2_PACKAGE_QT5BASE_SQLITE_QT=y BR2_PACKAGE_QT5BASE_DEFAULT_QPA="linuxfb" @@ -78,16 +79,14 @@ BR2_PACKAGE_QT5XMLPATTERNS=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_RTW88=y +BR2_PACKAGE_DBUS_GLIB=y BR2_PACKAGE_DT_UTILS=y -BR2_PACKAGE_HWLOC=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_IOSTAT=y -BR2_PACKAGE_LIBUIO=y BR2_PACKAGE_LINUX_SERIAL_TEST=y BR2_PACKAGE_LM_SENSORS=y BR2_PACKAGE_LM_SENSORS_PWMCONFIG=y BR2_PACKAGE_LSHW=y -BR2_PACKAGE_LSUIO=y BR2_PACKAGE_MEMTESTER=y BR2_PACKAGE_RS485CONF=y BR2_PACKAGE_RTC_TOOLS=y @@ -107,6 +106,7 @@ BR2_PACKAGE_PYTHON_DJANGO=y BR2_PACKAGE_PYTHON_FLASK=y BR2_PACKAGE_PYTHON_LXML=y BR2_PACKAGE_PYTHON_MODBUS_TK=y +BR2_PACKAGE_PYTHON_NUMPY=y BR2_PACKAGE_PYTHON_PIP=y BR2_PACKAGE_PYTHON_PYGAME=y BR2_PACKAGE_PYTHON_PYGAME_IMAGE=y @@ -122,17 +122,9 @@ BR2_PACKAGE_PYTHON_PYUSB=y BR2_PACKAGE_PYTHON_SIMPLESQLITE=y BR2_PACKAGE_PYTHON_SOCKETIO=y BR2_PACKAGE_PYTHON_URLLIB3=y -BR2_PACKAGE_LIBARCHIVE=y -BR2_PACKAGE_LIBARCHIVE_BSDTAR=y -BR2_PACKAGE_LIBARCHIVE_BSDCPIO=y -BR2_PACKAGE_LIBARCHIVE_BSDCAT=y BR2_PACKAGE_LIBSSH=y BR2_PACKAGE_LIBSSH_SERVER=y BR2_PACKAGE_LIBSSH2=y -BR2_PACKAGE_RHASH=y -BR2_PACKAGE_RHASH_BIN=y -BR2_PACKAGE_HIREDIS=y -BR2_PACKAGE_REDIS=y BR2_PACKAGE_SQLITE_STAT4=y BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA=y BR2_PACKAGE_SQLITE_ENABLE_FTS3=y @@ -141,33 +133,11 @@ BR2_PACKAGE_SQLITE_ENABLE_UNLOCK_NOTIFY=y BR2_PACKAGE_SQLITE_SECURE_DELETE=y BR2_PACKAGE_SQLITE_NO_SYNC=y BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y -BR2_PACKAGE_LIBSVG_CAIRO=y -BR2_PACKAGE_OPENCV3=y -BR2_PACKAGE_OPENCV3_WITH_QT5=y -BR2_PACKAGE_OPENCV3_LIB_PYTHON=y -BR2_PACKAGE_OPENCV3_LIB_SHAPE=y -BR2_PACKAGE_OPENCV3_LIB_STITCHING=y -BR2_PACKAGE_OPENCV3_LIB_SUPERRES=y -BR2_PACKAGE_OPENCV3_LIB_TS=y -BR2_PACKAGE_OPENCV3_LIB_VIDEOSTAB=y -BR2_PACKAGE_OPENCV3_BUILD_TESTS=y -BR2_PACKAGE_OPENCV3_BUILD_PERF_TESTS=y -BR2_PACKAGE_OPENCV3_WITH_FFMPEG=y -BR2_PACKAGE_OPENCV3_WITH_JPEG=y -BR2_PACKAGE_OPENCV3_WITH_PNG=y -BR2_PACKAGE_OPENCV3_WITH_PROTOBUF=y -BR2_PACKAGE_OPENCV3_WITH_TIFF=y -BR2_PACKAGE_OPENCV3_WITH_V4L=y -BR2_PACKAGE_OPENCV3_WITH_WEBP=y -BR2_PACKAGE_OPENCV3_INSTALL_DATA=y +BR2_PACKAGE_JSON_C=y BR2_PACKAGE_JSONCPP=y BR2_PACKAGE_LIBFASTJSON=y BR2_PACKAGE_TINYXML=y BR2_PACKAGE_TINYXML2=y -BR2_PACKAGE_LIBCAMERA=y -BR2_PACKAGE_LIBCAMERA_V4L2=y -BR2_PACKAGE_X264=y -BR2_PACKAGE_X265=y BR2_PACKAGE_CPPZMQ=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_LIBCURL_CURL=y @@ -200,27 +170,17 @@ BR2_PACKAGE_BOOST_TEST=y BR2_PACKAGE_BOOST_TYPE_ERASURE=y BR2_PACKAGE_BOOST_WAVE=y BR2_PACKAGE_CMOCKA=y +BR2_PACKAGE_ELL=y BR2_PACKAGE_LIBEVENT=y +BR2_PACKAGE_LIBICAL=y +BR2_PACKAGE_LIBUBOX=y BR2_PACKAGE_LIBUV=y +BR2_PACKAGE_PROTOBUF=y BR2_PACKAGE_COLLECTD=y BR2_PACKAGE_COLLECTD_EXEC=y BR2_PACKAGE_COLLECTD_IPTABLES=y BR2_PACKAGE_COLLECTD_NFS=y BR2_PACKAGE_XUTIL_UTIL_MACROS=y -BR2_PACKAGE_BLUEZ_TOOLS=y -BR2_PACKAGE_BLUEZ5_UTILS=y -BR2_PACKAGE_BLUEZ5_UTILS_OBEX=y -BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y -BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y -BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL=y -BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH=y -BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MESH=y -BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MIDI=y -BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_NFC=y -BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP=y -BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS=y -BR2_PACKAGE_BLUEZ5_UTILS_TEST=y -BR2_PACKAGE_BLUEZ5_UTILS_TOOLS_HID2HCI=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y BR2_PACKAGE_DHCP=y @@ -229,9 +189,6 @@ BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK=y BR2_PACKAGE_DHCP_RELAY=y BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCPCD5=y -BR2_PACKAGE_DROPBEAR=y -BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS=y -BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO=y BR2_PACKAGE_ETHTOOL=y BR2_PACKAGE_HOSTAPD=y BR2_PACKAGE_IFTOP=y @@ -254,8 +211,6 @@ BR2_PACKAGE_LIGHTTPD_BZIP2=y BR2_PACKAGE_LIGHTTPD_PCRE=y BR2_PACKAGE_LIGHTTPD_WEBDAV=y BR2_PACKAGE_LRZSZ=y -BR2_PACKAGE_NETSNMP=y -BR2_PACKAGE_NETSNMP_STATIC=y BR2_PACKAGE_NETWORK_MANAGER=y BR2_PACKAGE_NETWORK_MANAGER_TUI=y BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y @@ -263,7 +218,6 @@ BR2_PACKAGE_NETWORK_MANAGER_PPPD=y BR2_PACKAGE_NETWORK_MANAGER_OVS=y BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_RSYNC=y -BR2_PACKAGE_UHTTPD=y BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y BR2_PACKAGE_WPA_SUPPLICANT_WIFI_DISPLAY=y @@ -295,6 +249,9 @@ BR2_PACKAGE_LESS=y BR2_PACKAGE_MC=y BR2_PACKAGE_VIM=y BR2_PACKAGE_BOOT_RUN=y +BR2_PACKAGE_DRIVER_TESTCASE=y +BR2_PACKAGE_DRIVER_TESTCASE_QT=y +# BR2_PACKAGE_DRIVER_TESTCASE_QT_AUTO_START is not set BR2_PACKAGE_LVGL_KIT=y BR2_PACKAGE_LS_DEFAULT_ETH_CONFIG=y BR2_PACKAGE_QT_USE_TSLIB=y @@ -308,8 +265,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="512M" BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit -O ^metadata_csum" -BR2_TARGET_ROOTFS_EXT2_GZIP=y -BR2_TARGET_ROOTFS_TAR_GZIP=y +BR2_TARGET_ROOTFS_EXT2_PIGZ=y +BR2_TARGET_ROOTFS_TAR_PIGZ=y BR2_PACKAGE_HOST_CMAKE=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/loongson2k300_pure_busybox_defconfig b/configs/loongson2k300_pure_busybox_defconfig index 36362448..5a16f28b 100644 --- a/configs/loongson2k300_pure_busybox_defconfig +++ b/configs/loongson2k300_pure_busybox_defconfig @@ -33,7 +33,7 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="128M" BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit -O ^metadata_csum" -BR2_TARGET_ROOTFS_EXT2_GZIP=y -BR2_TARGET_ROOTFS_TAR_GZIP=y +BR2_TARGET_ROOTFS_EXT2_PIGZ=y +BR2_TARGET_ROOTFS_TAR_PIGZ=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MKPASSWD=y diff --git a/configs/loongson2k300_test_defconfig b/configs/loongson2k300_test_defconfig new file mode 100644 index 00000000..96950ae1 --- /dev/null +++ b/configs/loongson2k300_test_defconfig @@ -0,0 +1,176 @@ +BR2_loongarch64=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_PATH="/opt/loongson-gnu-toolchain-x86_64-loongarch64-linux-gnu" +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-linux-gnu" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y +BR2_TOOLCHAIN_EXTERNAL_CXX=y +BR2_TARGET_GENERIC_HOSTNAME="LS-GD" +BR2_TARGET_GENERIC_ISSUE="Welcome to Loongson-gd" +BR2_TARGET_GENERIC_PASSWD_SHA512=y +BR2_INIT_SYSTEMD=y +BR2_TARGET_GENERIC_ROOT_PASSWD="123" +BR2_SYSTEM_BIN_SH_BASH=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_SYSTEM_DEFAULT_PATH="/bin:/sbin:/usr/bin:/usr/sbin" +BR2_SYSTEM_ENABLE_NLS=y +BR2_TARGET_LOCALTIME="Asia/Shanghai" +BR2_ROOTFS_OVERLAY="board/loongson/ls2k300/rootfs_overlay" +BR2_PACKAGE_ALSA_UTILS=y +# BR2_PACKAGE_ALSA_UTILS_ALSACTL is not set +BR2_PACKAGE_ALSA_UTILS_APLAY=y +BR2_PACKAGE_GZIP=y +BR2_PACKAGE_ZIP=y +BR2_PACKAGE_DHRYSTONE=y +BR2_PACKAGE_PV=y +BR2_PACKAGE_STRESS=y +BR2_PACKAGE_STRESSAPPTEST=y +BR2_PACKAGE_SED=y +BR2_PACKAGE_TREE=y +BR2_PACKAGE_DOSFSTOOLS=y +BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y +BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y +BR2_PACKAGE_E2FSPROGS=y +BR2_PACKAGE_NFS_UTILS=y +# BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set +BR2_PACKAGE_SOURCEHANSERIF=y +BR2_PACKAGE_SOURCEHANSERIF_CN_REGULAR=y +BR2_PACKAGE_FSWEBCAM=y +BR2_PACKAGE_FBDUMP=y +BR2_PACKAGE_FBGRAB=y +BR2_PACKAGE_FBSET=y +BR2_PACKAGE_PSPLASH=y +BR2_PACKAGE_QT5=y +BR2_PACKAGE_QT5BASE_CONCURRENT=y +BR2_PACKAGE_QT5BASE_SQLITE_QT=y +BR2_PACKAGE_QT5BASE_DEFAULT_QPA="linuxfb" +BR2_PACKAGE_QT5BASE_FONTCONFIG=y +BR2_PACKAGE_QT5BASE_HARFBUZZ=y +BR2_PACKAGE_QT5BASE_GIF=y +BR2_PACKAGE_QT5BASE_JPEG=y +BR2_PACKAGE_QT5BASE_PNG=y +BR2_PACKAGE_QT5BASE_DBUS=y +BR2_PACKAGE_QT5BASE_TSLIB=y +BR2_PACKAGE_QT5CHARTS=y +BR2_PACKAGE_QT5MQTT=y +BR2_PACKAGE_QT5SENSORS=y +BR2_PACKAGE_QT5SERIALBUS=y +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_RTW88=y +BR2_PACKAGE_DBUS_GLIB=y +BR2_PACKAGE_I2C_TOOLS=y +BR2_PACKAGE_LM_SENSORS=y +BR2_PACKAGE_LSHW=y +BR2_PACKAGE_RTC_TOOLS=y +BR2_PACKAGE_SPI_TOOLS=y +BR2_PACKAGE_USBUTILS=y +BR2_PACKAGE_PYTHON3=y +BR2_PACKAGE_PYTHON3_PY_PYC=y +BR2_PACKAGE_PYTHON3_BZIP2=y +BR2_PACKAGE_PYTHON3_CODECSCJK=y +BR2_PACKAGE_PYTHON3_CURSES=y +BR2_PACKAGE_PYTHON3_OSSAUDIODEV=y +BR2_PACKAGE_PYTHON3_READLINE=y +BR2_PACKAGE_PYTHON3_SSL=y +BR2_PACKAGE_PYTHON3_XZ=y +BR2_PACKAGE_PYTHON_CANOPEN=y +BR2_PACKAGE_PYTHON_MODBUS_TK=y +BR2_PACKAGE_PYTHON_PYMODBUS=y +BR2_PACKAGE_PYTHON_PYQT5=y +BR2_PACKAGE_PYTHON_PYUSB=y +BR2_PACKAGE_PYTHON_SIMPLESQLITE=y +BR2_PACKAGE_PYTHON_SOCKETIO=y +BR2_PACKAGE_PYTHON_SQLPARSE=y +BR2_PACKAGE_PYTHON_W1THERMSENSOR=y +BR2_PACKAGE_PYTHON_LUMAOLED=y +BR2_PACKAGE_SQLITE_STAT4=y +BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA=y +BR2_PACKAGE_SQLITE_ENABLE_FTS3=y +BR2_PACKAGE_SQLITE_ENABLE_JSON1=y +BR2_PACKAGE_SQLITE_ENABLE_UNLOCK_NOTIFY=y +BR2_PACKAGE_SQLITE_SECURE_DELETE=y +BR2_PACKAGE_SQLITE_NO_SYNC=y +BR2_PACKAGE_LIBLOCKFILE=y +BR2_PACKAGE_LIBGUDEV=y +BR2_PACKAGE_LIBV4L=y +# BR2_PACKAGE_LIBXKBCOMMON_RULES is not set +BR2_PACKAGE_JANSSON=y +BR2_PACKAGE_JSON_C=y +BR2_PACKAGE_LIBXML2=y +BR2_PACKAGE_LIBMODBUS=y +BR2_PACKAGE_CAN_UTILS=y +BR2_PACKAGE_DHCP=y +BR2_PACKAGE_DHCP_SERVER=y +BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK=y +BR2_PACKAGE_DHCP_RELAY=y +BR2_PACKAGE_DHCP_CLIENT=y +BR2_PACKAGE_DHCPCD5=y +BR2_PACKAGE_ETHTOOL=y +BR2_PACKAGE_HOSTAPD=y +BR2_PACKAGE_IFTOP=y +BR2_PACKAGE_IFUPDOWN=y +BR2_PACKAGE_IPERF=y +BR2_PACKAGE_IPERF3=y +BR2_PACKAGE_IPROUTE2=y +BR2_PACKAGE_IW=y +BR2_PACKAGE_LFTP=y +BR2_PACKAGE_LFTP_CMD_TORRENT=y +BR2_PACKAGE_LFTP_PROTO_HTTP=y +BR2_PACKAGE_LFTP_PROTO_SFTP=y +BR2_PACKAGE_LRZSZ=y +BR2_PACKAGE_NETWORK_MANAGER=y +BR2_PACKAGE_NETWORK_MANAGER_TUI=y +BR2_PACKAGE_OPENSSH=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y +BR2_PACKAGE_WPA_SUPPLICANT_WIFI_DISPLAY=y +BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING=y +BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y +BR2_PACKAGE_WPA_SUPPLICANT_EAP=y +BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT=y +BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG=y +BR2_PACKAGE_WPA_SUPPLICANT_WPS=y +BR2_PACKAGE_WPA_SUPPLICANT_WPA3=y +BR2_PACKAGE_WPA_SUPPLICANT_CLI=y +BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO=y +BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION=y +BR2_PACKAGE_FILE=y +BR2_PACKAGE_COREUTILS=y +BR2_PACKAGE_HTOP=y +BR2_PACKAGE_SYSTEMD_ANALYZE=y +BR2_PACKAGE_UTIL_LINUX_BINARIES=y +BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y +BR2_PACKAGE_UTIL_LINUX_RFKILL=y +BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=y +BR2_PACKAGE_LESS=y +BR2_PACKAGE_MC=y +BR2_PACKAGE_VIM=y +BR2_PACKAGE_BOOT_RUN=y +# BR2_PACKAGE_QT_MOVIE is not set +BR2_PACKAGE_LVGL_KIT=y +BR2_PACKAGE_LS_DEFAULT_ETH_CONFIG=y +BR2_PACKAGE_QT_USE_TSLIB=y +BR2_PACKAGE_AUTOREBOOT=y +# BR2_PACKAGE_LS2_SYS_CONFIG_TOOL is not set +BR2_PACKAGE_LS3_SYSTEM_TOOL=y +BR2_PACKAGE_LS3_SYSTEM_TOOL_QT=y +BR2_PACKAGE_LS3_SYSTEM_TOOL_QT_AUTO_START=y +BR2_PACKAGE_LOONGSON_RESIZE=y +BR2_PACKAGE_LOONGSON_KERNEL=y +BR2_PACKAGE_LOONGSON_KERNEL_PATH="~/tmp/bsp/test/2K300/kernel/" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_IMG_WITH_PARTITION_SIZE=300 +BR2_TARGET_ROOTFS_EXT2_SIZE="300M" +BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit -O ^metadata_csum" +BR2_TARGET_ROOTFS_EXT2_GZIP=y +BR2_TARGET_ROOTFS_TAR_GZIP=y +BR2_PACKAGE_HOST_CMAKE=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_PYTHON3=y diff --git a/configs/loongson2k500_defconfig b/configs/loongson2k500_defconfig index de19c204..28ab8c49 100644 --- a/configs/loongson2k500_defconfig +++ b/configs/loongson2k500_defconfig @@ -242,7 +242,7 @@ BR2_PACKAGE_LS_DEFAULT_ETH_IP="192.168.1.10 192.168.2.11" BR2_PACKAGE_QT_USE_TSLIB=y BR2_PACKAGE_LIBGO_LA=y # BR2_PACKAGE_LS2_SYS_CONFIG_TOOL is not set -BR2_TARGET_ROOTFS_TAR_GZIP=y +BR2_TARGET_ROOTFS_TAR_PIGZ=y BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y diff --git a/configs/loongson2k500_fastboot_defconfig b/configs/loongson2k500_fastboot_defconfig index 168d9530..373754ba 100644 --- a/configs/loongson2k500_fastboot_defconfig +++ b/configs/loongson2k500_fastboot_defconfig @@ -165,7 +165,7 @@ BR2_PACKAGE_LS_DEFAULT_ETH_CONFIG=y BR2_PACKAGE_LS_DEFAULT_ETH_NAME="eth0 eth1" BR2_PACKAGE_LS_DEFAULT_ETH_IP="192.168.1.10 192.168.2.11" BR2_PACKAGE_FASTBOOT_BUSYBOX=y -BR2_TARGET_ROOTFS_TAR_GZIP=y +BR2_TARGET_ROOTFS_TAR_PIGZ=y BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y diff --git a/configs/loongson2k500_mini_defconfig b/configs/loongson2k500_mini_defconfig index b1bff1a8..a95560b4 100644 --- a/configs/loongson2k500_mini_defconfig +++ b/configs/loongson2k500_mini_defconfig @@ -65,7 +65,7 @@ BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=y BR2_PACKAGE_BOOT_RUN=y BR2_PACKAGE_LVGL_KIT=y BR2_PACKAGE_TOUCH_SCREEN_MAP_VALUE=y -BR2_TARGET_ROOTFS_TAR_GZIP=y +BR2_TARGET_ROOTFS_TAR_PIGZ=y BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y diff --git a/configs/loongson2k500_mini_dp_4k_page_defconfig b/configs/loongson2k500_mini_dp_4k_page_defconfig index 009221f0..65752975 100644 --- a/configs/loongson2k500_mini_dp_4k_page_defconfig +++ b/configs/loongson2k500_mini_dp_4k_page_defconfig @@ -185,7 +185,7 @@ BR2_PACKAGE_LVGL_KIT=y BR2_PACKAGE_LS_DEFAULT_ETH_CONFIG=y BR2_PACKAGE_QT_USE_TSLIB=y BR2_PACKAGE_LIBGO_LA=y -BR2_TARGET_ROOTFS_TAR_GZIP=y +BR2_TARGET_ROOTFS_TAR_PIGZ=y BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x40000 BR2_TARGET_ROOTFS_UBI_SUBSIZE=4096 diff --git a/configs/loongson2k500_mini_dp_defconfig b/configs/loongson2k500_mini_dp_defconfig index b09b8bfe..508c2c58 100644 --- a/configs/loongson2k500_mini_dp_defconfig +++ b/configs/loongson2k500_mini_dp_defconfig @@ -211,7 +211,7 @@ BR2_PACKAGE_LVGL_KIT=y BR2_PACKAGE_LS_DEFAULT_ETH_CONFIG=y BR2_PACKAGE_QT_USE_TSLIB=y BR2_PACKAGE_LIBGO_LA=y -BR2_TARGET_ROOTFS_TAR_GZIP=y +BR2_TARGET_ROOTFS_TAR_PIGZ=y BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y diff --git a/configs/loongson2k500_mini_dp_mini_defconfig b/configs/loongson2k500_mini_dp_mini_defconfig index 449e9a94..b83ea1ea 100644 --- a/configs/loongson2k500_mini_dp_mini_defconfig +++ b/configs/loongson2k500_mini_dp_mini_defconfig @@ -59,7 +59,7 @@ BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=y BR2_PACKAGE_BOOT_RUN=y BR2_PACKAGE_LVGL_KIT=y -BR2_TARGET_ROOTFS_TAR_GZIP=y +BR2_TARGET_ROOTFS_TAR_PIGZ=y BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y diff --git a/configs/loongson2k500_pure_busybox_defconfig b/configs/loongson2k500_pure_busybox_defconfig index 92839d43..72cddbf9 100644 --- a/configs/loongson2k500_pure_busybox_defconfig +++ b/configs/loongson2k500_pure_busybox_defconfig @@ -26,7 +26,7 @@ BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS=y BR2_PACKAGE_UTIL_LINUX_FSCK=y BR2_PACKAGE_UTIL_LINUX_MOUNT=y # BR2_PACKAGE_LS2_SYS_CONFIG_TOOL is not set -BR2_TARGET_ROOTFS_TAR_GZIP=y +BR2_TARGET_ROOTFS_TAR_PIGZ=y BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y diff --git a/configs/loongson2k500_rt_defconfig b/configs/loongson2k500_rt_defconfig index d14bbf7d..9c880cdf 100644 --- a/configs/loongson2k500_rt_defconfig +++ b/configs/loongson2k500_rt_defconfig @@ -59,7 +59,7 @@ BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS=y BR2_PACKAGE_UTIL_LINUX_FSCK=y BR2_PACKAGE_UTIL_LINUX_MOUNT=y # BR2_PACKAGE_LS2_SYS_CONFIG_TOOL is not set -BR2_TARGET_ROOTFS_TAR_GZIP=y +BR2_TARGET_ROOTFS_TAR_PIGZ=y BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y diff --git a/configs/loongson2k500_test_defconfig b/configs/loongson2k500_test_defconfig index 02374f79..67cf31ce 100644 --- a/configs/loongson2k500_test_defconfig +++ b/configs/loongson2k500_test_defconfig @@ -174,7 +174,7 @@ BR2_PACKAGE_LS_DEFAULT_ETH_NAME="eth0 eth1" BR2_PACKAGE_LS_DEFAULT_ETH_IP="192.168.1.10 192.168.2.11" BR2_PACKAGE_LIBGO_LA=y BR2_PACKAGE_AUTOREBOOT=y -BR2_TARGET_ROOTFS_TAR_GZIP=y +BR2_TARGET_ROOTFS_TAR_PIGZ=y BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y diff --git a/configs/loongson2p500_defconfig b/configs/loongson2p500_defconfig index bb4ce43f..88410d5d 100644 --- a/configs/loongson2p500_defconfig +++ b/configs/loongson2p500_defconfig @@ -292,8 +292,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="512M" BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit -O ^metadata_csum" -BR2_TARGET_ROOTFS_EXT2_GZIP=y -BR2_TARGET_ROOTFS_TAR_GZIP=y +BR2_TARGET_ROOTFS_EXT2_PIGZ=y +BR2_TARGET_ROOTFS_TAR_PIGZ=y BR2_PACKAGE_HOST_CMAKE=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/loongson_ramdisk_defconfig b/configs/loongson_ramdisk_defconfig new file mode 100644 index 00000000..80978074 --- /dev/null +++ b/configs/loongson_ramdisk_defconfig @@ -0,0 +1,42 @@ +BR2_loongarch64=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_PATH="/opt/loongson-gnu-toolchain-x86_64-loongarch64-linux-gnu" +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-linux-gnu" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y +BR2_TOOLCHAIN_EXTERNAL_CXX=y +BR2_TARGET_GENERIC_HOSTNAME="LS-GD" +BR2_TARGET_GENERIC_ISSUE="Welcome to Loongson-gd ramdisk" +BR2_TARGET_GENERIC_PASSWD_SHA512=y +BR2_ROOTFS_MERGED_USR=y +# BR2_TARGET_ENABLE_ROOT_LOGIN is not set +# BR2_TARGET_GENERIC_GETTY is not set +BR2_SYSTEM_DEFAULT_PATH="/bin:/sbin:/usr/bin:/usr/sbin" +# BR2_ENABLE_LOCALE_PURGE is not set +BR2_ROOTFS_OVERLAY="board/loongson/ls2k1000la/rootfs_ramdisk_overlay" +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_GZIP=y +BR2_PACKAGE_PIGZ=y +BR2_PACKAGE_PV=y +BR2_PACKAGE_E2FSPROGS=y +BR2_PACKAGE_ETHTOOL=y +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set +BR2_PACKAGE_IPROUTE2=y +BR2_PACKAGE_RSYNC=y +# BR2_PACKAGE_URANDOM_SCRIPTS is not set +BR2_PACKAGE_BASH=y +BR2_PACKAGE_UTIL_LINUX_LIBFDISK=y +BR2_PACKAGE_UTIL_LINUX_FSCK=y +BR2_PACKAGE_UTIL_LINUX_LOSETUP=y +BR2_PACKAGE_UTIL_LINUX_MOUNT=y +BR2_PACKAGE_UTIL_LINUX_PARTX=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_SIZE="32M" +BR2_TARGET_ROOTFS_EXT2_GZIP=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_PACKAGE_HOST_CMAKE=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MKPASSWD=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/dl/ls2_sys_config_tool/ls2_sys_config_tool-origin_master-br1.tar.gz b/dl/ls2_sys_config_tool/ls2_sys_config_tool-origin_master-br1.tar.gz new file mode 100644 index 00000000..4e368d41 Binary files /dev/null and b/dl/ls2_sys_config_tool/ls2_sys_config_tool-origin_master-br1.tar.gz differ diff --git a/fs/common.mk b/fs/common.mk index afab7b50..d3838745 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -159,6 +159,10 @@ ROOTFS_$(2)_DEPENDENCIES += host-zstd ROOTFS_$(2)_COMPRESS_EXT = .zst ROOTFS_$(2)_COMPRESS_CMD = zstd -19 -z -f -T$(PARALLEL_JOBS) endif +ifeq ($(BR2_TARGET_ROOTFS_$(2)_PIGZ),y) +ROOTFS_$(2)_COMPRESS_EXT = .gz +ROOTFS_$(2)_COMPRESS_CMD = pigz -9 -c -n +endif $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): ROOTFS=$(2) $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): FAKEROOT_SCRIPT=$$(ROOTFS_$(2)_DIR)/fakeroot diff --git a/fs/ext2/Config.in b/fs/ext2/Config.in index cd5915f8..d1eeb2d7 100644 --- a/fs/ext2/Config.in +++ b/fs/ext2/Config.in @@ -34,6 +34,25 @@ config BR2_TARGET_ROOTFS_IMG depends on BR2_TARGET_ROOTFS_EXT2_4 default y +config BR2_TARGET_ROOTFS_IMG_WITH_PARTITION + bool "img with partition" + depends on BR2_TARGET_ROOTFS_IMG + default y + help + if select this must use BR2_TARGET_ROOTFS_IMG_WITH_PARTITION_SIZE + as the size of the filesystem image + BR2_TARGET_ROOTFS_EXT2_SIZE is unused + and unit is M (default 512M) + and must use number + +config BR2_TARGET_ROOTFS_IMG_WITH_PARTITION_SIZE + int "M about img size" + depends on BR2_TARGET_ROOTFS_IMG_WITH_PARTITION + default 512 + help + unit is M (default 512M) + and must use number + config BR2_TARGET_ROOTFS_EXT2_GEN int default 2 if BR2_TARGET_ROOTFS_EXT2_2 @@ -136,6 +155,11 @@ config BR2_TARGET_ROOTFS_EXT2_XZ help Do compress the ext2 filesystem with xz. +config BR2_TARGET_ROOTFS_EXT2_PIGZ + bool "pigz" + help + Do compress the ext2 filesystem with pigz. + endchoice endif # BR2_TARGET_ROOTFS_EXT2 diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk index 10be3fb1..1c5539ed 100644 --- a/fs/ext2/ext2.mk +++ b/fs/ext2/ext2.mk @@ -4,7 +4,11 @@ # ################################################################################ +ifeq ($(BR2_TARGET_ROOTFS_IMG_WITH_PARTITION),y) +EXT2_SIZE = $(shell expr $(BR2_TARGET_ROOTFS_IMG_WITH_PARTITION_SIZE) - 1)M +else EXT2_SIZE = $(call qstrip,$(BR2_TARGET_ROOTFS_EXT2_SIZE)) +endif ifeq ($(BR2_TARGET_ROOTFS_EXT2)-$(EXT2_SIZE),y-) $(error BR2_TARGET_ROOTFS_EXT2_SIZE cannot be empty) endif @@ -26,6 +30,30 @@ EXT2_OPTS = \ ROOTFS_EXT2_DEPENDENCIES = host-e2fsprogs +ifeq ($(BR2_TARGET_ROOTFS_IMG_WITH_PARTITION),y) +define ROOTFS_PARTITION_TABLE_CMD + dd if=/dev/zero of=$(BINARIES_DIR)/table.img bs=1M count=$(BR2_TARGET_ROOTFS_IMG_WITH_PARTITION_SIZE) + echo "o" > $(BINARIES_DIR)/fdisk.txt + echo "n" >> $(BINARIES_DIR)/fdisk.txt + echo "p" >> $(BINARIES_DIR)/fdisk.txt + echo "1" >> $(BINARIES_DIR)/fdisk.txt + echo "" >> $(BINARIES_DIR)/fdisk.txt + echo "" >> $(BINARIES_DIR)/fdisk.txt + echo "w" >> $(BINARIES_DIR)/fdisk.txt + $(HOST_DIR)/sbin/fdisk $(BINARIES_DIR)/table.img < $(BINARIES_DIR)/fdisk.txt + dd if=$(BINARIES_DIR)/table.img of=$(BINARIES_DIR)/table-1.img bs=1M count=1 + mv $(BINARIES_DIR)/table-1.img $(BINARIES_DIR)/table.img + cat $(BINARIES_DIR)/table.img $(BINARIES_DIR)/rootfs.ext2 > $(BINARIES_DIR)/rootfs.ext2.new + mv $(BINARIES_DIR)/rootfs.ext2.new $(BINARIES_DIR)/rootfs.ext2 + rm -rf $(BINARIES_DIR)/table.img + rm -rf $(BINARIES_DIR)/fdisk.txt +endef +else +define ROOTFS_PARTITION_TABLE_CMD + echo "" +endef +endif + define ROOTFS_EXT2_CMD rm -f $@ $(HOST_DIR)/sbin/mkfs.ext$(BR2_TARGET_ROOTFS_EXT2_GEN) $(EXT2_OPTS) $@ \ @@ -34,6 +62,7 @@ define ROOTFS_EXT2_CMD echo "*** Maybe you need to increase the filesystem size (BR2_TARGET_ROOTFS_EXT2_SIZE)" 1>&2; \ exit $$ret; \ } + $(ROOTFS_PARTITION_TABLE_CMD) endef ifneq ($(BR2_TARGET_ROOTFS_EXT2_GEN),2) diff --git a/fs/tar/Config.in b/fs/tar/Config.in index a4e375c6..f8f2d92d 100644 --- a/fs/tar/Config.in +++ b/fs/tar/Config.in @@ -46,6 +46,11 @@ config BR2_TARGET_ROOTFS_TAR_XZ help Do compress the tarball with xz. +config BR2_TARGET_ROOTFS_TAR_PIGZ + bool "pigz" + help + Do compress the tarball with pigz. + endchoice config BR2_TARGET_ROOTFS_TAR_OPTIONS diff --git a/package/autoreboot/Config.in b/package/autoreboot/Config.in index 850ca729..4b19b3b9 100644 --- a/package/autoreboot/Config.in +++ b/package/autoreboot/Config.in @@ -13,3 +13,10 @@ config BR2_PACKAGE_AUTOREBOOT if you want to enable this service you can run this command 'systemctl enable autoreboot' +config BR2_PACKAGE_AUTOREBOOT_START + bool "run autoreboot test after boot" + depends on BR2_PACKAGE_AUTOREBOOT + default n + help + it'll enable and start autoreboot.service + diff --git a/package/autoreboot/autoreboot.mk b/package/autoreboot/autoreboot.mk index 3a10a256..731c331b 100644 --- a/package/autoreboot/autoreboot.mk +++ b/package/autoreboot/autoreboot.mk @@ -31,7 +31,6 @@ define AUTOREBOOT_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/multi-user.target.wants cd $(@D)/autoreboot && cp autoreboot.service $(TARGET_DIR)/usr/lib/systemd/system/ - cd $(TARGET_DIR)/usr/lib/systemd/system/multi-user.target.wants && ln -b -s ../autoreboot.service autoreboot_service mkdir -p $(TARGET_DIR)/opt cd $(@D)/autoreboot && cp autoreboot.sh $(TARGET_DIR)/opt endef @@ -41,10 +40,16 @@ define AUTOREBOOT_INSTALL_TARGET_CMDS endef endif +ifeq ($(BR2_PACKAGE_AUTOREBOOT_START), y) +define AUTOREBOOT_START + cd $(TARGET_DIR)/usr/lib/systemd/system/multi-user.target.wants && ln -b -s ../autoreboot.service autoreboot_service +endef +endif #define BUILD_AUTOREBOOT_ADD_TLS_LINK # mkdir -p $(TARGET_DIR)/usr/lib64/tls; cd $(TARGET_DIR)/usr/lib64/tls; if ! test -L loongarch ; then ln -s ../../lib64/ loongarch; fi #endef # #AUTOREBOOT_TARGET_FINALIZE_HOOKS += BUILD_AUTOREBOOT_ADD_TLS_LINK +AUTOREBOOT_TARGET_FINALIZE_HOOKS += AUTOREBOOT_START $(eval $(generic-package)) diff --git a/package/loongson_kernel/Config.in b/package/loongson_kernel/Config.in index 2a263ef2..f6f9665c 100644 --- a/package/loongson_kernel/Config.in +++ b/package/loongson_kernel/Config.in @@ -23,3 +23,11 @@ config BR2_PACKAGE_LOONGSON_KERNEL_PATH string "uImage file path in host site" depends on BR2_PACKAGE_LOONGSON_KERNEL +config BR2_PACKAGE_LOONGSON_KERNEL_MODULES + bool "Loongson Linux Kernel Modules" + depends on BR2_PACKAGE_LOONGSON_KERNEL + default y + help + Enable this option if you want to put kernel objects in /usr/lib/modules + + diff --git a/package/loongson_kernel/loongson_kernel.mk b/package/loongson_kernel/loongson_kernel.mk index d55b9a21..998dc823 100644 --- a/package/loongson_kernel/loongson_kernel.mk +++ b/package/loongson_kernel/loongson_kernel.mk @@ -8,13 +8,14 @@ LOONGSON_KERNEL_SITE = $(TOPDIR)/package/loongson_kernel/loongson_kernel.tar.gz LOONGSON_KERNEL_SITE_METHOD = file define LOONGSON_KERNEL_EXTRACT_CMDS - tar -xzf $(LOONGSON_KERNEL_SITE) -C $(@D)/ --strip-components 1 --wildcards */uImage + tar -xzf $(LOONGSON_KERNEL_SITE) -C $(@D)/ --strip-components 1 endef define LOONGSON_KERNEL_INSTALL_TARGET_CMDS echo "install LSGD Kernel" mkdir -p $(TARGET_DIR)/boot cd $(@D) && cp uImage $(TARGET_DIR)/boot + cd $(@D) && mv lib/modules/ $(TARGET_DIR)/usr/lib/ endef $(eval $(generic-package)) diff --git a/package/loongson_kernel/loongson_kernel.tar.gz b/package/loongson_kernel/loongson_kernel.tar.gz index ed59cb8a..6dd252d3 100644 Binary files a/package/loongson_kernel/loongson_kernel.tar.gz and b/package/loongson_kernel/loongson_kernel.tar.gz differ diff --git a/package/loongson_resize/loongson_resize.mk b/package/loongson_resize/loongson_resize.mk index fae2ec27..8809a7fe 100644 --- a/package/loongson_resize/loongson_resize.mk +++ b/package/loongson_resize/loongson_resize.mk @@ -18,9 +18,11 @@ endef define LOONGSON_RESIZE_INSTALL_TARGET_CMDS echo "install loongson resize init.d/profile.d" - cd $(@D) && chmod a+x ./resizerootfs.sh && cp resizerootfs.sh $(TARGET_DIR)/root/ + mkdir -p $(TARGET_DIR)/usr/local/ls_resize + cd $(@D) && chmod a+x ./resizerootfs.sh && cp resizerootfs.sh $(TARGET_DIR)/usr/local/ls_resize/ + cd $(@D) && chmod a+x ./fdisk_resize.sh && cp fdisk_resize.sh $(TARGET_DIR)/usr/local/ls_resize/ mkdir -p $(TARGET_DIR)/etc/init.d - cd $(@D) && chmod a+x ./S01resizerootfs && cp S01resizerootfs $(TARGET_DIR)/etc/init.d + cd $(@D) && chmod a+x ./S03resizerootfs && cp S03resizerootfs $(TARGET_DIR)/etc/init.d cd $(@D) && cp loongson-resize.service $(TARGET_DIR)/usr/lib/systemd/system/ cd $(TARGET_DIR)/usr/lib/systemd/system/sysinit.target.wants && ln -sf ../loongson-resize.service loongson-resize.service endef diff --git a/package/loongson_resize/loongson_resize.tar.gz b/package/loongson_resize/loongson_resize.tar.gz index 6e35cf3c..9326763f 100644 Binary files a/package/loongson_resize/loongson_resize.tar.gz and b/package/loongson_resize/loongson_resize.tar.gz differ diff --git a/package/ls2_sys_config_tool/ls2_sys_config_tool.mk b/package/ls2_sys_config_tool/ls2_sys_config_tool.mk index a6810622..8214ee58 100644 --- a/package/ls2_sys_config_tool/ls2_sys_config_tool.mk +++ b/package/ls2_sys_config_tool/ls2_sys_config_tool.mk @@ -7,8 +7,15 @@ LS2_SYS_CONFIG_TOOL_VERSION = origin/master LS2_SYS_CONFIG_TOOL_SITE = http://10.120.1.5:3000/base/sys_config_tool LS2_SYS_CONFIG_TOOL_SITE_METHOD = git +LS2_SYS_CONFIG_TOOL_GIT_SUBMODULES = YES LS2_SYS_CONFIG_TOOL_CFLAGS = $(TARGET_CFLAGS) +ifeq ($(BR2_INIT_SYSTEMD),y) +LS2_SYS_CONFIG_TOOL_DEPLOY_WAY=1 +else +LS2_SYS_CONFIG_TOOL_DEPLOY_WAY=0 +endif + ifeq ($(BR2_PACKAGE_LS2_SYS_CONFIG_TOOL_QT),y) LS2_SYS_CONFIG_TOOL_DEPENDENCIES = qt5base endif @@ -58,6 +65,7 @@ define LS2_SYS_CONFIG_TOOL_BUILD_CMDS cd $(@D)/cmd_version && $(MAKE) clean && $(TARGET_MAKE_ENV) $(MAKE) CC=$(TARGET_CC) BUILD_TYPE=3 && cp sys_config_tool update_uboot cd $(@D)/cmd_version && $(MAKE) clean && $(TARGET_MAKE_ENV) $(MAKE) CC=$(TARGET_CC) BUILD_TYPE=2 && cp sys_config_tool update_system cd $(@D)/cmd_version && $(MAKE) clean && $(TARGET_MAKE_ENV) $(MAKE) CC=$(TARGET_CC) + cd $(@D)/cmd_version && cp update_uboot update_system sys_config_tool $(@D) echo "second build qt version software" $(LS2_SYS_CONFIG_TOOL_BUILD_QT_VER_CMDS) endef @@ -68,13 +76,7 @@ endef define LS2_SYS_CONFIG_TOOL_INSTALL_TARGET_CMDS echo "install cmd version sofeware" - cd $(TARGET_DIR)/ && mkdir -p ./root/ls2_sys_config_tool/file - cd $(@D)/file && cp -r download_system_tftp $(TARGET_DIR)/root/ls2_sys_config_tool/file/download_system - cd $(@D)/file && cp -r install_system $(TARGET_DIR)/root/ls2_sys_config_tool/file/ - cd $(@D)/file && cp -r fstab $(TARGET_DIR)/root/ls2_sys_config_tool/file/ - cd $(@D)/cmd_version && cp sys_config_tool $(TARGET_DIR)/root/ls2_sys_config_tool/ - cd $(@D)/cmd_version && cp update_system $(TARGET_DIR)/root/ls2_sys_config_tool/ - cd $(@D)/cmd_version && cp update_uboot $(TARGET_DIR)/root/ls2_sys_config_tool/ + cd $(@D) && ./deploy_budilroot.sh $(LS2_SYS_CONFIG_TOOL_DEPLOY_WAY) $(TARGET_DIR) $(LS2_SYS_CONFIG_TOOL_INSTALL_QT_VER_CMDS) $(LS2_SYS_CONFIG_TOOL_INSTALL_AUTO_EXEC_AFTER_BOOT_CMDS) endef diff --git a/package/ls_default_eth_config/ls_default_eth_config.mk b/package/ls_default_eth_config/ls_default_eth_config.mk index f001d7a9..5fba61fd 100644 --- a/package/ls_default_eth_config/ls_default_eth_config.mk +++ b/package/ls_default_eth_config/ls_default_eth_config.mk @@ -39,7 +39,8 @@ endef define INSTALL_LS_DEFAULT_ETH_CONFIG_GEN echo "install keep-nmcli.sh and keep-nmcli.service" - cd $(@D) && cp keep-nmcli.sh $(TARGET_DIR)/root/ + mkdir -p $(TARGET_DIR)/usr/local + cd $(@D) && cp keep-nmcli.sh $(TARGET_DIR)/usr/local cd $(@D) && cp keep-nmcli.service $(TARGET_DIR)/usr/lib/systemd/system/ cd $(TARGET_DIR)/usr/lib/systemd/system/multi-user.target.wants && ln -sf ../keep-nmcli.service keep-nmcli.service endef diff --git a/package/ls_default_eth_config/ls_default_eth_config.tar.gz b/package/ls_default_eth_config/ls_default_eth_config.tar.gz index 9e35abc3..cd444b58 100644 Binary files a/package/ls_default_eth_config/ls_default_eth_config.tar.gz and b/package/ls_default_eth_config/ls_default_eth_config.tar.gz differ