IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7859 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 04441d8a3c582aaed2a34f65934dfb7bda28b7e2
by git＠ipfire.org 20 Jul '18

20 Jul '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 04441d8a3c582aaed2a34f65934dfb7bda28b7e2 (commit) from 011204d96366bd8ca9e46e63a9edcb3a064a495f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 04441d8a3c582aaed2a34f65934dfb7bda28b7e2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 20 14:21:36 2018 +0000 asterisk: Don't optimise for builder Asterisk enables -march=native which renders the code incompatible to most systems. Fixes: #11793 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/asterisk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Difference in files: diff --git a/lfs/asterisk b/lfs/asterisk index 723639015..8bedb4f28 100755 --- a/lfs/asterisk +++ b/lfs/asterisk @@ -28,7 +28,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = asterisk -PAK_VER = 24 +PAK_VER = 25 DEPS = "jansson libsrtp opus" @@ -99,6 +99,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable res_srtp \ --enable EXTRA-SOUNDS-EN-GSM \ --enable MOH-OPSOUND-GSM \ + --disable BUILD_NATIVE \ menuselect.makeopts # add additional sounds hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, efi, updated. a570226765f6774c3eece1006b462d20d0b991f9
by git＠ipfire.org 20 Jul '18

20 Jul '18

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 011204d96366bd8ca9e46e63a9edcb3a064a495f
by git＠ipfire.org 20 Jul '18

20 Jul '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 011204d96366bd8ca9e46e63a9edcb3a064a495f (commit) from 413149f80dba07373b0a52ba39259ae656b9a65f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 011204d96366bd8ca9e46e63a9edcb3a064a495f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 20 12:06:11 2018 +0000 fireinfo: Import latest patches Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/fireinfo | 3 ++ ...-when-proc-cpuinfo-doesn-t-have-any-infor.patch | 34 ++++++++++++++++++++++ ...Ignore-any-systems-with-ID-Default-string.patch | 25 ++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 src/patches/fireinfo-Don-t-crash-when-proc-cpuinfo-doesn-t-have-any-infor.patch create mode 100644 src/patches/fireinfo-Ignore-any-systems-with-ID-Default-string.patch Difference in files: diff --git a/lfs/fireinfo b/lfs/fireinfo index dec588705..784685029 100644 --- a/lfs/fireinfo +++ b/lfs/fireinfo @@ -71,6 +71,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-Don-t-crash-when-proc-cpuinfo-doesn-t-have-any-infor.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-Ignore-any-systems-with-ID-Default-string.patch + cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) diff --git a/src/patches/fireinfo-Don-t-crash-when-proc-cpuinfo-doesn-t-have-any-infor.patch b/src/patches/fireinfo-Don-t-crash-when-proc-cpuinfo-doesn-t-have-any-infor.patch new file mode 100644 index 000000000..a99c618e9 --- /dev/null +++ b/src/patches/fireinfo-Don-t-crash-when-proc-cpuinfo-doesn-t-have-any-infor.patch @@ -0,0 +1,34 @@ +From e2b6025dea547bf8de4bd2b8056f2a8227c635f5 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Wed, 13 Jun 2018 20:56:41 +0200 +Subject: [PATCH 1/2] Don't crash when /proc/cpuinfo doesn't have any + information + +Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> +--- + src/fireinfo/cpu.py | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/fireinfo/cpu.py b/src/fireinfo/cpu.py +index 541575a..dc76caf 100644 +--- a/src/fireinfo/cpu.py ++++ b/src/fireinfo/cpu.py +@@ -108,10 +108,11 @@ class CPU(object): + """ + Return the model string of this CPU. + """ +- try: +- return self.__cpuinfo["model_name"] +- except KeyError: +- return self.__cpuinfo["Processor"] ++ for key in ("model_name", "Processor"): ++ try: ++ return self.__cpuinfo[key] ++ except KeyError: ++ pass + + @property + def vendor(self): +-- +2.12.2 + diff --git a/src/patches/fireinfo-Ignore-any-systems-with-ID-Default-string.patch b/src/patches/fireinfo-Ignore-any-systems-with-ID-Default-string.patch new file mode 100644 index 000000000..ace5d0133 --- /dev/null +++ b/src/patches/fireinfo-Ignore-any-systems-with-ID-Default-string.patch @@ -0,0 +1,25 @@ +From d1f6789178e141664895332af79dbe7aa9e5ab68 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Wed, 13 Jun 2018 20:58:42 +0200 +Subject: [PATCH 2/2] Ignore any systems with ID "Default string" + +Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> +--- + src/fireinfo/system.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/fireinfo/system.py b/src/fireinfo/system.py +index e3295af..73c3882 100644 +--- a/src/fireinfo/system.py ++++ b/src/fireinfo/system.py +@@ -42,6 +42,7 @@ INVALID_ID_STRINGS = ( + "N/A", "n/a", + "12345", "54321", "202020", + "Chassis", "chassis", ++ "Default string", + "EVAL", + "Not Applicable", + "None", "empty", +-- +2.12.2 + hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, efi, updated. 12034118dd0cf631efef85edc5d0944055a7ef5f
by git＠ipfire.org 20 Jul '18

20 Jul '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, efi has been updated via 12034118dd0cf631efef85edc5d0944055a7ef5f (commit) via 6cf5a533f50256e961023bed8300eef178ac398f (commit) via 43829df3bbc85e0bbdddbafeb91fd2fe6bccb6de (commit) via befc0404976287adfd52f76dd9c3a4ab6afe2ab9 (commit) via eadde44b05294152f88eeeb2401622dac6fd0f00 (commit) via c1397b7ab39e6ddeed64e3c63ff7012f5659df84 (commit) from 46a4581db662d70e781d59782d2e24a4c2968968 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 12034118dd0cf631efef85edc5d0944055a7ef5f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 20 11:59:00 2018 +0000 installer: Run install-bootloader script instead of own code This allows us to keep the GRUB installation routine in one place only. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6cf5a533f50256e961023bed8300eef178ac398f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 20 11:53:55 2018 +0000 partresize: Remove debugging line Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 43829df3bbc85e0bbdddbafeb91fd2fe6bccb6de Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 20 11:53:24 2018 +0000 partresize: Only regenerate configuration instead of re-installing GRUB This should not be necessary Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit befc0404976287adfd52f76dd9c3a4ab6afe2ab9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 20 11:51:50 2018 +0000 Move update-bootloader script into installer Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit eadde44b05294152f88eeeb2401622dac6fd0f00 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 20 11:47:35 2018 +0000 update-bootloader: Allow passing device to install GRUB on Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c1397b7ab39e6ddeed64e3c63ff7012f5659df84 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 20 11:34:55 2018 +0000 update-bootloader: Extend script to support EFI Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/aarch64/stage2 | 1 - config/rootfiles/common/installer | 1 + config/rootfiles/common/stage2 | 1 - config/rootfiles/common/x86_64/stage2 | 1 - src/initscripts/system/partresize | 6 +- src/installer/Makefile.am | 1 + src/installer/hw.c | 47 +----------- src/installer/hw.h | 3 - .../install-bootloader} | 88 +++++++++++++++++----- 9 files changed, 75 insertions(+), 74 deletions(-) rename src/{scripts/update-bootloader => installer/install-bootloader} (67%) Difference in files: diff --git a/config/rootfiles/common/aarch64/stage2 b/config/rootfiles/common/aarch64/stage2 index 70a33d659..110114c47 100644 --- a/config/rootfiles/common/aarch64/stage2 +++ b/config/rootfiles/common/aarch64/stage2 @@ -103,7 +103,6 @@ usr/local/bin/scanhd usr/local/bin/settime usr/local/bin/timecheck usr/local/bin/timezone-transition -usr/local/bin/update-bootloader usr/local/bin/update-lang-cache usr/local/bin/xt_geoip_build usr/local/bin/xt_geoip_update diff --git a/config/rootfiles/common/installer b/config/rootfiles/common/installer index ff8cda598..d4abb97aa 100644 --- a/config/rootfiles/common/installer +++ b/config/rootfiles/common/installer @@ -1,5 +1,6 @@ #usr/bin/downloadsource.sh #usr/bin/execute-postinstall.sh +usr/bin/install-bootloader #usr/bin/installer #usr/bin/start-networking.sh #usr/lib/dracut/modules.d/99installer diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index a5ba6ae26..5665f2301 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -101,7 +101,6 @@ usr/local/bin/scanhd usr/local/bin/settime usr/local/bin/timecheck usr/local/bin/timezone-transition -usr/local/bin/update-bootloader usr/local/bin/update-lang-cache usr/local/bin/xt_geoip_build usr/local/bin/xt_geoip_update diff --git a/config/rootfiles/common/x86_64/stage2 b/config/rootfiles/common/x86_64/stage2 index 70a33d659..110114c47 100644 --- a/config/rootfiles/common/x86_64/stage2 +++ b/config/rootfiles/common/x86_64/stage2 @@ -103,7 +103,6 @@ usr/local/bin/scanhd usr/local/bin/settime usr/local/bin/timecheck usr/local/bin/timezone-transition -usr/local/bin/update-bootloader usr/local/bin/update-lang-cache usr/local/bin/xt_geoip_build usr/local/bin/xt_geoip_update diff --git a/src/initscripts/system/partresize b/src/initscripts/system/partresize index 819d12885..2fad11251 100644 --- a/src/initscripts/system/partresize +++ b/src/initscripts/system/partresize @@ -38,12 +38,12 @@ case "${1}" in echo "GRUB_SERIAL_COMMAND=\"serial --unit=0 --speed=115200\"" >> /etc/default/grub sed -i -e "s|panic=10|& console=ttyS0,115200n8|g" /etc/default/grub fi - /usr/local/bin/update-bootloader + + # Re-generate GRUB configuration + /usr/sbin/grub-mkconfig -o /boot/grub/grub.cfg fi umount /boot > /dev/null - sleep 30 - # Detect device mount | while read -r dev tmp1 mountpoint tmp2; do [ "${dev}" = "rootfs" ] && continue diff --git a/src/installer/Makefile.am b/src/installer/Makefile.am index d0e52dc18..32f01bfa6 100644 --- a/src/installer/Makefile.am +++ b/src/installer/Makefile.am @@ -35,6 +35,7 @@ bin_PROGRAMS = \ bin_SCRIPTS = \ downloadsource.sh \ execute-postinstall.sh \ + install-bootloader \ start-networking.sh #- installer ------------------------------------------------------------------- diff --git a/src/installer/hw.c b/src/installer/hw.c index 3bd748036..c9b95017d 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -78,11 +78,6 @@ struct hw* hw_init() { if (ret == 0) snprintf(hw->arch, sizeof(hw->arch), "%s", uname_data.machine); - // Detect if we are running in EFI mode - ret = access("/sys/firmware/efi", R_OK); - if (ret == 0) - hw->efi_supported = 1; - // Should we install in EFI mode? if ((strcmp(hw->arch, "x86_64") == 0) || (strcmp(hw->arch, "aarch64") == 0)) hw->efi = 1; @@ -1041,47 +1036,9 @@ int hw_stop_all_raid_arrays(const char* output) { int hw_install_bootloader(struct hw* hw, struct hw_destination* dest, const char* output) { char cmd[STRING_SIZE]; - int r; - - char cmd_grub[STRING_SIZE]; - snprintf(cmd_grub, sizeof(cmd_grub), "/usr/sbin/grub-install --target=i386-pc" - " --no-floppy --recheck"); - - if (dest->is_raid) { - snprintf(cmd, sizeof(cmd), "%s %s", cmd_grub, dest->disk1->path); - r = system_chroot(output, DESTINATION_MOUNT_PATH, cmd); - if (r) - return r; - - snprintf(cmd, sizeof(cmd), "%s %s", cmd_grub, dest->disk2->path); - r = system_chroot(output, DESTINATION_MOUNT_PATH, cmd); - if (r) - return r; - } else { - snprintf(cmd, sizeof(cmd), "%s %s", cmd_grub, dest->path); - r = system_chroot(output, DESTINATION_MOUNT_PATH, cmd); - if (r) - return r; - } - - // Install GRUB in EFI mode - if (hw->efi) { - for (int removable = 0; removable < 1; removable++) { - snprintf(cmd, sizeof(cmd), "/usr/sbin/grub-install" - " --target=%s-efi --efi-directory=%s %s %s", - hw->arch, HW_PATH_BOOT_EFI, - (hw->efi_supported) ? "" : "--no-nvram", - (removable) ? "--removable" : ""); - - r = system_chroot(output, DESTINATION_MOUNT_PATH, cmd); - if (r) - return r; - } - } - // Generate configuration file - snprintf(cmd, sizeof(cmd), "/usr/sbin/grub-mkconfig -o /boot/grub/grub.cfg"); - r = system_chroot(output, DESTINATION_MOUNT_PATH, cmd); + snprintf(cmd, sizeof(cmd), "/usr/bin/install-bootloader %s", dest->path); + int r = system_chroot(output, DESTINATION_MOUNT_PATH, cmd); if (r) return r; diff --git a/src/installer/hw.h b/src/installer/hw.h index 4e0afc431..9fe69271e 100644 --- a/src/installer/hw.h +++ b/src/installer/hw.h @@ -63,9 +63,6 @@ struct hw { // Enabled if we should install in EFI mode int efi; - - // Enabled if this system supports EFI - int efi_supported; }; struct hw_disk { diff --git a/src/scripts/update-bootloader b/src/installer/install-bootloader similarity index 67% rename from src/scripts/update-bootloader rename to src/installer/install-bootloader index ad6fdb642..9c7869613 100644 --- a/src/scripts/update-bootloader +++ b/src/installer/install-bootloader @@ -21,7 +21,7 @@ # # ############################################################################ -GRUB_INSTALL_ARGS="--no-floppy --recheck" +GRUB_INSTALL_ARGS="--no-floppy --recheck --force" function find_bootloader_device() { local mp @@ -52,7 +52,7 @@ function find_device() { # Get the actual device from the partition that holds / while [ -n "${root}" ]; do if [ -e "/sys/block/${root}" ]; then - echo "${root}" + echo "/dev/${root}" return 0 fi @@ -66,15 +66,15 @@ function find_device() { function device_is_mdraid() { local device="${1}" - [ -d "/sys/block/${device}/md" ] + [ -d "/sys/block/${device/\/dev/}/md" ] } function mdraid_get_slaves() { local device="${1}" local slave - for slave in /sys/block/${device}/slaves/*; do - basename "${slave}" + for slave in /sys/block/${device/\/dev/}/slaves/*; do + echo "/dev/$(basename "${slave}")" done 2>/dev/null } @@ -99,44 +99,92 @@ function grub_install() { return 1 fi - local args - for args in "" "--force"; do - if grub-install ${GRUB_INSTALL_ARGS} ${args} "${device}" &>/dev/null; then - return 0 - fi + local arches + case "$(uname -m)" in + aarch64) + arches="arm64-efi" + ;; + i?86) + arches="i386-pc" + ;; + x86_64) + arches="i386-pc x86_64-efi" + ;; + esac + + local arch + for arch in ${arches}; do + local args="--target=${arch}" + + case "${arch}" in + *-efi) + # Skip all EFI architectures if no EFI partition exists + if [ ! -d "/boot/efi" ]; then + continue + fi + + args="${args} --efi-directory=/boot/efi" + + # Don't try to modify the BIOS when we are + # not running on EFI right now + if [ ! -d "/sys/firmware/efi" ]; then + args="${args} --no-nvram" + fi + ;; + esac + + local removable + for removable in "" "--removable"; do + if ! grub-install ${GRUB_INSTALL_ARGS} ${args} \ + ${removable} "${device}" &>/dev/null; then + echo "Could not install GRUB on ${device}" >&2 + return 1 + fi + + # Do not try to install with --removable for non-efi architectures + [[ "${arch}" =~ \-efi$ ]] || break + done done - echo "Could not install GRUB on ${device}" >&2 - return 1 + return 0 } function main() { + local device="${1}" + # Find the root device - local device="$(find_bootloader_device)" if [ -z "${device}" ]; then - echo "Could not find root device. Aborting." >&2 - exit 1 + device="$(find_bootloader_device)" + if [ -z "${device}" ]; then + echo "Could not find root device. Aborting." >&2 + return 1 + fi + + echo "Found bootloader device: ${device}" fi - echo "Found bootloader device: /dev/${device}" + if [ ! -b "${device}" ]; then + echo "${device} does not exist" >&2 + return 2 + fi # Update configuration files - grub_update_config || exit $? + grub_update_config || return $? # Handle mdraid devices if device_is_mdraid "${device}"; then local slave for slave in $(mdraid_get_slaves "${device}"); do - grub_install "/dev/${slave}" + grub_install "${slave}" done # Handle normal block devices else - grub_install "/dev/${device}" + grub_install "${device}" fi return 0 } # Run main function -main +main "$@" || exit $? hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, efi, updated. 46a4581db662d70e781d59782d2e24a4c2968968
by git＠ipfire.org 20 Jul '18

20 Jul '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, efi has been updated via 46a4581db662d70e781d59782d2e24a4c2968968 (commit) via f8f4ef0795753b7cfbb7ef18def75e147ee7303d (commit) via 413149f80dba07373b0a52ba39259ae656b9a65f (commit) via 0487a49fec8636a106bd01cb06be2d9bfaf209d7 (commit) via 66a29eaa02a7fdf8096b212bec0cbdd7db0a12fe (commit) via 6a7e6b4499115e52cc6ec1abb799f6a7d14d2168 (commit) via 87d7fc6609277c4e6521265b6f008311291c1890 (commit) via 53eb49180e16e1cc740695bb9cdb381becfd59a1 (commit) via e2d9fe7e166dc3dbf50d5d2cfe27b0d9abcb9f45 (commit) from 3deac294f5760a00e42eec0265ded0b10e9291ee (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 46a4581db662d70e781d59782d2e24a4c2968968 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jul 20 12:24:49 2018 +0100 flash-image: use FAT for /boot partition on aarch64 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit f8f4ef0795753b7cfbb7ef18def75e147ee7303d Merge: 3deac294f 413149f80 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jul 19 18:15:50 2018 +0100 Merge branch 'next' into efi Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> Conflicts: config/kernel/kernel.config.aarch64-ipfire ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 26 ++++++++++++++++--- config/rootfiles/common/aarch64/linux | 30 +++++++++++++-------- config/rootfiles/common/aarch64/linux-headers | 1 + config/u-boot/boot.cmd | 34 +++++++++++++++++------- config/u-boot/boot.scr | Bin 1981 -> 2373 bytes lfs/flash-images | 5 +++- lfs/linux | 4 +++ src/initscripts/helper/aws-setup | 36 ++++++++++++++------------ 8 files changed, 95 insertions(+), 41 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 37e190741..fd7073490 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -349,6 +349,7 @@ CONFIG_EFI_PARTITION=y # CONFIG_CMDLINE_PARTITION is not set CONFIG_BLOCK_COMPAT=y CONFIG_BLK_MQ_PCI=y +CONFIG_BLK_MQ_VIRTIO=y # # IO Schedulers @@ -539,6 +540,8 @@ CONFIG_NO_BOOTMEM=y CONFIG_MEMORY_ISOLATION=y # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_MEMORY_BALLOON=y +CONFIG_BALLOON_COMPACTION=y CONFIG_COMPACTION=y CONFIG_MIGRATION=y CONFIG_PHYS_ADDR_T_64BIT=y @@ -1292,6 +1295,8 @@ CONFIG_OPENVSWITCH_GRE=m CONFIG_OPENVSWITCH_VXLAN=m CONFIG_OPENVSWITCH_GENEVE=m CONFIG_VSOCKETS=m +CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO_VSOCKETS_COMMON=m CONFIG_NETLINK_DIAG=m CONFIG_MPLS=y CONFIG_NET_MPLS_GSO=m @@ -1615,6 +1620,8 @@ CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set +CONFIG_VIRTIO_BLK=m +CONFIG_VIRTIO_BLK_SCSI=y # CONFIG_BLK_DEV_RBD is not set # CONFIG_BLK_DEV_RSXX is not set CONFIG_NVME_CORE=m @@ -1795,6 +1802,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m # CONFIG_SCSI_PMCRAID is not set # CONFIG_SCSI_PM8001 is not set # CONFIG_SCSI_BFA_FC is not set +CONFIG_SCSI_VIRTIO=y # CONFIG_SCSI_CHELSIO_FCOE is not set # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set CONFIG_SCSI_DH=y @@ -1989,6 +1997,7 @@ CONFIG_TUN=m CONFIG_TAP=m # CONFIG_TUN_VNET_CROSS_LE is not set CONFIG_VETH=m +CONFIG_VIRTIO_NET=m CONFIG_NLMON=m CONFIG_NET_VRF=m CONFIG_SUNGEM_PHY=m @@ -2860,7 +2869,9 @@ CONFIG_SERIAL_MVEBU_CONSOLE=y CONFIG_PRINTER=m CONFIG_LP_CONSOLE=y CONFIG_PPDEV=m +CONFIG_HVC_DRIVER=y # CONFIG_HVC_DCC is not set +CONFIG_VIRTIO_CONSOLE=m CONFIG_IPMI_HANDLER=m CONFIG_IPMI_DMI_DECODE=y # CONFIG_IPMI_PANIC_EVENT is not set @@ -2873,6 +2884,7 @@ CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_BCM2835=y CONFIG_HW_RANDOM_OMAP=y +CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM_MESON=y CONFIG_HW_RANDOM_CAVIUM=y CONFIG_R3964=m @@ -4236,6 +4248,7 @@ CONFIG_DRM_UDL=m CONFIG_DRM_RCAR_DW_HDMI=m # CONFIG_DRM_QXL is not set # CONFIG_DRM_BOCHS is not set +CONFIG_DRM_VIRTIO_GPU=m CONFIG_DRM_PANEL=y # @@ -4349,7 +4362,7 @@ CONFIG_FB_OPENCORES=m CONFIG_FB_SMSCUFX=m # CONFIG_FB_UDL is not set # CONFIG_FB_IBM_GXT4500 is not set -# CONFIG_FB_VIRTUAL is not set +CONFIG_FB_VIRTUAL=m # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set # CONFIG_FB_BROADSHEET is not set @@ -5391,12 +5404,17 @@ CONFIG_UIO=m # CONFIG_UIO_MF624 is not set # CONFIG_VFIO is not set CONFIG_VIRT_DRIVERS=y +CONFIG_VIRTIO=y # # Virtio drivers # -# CONFIG_VIRTIO_PCI is not set -# CONFIG_VIRTIO_MMIO is not set +CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_PCI_LEGACY=y +CONFIG_VIRTIO_BALLOON=y +CONFIG_VIRTIO_INPUT=y +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y # # Microsoft Hyper-V guest support @@ -6611,6 +6629,7 @@ CONFIG_CRYPTO_CRYPTD=y # CONFIG_CRYPTO_MCRYPTD is not set CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_ENGINE=m # # Authenticated Encryption with Associated Data @@ -6719,6 +6738,7 @@ CONFIG_CRYPTO_HW=y # CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set CONFIG_CRYPTO_DEV_ROCKCHIP=y # CONFIG_CRYPTO_DEV_CHELSIO is not set +CONFIG_CRYPTO_DEV_VIRTIO=m # CONFIG_CRYPTO_DEV_SAFEXCEL is not set # CONFIG_ASYMMETRIC_KEY_TYPE is not set diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 28a02a322..c5351db94 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -48,8 +48,8 @@ boot/dtb-KVER-ipfire #boot/dtb-KVER-ipfire/arm/rtsm_ve-aemv8a.dtb #boot/dtb-KVER-ipfire/arm/vexpress-v2f-1xv7-ca53x2.dtb #boot/dtb-KVER-ipfire/broadcom -#boot/dtb-KVER-ipfire/broadcom/bcm2837-rpi-3-b.dtb #boot/dtb-KVER-ipfire/broadcom/bcm2837-rpi-3-b-plus.dtb +#boot/dtb-KVER-ipfire/broadcom/bcm2837-rpi-3-b.dtb #boot/dtb-KVER-ipfire/marvell #boot/dtb-KVER-ipfire/marvell/armada-3720-db.dtb #boot/dtb-KVER-ipfire/marvell/armada-3720-espressobin.dtb @@ -100,6 +100,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/crypto/cast_common.ko #lib/modules/KVER-ipfire/kernel/crypto/ccm.ko #lib/modules/KVER-ipfire/kernel/crypto/cmac.ko +#lib/modules/KVER-ipfire/kernel/crypto/crypto_engine.ko #lib/modules/KVER-ipfire/kernel/crypto/cts.ko #lib/modules/KVER-ipfire/kernel/crypto/deflate.ko #lib/modules/KVER-ipfire/kernel/crypto/ecdh_generic.ko @@ -160,6 +161,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/bcma/bcma.ko #lib/modules/KVER-ipfire/kernel/drivers/block #lib/modules/KVER-ipfire/kernel/drivers/block/cryptoloop.ko +#lib/modules/KVER-ipfire/kernel/drivers/block/virtio_blk.ko #lib/modules/KVER-ipfire/kernel/drivers/bluetooth #lib/modules/KVER-ipfire/kernel/drivers/bluetooth/ath3k.ko #lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bcm203x.ko @@ -188,6 +190,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/char/ipmi/ipmi_watchdog.ko #lib/modules/KVER-ipfire/kernel/drivers/char/lp.ko #lib/modules/KVER-ipfire/kernel/drivers/char/ppdev.ko +#lib/modules/KVER-ipfire/kernel/drivers/char/virtio_console.ko #lib/modules/KVER-ipfire/kernel/drivers/clk #lib/modules/KVER-ipfire/kernel/drivers/clk/clk-si5351.ko #lib/modules/KVER-ipfire/kernel/drivers/clk/clk-si570.ko @@ -195,6 +198,9 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/cpufreq #lib/modules/KVER-ipfire/kernel/drivers/cpufreq/arm_big_little.ko #lib/modules/KVER-ipfire/kernel/drivers/cpufreq/arm_big_little_dt.ko +#lib/modules/KVER-ipfire/kernel/drivers/crypto +#lib/modules/KVER-ipfire/kernel/drivers/crypto/virtio +#lib/modules/KVER-ipfire/kernel/drivers/crypto/virtio/virtio_crypto.ko #lib/modules/KVER-ipfire/kernel/drivers/dma #lib/modules/KVER-ipfire/kernel/drivers/dma/dw #lib/modules/KVER-ipfire/kernel/drivers/dma/dw/dw_dmac_core.ko @@ -203,6 +209,9 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/firewire/firewire-core.ko #lib/modules/KVER-ipfire/kernel/drivers/firewire/firewire-ohci.ko #lib/modules/KVER-ipfire/kernel/drivers/firewire/firewire-sbp2.ko +#lib/modules/KVER-ipfire/kernel/drivers/firmware +#lib/modules/KVER-ipfire/kernel/drivers/firmware/efi +#lib/modules/KVER-ipfire/kernel/drivers/firmware/efi/efibc.ko #lib/modules/KVER-ipfire/kernel/drivers/gpio #lib/modules/KVER-ipfire/kernel/drivers/gpio/gpio-adnp.ko #lib/modules/KVER-ipfire/kernel/drivers/gpio/gpio-viperboard.ko @@ -254,15 +263,6 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/panel/panel-simple.ko #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/pl111 #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/pl111/pl111_drm.ko -#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i -#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i/sun4i-backend.ko -#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i/sun4i-drm-hdmi.ko -#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i/sun4i-drm.ko -#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i/sun4i-tcon.ko -#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i/sun4i_tv.ko -#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i/sun6i_drc.ko -#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i/sun8i-mixer.ko -#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.ko #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/tinydrm #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/tinydrm/core #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/tinydrm/core/tinydrm.ko @@ -272,6 +272,8 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/udl/udl.ko #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/vc4 #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/vc4/vc4.ko +#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/virtio +#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/virtio/virtio-gpu.ko #lib/modules/KVER-ipfire/kernel/drivers/hid #lib/modules/KVER-ipfire/kernel/drivers/hid/hid-aureal.ko #lib/modules/KVER-ipfire/kernel/drivers/hid/hid-gyration.ko @@ -525,7 +527,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/md/dm-cache.ko #lib/modules/KVER-ipfire/kernel/drivers/md/dm-crypt.ko #lib/modules/KVER-ipfire/kernel/drivers/md/dm-log-userspace.ko -#lib/modules/KVER-ipfire/kernel/drivers/md/dmpath.ko +#lib/modules/KVER-ipfire/kernel/drivers/md/dm-multipath.ko #lib/modules/KVER-ipfire/kernel/drivers/md/dm-queue-length.ko #lib/modules/KVER-ipfire/kernel/drivers/md/dm-raid.ko #lib/modules/KVER-ipfire/kernel/drivers/md/dm-round-robin.ko @@ -1483,6 +1485,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/net/usb/usbnet.ko #lib/modules/KVER-ipfire/kernel/drivers/net/usb/zaurus.ko #lib/modules/KVER-ipfire/kernel/drivers/net/veth.ko +#lib/modules/KVER-ipfire/kernel/drivers/net/virtio_net.ko #lib/modules/KVER-ipfire/kernel/drivers/net/vmxnet3 #lib/modules/KVER-ipfire/kernel/drivers/net/vmxnet3/vmxnet3.ko #lib/modules/KVER-ipfire/kernel/drivers/net/vrf.ko @@ -1899,6 +1902,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/video/fbdev/ocfb.ko #lib/modules/KVER-ipfire/kernel/drivers/video/fbdev/smscufx.ko #lib/modules/KVER-ipfire/kernel/drivers/video/fbdev/ssd1307fb.ko +#lib/modules/KVER-ipfire/kernel/drivers/video/fbdev/vfb.ko #lib/modules/KVER-ipfire/kernel/drivers/w1 #lib/modules/KVER-ipfire/kernel/drivers/w1/masters #lib/modules/KVER-ipfire/kernel/drivers/w1/masters/ds1wm.ko @@ -1941,6 +1945,8 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/fs/configfs/configfs.ko #lib/modules/KVER-ipfire/kernel/fs/dlm #lib/modules/KVER-ipfire/kernel/fs/dlm/dlm.ko +#lib/modules/KVER-ipfire/kernel/fs/efivarfs +#lib/modules/KVER-ipfire/kernel/fs/efivarfs/efivarfs.ko #lib/modules/KVER-ipfire/kernel/fs/fat #lib/modules/KVER-ipfire/kernel/fs/fat/fat.ko #lib/modules/KVER-ipfire/kernel/fs/fat/msdos.ko @@ -2493,6 +2499,8 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/net/unix #lib/modules/KVER-ipfire/kernel/net/unix/unix_diag.ko #lib/modules/KVER-ipfire/kernel/net/vmw_vsock +#lib/modules/KVER-ipfire/kernel/net/vmw_vsock/vmw_vsock_virtio_transport.ko +#lib/modules/KVER-ipfire/kernel/net/vmw_vsock/vmw_vsock_virtio_transport_common.ko #lib/modules/KVER-ipfire/kernel/net/vmw_vsock/vsock.ko #lib/modules/KVER-ipfire/kernel/net/wireless #lib/modules/KVER-ipfire/kernel/net/wireless/cfg80211.ko diff --git a/config/rootfiles/common/aarch64/linux-headers b/config/rootfiles/common/aarch64/linux-headers index db9f3d5dd..6cbe4b964 100644 --- a/config/rootfiles/common/aarch64/linux-headers +++ b/config/rootfiles/common/aarch64/linux-headers @@ -91,6 +91,7 @@ #usr/include/drm/radeon_drm.h #usr/include/drm/savage_drm.h #usr/include/drm/sis_drm.h +#usr/include/drm/sun4i_drm.h #usr/include/drm/tegra_drm.h #usr/include/drm/vc4_drm.h #usr/include/drm/vgem_drm.h diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd index 6679d679a..1d3017ba9 100644 --- a/config/u-boot/boot.cmd +++ b/config/u-boot/boot.cmd @@ -8,9 +8,13 @@ if test ${boot_part} = ""; then fi; if test ${soc} = "kirkwood"; then - setenv kernel_type kirkwood; + setenv kernel_type -kirkwood; else - setenv kernel_type multi; + if test ${cpu} = "armv8"; then + echo ; + else + setenv kernel_type -multi; + fi; fi; # Import uEnv txt... @@ -34,13 +38,25 @@ fi; if test "${SERIAL-CONSOLE}" = "ON"; then if test ${console} = ""; then if test "${board}" = "rpi"; then - if test "${fdtfile}" = "bcm2837-rpi-3-b-plus.dtb"; then - setenv console ttyS1,115200n8; + if test ${cpu} = "armv8"; then + if test "${fdtfile}" = "boradcom/bcm2837-rpi-3-b-plus.dtb"; then + setenv console ttyS1,115200n8; + else + if test "${fdtfile}" = "broadcom/bcm2837-rpi-3-b.dtb"; then + setenv console ttyS1,115200n8; + else + setenv console ttyAMA0,115200n8; + fi; + fi; else - if test "${fdtfile}" = "bcm2837-rpi-3-b.dtb"; then + if test "${fdtfile}" = "bcm2837-rpi-3-b-plus.dtb"; then setenv console ttyS1,115200n8; else - setenv console ttyAMA0,115200n8; + if test "${fdtfile}" = "bcm2837-rpi-3-b.dtb"; then + setenv console ttyS1,115200n8; + else + setenv console ttyAMA0,115200n8; + fi; fi; fi; else @@ -55,10 +71,10 @@ else fi; setenv fdt_high ffffffff; -fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}-ipfire-${kernel_type}; -fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}-ipfire-${kernel_type}/${fdtfile}; +fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}-ipfire${kernel_type}; +fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}-ipfire${kernel_type}/${fdtfile}; setenv ramdisk_addr ${ramdisk_addr_r} -if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}-ipfire-${kernel_type}; then +if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}-ipfire${kernel_type}; then echo Ramdisk loaded...; else echo Ramdisk not loaded...; diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr index 188d54456..0d9e67b96 100644 Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ diff --git a/lfs/flash-images b/lfs/flash-images index 55ffd0e81..1f7833250 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -59,12 +59,15 @@ MNThdd := /install/harddisk IMG := /install/images/image.img # All sizes in blocks -ifeq "$(BUILD_ARCH)" "armv5tel" +ifeq "$(BUILD_PLATFORM)" "arm" BOOTLOADER = S_OFFSET = 8192 # FAT32 PART_TYPE = c +ifeq "$(BUILD_ARCH)" "aarch64" + BOOTLOADER = grub +endif else BOOTLOADER = grub S_OFFSET = 8192 diff --git a/lfs/linux b/lfs/linux index f4700859c..c5d8a8e88 100644 --- a/lfs/linux +++ b/lfs/linux @@ -156,6 +156,10 @@ endif ifeq "$(KCFG)" "-multi" # Apply Arm-multiarch kernel patches. cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1 +endif +ifeq "$(BUILD_ARCH)" "aarch64" + # Apply Arm-multiarch kernel patches. + cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1 endif cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-3.14.79-amba-fix.patch diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup index a273aff7d..d8c7a358c 100644 --- a/src/initscripts/helper/aws-setup +++ b/src/initscripts/helper/aws-setup @@ -86,25 +86,27 @@ import_aws_configuration() { # Create setup user if ! getent passwd setup &>/dev/null; then - useradd -r setup -s /usr/bin/run-setup -g nobody -m + useradd setup -s /usr/bin/run-setup -g nobody -m + + # Unlock the account + usermod -p "x" setup fi - # Import SSH keys - local user - for user in /root /home/setup; do - local line - for line in $(get "public-keys/"); do - local key_no="${line%=*}" - - local key="$(get public-keys/${key_no}/openssh-key)" - if [ -n "${key}" ] && ! grep -q "^${key}$" "${user}/.ssh/authorized_keys" 2>/dev/null; then - mkdir -p "${user}/.ssh" - chmod 700 "${user}/.ssh" - - echo "${key}" >> "${user}/.ssh/authorized_keys" - chmod 600 "${user}/.ssh/authorized_keys" - fi - done + # Import SSH keys for setup user + local line + for line in $(get "public-keys/"); do + local key_no="${line%=*}" + + local key="$(get public-keys/${key_no}/openssh-key)" + if [ -n "${key}" ] && ! grep -q "^${key}$" "/home/setup/.ssh/authorized_keys" 2>/dev/null; then + mkdir -p "/home/setup/.ssh" + chmod 700 "/home/setup/.ssh" + chown setup.nobody "/home/setup/.ssh" + + echo "${key}" >> "/home/setup/.ssh/authorized_keys" + chmod 600 "/home/setup/.ssh/authorized_keys" + chown setup.nobody "/home/setup/.ssh/authorized_keys" + fi done # Import any DNS server settings hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 413149f80dba07373b0a52ba39259ae656b9a65f
by git＠ipfire.org 19 Jul '18

19 Jul '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 413149f80dba07373b0a52ba39259ae656b9a65f (commit) via 0487a49fec8636a106bd01cb06be2d9bfaf209d7 (commit) via 66a29eaa02a7fdf8096b212bec0cbdd7db0a12fe (commit) from 6a7e6b4499115e52cc6ec1abb799f6a7d14d2168 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 413149f80dba07373b0a52ba39259ae656b9a65f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jul 19 09:30:47 2018 +0100 kernel: aarch64: enable virtio drivers Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 0487a49fec8636a106bd01cb06be2d9bfaf209d7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jul 19 09:29:44 2018 +0100 u-boot: boot aarch64 kernel without -multi extension Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 66a29eaa02a7fdf8096b212bec0cbdd7db0a12fe Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jul 19 09:28:27 2018 +0100 kernel: apply multi arch patchset for aarch64 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 28 ++++++++++++++++++--- config/rootfiles/common/aarch64/linux | 16 ++++++++++-- config/rootfiles/common/aarch64/linux-headers | 1 + config/u-boot/boot.cmd | 34 +++++++++++++++++++------- config/u-boot/boot.scr | Bin 1981 -> 2373 bytes lfs/linux | 4 +++ 6 files changed, 68 insertions(+), 15 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 7444864f3..c3b97ea92 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.14.48-ipfire-multi Kernel Configuration +# Linux/arm64 4.14.50-ipfire-multi Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -349,6 +349,7 @@ CONFIG_EFI_PARTITION=y # CONFIG_CMDLINE_PARTITION is not set CONFIG_BLOCK_COMPAT=y CONFIG_BLK_MQ_PCI=y +CONFIG_BLK_MQ_VIRTIO=y # # IO Schedulers @@ -538,6 +539,8 @@ CONFIG_NO_BOOTMEM=y CONFIG_MEMORY_ISOLATION=y # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_MEMORY_BALLOON=y +CONFIG_BALLOON_COMPACTION=y CONFIG_COMPACTION=y CONFIG_MIGRATION=y CONFIG_PHYS_ADDR_T_64BIT=y @@ -1289,6 +1292,8 @@ CONFIG_OPENVSWITCH_GRE=m CONFIG_OPENVSWITCH_VXLAN=m CONFIG_OPENVSWITCH_GENEVE=m CONFIG_VSOCKETS=m +CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO_VSOCKETS_COMMON=m CONFIG_NETLINK_DIAG=m CONFIG_MPLS=y CONFIG_NET_MPLS_GSO=m @@ -1612,6 +1617,8 @@ CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set +CONFIG_VIRTIO_BLK=m +CONFIG_VIRTIO_BLK_SCSI=y # CONFIG_BLK_DEV_RBD is not set # CONFIG_BLK_DEV_RSXX is not set CONFIG_NVME_CORE=m @@ -1792,6 +1799,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m # CONFIG_SCSI_PMCRAID is not set # CONFIG_SCSI_PM8001 is not set # CONFIG_SCSI_BFA_FC is not set +CONFIG_SCSI_VIRTIO=y # CONFIG_SCSI_CHELSIO_FCOE is not set # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set CONFIG_SCSI_DH=y @@ -1986,6 +1994,7 @@ CONFIG_TUN=m CONFIG_TAP=m # CONFIG_TUN_VNET_CROSS_LE is not set CONFIG_VETH=m +CONFIG_VIRTIO_NET=m CONFIG_NLMON=m CONFIG_NET_VRF=m CONFIG_SUNGEM_PHY=m @@ -2859,7 +2868,9 @@ CONFIG_SERIAL_MVEBU_CONSOLE=y CONFIG_PRINTER=m CONFIG_LP_CONSOLE=y CONFIG_PPDEV=m +CONFIG_HVC_DRIVER=y # CONFIG_HVC_DCC is not set +CONFIG_VIRTIO_CONSOLE=m CONFIG_IPMI_HANDLER=m # CONFIG_IPMI_PANIC_EVENT is not set CONFIG_IPMI_DEVICE_INTERFACE=m @@ -2871,6 +2882,7 @@ CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_BCM2835=y CONFIG_HW_RANDOM_OMAP=y +CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM_MESON=y CONFIG_HW_RANDOM_CAVIUM=y CONFIG_R3964=m @@ -4242,6 +4254,7 @@ CONFIG_DRM_SUN8I_DW_HDMI=m CONFIG_DRM_SUN8I_MIXER=m # CONFIG_DRM_QXL is not set # CONFIG_DRM_BOCHS is not set +CONFIG_DRM_VIRTIO_GPU=m CONFIG_DRM_PANEL=y # @@ -4354,7 +4367,7 @@ CONFIG_FB_OPENCORES=m CONFIG_FB_SMSCUFX=m # CONFIG_FB_UDL is not set # CONFIG_FB_IBM_GXT4500 is not set -# CONFIG_FB_VIRTUAL is not set +CONFIG_FB_VIRTUAL=m # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set # CONFIG_FB_BROADSHEET is not set @@ -5395,12 +5408,17 @@ CONFIG_UIO=m # CONFIG_UIO_MF624 is not set # CONFIG_VFIO is not set CONFIG_VIRT_DRIVERS=y +CONFIG_VIRTIO=y # # Virtio drivers # -# CONFIG_VIRTIO_PCI is not set -# CONFIG_VIRTIO_MMIO is not set +CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_PCI_LEGACY=y +CONFIG_VIRTIO_BALLOON=y +CONFIG_VIRTIO_INPUT=y +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y # # Microsoft Hyper-V guest support @@ -6597,6 +6615,7 @@ CONFIG_CRYPTO_CRYPTD=y # CONFIG_CRYPTO_MCRYPTD is not set CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_ENGINE=m # # Authenticated Encryption with Associated Data @@ -6705,6 +6724,7 @@ CONFIG_CRYPTO_HW=y # CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set CONFIG_CRYPTO_DEV_ROCKCHIP=y # CONFIG_CRYPTO_DEV_CHELSIO is not set +CONFIG_CRYPTO_DEV_VIRTIO=m # CONFIG_CRYPTO_DEV_SAFEXCEL is not set # CONFIG_ASYMMETRIC_KEY_TYPE is not set diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 28a02a322..34ef44080 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -48,8 +48,8 @@ boot/dtb-KVER-ipfire #boot/dtb-KVER-ipfire/arm/rtsm_ve-aemv8a.dtb #boot/dtb-KVER-ipfire/arm/vexpress-v2f-1xv7-ca53x2.dtb #boot/dtb-KVER-ipfire/broadcom -#boot/dtb-KVER-ipfire/broadcom/bcm2837-rpi-3-b.dtb #boot/dtb-KVER-ipfire/broadcom/bcm2837-rpi-3-b-plus.dtb +#boot/dtb-KVER-ipfire/broadcom/bcm2837-rpi-3-b.dtb #boot/dtb-KVER-ipfire/marvell #boot/dtb-KVER-ipfire/marvell/armada-3720-db.dtb #boot/dtb-KVER-ipfire/marvell/armada-3720-espressobin.dtb @@ -100,6 +100,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/crypto/cast_common.ko #lib/modules/KVER-ipfire/kernel/crypto/ccm.ko #lib/modules/KVER-ipfire/kernel/crypto/cmac.ko +#lib/modules/KVER-ipfire/kernel/crypto/crypto_engine.ko #lib/modules/KVER-ipfire/kernel/crypto/cts.ko #lib/modules/KVER-ipfire/kernel/crypto/deflate.ko #lib/modules/KVER-ipfire/kernel/crypto/ecdh_generic.ko @@ -160,6 +161,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/bcma/bcma.ko #lib/modules/KVER-ipfire/kernel/drivers/block #lib/modules/KVER-ipfire/kernel/drivers/block/cryptoloop.ko +#lib/modules/KVER-ipfire/kernel/drivers/block/virtio_blk.ko #lib/modules/KVER-ipfire/kernel/drivers/bluetooth #lib/modules/KVER-ipfire/kernel/drivers/bluetooth/ath3k.ko #lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bcm203x.ko @@ -188,6 +190,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/char/ipmi/ipmi_watchdog.ko #lib/modules/KVER-ipfire/kernel/drivers/char/lp.ko #lib/modules/KVER-ipfire/kernel/drivers/char/ppdev.ko +#lib/modules/KVER-ipfire/kernel/drivers/char/virtio_console.ko #lib/modules/KVER-ipfire/kernel/drivers/clk #lib/modules/KVER-ipfire/kernel/drivers/clk/clk-si5351.ko #lib/modules/KVER-ipfire/kernel/drivers/clk/clk-si570.ko @@ -195,6 +198,9 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/cpufreq #lib/modules/KVER-ipfire/kernel/drivers/cpufreq/arm_big_little.ko #lib/modules/KVER-ipfire/kernel/drivers/cpufreq/arm_big_little_dt.ko +#lib/modules/KVER-ipfire/kernel/drivers/crypto +#lib/modules/KVER-ipfire/kernel/drivers/crypto/virtio +#lib/modules/KVER-ipfire/kernel/drivers/crypto/virtio/virtio_crypto.ko #lib/modules/KVER-ipfire/kernel/drivers/dma #lib/modules/KVER-ipfire/kernel/drivers/dma/dw #lib/modules/KVER-ipfire/kernel/drivers/dma/dw/dw_dmac_core.ko @@ -272,6 +278,8 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/udl/udl.ko #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/vc4 #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/vc4/vc4.ko +#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/virtio +#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/virtio/virtio-gpu.ko #lib/modules/KVER-ipfire/kernel/drivers/hid #lib/modules/KVER-ipfire/kernel/drivers/hid/hid-aureal.ko #lib/modules/KVER-ipfire/kernel/drivers/hid/hid-gyration.ko @@ -525,7 +533,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/md/dm-cache.ko #lib/modules/KVER-ipfire/kernel/drivers/md/dm-crypt.ko #lib/modules/KVER-ipfire/kernel/drivers/md/dm-log-userspace.ko -#lib/modules/KVER-ipfire/kernel/drivers/md/dmpath.ko +#lib/modules/KVER-ipfire/kernel/drivers/md/dm-multipath.ko #lib/modules/KVER-ipfire/kernel/drivers/md/dm-queue-length.ko #lib/modules/KVER-ipfire/kernel/drivers/md/dm-raid.ko #lib/modules/KVER-ipfire/kernel/drivers/md/dm-round-robin.ko @@ -1483,6 +1491,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/net/usb/usbnet.ko #lib/modules/KVER-ipfire/kernel/drivers/net/usb/zaurus.ko #lib/modules/KVER-ipfire/kernel/drivers/net/veth.ko +#lib/modules/KVER-ipfire/kernel/drivers/net/virtio_net.ko #lib/modules/KVER-ipfire/kernel/drivers/net/vmxnet3 #lib/modules/KVER-ipfire/kernel/drivers/net/vmxnet3/vmxnet3.ko #lib/modules/KVER-ipfire/kernel/drivers/net/vrf.ko @@ -1899,6 +1908,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/video/fbdev/ocfb.ko #lib/modules/KVER-ipfire/kernel/drivers/video/fbdev/smscufx.ko #lib/modules/KVER-ipfire/kernel/drivers/video/fbdev/ssd1307fb.ko +#lib/modules/KVER-ipfire/kernel/drivers/video/fbdev/vfb.ko #lib/modules/KVER-ipfire/kernel/drivers/w1 #lib/modules/KVER-ipfire/kernel/drivers/w1/masters #lib/modules/KVER-ipfire/kernel/drivers/w1/masters/ds1wm.ko @@ -2493,6 +2503,8 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/net/unix #lib/modules/KVER-ipfire/kernel/net/unix/unix_diag.ko #lib/modules/KVER-ipfire/kernel/net/vmw_vsock +#lib/modules/KVER-ipfire/kernel/net/vmw_vsock/vmw_vsock_virtio_transport.ko +#lib/modules/KVER-ipfire/kernel/net/vmw_vsock/vmw_vsock_virtio_transport_common.ko #lib/modules/KVER-ipfire/kernel/net/vmw_vsock/vsock.ko #lib/modules/KVER-ipfire/kernel/net/wireless #lib/modules/KVER-ipfire/kernel/net/wireless/cfg80211.ko diff --git a/config/rootfiles/common/aarch64/linux-headers b/config/rootfiles/common/aarch64/linux-headers index db9f3d5dd..6cbe4b964 100644 --- a/config/rootfiles/common/aarch64/linux-headers +++ b/config/rootfiles/common/aarch64/linux-headers @@ -91,6 +91,7 @@ #usr/include/drm/radeon_drm.h #usr/include/drm/savage_drm.h #usr/include/drm/sis_drm.h +#usr/include/drm/sun4i_drm.h #usr/include/drm/tegra_drm.h #usr/include/drm/vc4_drm.h #usr/include/drm/vgem_drm.h diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd index 6679d679a..1d3017ba9 100644 --- a/config/u-boot/boot.cmd +++ b/config/u-boot/boot.cmd @@ -8,9 +8,13 @@ if test ${boot_part} = ""; then fi; if test ${soc} = "kirkwood"; then - setenv kernel_type kirkwood; + setenv kernel_type -kirkwood; else - setenv kernel_type multi; + if test ${cpu} = "armv8"; then + echo ; + else + setenv kernel_type -multi; + fi; fi; # Import uEnv txt... @@ -34,13 +38,25 @@ fi; if test "${SERIAL-CONSOLE}" = "ON"; then if test ${console} = ""; then if test "${board}" = "rpi"; then - if test "${fdtfile}" = "bcm2837-rpi-3-b-plus.dtb"; then - setenv console ttyS1,115200n8; + if test ${cpu} = "armv8"; then + if test "${fdtfile}" = "boradcom/bcm2837-rpi-3-b-plus.dtb"; then + setenv console ttyS1,115200n8; + else + if test "${fdtfile}" = "broadcom/bcm2837-rpi-3-b.dtb"; then + setenv console ttyS1,115200n8; + else + setenv console ttyAMA0,115200n8; + fi; + fi; else - if test "${fdtfile}" = "bcm2837-rpi-3-b.dtb"; then + if test "${fdtfile}" = "bcm2837-rpi-3-b-plus.dtb"; then setenv console ttyS1,115200n8; else - setenv console ttyAMA0,115200n8; + if test "${fdtfile}" = "bcm2837-rpi-3-b.dtb"; then + setenv console ttyS1,115200n8; + else + setenv console ttyAMA0,115200n8; + fi; fi; fi; else @@ -55,10 +71,10 @@ else fi; setenv fdt_high ffffffff; -fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}-ipfire-${kernel_type}; -fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}-ipfire-${kernel_type}/${fdtfile}; +fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}-ipfire${kernel_type}; +fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}-ipfire${kernel_type}/${fdtfile}; setenv ramdisk_addr ${ramdisk_addr_r} -if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}-ipfire-${kernel_type}; then +if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}-ipfire${kernel_type}; then echo Ramdisk loaded...; else echo Ramdisk not loaded...; diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr index 188d54456..0d9e67b96 100644 Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ diff --git a/lfs/linux b/lfs/linux index f4700859c..c5d8a8e88 100644 --- a/lfs/linux +++ b/lfs/linux @@ -156,6 +156,10 @@ endif ifeq "$(KCFG)" "-multi" # Apply Arm-multiarch kernel patches. cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1 +endif +ifeq "$(BUILD_ARCH)" "aarch64" + # Apply Arm-multiarch kernel patches. + cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1 endif cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-3.14.79-amba-fix.patch hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, efi, updated. 3deac294f5760a00e42eec0265ded0b10e9291ee
by git＠ipfire.org 16 Jul '18

16 Jul '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, efi has been updated via 3deac294f5760a00e42eec0265ded0b10e9291ee (commit) via 479d82d1b8e20b63ed645ce8fdaae9d418c180b6 (commit) from 37dc79434ad752c7115c01aa26264c933e9de647 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3deac294f5760a00e42eec0265ded0b10e9291ee Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 16 22:35:21 2018 +0100 cdrom: mkisofs seems to not like the order of the arguments Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 479d82d1b8e20b63ed645ce8fdaae9d418c180b6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 16 22:31:11 2018 +0100 Rootfile update We don't have EFI on i586 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/i586/grub | 437 +------------------------------------- lfs/cdrom | 16 +- 2 files changed, 13 insertions(+), 440 deletions(-) Difference in files: diff --git a/config/rootfiles/common/i586/grub b/config/rootfiles/common/i586/grub index 16e76aa0f..bc28d4593 100644 --- a/config/rootfiles/common/i586/grub +++ b/config/rootfiles/common/i586/grub @@ -1,13 +1,6 @@ -#boot/efi -#boot/efi/EFI -#boot/efi/EFI/ipfire -#boot/efi/EFI/ipfire/grub-efi -boot/efi/EFI/ipfire/grub-efi/grub.cfg -boot/efi/EFI/ipfire/grub-efi/grub.efi #boot/grub boot/grub/grub.cfg boot/grub/splash.png -boot/grub/unifont.pf2 #etc/bash_completion.d #etc/bash_completion.d/grub etc/default/grub @@ -37,429 +30,6 @@ usr/bin/grub-render-label usr/bin/grub-script-check usr/bin/grub-syslinux2cfg #usr/lib/grub -usr/lib/grub -usr/lib/grub/i386-efi -usr/lib/grub/i386-efi/acpi.mod -usr/lib/grub/i386-efi/acpi.module -usr/lib/grub/i386-efi/adler32.mod -usr/lib/grub/i386-efi/adler32.module -usr/lib/grub/i386-efi/affs.mod -usr/lib/grub/i386-efi/affs.module -usr/lib/grub/i386-efi/afs.mod -usr/lib/grub/i386-efi/afs.module -usr/lib/grub/i386-efi/ahci.mod -usr/lib/grub/i386-efi/ahci.module -usr/lib/grub/i386-efi/all_video.mod -usr/lib/grub/i386-efi/all_video.module -usr/lib/grub/i386-efi/aout.mod -usr/lib/grub/i386-efi/aout.module -usr/lib/grub/i386-efi/appleldr.mod -usr/lib/grub/i386-efi/appleldr.module -usr/lib/grub/i386-efi/at_keyboard.mod -usr/lib/grub/i386-efi/at_keyboard.module -usr/lib/grub/i386-efi/ata.mod -usr/lib/grub/i386-efi/ata.module -usr/lib/grub/i386-efi/backtrace.mod -usr/lib/grub/i386-efi/backtrace.module -usr/lib/grub/i386-efi/bfs.mod -usr/lib/grub/i386-efi/bfs.module -usr/lib/grub/i386-efi/bitmap.mod -usr/lib/grub/i386-efi/bitmap.module -usr/lib/grub/i386-efi/bitmap_scale.mod -usr/lib/grub/i386-efi/bitmap_scale.module -usr/lib/grub/i386-efi/blocklist.mod -usr/lib/grub/i386-efi/blocklist.module -usr/lib/grub/i386-efi/boot.mod -usr/lib/grub/i386-efi/boot.module -usr/lib/grub/i386-efi/bsd.mod -usr/lib/grub/i386-efi/bsd.module -usr/lib/grub/i386-efi/btrfs.mod -usr/lib/grub/i386-efi/btrfs.module -usr/lib/grub/i386-efi/bufio.mod -usr/lib/grub/i386-efi/bufio.module -usr/lib/grub/i386-efi/cat.mod -usr/lib/grub/i386-efi/cat.module -usr/lib/grub/i386-efi/chain.mod -usr/lib/grub/i386-efi/chain.module -usr/lib/grub/i386-efi/cmp.mod -usr/lib/grub/i386-efi/cmp.module -usr/lib/grub/i386-efi/command.lst -usr/lib/grub/i386-efi/config.h -usr/lib/grub/i386-efi/configfile.mod -usr/lib/grub/i386-efi/configfile.module -usr/lib/grub/i386-efi/cpio.mod -usr/lib/grub/i386-efi/cpio.module -usr/lib/grub/i386-efi/cpio_be.mod -usr/lib/grub/i386-efi/cpio_be.module -usr/lib/grub/i386-efi/cpuid.mod -usr/lib/grub/i386-efi/cpuid.module -usr/lib/grub/i386-efi/crc64.mod -usr/lib/grub/i386-efi/crc64.module -usr/lib/grub/i386-efi/crypto.lst -usr/lib/grub/i386-efi/crypto.mod -usr/lib/grub/i386-efi/crypto.module -usr/lib/grub/i386-efi/cryptodisk.mod -usr/lib/grub/i386-efi/cryptodisk.module -usr/lib/grub/i386-efi/cs5536.mod -usr/lib/grub/i386-efi/cs5536.module -usr/lib/grub/i386-efi/date.mod -usr/lib/grub/i386-efi/date.module -usr/lib/grub/i386-efi/datehook.mod -usr/lib/grub/i386-efi/datehook.module -usr/lib/grub/i386-efi/datetime.mod -usr/lib/grub/i386-efi/datetime.module -usr/lib/grub/i386-efi/diskfilter.mod -usr/lib/grub/i386-efi/diskfilter.module -usr/lib/grub/i386-efi/dm_nv.mod -usr/lib/grub/i386-efi/dm_nv.module -usr/lib/grub/i386-efi/echo.mod -usr/lib/grub/i386-efi/echo.module -usr/lib/grub/i386-efi/efi_gop.mod -usr/lib/grub/i386-efi/efi_gop.module -usr/lib/grub/i386-efi/efi_uga.mod -usr/lib/grub/i386-efi/efi_uga.module -usr/lib/grub/i386-efi/efinet.mod -usr/lib/grub/i386-efi/efinet.module -usr/lib/grub/i386-efi/ehci.mod -usr/lib/grub/i386-efi/ehci.module -usr/lib/grub/i386-efi/elf.mod -usr/lib/grub/i386-efi/elf.module -usr/lib/grub/i386-efi/exfat.mod -usr/lib/grub/i386-efi/exfat.module -usr/lib/grub/i386-efi/exfctest.mod -usr/lib/grub/i386-efi/exfctest.module -usr/lib/grub/i386-efi/ext2.mod -usr/lib/grub/i386-efi/ext2.module -usr/lib/grub/i386-efi/extcmd.mod -usr/lib/grub/i386-efi/extcmd.module -usr/lib/grub/i386-efi/fat.mod -usr/lib/grub/i386-efi/fat.module -usr/lib/grub/i386-efi/fixvideo.mod -usr/lib/grub/i386-efi/fixvideo.module -usr/lib/grub/i386-efi/font.mod -usr/lib/grub/i386-efi/font.module -usr/lib/grub/i386-efi/fs.lst -usr/lib/grub/i386-efi/fshelp.mod -usr/lib/grub/i386-efi/fshelp.module -usr/lib/grub/i386-efi/functional_test.mod -usr/lib/grub/i386-efi/functional_test.module -usr/lib/grub/i386-efi/gcry_arcfour.mod -usr/lib/grub/i386-efi/gcry_arcfour.module -usr/lib/grub/i386-efi/gcry_blowfish.mod -usr/lib/grub/i386-efi/gcry_blowfish.module -usr/lib/grub/i386-efi/gcry_camellia.mod -usr/lib/grub/i386-efi/gcry_camellia.module -usr/lib/grub/i386-efi/gcry_cast5.mod -usr/lib/grub/i386-efi/gcry_cast5.module -usr/lib/grub/i386-efi/gcry_crc.mod -usr/lib/grub/i386-efi/gcry_crc.module -usr/lib/grub/i386-efi/gcry_des.mod -usr/lib/grub/i386-efi/gcry_des.module -usr/lib/grub/i386-efi/gcry_md4.mod -usr/lib/grub/i386-efi/gcry_md4.module -usr/lib/grub/i386-efi/gcry_md5.mod -usr/lib/grub/i386-efi/gcry_md5.module -usr/lib/grub/i386-efi/gcry_rfc2268.mod -usr/lib/grub/i386-efi/gcry_rfc2268.module -usr/lib/grub/i386-efi/gcry_rijndael.mod -usr/lib/grub/i386-efi/gcry_rijndael.module -usr/lib/grub/i386-efi/gcry_rmd160.mod -usr/lib/grub/i386-efi/gcry_rmd160.module -usr/lib/grub/i386-efi/gcry_seed.mod -usr/lib/grub/i386-efi/gcry_seed.module -usr/lib/grub/i386-efi/gcry_serpent.mod -usr/lib/grub/i386-efi/gcry_serpent.module -usr/lib/grub/i386-efi/gcry_sha1.mod -usr/lib/grub/i386-efi/gcry_sha1.module -usr/lib/grub/i386-efi/gcry_sha256.mod -usr/lib/grub/i386-efi/gcry_sha256.module -usr/lib/grub/i386-efi/gcry_sha512.mod -usr/lib/grub/i386-efi/gcry_sha512.module -usr/lib/grub/i386-efi/gcry_tiger.mod -usr/lib/grub/i386-efi/gcry_tiger.module -usr/lib/grub/i386-efi/gcry_twofish.mod -usr/lib/grub/i386-efi/gcry_twofish.module -usr/lib/grub/i386-efi/gcry_whirlpool.mod -usr/lib/grub/i386-efi/gcry_whirlpool.module -usr/lib/grub/i386-efi/gdb.mod -usr/lib/grub/i386-efi/gdb.module -usr/lib/grub/i386-efi/gdb_grub -usr/lib/grub/i386-efi/geli.mod -usr/lib/grub/i386-efi/geli.module -usr/lib/grub/i386-efi/gettext.mod -usr/lib/grub/i386-efi/gettext.module -usr/lib/grub/i386-efi/gfxmenu.mod -usr/lib/grub/i386-efi/gfxmenu.module -usr/lib/grub/i386-efi/gfxterm.mod -usr/lib/grub/i386-efi/gfxterm.module -usr/lib/grub/i386-efi/gmodule.pl -usr/lib/grub/i386-efi/gptsync.mod -usr/lib/grub/i386-efi/gptsync.module -usr/lib/grub/i386-efi/gzio.mod -usr/lib/grub/i386-efi/gzio.module -usr/lib/grub/i386-efi/halt.mod -usr/lib/grub/i386-efi/halt.module -usr/lib/grub/i386-efi/hashsum.mod -usr/lib/grub/i386-efi/hashsum.module -usr/lib/grub/i386-efi/hdparm.mod -usr/lib/grub/i386-efi/hdparm.module -usr/lib/grub/i386-efi/hello.mod -usr/lib/grub/i386-efi/hello.module -usr/lib/grub/i386-efi/help.mod -usr/lib/grub/i386-efi/help.module -usr/lib/grub/i386-efi/hexdump.mod -usr/lib/grub/i386-efi/hexdump.module -usr/lib/grub/i386-efi/hfs.mod -usr/lib/grub/i386-efi/hfs.module -usr/lib/grub/i386-efi/hfsplus.mod -usr/lib/grub/i386-efi/hfsplus.module -usr/lib/grub/i386-efi/http.mod -usr/lib/grub/i386-efi/http.module -usr/lib/grub/i386-efi/iorw.mod -usr/lib/grub/i386-efi/iorw.module -usr/lib/grub/i386-efi/iso9660.mod -usr/lib/grub/i386-efi/iso9660.module -usr/lib/grub/i386-efi/jfs.mod -usr/lib/grub/i386-efi/jfs.module -usr/lib/grub/i386-efi/jpeg.mod -usr/lib/grub/i386-efi/jpeg.module -usr/lib/grub/i386-efi/kernel.exec -usr/lib/grub/i386-efi/kernel.img -usr/lib/grub/i386-efi/keylayouts.mod -usr/lib/grub/i386-efi/keylayouts.module -usr/lib/grub/i386-efi/keystatus.mod -usr/lib/grub/i386-efi/keystatus.module -usr/lib/grub/i386-efi/ldm.mod -usr/lib/grub/i386-efi/ldm.module -usr/lib/grub/i386-efi/linux.mod -usr/lib/grub/i386-efi/linux.module -usr/lib/grub/i386-efi/loadbios.mod -usr/lib/grub/i386-efi/loadbios.module -usr/lib/grub/i386-efi/loadenv.mod -usr/lib/grub/i386-efi/loadenv.module -usr/lib/grub/i386-efi/loopback.mod -usr/lib/grub/i386-efi/loopback.module -usr/lib/grub/i386-efi/ls.mod -usr/lib/grub/i386-efi/ls.module -usr/lib/grub/i386-efi/lsacpi.mod -usr/lib/grub/i386-efi/lsacpi.module -usr/lib/grub/i386-efi/lsefimmap.mod -usr/lib/grub/i386-efi/lsefimmap.module -usr/lib/grub/i386-efi/lsefisystab.mod -usr/lib/grub/i386-efi/lsefisystab.module -usr/lib/grub/i386-efi/lsmmap.mod -usr/lib/grub/i386-efi/lsmmap.module -usr/lib/grub/i386-efi/lspci.mod -usr/lib/grub/i386-efi/lspci.module -usr/lib/grub/i386-efi/lssal.mod -usr/lib/grub/i386-efi/lssal.module -usr/lib/grub/i386-efi/luks.mod -usr/lib/grub/i386-efi/luks.module -usr/lib/grub/i386-efi/lvm.mod -usr/lib/grub/i386-efi/lvm.module -usr/lib/grub/i386-efi/lzopio.mod -usr/lib/grub/i386-efi/lzopio.module -usr/lib/grub/i386-efi/mdraid09.mod -usr/lib/grub/i386-efi/mdraid09.module -usr/lib/grub/i386-efi/mdraid09_be.mod -usr/lib/grub/i386-efi/mdraid09_be.module -usr/lib/grub/i386-efi/mdraid1x.mod -usr/lib/grub/i386-efi/mdraid1x.module -usr/lib/grub/i386-efi/memdisk.mod -usr/lib/grub/i386-efi/memdisk.module -usr/lib/grub/i386-efi/memrw.mod -usr/lib/grub/i386-efi/memrw.module -usr/lib/grub/i386-efi/minicmd.mod -usr/lib/grub/i386-efi/minicmd.module -usr/lib/grub/i386-efi/minix.mod -usr/lib/grub/i386-efi/minix.module -usr/lib/grub/i386-efi/minix2.mod -usr/lib/grub/i386-efi/minix2.module -usr/lib/grub/i386-efi/minix2_be.mod -usr/lib/grub/i386-efi/minix2_be.module -usr/lib/grub/i386-efi/minix3.mod -usr/lib/grub/i386-efi/minix3.module -usr/lib/grub/i386-efi/minix3_be.mod -usr/lib/grub/i386-efi/minix3_be.module -usr/lib/grub/i386-efi/minix_be.mod -usr/lib/grub/i386-efi/minix_be.module -usr/lib/grub/i386-efi/mmap.mod -usr/lib/grub/i386-efi/mmap.module -usr/lib/grub/i386-efi/moddep.lst -usr/lib/grub/i386-efi/modinfo.sh -usr/lib/grub/i386-efi/msdospart.mod -usr/lib/grub/i386-efi/msdospart.module -usr/lib/grub/i386-efi/multiboot.mod -usr/lib/grub/i386-efi/multiboot.module -usr/lib/grub/i386-efi/multiboot2.mod -usr/lib/grub/i386-efi/multiboot2.module -usr/lib/grub/i386-efi/net.mod -usr/lib/grub/i386-efi/net.module -usr/lib/grub/i386-efi/newc.mod -usr/lib/grub/i386-efi/newc.module -usr/lib/grub/i386-efi/nilfs2.mod -usr/lib/grub/i386-efi/nilfs2.module -usr/lib/grub/i386-efi/normal.mod -usr/lib/grub/i386-efi/normal.module -usr/lib/grub/i386-efi/ntfs.mod -usr/lib/grub/i386-efi/ntfs.module -usr/lib/grub/i386-efi/ntfscomp.mod -usr/lib/grub/i386-efi/ntfscomp.module -usr/lib/grub/i386-efi/odc.mod -usr/lib/grub/i386-efi/odc.module -usr/lib/grub/i386-efi/ohci.mod -usr/lib/grub/i386-efi/ohci.module -usr/lib/grub/i386-efi/part_acorn.mod -usr/lib/grub/i386-efi/part_acorn.module -usr/lib/grub/i386-efi/part_amiga.mod -usr/lib/grub/i386-efi/part_amiga.module -usr/lib/grub/i386-efi/part_apple.mod -usr/lib/grub/i386-efi/part_apple.module -usr/lib/grub/i386-efi/part_bsd.mod -usr/lib/grub/i386-efi/part_bsd.module -usr/lib/grub/i386-efi/part_dvh.mod -usr/lib/grub/i386-efi/part_dvh.module -usr/lib/grub/i386-efi/part_gpt.mod -usr/lib/grub/i386-efi/part_gpt.module -usr/lib/grub/i386-efi/part_msdos.mod -usr/lib/grub/i386-efi/part_msdos.module -usr/lib/grub/i386-efi/part_plan.mod -usr/lib/grub/i386-efi/part_plan.module -usr/lib/grub/i386-efi/part_sun.mod -usr/lib/grub/i386-efi/part_sun.module -usr/lib/grub/i386-efi/part_sunpc.mod -usr/lib/grub/i386-efi/part_sunpc.module -usr/lib/grub/i386-efi/partmap.lst -usr/lib/grub/i386-efi/parttool.lst -usr/lib/grub/i386-efi/parttool.mod -usr/lib/grub/i386-efi/parttool.module -usr/lib/grub/i386-efi/password.mod -usr/lib/grub/i386-efi/password.module -usr/lib/grub/i386-efi/password_pbkdf2.mod -usr/lib/grub/i386-efi/password_pbkdf2.module -usr/lib/grub/i386-efi/pata.mod -usr/lib/grub/i386-efi/pata.module -usr/lib/grub/i386-efi/pbkdf2.mod -usr/lib/grub/i386-efi/pbkdf2.module -usr/lib/grub/i386-efi/play.mod -usr/lib/grub/i386-efi/play.module -usr/lib/grub/i386-efi/png.mod -usr/lib/grub/i386-efi/png.module -usr/lib/grub/i386-efi/priority_queue.mod -usr/lib/grub/i386-efi/priority_queue.module -usr/lib/grub/i386-efi/probe.mod -usr/lib/grub/i386-efi/probe.module -usr/lib/grub/i386-efi/raid5rec.mod -usr/lib/grub/i386-efi/raid5rec.module -usr/lib/grub/i386-efi/raid6rec.mod -usr/lib/grub/i386-efi/raid6rec.module -usr/lib/grub/i386-efi/read.mod -usr/lib/grub/i386-efi/read.module -usr/lib/grub/i386-efi/reboot.mod -usr/lib/grub/i386-efi/reboot.module -usr/lib/grub/i386-efi/regexp.mod -usr/lib/grub/i386-efi/regexp.module -usr/lib/grub/i386-efi/reiserfs.mod -usr/lib/grub/i386-efi/reiserfs.module -usr/lib/grub/i386-efi/relocator.mod -usr/lib/grub/i386-efi/relocator.module -usr/lib/grub/i386-efi/romfs.mod -usr/lib/grub/i386-efi/romfs.module -usr/lib/grub/i386-efi/scsi.mod -usr/lib/grub/i386-efi/scsi.module -usr/lib/grub/i386-efi/search.mod -usr/lib/grub/i386-efi/search.module -usr/lib/grub/i386-efi/search_fs_file.mod -usr/lib/grub/i386-efi/search_fs_file.module -usr/lib/grub/i386-efi/search_fs_uuid.mod -usr/lib/grub/i386-efi/search_fs_uuid.module -usr/lib/grub/i386-efi/search_label.mod -usr/lib/grub/i386-efi/search_label.module -usr/lib/grub/i386-efi/serial.mod -usr/lib/grub/i386-efi/serial.module -usr/lib/grub/i386-efi/setjmp.mod -usr/lib/grub/i386-efi/setjmp.module -usr/lib/grub/i386-efi/setpci.mod -usr/lib/grub/i386-efi/setpci.module -usr/lib/grub/i386-efi/sfs.mod -usr/lib/grub/i386-efi/sfs.module -usr/lib/grub/i386-efi/sleep.mod -usr/lib/grub/i386-efi/sleep.module -usr/lib/grub/i386-efi/squash4.mod -usr/lib/grub/i386-efi/squash4.module -usr/lib/grub/i386-efi/tar.mod -usr/lib/grub/i386-efi/tar.module -usr/lib/grub/i386-efi/terminal.lst -usr/lib/grub/i386-efi/terminal.mod -usr/lib/grub/i386-efi/terminal.module -usr/lib/grub/i386-efi/terminfo.mod -usr/lib/grub/i386-efi/terminfo.module -usr/lib/grub/i386-efi/test.mod -usr/lib/grub/i386-efi/test.module -usr/lib/grub/i386-efi/test_blockarg.mod -usr/lib/grub/i386-efi/test_blockarg.module -usr/lib/grub/i386-efi/testload.mod -usr/lib/grub/i386-efi/testload.module -usr/lib/grub/i386-efi/tftp.mod -usr/lib/grub/i386-efi/tftp.module -usr/lib/grub/i386-efi/tga.mod -usr/lib/grub/i386-efi/tga.module -usr/lib/grub/i386-efi/time.mod -usr/lib/grub/i386-efi/time.module -usr/lib/grub/i386-efi/trig.mod -usr/lib/grub/i386-efi/trig.module -usr/lib/grub/i386-efi/true.mod -usr/lib/grub/i386-efi/true.module -usr/lib/grub/i386-efi/udf.mod -usr/lib/grub/i386-efi/udf.module -usr/lib/grub/i386-efi/ufs1.mod -usr/lib/grub/i386-efi/ufs1.module -usr/lib/grub/i386-efi/ufs2.mod -usr/lib/grub/i386-efi/ufs2.module -usr/lib/grub/i386-efi/uhci.mod -usr/lib/grub/i386-efi/uhci.module -usr/lib/grub/i386-efi/usb.mod -usr/lib/grub/i386-efi/usb.module -usr/lib/grub/i386-efi/usb_keyboard.mod -usr/lib/grub/i386-efi/usb_keyboard.module -usr/lib/grub/i386-efi/usbms.mod -usr/lib/grub/i386-efi/usbms.module -usr/lib/grub/i386-efi/usbserial_common.mod -usr/lib/grub/i386-efi/usbserial_common.module -usr/lib/grub/i386-efi/usbserial_ftdi.mod -usr/lib/grub/i386-efi/usbserial_ftdi.module -usr/lib/grub/i386-efi/usbserial_pl2303.mod -usr/lib/grub/i386-efi/usbserial_pl2303.module -usr/lib/grub/i386-efi/usbtest.mod -usr/lib/grub/i386-efi/usbtest.module -usr/lib/grub/i386-efi/video.lst -usr/lib/grub/i386-efi/video.mod -usr/lib/grub/i386-efi/video.module -usr/lib/grub/i386-efi/video_bochs.mod -usr/lib/grub/i386-efi/video_bochs.module -usr/lib/grub/i386-efi/video_cirrus.mod -usr/lib/grub/i386-efi/video_cirrus.module -usr/lib/grub/i386-efi/video_fb.mod -usr/lib/grub/i386-efi/video_fb.module -usr/lib/grub/i386-efi/videoinfo.mod -usr/lib/grub/i386-efi/videoinfo.module -usr/lib/grub/i386-efi/videotest.mod -usr/lib/grub/i386-efi/videotest.module -usr/lib/grub/i386-efi/xfs.mod -usr/lib/grub/i386-efi/xfs.module -usr/lib/grub/i386-efi/xnu.mod -usr/lib/grub/i386-efi/xnu.module -usr/lib/grub/i386-efi/xnu_uuid.mod -usr/lib/grub/i386-efi/xnu_uuid.module -usr/lib/grub/i386-efi/xzio.mod -usr/lib/grub/i386-efi/xzio.module -usr/lib/grub/i386-efi/zfs.mod -usr/lib/grub/i386-efi/zfs.module -usr/lib/grub/i386-efi/zfscrypt.mod -usr/lib/grub/i386-efi/zfscrypt.module -usr/lib/grub/i386-efi/zfsinfo.mod -usr/lib/grub/i386-efi/zfsinfo.module ->>>>>>> Enhance the flash image to support EFI usr/lib/grub/i386-pc #usr/lib/grub/i386-pc/acpi.mod #usr/lib/grub/i386-pc/acpi.module @@ -578,8 +148,6 @@ usr/lib/grub/i386-pc #usr/lib/grub/i386-pc/echo.module #usr/lib/grub/i386-pc/efiemu.mod #usr/lib/grub/i386-pc/efiemu.module -#usr/lib/grub/i386-pc/efiemu32.o -#usr/lib/grub/i386-pc/efiemu64.o #usr/lib/grub/i386-pc/ehci.mod #usr/lib/grub/i386-pc/ehci.module #usr/lib/grub/i386-pc/elf.mod @@ -1027,7 +595,12 @@ usr/sbin/grub-reboot usr/sbin/grub-set-default usr/sbin/grub-sparc64-setup #usr/share/grub +#usr/share/grub/ascii.h +usr/share/grub/ascii.pf2 +usr/share/grub/euro.pf2 usr/share/grub/grub-mkconfig_lib +usr/share/grub/unicode.pf2 +#usr/share/grub/widthspec.h #usr/share/info/grub-dev.info #usr/share/info/grub.info #usr/share/locale/ast/LC_MESSAGES/grub.mo diff --git a/lfs/cdrom b/lfs/cdrom index 7fa3999c2..faaa3dff1 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -56,14 +56,6 @@ ISO_ARGS = -J -r -v \ ISOHYBRID_ARGS = -ifeq "$(EFI)" "1" - ISO_ARGS += \ - -eltorito-alt-boot \ - -e boot/isolinux/efiboot.img - - ISOHYBRID_ARGS += --uefi -endif - ifeq "$(HAS_ISOLINUX)" "1" ISO_ARGS += \ -no-emul-boot \ @@ -73,6 +65,14 @@ ifeq "$(HAS_ISOLINUX)" "1" -c boot/isolinux/boot.catalog endif +ifeq "$(EFI)" "1" + ISO_ARGS += \ + -eltorito-alt-boot \ + -e boot/isolinux/efiboot.img + + ISOHYBRID_ARGS += --uefi +endif + ############################################################################### # Top-level Rules ############################################################################### hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6a7e6b4499115e52cc6ec1abb799f6a7d14d2168
by git＠ipfire.org 14 Jul '18

14 Jul '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 6a7e6b4499115e52cc6ec1abb799f6a7d14d2168 (commit) via 87d7fc6609277c4e6521265b6f008311291c1890 (commit) via 53eb49180e16e1cc740695bb9cdb381becfd59a1 (commit) via e2d9fe7e166dc3dbf50d5d2cfe27b0d9abcb9f45 (commit) from 0927eadc529ac50730b0a28e567c09a51e0d4083 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6a7e6b4499115e52cc6ec1abb799f6a7d14d2168 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jul 14 15:06:39 2018 +0100 AWS: Give setup user permissions to read its own SSH keys Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 87d7fc6609277c4e6521265b6f008311291c1890 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 12 15:37:59 2018 +0100 aws: Unlock setup account Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 53eb49180e16e1cc740695bb9cdb381becfd59a1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 12 13:57:19 2018 +0100 aws: Install SSH keys only for setup user Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e2d9fe7e166dc3dbf50d5d2cfe27b0d9abcb9f45 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 12 13:55:38 2018 +0100 aws: setup user should not be a system user Login is not permitted for system users Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/initscripts/helper/aws-setup | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) Difference in files: diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup index a273aff7d..d8c7a358c 100644 --- a/src/initscripts/helper/aws-setup +++ b/src/initscripts/helper/aws-setup @@ -86,25 +86,27 @@ import_aws_configuration() { # Create setup user if ! getent passwd setup &>/dev/null; then - useradd -r setup -s /usr/bin/run-setup -g nobody -m + useradd setup -s /usr/bin/run-setup -g nobody -m + + # Unlock the account + usermod -p "x" setup fi - # Import SSH keys - local user - for user in /root /home/setup; do - local line - for line in $(get "public-keys/"); do - local key_no="${line%=*}" - - local key="$(get public-keys/${key_no}/openssh-key)" - if [ -n "${key}" ] && ! grep -q "^${key}$" "${user}/.ssh/authorized_keys" 2>/dev/null; then - mkdir -p "${user}/.ssh" - chmod 700 "${user}/.ssh" - - echo "${key}" >> "${user}/.ssh/authorized_keys" - chmod 600 "${user}/.ssh/authorized_keys" - fi - done + # Import SSH keys for setup user + local line + for line in $(get "public-keys/"); do + local key_no="${line%=*}" + + local key="$(get public-keys/${key_no}/openssh-key)" + if [ -n "${key}" ] && ! grep -q "^${key}$" "/home/setup/.ssh/authorized_keys" 2>/dev/null; then + mkdir -p "/home/setup/.ssh" + chmod 700 "/home/setup/.ssh" + chown setup.nobody "/home/setup/.ssh" + + echo "${key}" >> "/home/setup/.ssh/authorized_keys" + chmod 600 "/home/setup/.ssh/authorized_keys" + chown setup.nobody "/home/setup/.ssh/authorized_keys" + fi done # Import any DNS server settings hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, efi, updated. 37dc79434ad752c7115c01aa26264c933e9de647
by git＠ipfire.org 14 Jul '18

14 Jul '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, efi has been updated via 37dc79434ad752c7115c01aa26264c933e9de647 (commit) from a5c92f50bfcecb8496216c82b41d4dd4b7d78635 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 37dc79434ad752c7115c01aa26264c933e9de647 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jul 14 14:05:09 2018 +0100 kernel: Enable EFI on aarch64 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 39 +++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 12 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 7444864f3..37e190741 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.14.48-ipfire-multi Kernel Configuration +# Linux/arm64 4.14.50-ipfire Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -441,6 +441,7 @@ CONFIG_PCI_ECAM=y # CONFIG_PCI_IOV is not set # CONFIG_PCI_PRI is not set # CONFIG_PCI_PASID is not set +CONFIG_PCI_LABEL=y # CONFIG_HOTPLUG_PCI is not set # @@ -597,7 +598,9 @@ CONFIG_ARM64_MODULE_CMODEL_LARGE=y # CONFIG_CMDLINE="console=ttyAM0,115200 root=/dev/sda1 rootdelay=20" # CONFIG_CMDLINE_FORCE is not set -# CONFIG_EFI is not set +CONFIG_EFI_STUB=y +CONFIG_EFI=y +CONFIG_DMI=y # # Userspace binary formats @@ -2403,7 +2406,6 @@ CONFIG_WLAN=y # CONFIG_WIRELESS_WDS is not set CONFIG_WLAN_VENDOR_ADMTEK=y CONFIG_ADM8211=m -# CONFIG_RTL8189ES is not set CONFIG_ATH_COMMON=m CONFIG_WLAN_VENDOR_ATH=y # CONFIG_ATH_DEBUG is not set @@ -2614,7 +2616,6 @@ CONFIG_WL18XX=m CONFIG_WLCORE=m CONFIG_WLCORE_SDIO=m CONFIG_WILINK_PLATFORM_DATA=y -# CONFIG_WLAN_VENDOR_XRADIO is not set CONFIG_WLAN_VENDOR_ZYDAS=y CONFIG_USB_ZD1201=m CONFIG_ZD1211RW=m @@ -2861,6 +2862,7 @@ CONFIG_LP_CONSOLE=y CONFIG_PPDEV=m # CONFIG_HVC_DCC is not set CONFIG_IPMI_HANDLER=m +CONFIG_IPMI_DMI_DECODE=y # CONFIG_IPMI_PANIC_EVENT is not set CONFIG_IPMI_DEVICE_INTERFACE=m CONFIG_IPMI_SI=m @@ -3580,7 +3582,6 @@ CONFIG_REGULATOR_PFUZE100=y # CONFIG_REGULATOR_PV88080 is not set # CONFIG_REGULATOR_PV88090 is not set # CONFIG_REGULATOR_PWM is not set -CONFIG_REGULATOR_SY8106A=y # CONFIG_REGULATOR_TPS51632 is not set # CONFIG_REGULATOR_TPS62360 is not set # CONFIG_REGULATOR_TPS65023 is not set @@ -3591,7 +3592,6 @@ CONFIG_REGULATOR_TWL4030=y CONFIG_REGULATOR_VEXPRESS=y CONFIG_CEC_CORE=m CONFIG_CEC_NOTIFIER=y -CONFIG_CEC_PIN=y CONFIG_RC_CORE=m CONFIG_RC_MAP=m CONFIG_RC_DECODERS=y @@ -4234,12 +4234,6 @@ CONFIG_DRM_UDL=m # CONFIG_DRM_MGAG200 is not set # CONFIG_DRM_CIRRUS_QEMU is not set CONFIG_DRM_RCAR_DW_HDMI=m -CONFIG_DRM_SUN4I=m -CONFIG_DRM_SUN4I_HDMI=m -CONFIG_DRM_SUN4I_HDMI_CEC=y -CONFIG_DRM_SUN4I_BACKEND=m -CONFIG_DRM_SUN8I_DW_HDMI=m -CONFIG_DRM_SUN8I_MIXER=m # CONFIG_DRM_QXL is not set # CONFIG_DRM_BOCHS is not set CONFIG_DRM_PANEL=y @@ -4329,6 +4323,7 @@ CONFIG_FB_ARMCLCD=m # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_UVESA is not set +CONFIG_FB_EFI=y CONFIG_FB_OPENCORES=m # CONFIG_FB_S1D13XXX is not set # CONFIG_FB_NVIDIA is not set @@ -5315,6 +5310,7 @@ CONFIG_RTC_DRV_DS1553=m # CONFIG_RTC_DRV_DS1685_FAMILY is not set CONFIG_RTC_DRV_DS1742=m CONFIG_RTC_DRV_DS2404=m +# CONFIG_RTC_DRV_EFI is not set CONFIG_RTC_DRV_STK17TA8=m # CONFIG_RTC_DRV_M48T86 is not set CONFIG_RTC_DRV_M48T35=m @@ -6048,10 +6044,27 @@ CONFIG_ARM_PSCI_FW=y # CONFIG_ARM_PSCI_CHECKER is not set # CONFIG_ARM_SCPI_PROTOCOL is not set # CONFIG_FIRMWARE_MEMMAP is not set +CONFIG_DMIID=y +# CONFIG_DMI_SYSFS is not set CONFIG_RASPBERRYPI_FIRMWARE=y # CONFIG_FW_CFG_SYSFS is not set CONFIG_HAVE_ARM_SMCCC=y # CONFIG_GOOGLE_FIRMWARE is not set + +# +# EFI (Extensible Firmware Interface) Support +# +CONFIG_EFI_VARS=y +CONFIG_EFI_ESRT=y +CONFIG_EFI_VARS_PSTORE=y +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set +CONFIG_EFI_PARAMS_FROM_FDT=y +CONFIG_EFI_RUNTIME_WRAPPERS=y +CONFIG_EFI_ARMSTUB=y +CONFIG_EFI_BOOTLOADER_CONTROL=m +# CONFIG_EFI_CAPSULE_LOADER is not set +# CONFIG_EFI_TEST is not set +# CONFIG_RESET_ATTACK_MITIGATION is not set CONFIG_MESON_SM=y # @@ -6173,6 +6186,7 @@ CONFIG_TMPFS_XATTR=y # CONFIG_HUGETLB_PAGE is not set CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=m +CONFIG_EFIVAR_FS=m CONFIG_MISC_FILESYSTEMS=y # CONFIG_ORANGEFS_FS is not set # CONFIG_ADFS_FS is not set @@ -6790,6 +6804,7 @@ CONFIG_DDR=y CONFIG_IRQ_POLL=y CONFIG_LIBFDT=y CONFIG_OID_REGISTRY=m +CONFIG_UCS2_STRING=y CONFIG_FONT_SUPPORT=y # CONFIG_FONTS is not set CONFIG_FONT_8x8=y hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, efi, created. a5c92f50bfcecb8496216c82b41d4dd4b7d78635
by git＠ipfire.org 14 Jul '18

14 Jul '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, efi has been created at a5c92f50bfcecb8496216c82b41d4dd4b7d78635 (commit) - Log ----------------------------------------------------------------- commit a5c92f50bfcecb8496216c82b41d4dd4b7d78635 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 12 13:59:07 2018 +0100 flash-images: Only install grub for EFI on aarch64 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 092bc105e4ccde0743fabb18f4891aebd5747c5a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 12 10:39:57 2018 +0100 cdrom: Run isohybrid only when we have syslinux Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a1eb7761991af6515bd3b08f598454c7720119f8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 10 18:10:14 2018 +0100 cdrom: Fix building GRUB image for aarch64 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4790db5f9509befbaa2d379a854bddd49d09f497 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 10 15:34:30 2018 +0100 cdrom: Install ISOLINUX only on some architectures Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0ce1e4906e0f9db3c5ef4c1e9dd53449cc1d63d9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 10 14:38:21 2018 +0100 cdrom: Install iPXE only on x86 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b7407ccad54e5d5d5b4a83073fb1ccdbcfa5b85e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 5 23:29:20 2018 +0100 cdrom: Install memtest only on x86 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 701c891b40dc7e115f7359b26babab86ba36602c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 21 15:53:38 2018 +0100 Build efibootmgr and efivars only for x86_64 and aarch64 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7c80f8c5cc517e4c39824f038cd3867518e4f262 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 17 22:49:14 2018 +0100 syslinux: Update to 6.04-pre1 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e3a3af3c5d1e49d8f86e82500ad7df5f5b2a3b33 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 17 18:18:25 2018 +0100 installer: Install GRUB in removable mode as well This allows that a system will boot IPFire even when no boot entry is configured in the EFI BIOS Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7dc7880ddacc97f9e2393d2155f12384c6a3ad11 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 17 18:16:26 2018 +0100 installer: Always install EFI bootloader on x86_64 and aarch64 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8fbadfc7a31a224c6b339e45ffe2f0041c8f7ec8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 17 18:15:08 2018 +0100 installer: Create a flag that marks if EFI support is available Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f096a2ea9871ab087e36cd0044a3875d03b98799 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 13 23:21:58 2018 +0100 flash-image+cdrom: Execute ARMv5-specific code on ARMv5 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2c49856ead5c553dde1e8888b6de0937b3f3d00a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 13 23:05:44 2018 +0100 Rootfile update for parted Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b62f71f7f21752d3f919aaed9378826c36e5731c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 11 18:32:42 2018 +0100 Build GRUB on aarch64 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3755e358098f303df3f5f7effe47f6e354c8b733 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 11 17:13:40 2018 +0100 make.sh: Build popt earlier efivars depends on it and since it is a very common library without any dependencies, we can build it very early Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8a06ff80c4e2daf597ec4ea6542854183351880d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 11 10:32:28 2018 +0100 grub: Don't explicitely set the font Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 92e782332c88a3adc375f39d8183f031ccfe272a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 11 10:31:29 2018 +0100 installer: Add support to install on EFI systems Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4c2343931cc01bf1594d9e9ef194a7ab87c7298a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 11 10:17:54 2018 +0100 parted: Update to 3.2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b89c7379f9891a35845a2c1402c86392c4c5800d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 7 23:31:13 2018 +0100 flash-images: Make EFI partition 32MB Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 89e79c50c7e497dd7fa8eb5f451fbafa8abb72e6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 7 23:18:08 2018 +0100 flash-images: Cleanup partitioning code No functional changes Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8662e981738a22b780f6062900489dfe42c403a3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 7 22:22:02 2018 +0100 flash-images: Mark the /boot partition as bootable Before, the ESP was marked as bootable which isn't necessary Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7d456c39710018b92ad7668e407f058924ff13b1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 7 22:18:32 2018 +0100 flash-image: Use grub-install to install GRUB in EFI mode Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2f329aab2700e7a36afcc32a047c44057b4f334a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 7 22:17:34 2018 +0100 flash-image: Mark the EFI system partition as such Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit dfb0084e355885908d80b6544bd86fe5c0c1aba2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 7 22:17:05 2018 +0100 flash-image: Remove any other GRUB configuration files in EFI mode Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 24e811b03acb228b71227430c98d48bd1e3ad9ab Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 7 22:15:58 2018 +0100 grub: Don't install an empty EFI configuration file Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fd80e500dfff0f8d5f6ec4a417b7c9fe423779b0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 7 15:33:48 2018 +0100 Add efibootmgr and efivar These packages are required to manage EFI boot options Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b6a0fd583981787fb50a2eae43d34393215eeb95 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 15:24:51 2018 +0100 cdrom: Select installation as default Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5fb499f13b3eb8b25c55f113851f25bc9ac91e17 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 15:24:39 2018 +0100 installer: Detect if we are running in EFI mode Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6b44fee76f2f086b8ac5378e1fdcf1fc000b70e6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 15:08:53 2018 +0100 cdrom: Keep the EFI image on the ISO9660 file system as well This allows systems to boot the EFI bootloader from the CDROM file system instead of using the FAT filesystem which is for USB keys. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5765b49bff0c3bcd60d1624c1bb159ce47085183 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 14:57:12 2018 +0100 cdrom: Add grub.cfg that allows to install IPFire Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 582aba05344e161a2ecbed81eef19005a80289ed Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 13:47:47 2018 +0100 Enable EFI on aarch64 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5f387a1b8630c73cd0d573961356f579fd5520e4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 13:46:56 2018 +0100 cdrom: Install GRUB into EFI image This will start GRUB on EFI systems when booting from CD Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f4330e19b18589a75422d4d1bb34db4b95d02375 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 12:46:01 2018 +0100 Fix syntax error in lfs/cdrom Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b661333e3a4359c4dcf7cf68a7537fe84ecdee34 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 11:01:08 2018 +0100 syslinux: FTBFS with newer ld Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 78dd680dfa04b6197488d18c3badbe4fe15c711c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 11:00:43 2018 +0100 make.sh: cdrkit required cmake to build Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 308af080f665e7a43d6ad5aeae8383a7dc34bb0e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 30 15:43:30 2018 +0100 grub: Build new version in EFI mode Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ba3cbb0cfbf41c05185caa1f42b985738ff218bc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 30 15:23:57 2018 +0100 Adjust variables that have been renamed Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7b4323c66ee5e639c841cced6503544c520374e9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 29 20:14:59 2018 +0100 cdrom: Simplify commands that author the ISO image Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5f52a95646b6e2f9aa13cd8b38ed1b22484470f7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 16 23:57:18 2015 +0200 cdrom: Build EFI-enabled ISO image Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 72d40cfddde09c4db8249ab7dec74e12c0664a6c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 16 23:56:45 2015 +0200 Config: Have a simple configuration variable that enables EFI Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit df261337933e0532cd7c88658f11070771fa18f7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 16 23:52:09 2015 +0200 syslinux: Update to 6.03 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8a9605840cbfc095b94320d21f14b211e81c3af9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 3 21:32:12 2015 +0200 Remove dvdrtools for cdrkit Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0268380764dc5cc33541643e603b32ce513ab963 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 3 20:25:34 2015 +0200 ipfire-netboot: Ship EFI image Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7fbbd2aebc014bdd86e527b94418e8201c82ce42 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Sep 19 23:17:02 2015 +0200 Enable EFI on x86_64 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 784cd5cbd7f4b7ad3d0cda1411b8eb1e038ffc7e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 22 21:18:18 2015 +0100 Enhance the flash image to support EFI Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM