mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-05-01 07:50:23 +02:00
Merge branch 'aarch64' into next
Conflicts: config/rootfiles/core/121/filelists/acpid config/rootfiles/core/121/filelists/apache2 config/rootfiles/core/121/filelists/apr config/rootfiles/core/121/filelists/aprutil config/rootfiles/core/121/filelists/armv5tel/files config/rootfiles/core/121/filelists/armv5tel/linux-initrd-kirkwood config/rootfiles/core/121/filelists/armv5tel/linux-initrd-multi config/rootfiles/core/121/filelists/armv5tel/linux-kirkwood config/rootfiles/core/121/filelists/armv5tel/linux-multi config/rootfiles/core/121/filelists/armv5tel/rpi-firmware config/rootfiles/core/121/filelists/armv5tel/u-boot config/rootfiles/core/121/filelists/armv5tel/u-boot-kirkwood config/rootfiles/core/121/filelists/armv5tel/u-boot-mkimage config/rootfiles/core/121/filelists/beep config/rootfiles/core/121/filelists/cmake config/rootfiles/core/121/filelists/crda config/rootfiles/core/121/filelists/dhcp config/rootfiles/core/121/filelists/flex config/rootfiles/core/121/filelists/i586/grub config/rootfiles/core/121/filelists/i586/intel-microcode config/rootfiles/core/121/filelists/i586/linux config/rootfiles/core/121/filelists/i586/linux-initrd config/rootfiles/core/121/filelists/iw config/rootfiles/core/121/filelists/jwhois config/rootfiles/core/121/filelists/libidn config/rootfiles/core/121/filelists/multipath-tools config/rootfiles/core/121/filelists/pcre config/rootfiles/core/121/filelists/tar config/rootfiles/core/121/filelists/unbound config/rootfiles/core/121/filelists/wget config/rootfiles/core/121/filelists/x86_64/grub config/rootfiles/core/121/filelists/x86_64/intel-microcode config/rootfiles/core/121/filelists/x86_64/linux config/rootfiles/core/121/filelists/x86_64/linux-initrd config/rootfiles/core/122/filelists/aarch64/files config/rootfiles/core/122/filelists/acpid config/rootfiles/core/122/filelists/apache2 config/rootfiles/core/122/filelists/apr config/rootfiles/core/122/filelists/aprutil config/rootfiles/core/122/filelists/armv5tel/linux-initrd-kirkwood config/rootfiles/core/122/filelists/armv5tel/linux-initrd-multi config/rootfiles/core/122/filelists/armv5tel/linux-kirkwood config/rootfiles/core/122/filelists/armv5tel/linux-multi config/rootfiles/core/122/filelists/armv5tel/rpi-firmware config/rootfiles/core/122/filelists/armv5tel/u-boot config/rootfiles/core/122/filelists/armv5tel/u-boot-kirkwood config/rootfiles/core/122/filelists/armv5tel/u-boot-mkimage config/rootfiles/core/122/filelists/beep config/rootfiles/core/122/filelists/cmake config/rootfiles/core/122/filelists/crda config/rootfiles/core/122/filelists/dhcp config/rootfiles/core/122/filelists/flex config/rootfiles/core/122/filelists/i586/grub config/rootfiles/core/122/filelists/i586/intel-microcode config/rootfiles/core/122/filelists/i586/linux config/rootfiles/core/122/filelists/i586/linux-initrd config/rootfiles/core/122/filelists/iw config/rootfiles/core/122/filelists/jwhois config/rootfiles/core/122/filelists/libidn config/rootfiles/core/122/filelists/multipath-tools config/rootfiles/core/122/filelists/pcre config/rootfiles/core/122/filelists/tar config/rootfiles/core/122/filelists/unbound config/rootfiles/core/122/filelists/wget config/rootfiles/core/122/filelists/x86_64/grub config/rootfiles/core/122/filelists/x86_64/intel-microcode config/rootfiles/core/122/filelists/x86_64/linux config/rootfiles/core/122/filelists/x86_64/linux-initrd config/rootfiles/core/123/filelists/unbound config/rootfiles/oldcore/121/filelists/acpid config/rootfiles/oldcore/121/filelists/apache2 config/rootfiles/oldcore/121/filelists/apr config/rootfiles/oldcore/121/filelists/aprutil config/rootfiles/oldcore/121/filelists/armv5tel/files config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-kirkwood config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-multi config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-rpi config/rootfiles/oldcore/121/filelists/armv5tel/linux-kirkwood config/rootfiles/oldcore/121/filelists/armv5tel/linux-multi config/rootfiles/oldcore/121/filelists/armv5tel/linux-rpi config/rootfiles/oldcore/121/filelists/armv5tel/rpi-firmware config/rootfiles/oldcore/121/filelists/armv5tel/u-boot config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-kirkwood config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-mkimage config/rootfiles/oldcore/121/filelists/beep config/rootfiles/oldcore/121/filelists/cmake config/rootfiles/oldcore/121/filelists/crda config/rootfiles/oldcore/121/filelists/dhcp config/rootfiles/oldcore/121/filelists/flex config/rootfiles/oldcore/121/filelists/i586/grub config/rootfiles/oldcore/121/filelists/i586/intel-microcode config/rootfiles/oldcore/121/filelists/i586/linux config/rootfiles/oldcore/121/filelists/i586/linux-initrd config/rootfiles/oldcore/121/filelists/iw config/rootfiles/oldcore/121/filelists/jwhois config/rootfiles/oldcore/121/filelists/libidn config/rootfiles/oldcore/121/filelists/multipath-tools config/rootfiles/oldcore/121/filelists/pcre config/rootfiles/oldcore/121/filelists/tar config/rootfiles/oldcore/121/filelists/wget config/rootfiles/oldcore/121/filelists/x86_64/grub config/rootfiles/oldcore/121/filelists/x86_64/intel-microcode config/rootfiles/oldcore/121/filelists/x86_64/linux config/rootfiles/oldcore/121/filelists/x86_64/linux-initrd make.sh
This commit is contained in:
Arne Fitzenreiter
@@ -119,6 +119,7 @@ etc/rc.d/rc0.d/S80mountfs
|
||||
etc/rc.d/rc0.d/S90swap
|
||||
etc/rc.d/rc0.d/S99halt
|
||||
#etc/rc.d/rc3.d
|
||||
etc/rc.d/rc3.d/S00random
|
||||
etc/rc.d/rc3.d/S01vnstat
|
||||
etc/rc.d/rc3.d/S10sysklogd
|
||||
etc/rc.d/rc3.d/S11unbound
|
||||
@@ -132,7 +133,6 @@ etc/rc.d/rc3.d/S19wlanclient
|
||||
etc/rc.d/rc3.d/S20network
|
||||
etc/rc.d/rc3.d/S21leds
|
||||
etc/rc.d/rc3.d/S24cyrus-sasl
|
||||
etc/rc.d/rc3.d/S25random
|
||||
etc/rc.d/rc3.d/S30sshd
|
||||
etc/rc.d/rc3.d/S32apache
|
||||
etc/rc.d/rc3.d/S40fcron
|
||||
|
||||
2
config/rootfiles/common/aarch64/linux-initrd-multi
Normal file
2
config/rootfiles/common/aarch64/linux-initrd-multi
Normal file
@@ -0,0 +1,2 @@
|
||||
#boot/uInit-KVER-ipfire-multi
|
||||
boot/initramfs-KVER-ipfire-multi.img
|
||||
2692
config/rootfiles/common/aarch64/linux-multi
Normal file
2692
config/rootfiles/common/aarch64/linux-multi
Normal file
File diff suppressed because it is too large
Load Diff
18
config/rootfiles/common/aarch64/rpi-firmware
Normal file
18
config/rootfiles/common/aarch64/rpi-firmware
Normal file
@@ -0,0 +1,18 @@
|
||||
#boot/LICENCE.broadcom
|
||||
boot/bootcode.bin
|
||||
boot/cmdline.txt
|
||||
boot/config.txt
|
||||
boot/fixup.dat
|
||||
boot/fixup_cd.dat
|
||||
boot/fixup_db.dat
|
||||
boot/fixup_x.dat
|
||||
boot/start.elf
|
||||
boot/start_cd.elf
|
||||
boot/start_db.elf
|
||||
boot/start_x.elf
|
||||
lib/firmware/brcm/brcmfmac43430-sdio.bin
|
||||
lib/firmware/brcm/brcmfmac43430-sdio.txt
|
||||
lib/firmware/brcm/brcmfmac43430a0-sdio.bin
|
||||
lib/firmware/brcm/brcmfmac43455-sdio.bin
|
||||
lib/firmware/brcm/brcmfmac43455-sdio.clm_blob
|
||||
lib/firmware/brcm/brcmfmac43455-sdio.txt
|
||||
9
config/rootfiles/common/aarch64/u-boot
Normal file
9
config/rootfiles/common/aarch64/u-boot
Normal file
@@ -0,0 +1,9 @@
|
||||
boot/boot.cmd
|
||||
boot/boot.mk
|
||||
boot/boot.scr
|
||||
boot/kernel8.img
|
||||
boot/uEnv.txt
|
||||
boot/uboot.env
|
||||
#usr/share/u-boot
|
||||
#usr/share/u-boot/rpi3
|
||||
usr/share/u-boot/rpi3/kernel8.img
|
||||
1
config/rootfiles/common/aarch64/u-boot-mkimage
Normal file
1
config/rootfiles/common/aarch64/u-boot-mkimage
Normal file
@@ -0,0 +1 @@
|
||||
usr/bin/mkimage
|
||||
@@ -119,6 +119,7 @@ etc/rc.d/rc0.d/S80mountfs
|
||||
etc/rc.d/rc0.d/S90swap
|
||||
etc/rc.d/rc0.d/S99halt
|
||||
#etc/rc.d/rc3.d
|
||||
etc/rc.d/rc3.d/S00random
|
||||
etc/rc.d/rc3.d/S01vnstat
|
||||
etc/rc.d/rc3.d/S10sysklogd
|
||||
etc/rc.d/rc3.d/S11unbound
|
||||
@@ -132,7 +133,6 @@ etc/rc.d/rc3.d/S19wlanclient
|
||||
etc/rc.d/rc3.d/S20network
|
||||
etc/rc.d/rc3.d/S21leds
|
||||
etc/rc.d/rc3.d/S24cyrus-sasl
|
||||
etc/rc.d/rc3.d/S25random
|
||||
etc/rc.d/rc3.d/S30sshd
|
||||
etc/rc.d/rc3.d/S32apache
|
||||
etc/rc.d/rc3.d/S40fcron
|
||||
|
||||
@@ -118,6 +118,7 @@ etc/rc.d/rc0.d/S80mountfs
|
||||
etc/rc.d/rc0.d/S90swap
|
||||
etc/rc.d/rc0.d/S99halt
|
||||
#etc/rc.d/rc3.d
|
||||
etc/rc.d/rc3.d/S00random
|
||||
etc/rc.d/rc3.d/S01vnstat
|
||||
etc/rc.d/rc3.d/S10sysklogd
|
||||
etc/rc.d/rc3.d/S12acpid
|
||||
@@ -131,7 +132,6 @@ etc/rc.d/rc3.d/S20network
|
||||
etc/rc.d/rc3.d/S11unbound
|
||||
etc/rc.d/rc3.d/S21leds
|
||||
etc/rc.d/rc3.d/S24cyrus-sasl
|
||||
etc/rc.d/rc3.d/S25random
|
||||
etc/rc.d/rc3.d/S30sshd
|
||||
etc/rc.d/rc3.d/S32apache
|
||||
etc/rc.d/rc3.d/S40fcron
|
||||
|
||||
@@ -118,6 +118,7 @@ etc/rc.d/rc0.d/S80mountfs
|
||||
etc/rc.d/rc0.d/S90swap
|
||||
etc/rc.d/rc0.d/S99halt
|
||||
#etc/rc.d/rc3.d
|
||||
etc/rc.d/rc3.d/S00random
|
||||
etc/rc.d/rc3.d/S01vnstat
|
||||
etc/rc.d/rc3.d/S10sysklogd
|
||||
etc/rc.d/rc3.d/S12acpid
|
||||
@@ -131,7 +132,6 @@ etc/rc.d/rc3.d/S20network
|
||||
etc/rc.d/rc3.d/S11unbound
|
||||
etc/rc.d/rc3.d/S21leds
|
||||
etc/rc.d/rc3.d/S24cyrus-sasl
|
||||
etc/rc.d/rc3.d/S25random
|
||||
etc/rc.d/rc3.d/S30sshd
|
||||
etc/rc.d/rc3.d/S32apache
|
||||
etc/rc.d/rc3.d/S40fcron
|
||||
|
||||
Reference in New Issue
Block a user