diff --git a/01-toolchain b/01-toolchain
index d06472a..a307196 100755
--- a/01-toolchain
+++ b/01-toolchain
@@ -81,7 +81,7 @@ fi
 CWD=$PWD
 
 if [ -f $CWD/config ]; then
-	source $CWD/config
+	. $CWD/config
 fi
 
 PATH=/tools/bin:/bin:/usr/bin
diff --git a/02-base b/02-base
index 30239ed..140c922 100755
--- a/02-base
+++ b/02-base
@@ -151,11 +151,11 @@ fi
 
 PKGS="filesystem linux-api-headers man-pages glibc tzdata zlib bzip2 file readline m4 bc binutils gmp mpfr mpc attr acl shadow gcc
 	pkgconf ncurses libcap sed psmisc iana-etc bison flex grep bash libtool gdbm gperf expat inetutils
-	perl perl-xml-parser intltool autoconf automake xz kmod gettext elfutils libffi openssl python3 coreutils
+	perl perl-xml-parser intltool autoconf automake xz kmod gettext openssl ca-certificates curl elfutils libffi python3 coreutils
 	diffutils gawk findutils groff fuse2 grub less gzip iproute2 kbd libpipeline make patch man-db tar texinfo vim procps-ng
-	util-linux e2fsprogs sysklogd sysvinit eudev lfs-bootscripts linux-firmware libarchive mkinitramfs linux libtasn1 p11-kit ca-certificates 
+	util-linux e2fsprogs sysklogd sysvinit eudev lfs-bootscripts linux-firmware libarchive mkinitramfs linux libtasn1 p11-kit
 	wget pkgutils libnl dbus libxml2 dhcpcd wpa_supplicant lzo lz4 squashfs-tools popt efivar pciutils efibootmgr libpng which freetype2 dosfstools grub-efi
-	curl ports httpup gpm libevent links mtools syslinux"
+	ports httpup gpm libevent links mtools syslinux"
 
 if [ ! -f $LFS/var/lib/pkg/db ]; then
 	lfs_dirs
diff --git a/ports/checkupdate b/ports/checkupdate
index 1fea36c..d0a4d1c 100755
--- a/ports/checkupdate
+++ b/ports/checkupdate
@@ -94,6 +94,7 @@ run_check() {
 	upver=${upver:-404}
 	
 	[ "$OUT" = 1 ] && {
+		touch error outdate
 		sed "\,^$ppath ,d" -i error
 		sed "\,^$ppath ,d" -i outdate
 	}
diff --git a/ports/core/bc/Pkgfile b/ports/core/bc/Pkgfile
index 2f5d048..daf1269 100755
--- a/ports/core/bc/Pkgfile
+++ b/ports/core/bc/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=bc
-version=4.0.0
+version=4.0.2
 release=1
 source=(https://github.com/gavinhoward/bc/archive/$version/bc-$version.tar.gz)
 
diff --git a/ports/core/curl/Pkgfile b/ports/core/curl/Pkgfile
index 8835d7b..a8bf0a0 100755
--- a/ports/core/curl/Pkgfile
+++ b/ports/core/curl/Pkgfile
@@ -4,16 +4,17 @@
 # Depends on:  ca-certificates openssl
 
 name=curl
-version=7.76.1
+version=7.77.0
 release=1
 source=(https://curl.haxx.se/download/$name-$version.tar.xz)
 
 build() {
 	cd $name-$version
 
-	./configure --prefix=/usr              \
-                    --disable-static           \
+	./configure --prefix=/usr \
+                    --disable-static \
                     --enable-threaded-resolver \
+		    --with-openssl \
                     --with-ca-bundle=/etc/ssl/cert.pem
 	make
 	make DESTDIR=$PKG install
diff --git a/ports/core/elfutils/Pkgfile b/ports/core/elfutils/Pkgfile
index abac476..01dbbc9 100755
--- a/ports/core/elfutils/Pkgfile
+++ b/ports/core/elfutils/Pkgfile
@@ -4,14 +4,18 @@
 # Depends on:  
 
 name=elfutils
-version=0.178
+version=0.185
 release=1
 source=(https://sourceware.org/ftp/elfutils/$version/elfutils-$version.tar.bz2)
 
 build() {
         cd $name-$version
 
-        ./configure --prefix=/usr --program-prefix="eu-" --disable-debuginfod
+        ./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--program-prefix="eu-" \
+		--disable-debuginfod
         make
         make DESTDIR=$PKG install
 }
diff --git a/ports/core/elfutils/update b/ports/core/elfutils/update
new file mode 100644
index 0000000..3e5a3c9
--- /dev/null
+++ b/ports/core/elfutils/update
@@ -0,0 +1,8 @@
+url=$(dirname $url)
+url=$url/$(fetch \
+| grep folder \
+| sed 's,.*href=",,;s,\/.*,,' \
+| grep ^[[:digit:]] \
+| sort -V \
+| uniq \
+| tail -n1)
diff --git a/ports/core/expat/Pkgfile b/ports/core/expat/Pkgfile
index 6d75f50..c19c00c 100755
--- a/ports/core/expat/Pkgfile
+++ b/ports/core/expat/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=expat
-version=2.3.0
+version=2.4.1
 release=1
 source=(https://sourceforge.net/projects/expat/files/expat/$version/expat-$version.tar.bz2)
 
diff --git a/ports/core/gcc/Pkgfile b/ports/core/gcc/Pkgfile
index 54eea95..3429a27 100755
--- a/ports/core/gcc/Pkgfile
+++ b/ports/core/gcc/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=gcc
-version=10.2.0
+version=11.1.0
 release=1
 source=(https://ftp.gnu.org/gnu/$name/$name-$version/$name-$version.tar.xz)
 
diff --git a/ports/core/gcc/update b/ports/core/gcc/update
new file mode 100644
index 0000000..025a5a4
--- /dev/null
+++ b/ports/core/gcc/update
@@ -0,0 +1,7 @@
+url=$(dirname $url)
+
+getver_gcc() {
+	fetch \
+	| grep -Eo gcc-[0-9.]+ \
+	| sed "s/$name-//"
+}
diff --git a/ports/core/grub-efi/Pkgfile b/ports/core/grub-efi/Pkgfile
index 6fabe53..d575230 100755
--- a/ports/core/grub-efi/Pkgfile
+++ b/ports/core/grub-efi/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  grub efivar efibootmgr freetype2 dosfstools
 
 name=grub-efi
-version=2.04
+version=2.06
 release=1
 source=(https://ftp.gnu.org/gnu/grub/grub-$version.tar.xz
         https://ftp.gnu.org/gnu/unifont/unifont-12.1.02/unifont-12.1.02.bdf.gz)
diff --git a/ports/core/grub/Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch b/ports/core/grub/Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch
deleted file mode 100644
index 357c825..0000000
--- a/ports/core/grub/Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch
+++ /dev/null
@@ -1,313 +0,0 @@
-From 6643507ce30f775008e093580f0c9499dfb2c485 Mon Sep 17 00:00:00 2001
-From: Simon Hardy <simon.hardy@itdev.co.uk>
-Date: Tue, 24 Mar 2020 13:29:12 +0000
-Subject: build: Fix GRUB i386-pc build with Ubuntu gcc
-
-With recent versions of gcc on Ubuntu a very large lzma_decompress.img file is
-output. (e.g. 134479600 bytes instead of 2864.) This causes grub-mkimage to
-fail with: "error: Decompressor is too big."
-
-This seems to be caused by a section .note.gnu.property that is placed at an
-offset such that objcopy needs to pad the img file with zeros.
-
-This issue is present on:
-Ubuntu 19.10 with gcc (Ubuntu 8.3.0-26ubuntu1~19.10) 8.3.0
-Ubuntu 19.10 with gcc (Ubuntu 9.2.1-9ubuntu2) 9.2.1 20191008
-
-This issue is not present on:
-Ubuntu 19.10 with gcc (Ubuntu 7.5.0-3ubuntu1~19.10) 7.5.0
-RHEL 8.0 with gcc 8.3.1 20190507 (Red Hat 8.3.1-4)
-
-The issue can be fixed by removing the section using objcopy as shown in
-this patch.
-
-Signed-off-by: Simon Hardy <simon.hardy@itdev.co.uk>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-[Retrieved (and updated to directly patch Makefile.in instead of
-gentpl.py to avoid adding a dependency on python) from:
-http://git.savannah.gnu.org/cgit/grub.git/commit/?id=6643507ce30f775008e093580f0c9499dfb2c485]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[yann.morin.1998@free.fr:
-  - keep the part patching gentpl.py
-  - restore it as a git-formatted patch
-  - introduce the hunk about the generated .am file
-]
-Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
----
- gentpl.py             |    2     1     1     0 +-
- grub-core/Makefile.in |   38    19    19     0 +++++++++++++++++++-------------------
- 2 files changed, 20 insertions(+), 20 deletions(-)
-
-diff --git a/gentpl.py b/gentpl.py
-index 387588c05..c86550d4f 100644
---- a/gentpl.py
-+++ b/gentpl.py
-@@ -766,7 +766,7 @@ def image(defn, platform):
- if test x$(TARGET_APPLE_LINKER) = x1; then \
-   $(MACHO2IMG) $< $@; \
- else \
--  $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; \
-+  $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; \
- fi
- """)
- 
-diff --git a/grub-core/Makefile.core.am b/grub-core/Makefile.core.am
-index 387588c05..c86550d4f 100644
---- a/grub-core/Makefile.core.am
-+++ 2/grub-core/Makefile.core.am
-@@ -22897,7 +22897,7 @@
- CLEANFILES += boot.img
- 
- boot.img: boot.image$(EXEEXT)
--	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 	
- endif
- 
-@@ -22918,7 +22918,7 @@
- CLEANFILES += boot.img
- 
- boot.img: boot.image$(EXEEXT)
--	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 	
- endif
- 
-@@ -22939,7 +22939,7 @@
- CLEANFILES += boot.img
- 
- boot.img: boot.image$(EXEEXT)
--	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 	
- endif
- 
-@@ -22960,7 +22960,7 @@
- CLEANFILES += boot_hybrid.img
- 
- boot_hybrid.img: boot_hybrid.image$(EXEEXT)
--	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_hybrid_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_hybrid_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 	
- endif
- 
-@@ -22981,7 +22981,7 @@
- CLEANFILES += cdboot.img
- 
- cdboot.img: cdboot.image$(EXEEXT)
--	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 	
- endif
- 
-@@ -23002,7 +23002,7 @@
- CLEANFILES += cdboot.img
- 
- cdboot.img: cdboot.image$(EXEEXT)
--	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 	
- endif
- 
-@@ -23023,7 +23023,7 @@
- CLEANFILES += pxeboot.img
- 
- pxeboot.img: pxeboot.image$(EXEEXT)
--	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(pxeboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(pxeboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 	
- endif
- 
-@@ -23044,7 +23044,7 @@
- CLEANFILES += diskboot.img
- 
- diskboot.img: diskboot.image$(EXEEXT)
--	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 	
- endif
- 
-@@ -23065,7 +23065,7 @@
- CLEANFILES += diskboot.img
- 
- diskboot.img: diskboot.image$(EXEEXT)
--	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 	
- endif
- 
-@@ -23086,7 +23086,7 @@
- CLEANFILES += lnxboot.img
- 
- lnxboot.img: lnxboot.image$(EXEEXT)
--	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(lnxboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(lnxboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 	
- endif
- 
-@@ -23107,7 +23107,7 @@
- CLEANFILES += xz_decompress.img
- 
- xz_decompress.img: xz_decompress.image$(EXEEXT)
--	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 	
- endif
- 
-@@ -23128,7 +23128,7 @@
- CLEANFILES += xz_decompress.img
- 
- xz_decompress.img: xz_decompress.image$(EXEEXT)
--	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 	
- endif
- 
-@@ -23149,7 +23149,7 @@
- CLEANFILES += xz_decompress.img
- 
- xz_decompress.img: xz_decompress.image$(EXEEXT)
--	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 	
- endif
- 
-@@ -23170,7 +23170,7 @@
- CLEANFILES += none_decompress.img
- 
- none_decompress.img: none_decompress.image$(EXEEXT)
--	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 	
- endif
- 
-@@ -23191,7 +23191,7 @@
- CLEANFILES += none_decompress.img
- 
- none_decompress.img: none_decompress.image$(EXEEXT)
--	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 	
- endif
- 
-@@ -23212,7 +23212,7 @@
- CLEANFILES += none_decompress.img
- 
- none_decompress.img: none_decompress.image$(EXEEXT)
--	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 	
- endif
- 
-@@ -23233,7 +23233,7 @@
- CLEANFILES += lzma_decompress.img
- 
- lzma_decompress.img: lzma_decompress.image$(EXEEXT)
--	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(lzma_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(lzma_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 	
- endif
- 
-@@ -23254,7 +23254,7 @@
- CLEANFILES += fwstart.img
- 
- fwstart.img: fwstart.image$(EXEEXT)
--	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(fwstart_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(fwstart_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 	
- endif
- 
-@@ -23275,7 +23275,7 @@
- CLEANFILES += fwstart_fuloong2f.img
- 
- fwstart_fuloong2f.img: fwstart_fuloong2f.image$(EXEEXT)
--	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(fwstart_fuloong2f_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(fwstart_fuloong2f_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 	
- endif
- 
-diff --git a/grub-core/Makefile.in b/grub-core/Makefile.in
-index 387588c05..c86550d4f 100644
---- a/grub-core/Makefile.in
-+++ b/grub-core/Makefile.in
-@@ -46531,61 +46531,61 @@
- @COND_riscv64_efi_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(TARGET_STRIP) -S -x $(kernel_exec) -o $@.bin $<;   $(TARGET_OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -ed2022 -ed2016 -wd1106 -nu -nd $@.bin $@;   rm -f $@.bin;    elif test ! -z '$(TARGET_OBJ2ELF)'; then      $(TARGET_STRIP) $(kernel_exec_STRIPFLAGS) -o $@.bin $< &&      $(TARGET_OBJ2ELF) $@.bin $@ || (rm -f $@; rm -f $@.bin; exit 1);      rm -f $@.bin; else $(TARGET_STRIP) $(kernel_exec_STRIPFLAGS) -o $@ $<; fi
- 
- @COND_i386_pc_TRUE@boot.img: boot.image$(EXEEXT)
--@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 
- @COND_i386_qemu_TRUE@boot.img: boot.image$(EXEEXT)
--@COND_i386_qemu_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+@COND_i386_qemu_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 
- @COND_sparc64_ieee1275_TRUE@boot.img: boot.image$(EXEEXT)
--@COND_sparc64_ieee1275_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+@COND_sparc64_ieee1275_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 
- @COND_i386_pc_TRUE@boot_hybrid.img: boot_hybrid.image$(EXEEXT)
--@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_hybrid_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(boot_hybrid_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 
- @COND_i386_pc_TRUE@cdboot.img: cdboot.image$(EXEEXT)
--@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 
- @COND_sparc64_ieee1275_TRUE@cdboot.img: cdboot.image$(EXEEXT)
--@COND_sparc64_ieee1275_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+@COND_sparc64_ieee1275_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 
- @COND_i386_pc_TRUE@pxeboot.img: pxeboot.image$(EXEEXT)
--@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(pxeboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(pxeboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 
- @COND_i386_pc_TRUE@diskboot.img: diskboot.image$(EXEEXT)
--@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 
- @COND_sparc64_ieee1275_TRUE@diskboot.img: diskboot.image$(EXEEXT)
--@COND_sparc64_ieee1275_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+@COND_sparc64_ieee1275_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 
- @COND_i386_pc_TRUE@lnxboot.img: lnxboot.image$(EXEEXT)
--@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(lnxboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(lnxboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 
- @COND_mips_loongson_TRUE@xz_decompress.img: xz_decompress.image$(EXEEXT)
--@COND_mips_loongson_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+@COND_mips_loongson_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 
- @COND_mips_arc_TRUE@xz_decompress.img: xz_decompress.image$(EXEEXT)
--@COND_mips_arc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+@COND_mips_arc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 
- @COND_mips_qemu_mips_TRUE@xz_decompress.img: xz_decompress.image$(EXEEXT)
--@COND_mips_qemu_mips_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+@COND_mips_qemu_mips_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 
- @COND_mips_loongson_TRUE@none_decompress.img: none_decompress.image$(EXEEXT)
--@COND_mips_loongson_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+@COND_mips_loongson_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 
- @COND_mips_arc_TRUE@none_decompress.img: none_decompress.image$(EXEEXT)
--@COND_mips_arc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+@COND_mips_arc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 
- @COND_mips_qemu_mips_TRUE@none_decompress.img: none_decompress.image$(EXEEXT)
--@COND_mips_qemu_mips_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+@COND_mips_qemu_mips_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 
- @COND_i386_pc_TRUE@lzma_decompress.img: lzma_decompress.image$(EXEEXT)
--@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(lzma_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+@COND_i386_pc_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(lzma_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 
- @COND_mips_loongson_TRUE@fwstart.img: fwstart.image$(EXEEXT)
--@COND_mips_loongson_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(fwstart_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+@COND_mips_loongson_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(fwstart_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 
- @COND_mips_loongson_TRUE@fwstart_fuloong2f.img: fwstart_fuloong2f.image$(EXEEXT)
--@COND_mips_loongson_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(fwstart_fuloong2f_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi
-+@COND_mips_loongson_TRUE@	if test x$(TARGET_APPLE_LINKER) = x1; then   $(MACHO2IMG) $< $@; else   $(TARGET_OBJCOPY) $(fwstart_fuloong2f_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi
- 
- @COND_MAN_PAGES_TRUE@@COND_emu_TRUE@grub-emu.1: grub-emu 
- @COND_MAN_PAGES_TRUE@@COND_emu_TRUE@	chmod a+x grub-emu
diff --git a/ports/core/grub/Pkgfile b/ports/core/grub/Pkgfile
index c7467b2..0aa42da 100755
--- a/ports/core/grub/Pkgfile
+++ b/ports/core/grub/Pkgfile
@@ -4,17 +4,13 @@
 # Depends on:  gettext bash xz fuse2 python3
 
 name=grub
-version=2.04
+version=2.06
 release=1
-source=(https://ftp.gnu.org/gnu/$name/$name-$version.tar.xz grub.default
-	Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch)
+source=(https://ftp.gnu.org/gnu/$name/$name-$version.tar.xz grub.default)
 
 build() {
         cd $name-$version
 
-	patch -Np1 -i ../Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch
-
-	autoreconf -fiv
         ./configure --prefix=/usr \
                     --sbindir=/sbin \
                     --sysconfdir=/etc \
diff --git a/ports/core/iproute2/Pkgfile b/ports/core/iproute2/Pkgfile
index ba18859..e4acaff 100755
--- a/ports/core/iproute2/Pkgfile
+++ b/ports/core/iproute2/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=iproute2
-version=5.11.0
+version=5.12.0
 release=1
 source=(https://www.kernel.org/pub/linux/utils/net/$name/$name-$version.tar.xz)
 
diff --git a/ports/core/kmod/Pkgfile b/ports/core/kmod/Pkgfile
index ae9f596..3cf532b 100755
--- a/ports/core/kmod/Pkgfile
+++ b/ports/core/kmod/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=kmod
-version=28
+version=29
 release=1
 source=(https://www.kernel.org/pub/linux/utils/kernel/$name/$name-$version.tar.xz)
 
diff --git a/ports/core/less/Pkgfile b/ports/core/less/Pkgfile
index cd88d93..aa7194b 100755
--- a/ports/core/less/Pkgfile
+++ b/ports/core/less/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  ncurses
 
 name=less
-version=581
+version=590
 release=1
 source=(http://www.greenwoodsoftware.com/$name/$name-$version.tar.gz)
 
diff --git a/ports/core/lfs-bootscripts/Pkgfile b/ports/core/lfs-bootscripts/Pkgfile
index 4b7cf8b..7fd56ae 100755
--- a/ports/core/lfs-bootscripts/Pkgfile
+++ b/ports/core/lfs-bootscripts/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=lfs-bootscripts
-version=20210201
+version=20210608
 release=1
 source=(http://www.linuxfromscratch.org/lfs/downloads/development/lfs-bootscripts-$version.tar.xz
 	lfs-bootscripts_add-support-uefi.patch
diff --git a/ports/core/libcap/Pkgfile b/ports/core/libcap/Pkgfile
index 56d6db5..57c02de 100755
--- a/ports/core/libcap/Pkgfile
+++ b/ports/core/libcap/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=libcap
-version=2.49
+version=2.50
 release=1
 source=(https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$name-$version.tar.xz)
 
diff --git a/ports/core/libtasn1/Pkgfile b/ports/core/libtasn1/Pkgfile
index 5d269c5..632e890 100755
--- a/ports/core/libtasn1/Pkgfile
+++ b/ports/core/libtasn1/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=libtasn1
-version=4.16.0
+version=4.17.0
 release=1
 source=(https://ftp.gnu.org/gnu/libtasn1/libtasn1-$version.tar.gz)
 
diff --git a/ports/core/libxml2/Pkgfile b/ports/core/libxml2/Pkgfile
index d4c33b2..c37f90f 100755
--- a/ports/core/libxml2/Pkgfile
+++ b/ports/core/libxml2/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=libxml2
-version=2.9.10
+version=2.9.12
 release=1
 source=(http://xmlsoft.org/sources/$name-$version.tar.gz)
 
diff --git a/ports/core/links/Pkgfile b/ports/core/links/Pkgfile
index 8eba408..162d3d2 100755
--- a/ports/core/links/Pkgfile
+++ b/ports/core/links/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  openssl libevent
 
 name=links
-version=2.22
+version=2.23
 release=1
 source=(http://links.twibright.com/download/$name-$version.tar.bz2)
 
diff --git a/ports/core/linux-api-headers/Pkgfile b/ports/core/linux-api-headers/Pkgfile
index de1108c..6af30a5 100755
--- a/ports/core/linux-api-headers/Pkgfile
+++ b/ports/core/linux-api-headers/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=linux-api-headers
-version=5.11.15
+version=5.12.10
 release=1
 source=(https://www.kernel.org/pub/linux/kernel/v5.x/linux-$version.tar.xz)
 
diff --git a/ports/core/linux-firmware/Pkgfile b/ports/core/linux-firmware/Pkgfile
index fc5f08f..5819bbc 100755
--- a/ports/core/linux-firmware/Pkgfile
+++ b/ports/core/linux-firmware/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=linux-firmware
-version=20210315
+version=20210511
 release=1
 source=(https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-$version.tar.gz)
 
diff --git a/ports/core/linux/Pkgfile b/ports/core/linux/Pkgfile
index cdaf525..0e5f087 100755
--- a/ports/core/linux/Pkgfile
+++ b/ports/core/linux/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  elfutils mkinitramfs openssl linux-firmware
 
 name=linux
-version=5.11.15
+version=5.12.10
 release=1
 source=(https://www.kernel.org/pub/linux/kernel/v5.x/linux-$version.tar.xz
         config)
diff --git a/ports/core/m4/Pkgfile b/ports/core/m4/Pkgfile
index 238541f..00b1498 100755
--- a/ports/core/m4/Pkgfile
+++ b/ports/core/m4/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=m4
-version=1.4.18
+version=1.4.19
 release=1
 source=(https://ftp.gnu.org/gnu/$name/$name-$version.tar.xz)
 
diff --git a/ports/core/mtools/Pkgfile b/ports/core/mtools/Pkgfile
index ab621fa..ac8c0f0 100755
--- a/ports/core/mtools/Pkgfile
+++ b/ports/core/mtools/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer:  Emmett1, emmett1 dot 2miligrams at gmail dot com
 
 name=mtools
-version=4.0.26
+version=4.0.29
 release=1
 source=(ftp://ftp.gnu.org/gnu/mtools/$name-$version.tar.bz2)
 
diff --git a/ports/core/p11-kit/Pkgfile b/ports/core/p11-kit/Pkgfile
index a91cc25..7a01c91 100755
--- a/ports/core/p11-kit/Pkgfile
+++ b/ports/core/p11-kit/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=p11-kit
-version=0.23.22
+version=0.24.0
 release=1
 source=(https://github.com/p11-glue/p11-kit/releases/download/$version/p11-kit-$version.tar.xz)
 
diff --git a/ports/core/perl/Pkgfile b/ports/core/perl/Pkgfile
index eac1110..1784fdf 100755
--- a/ports/core/perl/Pkgfile
+++ b/ports/core/perl/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=perl
-version=5.32.1
+version=5.34.0
 release=1
 source=(https://www.cpan.org/src/5.0/$name-$version.tar.xz)
 
diff --git a/ports/core/python3/Pkgfile b/ports/core/python3/Pkgfile
index 0dce261..bc61b33 100755
--- a/ports/core/python3/Pkgfile
+++ b/ports/core/python3/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  libffi
 
 name=python3
-version=3.9.4
+version=3.9.5
 release=1
 source=(https://www.python.org/ftp/python/$version/Python-$version.tar.xz)
 
diff --git a/ports/core/vim/Pkgfile b/ports/core/vim/Pkgfile
index e91040c..fd9d39f 100755
--- a/ports/core/vim/Pkgfile
+++ b/ports/core/vim/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  acl gawk
 
 name=vim
-version=8.2.2771
+version=8.2.2984
 release=1
 source=(https://github.com/vim/vim/archive/v$version.tar.gz)
 
diff --git a/toolchain/02-gcc-pass1 b/toolchain/02-gcc-pass1
index cd11b56..ded0543 100755
--- a/toolchain/02-gcc-pass1
+++ b/toolchain/02-gcc-pass1
@@ -1,5 +1,5 @@
 name=gcc
-version=10.2.0
+version=11.1.0
 gmp_version=6.2.0
 mpc_version=1.2.1
 mpfr_version=4.1.0
diff --git a/toolchain/03-linux-api-headers b/toolchain/03-linux-api-headers
index 281d0fa..65b8bca 100755
--- a/toolchain/03-linux-api-headers
+++ b/toolchain/03-linux-api-headers
@@ -1,5 +1,5 @@
 name=linux
-version=5.11.15
+version=5.12.10
 source="https://www.kernel.org/pub/linux/kernel/v5.x/linux-$version.tar.xz"
 
 build() {
diff --git a/toolchain/05-libstdc++ b/toolchain/05-libstdc++
index 75f82aa..924e043 100755
--- a/toolchain/05-libstdc++
+++ b/toolchain/05-libstdc++
@@ -1,5 +1,5 @@
 name=gcc
-version=10.2.0
+version=11.1.0
 source="http://ftp.gnu.org/gnu/gcc/gcc-$version/gcc-$version.tar.xz"
 
 build() {
diff --git a/toolchain/07-gcc-pass2 b/toolchain/07-gcc-pass2
index b534721..4ca9f58 100755
--- a/toolchain/07-gcc-pass2
+++ b/toolchain/07-gcc-pass2
@@ -1,5 +1,5 @@
 name=gcc
-version=10.2.0
+version=11.1.0
 gmp_version=6.2.0
 mpc_version=1.2.1
 mpfr_version=4.1.0
diff --git a/toolchain/08-m4 b/toolchain/08-m4
index 7f8a80d..0a36a4b 100755
--- a/toolchain/08-m4
+++ b/toolchain/08-m4
@@ -1,5 +1,5 @@
 name=m4
-version=1.4.18
+version=1.4.19
 source="http://ftp.gnu.org/gnu/m4/m4-$version.tar.xz"
 
 build() {
diff --git a/toolchain/23-perl b/toolchain/23-perl
index ae63d8b..22260b1 100755
--- a/toolchain/23-perl
+++ b/toolchain/23-perl
@@ -1,5 +1,5 @@
 name=perl
-version=5.32.1
+version=5.34.0
 source="https://www.cpan.org/src/5.0/perl-$version.tar.xz"
 
 build() {
diff --git a/toolchain/24-python b/toolchain/24-python
index 109550c..fb4f687 100755
--- a/toolchain/24-python
+++ b/toolchain/24-python
@@ -1,5 +1,5 @@
 name=python
-version=3.9.4
+version=3.9.5
 source="https://www.python.org/ftp/python/$version/Python-$version.tar.xz"
 
 build() {
diff --git a/toolchain/31-curl b/toolchain/31-curl
index 62d5c5e..045fec1 100755
--- a/toolchain/31-curl
+++ b/toolchain/31-curl
@@ -1,12 +1,13 @@
 name=curl
-version=7.76.1
+version=7.77.0
 source="https://curl.haxx.se/download/$name-$version.tar.xz"
 
 build() {
 	cd $name-$version
-	./configure --prefix=/tools            \
-                    --disable-static           \
+	./configure --prefix=/tools \
+                    --disable-static \
                     --enable-threaded-resolver \
+		    --with-openssl \
                     --with-ca-bundle=/tools/etc/ssl/cert.pem
         make
         make install