mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-28 11:43:25 +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:
12
make.sh
12
make.sh
@@ -1137,6 +1137,17 @@ buildipfire() {
|
||||
# lfsmake2 backports KCFG="-multi"
|
||||
# lfsmake2 e1000e KCFG="-multi"
|
||||
# lfsmake2 igb KCFG="-multi"
|
||||
# lfsmake2 ixgbe KCFG="-multi"
|
||||
lfsmake2 xtables-addons KCFG="-multi"
|
||||
lfsmake2 linux-initrd KCFG="-multi"
|
||||
;;
|
||||
|
||||
aarch64)
|
||||
# arm multi platform (RPi3, OrangePi PC2 ...) kernel build
|
||||
lfsmake2 linux KCFG="-multi"
|
||||
# lfsmake2 backports KCFG="-multi"
|
||||
# lfsmake2 e1000e KCFG="-multi"
|
||||
# lfsmake2 igb KCFG="-multi"
|
||||
# lfsmake2 ixgbe KCFG="-multi"
|
||||
lfsmake2 xtables-addons KCFG="-multi"
|
||||
lfsmake2 linux-initrd KCFG="-multi"
|
||||
@@ -1323,7 +1334,6 @@ buildipfire() {
|
||||
lfsmake2 mc
|
||||
lfsmake2 wget
|
||||
lfsmake2 bridge-utils
|
||||
# lfsmake2 screen
|
||||
lfsmake2 smartmontools
|
||||
lfsmake2 htop
|
||||
lfsmake2 chkconfig
|
||||
|
||||
Reference in New Issue
Block a user