repos updated

4 files changed, 53 insertions, 56 deletions

diff --git a/repos/extra/grub/.files b/repos/extra/grub/.files
index e9817c43..85c88da6 100644
--- a/repos/extra/grub/.files
+++ b/repos/extra/grub/.files
@@ -1,6 +1,18 @@
 drwxr-xr-x root/root    etc/
+drwxr-xr-x root/root    etc/bash_completion.d/
+-rw-r--r-- root/root    etc/bash_completion.d/grub.new
 drwxr-xr-x root/root    etc/default/
 -rw-r--r-- root/root    etc/default/grub.new
+drwxr-xr-x root/root    etc/grub.d/
+-rwxr-xr-x root/root    etc/grub.d/00_header.new
+-rwxr-xr-x root/root    etc/grub.d/10_linux.new
+-rwxr-xr-x root/root    etc/grub.d/20_linux_xen.new
+-rwxr-xr-x root/root    etc/grub.d/25_bli.new
+-rwxr-xr-x root/root    etc/grub.d/30_os-prober.new
+-rwxr-xr-x root/root    etc/grub.d/30_uefi-firmware.new
+-rwxr-xr-x root/root    etc/grub.d/40_custom.new
+-rwxr-xr-x root/root    etc/grub.d/41_custom.new
+-rw-r--r-- root/root    etc/grub.d/README.new
 drwxr-xr-x root/root    usr/
 drwxr-xr-x root/root    usr/bin/
 -rwxr-xr-x root/root    usr/bin/grub-editenv
@@ -21,19 +33,6 @@ drwxr-xr-x root/root    usr/bin/
 -rwxr-xr-x root/root    usr/bin/grub-render-label
 -rwxr-xr-x root/root    usr/bin/grub-script-check
 -rwxr-xr-x root/root    usr/bin/grub-syslinux2cfg
-drwxr-xr-x root/root    usr/etc/
-drwxr-xr-x root/root    usr/etc/bash_completion.d/
--rw-r--r-- root/root    usr/etc/bash_completion.d/grub
-drwxr-xr-x root/root    usr/etc/grub.d/
--rwxr-xr-x root/root    usr/etc/grub.d/00_header
--rwxr-xr-x root/root    usr/etc/grub.d/10_linux
--rwxr-xr-x root/root    usr/etc/grub.d/20_linux_xen
--rwxr-xr-x root/root    usr/etc/grub.d/25_bli
--rwxr-xr-x root/root    usr/etc/grub.d/30_os-prober
--rwxr-xr-x root/root    usr/etc/grub.d/30_uefi-firmware
--rwxr-xr-x root/root    usr/etc/grub.d/40_custom
--rwxr-xr-x root/root    usr/etc/grub.d/41_custom
--rw-r--r-- root/root    usr/etc/grub.d/README
 drwxr-xr-x root/root    usr/lib/
 drwxr-xr-x root/root    usr/lib/grub/
 drwxr-xr-x root/root    usr/lib/grub/i386-pc/
@@ -1181,12 +1180,7 @@ drwxr-xr-x root/root    usr/share/fonts/
 drwxr-xr-x root/root    usr/share/fonts/unifont/
 -rw-r--r-- root/root    usr/share/fonts/unifont/unifont.pcf
 drwxr-xr-x root/root    usr/share/grub/
--rw-r--r-- root/root    usr/share/grub/ascii.h
--rw-r--r-- root/root    usr/share/grub/ascii.pf2
--rw-r--r-- root/root    usr/share/grub/euro.pf2
 -rw-r--r-- root/root    usr/share/grub/grub-mkconfig_lib
--rw-r--r-- root/root    usr/share/grub/unicode.pf2
--rw-r--r-- root/root    usr/share/grub/widthspec.h
 drwxr-xr-x root/root    usr/share/info/
 -rw-r--r-- root/root    usr/share/info/grub-dev.info.gz
 -rw-r--r-- root/root    usr/share/info/grub.info-1.gz
diff --git a/repos/extra/grub/abuild b/repos/extra/grub/abuild
new file mode 100644
index 00000000..a2c88dc5
--- /dev/null
+++ b/repos/extra/grub/abuild
@@ -0,0 +1,41 @@
+name=grub
+version=2.12
+release=1
+source="https://ftp.gnu.org/gnu/$name/$name-$version.tar.xz
+	https://unifoundry.com/pub/unifont/unifont-15.0.01/font-builds/unifont-15.0.01.pcf.gz::noextract
+	no-asorti.patch
+	grub.default"
+skip_patch=1
+build_dir=$SRC
+unset CFLAGS
+unset CXXFLAGS
+
+build() {
+	mv grub-* grub-pc
+	cp -rp grub-pc grub-efi
+	
+	_build_grub() {
+		cd grub-${1##*=}
+		patch -p1 < $SRC/no-asorti.patch
+		echo depends bli part_gpt > grub-core/extra_deps.lst
+		./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--enable-grub-mount \
+		--enable-grub-mkfont \
+		--disable-werror \
+		$@
+		make
+		make install
+		cd -
+	}
+	
+	_build_grub --with-platform=pc --target=i386
+	_build_grub --with-platform=efi --target=x86_64 --disable-efiemu
+	
+	mkdir -pv $PKG/usr/share/fonts/unifont
+	gunzip -c $SRC/unifont-15.0.01.pcf.gz > $PKG/usr/share/fonts/unifont/unifont.pcf
+	
+	mkdir -p $PKG/etc/default
+	cp $SRC/grub.default $PKG/etc/default/grub
+}
diff --git a/repos/extra/grub/build b/repos/extra/grub/build
deleted file mode 100644
index db19df3a..00000000
--- a/repos/extra/grub/build
+++ /dev/null
@@ -1,27 +0,0 @@
-mv grub-* grub-pc
-cp -rp grub-pc grub-efi
-
-_build_grub() {
-	cd grub-${1##*=}
-	patch -p1 < $SRC/no-asorti.patch
-	echo depends bli part_gpt > grub-core/extra_deps.lst
-	./configure \
-	--prefix=/usr \
-	--sysconfdir=/etc \
-	--enable-grub-mount \
-	--enable-grub-mkfont \
-	--disable-werror \
-	$@
-	make
-	make install
-	cd -
-}
-
-_build_grub --with-platform=pc --target=i386
-_build_grub --with-platform=efi --target=x86_64 --disable-efiemu
-
-mkdir -pv $PKG/usr/share/fonts/unifont
-gunzip -c $SRC/unifont-15.0.01.pcf.gz > $PKG/usr/share/fonts/unifont/unifont.pcf
-
-mkdir -p $PKG/etc/default
-cp $SRC/grub.default $PKG/etc/default/grub
diff --git a/repos/extra/grub/info b/repos/extra/grub/info
deleted file mode 100644
index 09e79711..00000000
--- a/repos/extra/grub/info
+++ /dev/null
@@ -1,11 +0,0 @@
-name=grub
-version=2.12
-release=1
-source="https://ftp.gnu.org/gnu/$name/$name-$version.tar.xz
-	https://unifoundry.com/pub/unifont/unifont-15.0.01/font-builds/unifont-15.0.01.pcf.gz::noextract
-	no-asorti.patch
-	grub.default"
-skip_patch=1
-build_dir=$SRC
-unset CFLAGS
-unset CXXFLAGS