From 1cbf184f87c36cecea5a60f6b0665d60fcc23b2b Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Wed, 18 Sep 2013 23:50:38 -0500 Subject: system/grub2: Removed (included in Slackware 14.1) Signed-off-by: Robby Workman --- system/grub2/README | 12 ---- system/grub2/doinst.sh | 13 ----- system/grub2/etc.default.grub | 24 -------- system/grub2/grub2.SlackBuild | 118 --------------------------------------- system/grub2/grub2.info | 10 ---- system/grub2/initrd_naming.patch | 13 ----- system/grub2/slack-desc | 19 ------- system/grub2/update-grub | 9 --- 8 files changed, 218 deletions(-) delete mode 100644 system/grub2/README delete mode 100644 system/grub2/doinst.sh delete mode 100644 system/grub2/etc.default.grub delete mode 100644 system/grub2/grub2.SlackBuild delete mode 100644 system/grub2/grub2.info delete mode 100644 system/grub2/initrd_naming.patch delete mode 100644 system/grub2/slack-desc delete mode 100644 system/grub2/update-grub diff --git a/system/grub2/README b/system/grub2/README deleted file mode 100644 index f6c5bc832c..0000000000 --- a/system/grub2/README +++ /dev/null @@ -1,12 +0,0 @@ -GRUB2 (the GRand Unified Bootloader) is a multiboot boot loader. - -If you want to set the size of gfxterm font, then specify -FONT_SIZE=size in the build options. The default size is 19. - -If you want to install grub2 on GPT, you need to put a BIOS boot -partition on GPT. To install it in the MBR replacing lilo, generate -a config file in /boot/grub and launch grub-install, e.g. - -mkdir /boot/grub -grub-mkconfig -o /boot/grub/grub.cfg -grub-install /dev/sda diff --git a/system/grub2/doinst.sh b/system/grub2/doinst.sh deleted file mode 100644 index 19a6ff6ac8..0000000000 --- a/system/grub2/doinst.sh +++ /dev/null @@ -1,13 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - diff --git a/system/grub2/etc.default.grub b/system/grub2/etc.default.grub deleted file mode 100644 index e363480836..0000000000 --- a/system/grub2/etc.default.grub +++ /dev/null @@ -1,24 +0,0 @@ -# If you change this file, run grub-mkconfig -o /boot/grub/grub.cfg -# afterwards to update /boot/grub/grub.cfg. - -GRUB_DEFAULT=0 -#GRUB_HIDDEN_TIMEOUT=0 -GRUB_HIDDEN_TIMEOUT_QUIET=false -GRUB_TIMEOUT=10 -GRUB_DISTRIBUTOR=$( sed 's/Slackware /Slackware-/' /etc/slackware-version ) -GRUB_CMDLINE_LINUX_DEFAULT="" -GRUB_CMDLINE_LINUX="" - -# Uncomment to disable graphical terminal (grub-pc only) -#GRUB_TERMINAL=console - -# The resolution used on graphical terminal -# note that you can use only modes which your graphic card supports via VBE -# you can see them in real GRUB with the command `vbeinfo' -#GRUB_GFXMODE=640x480 - -# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux -#GRUB_DISABLE_LINUX_UUID=true - -# Uncomment to disable generation of recovery mode menu entrys -#GRUB_DISABLE_LINUX_RECOVERY="true" diff --git a/system/grub2/grub2.SlackBuild b/system/grub2/grub2.SlackBuild deleted file mode 100644 index 12b74161a2..0000000000 --- a/system/grub2/grub2.SlackBuild +++ /dev/null @@ -1,118 +0,0 @@ -#!/bin/sh - -# Slackware build script for grub2 - -# Written by crocket (crockabiscuit@gmail.com) - -PRGNAM=grub2 -VERSION=${VERSION:-2.00} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} - -ARCNAM=grub - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -FONT_SIZE=${FONT_SIZE:-19} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - # -fPIC generates errors with grub2 1.99 - # SLKCFLAGS="-O2 -fPIC" - SLKCFLAGS="-O2" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $ARCNAM-$VERSION -tar xvf $CWD/$ARCNAM-$VERSION.tar.xz -cd $ARCNAM-$VERSION -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# We use initrd.gz here, so look for it too -patch -p1 < $CWD/initrd_naming.patch - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --infodir=/usr/info \ - --mandir=/usr/man \ - --build=$ARCH-slackware-linux \ - -make -make install DESTDIR=$PKG - -install -m 755 $CWD/update-grub $PKG/usr/bin - -mkdir -p $PKG/etc/default -cat $CWD/etc.default.grub > $PKG/etc/default/grub - -find $PKG/usr/bin | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -find $PKG/usr/sbin | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -# convert gnu-unifont to a font useable by grub2 gfxterm. -$PKG/usr/bin/grub-mkfont -o $PKG/usr/share/grub/unifont.pf2 -abv \ - -s $FONT_SIZE /usr/share/fonts/TTF/unifont.ttf - -rm -f $PKG/usr/info/dir -gzip -9 $PKG/usr/info/*.info* - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $(find $PKG/usr/man -type l); do ln -s $(readlink $i).gz $i.gz; rm $i; done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README THANKS TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -# Add .new extension to all configuration files -# and add them to doinst.sh -for file in $(find $PKG/etc -type f -perm -444) -do - mv $file $file.new - # This leads grub-mkconfig to abnormal behaviors. - # chmod -x $file.new - echo "config ${file#$PKG/}.new" >> $PKG/install/doinst.sh -done - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} - diff --git a/system/grub2/grub2.info b/system/grub2/grub2.info deleted file mode 100644 index ec9431ba47..0000000000 --- a/system/grub2/grub2.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="grub2" -VERSION="2.00" -HOMEPAGE="http://www.gnu.org/software/grub/" -DOWNLOAD="ftp://ftp.gnu.org/gnu/grub/grub-2.00.tar.xz" -MD5SUM="a1043102fbc7bcedbf53e7ee3d17ab91" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="gnu-unifont help2man" -MAINTAINER="crocket" -EMAIL="crockabiscuit@gmail.com" diff --git a/system/grub2/initrd_naming.patch b/system/grub2/initrd_naming.patch deleted file mode 100644 index 6b62778b07..0000000000 --- a/system/grub2/initrd_naming.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur grub-2.00.orig/util/grub.d/10_linux.in grub-2.00/util/grub.d/10_linux.in ---- grub-2.00.orig/util/grub.d/10_linux.in 2012-04-18 23:24:38.000000000 +0200 -+++ grub-2.00/util/grub.d/10_linux.in 2012-06-30 07:53:03.765625589 +0200 -@@ -198,7 +198,8 @@ - "initramfs-genkernel-${version}" \ - "initramfs-genkernel-${alt_version}" \ - "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ -- "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do -+ "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" \ -+ "initrd.gz"; do - if test -e "${dirname}/${i}" ; then - initrd="$i" - break diff --git a/system/grub2/slack-desc b/system/grub2/slack-desc deleted file mode 100644 index 5c1910c5d4..0000000000 --- a/system/grub2/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -grub2: GRUB2 (the GRand Unified Bootloader) -grub2: -grub2: GNU GRUB is a multiboot boot loader. -grub2: -grub2: Website: http://www.gnu.org/software/grub/ -grub2: -grub2: -grub2: -grub2: -grub2: -grub2: diff --git a/system/grub2/update-grub b/system/grub2/update-grub deleted file mode 100644 index 9f59590ef8..0000000000 --- a/system/grub2/update-grub +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -GRUB_MKCONFIG=$(which grub-mkconfig) - -if [ -e /boot/grub/grub.cfg ]; then - mv -n /boot/grub/grub.cfg /boot/grub/grub.cfg.old.$$ || exit 1 -fi - -$GRUB_MKCONFIG -o /boot/grub/grub.cfg $@ -- cgit v1.2.3