--- smage/trunk/core/grub/grub-2.04-r1.smage2	2020/07/07 11:56:33	14268
+++ smage/trunk/core/grub/grub-2.04-r1.smage2	2020/07/07 13:00:27	14269
@@ -43,12 +43,11 @@
 SRC_URI+=(
 	gnu://${PNAME}/${SRCFILE}
 	mirror://${PNAME}/${SRCFILE}
-	mirror://${PNAME}/${PNAME}-2.02-confd-2.patch
+	mirror://${PNAME}/${PNAME}-2.04-confd.patch
 	mirror://${PNAME}/${PNAME}-2.02-cosmetic.patch
 	mirror://${PNAME}/${PNAME}-2.00-10_linux-pretty-names-from-etc-os-release.patch
 	mirror://${PNAME}/${PNAME}-2.00-alx-add-includedir-function.patch
-	mirror://${PNAME}/${PNAME}-2.02-busybox-linux-install.patch
-	mirror://${PNAME}/${PNAME}-2.00-grub-mkconfig-fallback-to-blkid-instead-of-grub-probe-for-unknown-root-partition-types.patch
+	mirror://${PNAME}/${PNAME}-2.04-grub-mkconfig-fallback-to-blkid-instead-of-grub-probe-for-unknown-root-partition-types.patch
 )
 
 UP2DATE="updatecmd_gnu ${PNAME} gz"
@@ -64,18 +63,13 @@
 	cd ${SRCDIR}
 
 	# use /etc/conf.d/grub instead of /etc/default/grub
-	mpatch ${PNAME}-2.02-confd-2.patch || die
+	mpatch ${PNAME}-2.04-confd.patch || die
 	# cosmetic fixes
 	mpatch ${PNAME}-2.02-cosmetic.patch || die
 	# generate pretty names from os-release if GRUB_DISTRIBUTOR is not set
 	mpatch ${PNAME}-2.00-10_linux-pretty-names-from-etc-os-release.patch
 	# grub-mkconfig: fallback to blkid instead of grub probe for unknown root partition types like f2fs
-	mpatch ${PNAME}-2.00-grub-mkconfig-fallback-to-blkid-instead-of-grub-probe-for-unknown-root-partition-types.patch || die
-
-	# fixes some issues with busybox
-	# not required anymore with busybox-1.26 and above, grep -vx|-qx is now supported
-	#mpatch ${PNAME}-${PVER}-busybox.patch || die
-	mpatch ${PNAME}-2.02-busybox-linux-install.patch || die
+	mpatch ${PNAME}-2.04-grub-mkconfig-fallback-to-blkid-instead-of-grub-probe-for-unknown-root-partition-types.patch || die
 
 	# add includedir() function to grub-mkconfig_lib
 	# includedir() includes all grub configuration snippets of given directory