deleted file mode 100644

@@ -1,78 +0,0 @@

-%define debug_package %{nil}

-%define __os_install_post %{nil}

-Summary:	GRand Unified Bootloader

-Name:		grub

-Version:	2.02

-Release:	1%{?dist}

-License:	GPLv3+

-URL:		http://www.gnu.org/software/grub

-Group:		Applications/System

-Vendor:		VMware, Inc.

-Distribution: 	Photon

-Source0:	http://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.gz

-%define sha1 grub=b2c9227f9a54587532ae3f727d197ab112cdbbb3

-BuildRequires:	device-mapper-devel

-BuildRequires:	xz-devel

-Requires:	xz

-Requires:	device-mapper

-%description

-The GRUB package contains the GRand Unified Bootloader.

-

-%package lang

-Summary: Additional language files for grub

-Group: System Environment/Programming

-Requires: grub >= 2.00

-%description lang

-These are the additional language files of grub.

-

-

-%prep

-%setup -qn grub-2.02~beta2

-#sed -i -e '/gets is a/d' grub-core/gnulib/stdio.in.h

-%build

-./configure \

-	--prefix=%{_prefix} \

-	--sbindir=/sbin \

-	--sysconfdir=%{_sysconfdir} \

-	--disable-grub-emu-usb \

-	--disable-efiemu \

-	--disable-werror

-make %{?_smp_mflags}

-%install

-make DESTDIR=%{buildroot} install

-mkdir %{buildroot}%{_sysconfdir}/default

-touch %{buildroot}%{_sysconfdir}/default/grub

-mkdir %{buildroot}%{_sysconfdir}/sysconfig

-ln -sf %{_sysconfdir}/default/grub %{buildroot}%{_sysconfdir}/sysconfig/grub

-rm -rf %{buildroot}%{_infodir}

-%check

-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

-%post	-p /sbin/ldconfig

-%postun	-p /sbin/ldconfig

-%files

-%defattr(-,root,root)

-%dir %{_sysconfdir}/grub.d

-%config() %{_sysconfdir}/bash_completion.d/grub

-%config() %{_sysconfdir}/grub.d/00_header

-%config() %{_sysconfdir}/grub.d/10_linux

-%config() %{_sysconfdir}/grub.d/20_linux_xen

-%config() %{_sysconfdir}/grub.d/30_os-prober

-%config() %{_sysconfdir}/grub.d/40_custom

-%config() %{_sysconfdir}/grub.d/41_custom

-%config() %{_sysconfdir}/grub.d/README

-/sbin/*

-%{_bindir}/*

-%{_libdir}/grub/*

-%{_datarootdir}/%{name}/*

-%{_sysconfdir}/sysconfig/grub

-%{_sysconfdir}/default/grub

-

-%files lang

-%defattr(-,root,root)

-/usr/share/locale/*

-

-%changelog

-*	Mon Jun 29 2015 Divya Thaluru <dthaluru@vmware.com> 2.02-1

--	Updating grub to 2.02

-*	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 2.00-1

--	Initial build.	First version

new file mode 100644

@@ -0,0 +1,86 @@

+%define debug_package %{nil}

+%define __os_install_post %{nil}

+Summary:	GRand Unified Bootloader

+Name:		grub2

+Version:	2.02

+Release:	2%{?dist}

+License:	GPLv3+

+URL:		http://www.gnu.org/software/grub

+Group:		Applications/System

+Vendor:		VMware, Inc.

+Distribution: 	Photon

+Source0:	http://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.gz

+%define sha1 grub=b2c9227f9a54587532ae3f727d197ab112cdbbb3

+BuildRequires:	device-mapper-devel

+BuildRequires:	xz-devel

+Requires:	xz

+Requires:	device-mapper

+%description

+The GRUB package contains the GRand Unified Bootloader.

+

+%package lang

+Summary: Additional language files for grub

+Group: System Environment/Programming

+Requires: grub2 >= 2.00

+%description lang

+These are the additional language files of grub.

+

+

+%prep

+%setup -qn grub-2.02~beta2

+#sed -i -e '/gets is a/d' grub-core/gnulib/stdio.in.h

+%build

+./configure \

+	--prefix=%{_prefix} \

+	--sbindir=/sbin \

+	--sysconfdir=%{_sysconfdir} \

+	--disable-grub-emu-usb \

+	--disable-efiemu \

+	--disable-werror \

+	--program-transform-name=s,grub,%{name}, \

+	--with-grubdir=%{name}

+make %{?_smp_mflags}

+

+%install

+make DESTDIR=%{buildroot} install

+mkdir %{buildroot}%{_sysconfdir}/default

+touch %{buildroot}%{_sysconfdir}/default/grub

+mkdir %{buildroot}%{_sysconfdir}/sysconfig

+ln -sf %{_sysconfdir}/default/grub %{buildroot}%{_sysconfdir}/sysconfig/grub

+mkdir -p %{buildroot}/boot/%{name}

+touch %{buildroot}/boot/%{name}/grub.cfg

+rm -rf %{buildroot}%{_infodir}

+%check

+make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

+%post	-p /sbin/ldconfig

+%postun	-p /sbin/ldconfig

+%files

+%defattr(-,root,root)

+%dir %{_sysconfdir}/grub.d

+%config() %{_sysconfdir}/bash_completion.d/grub

+%config() %{_sysconfdir}/grub.d/00_header

+%config() %{_sysconfdir}/grub.d/10_linux

+%config() %{_sysconfdir}/grub.d/20_linux_xen

+%config() %{_sysconfdir}/grub.d/30_os-prober

+%config() %{_sysconfdir}/grub.d/40_custom

+%config() %{_sysconfdir}/grub.d/41_custom

+%config() %{_sysconfdir}/grub.d/README

+/sbin/*

+%{_bindir}/*

+%{_libdir}/grub/*

+%{_datarootdir}/grub/*

+%{_sysconfdir}/sysconfig/grub

+%{_sysconfdir}/default/grub

+%ghost %config(noreplace) /boot/%{name}/grub.cfg

+

+%files lang

+%defattr(-,root,root)

+/usr/share/locale/*

+

+%changelog

+*	Wed Jul 22 2015 Divya Thaluru <dthaluru@vmware.com> 2.02-2

+-	Changing program name from grub to grub2.

+*	Mon Jun 29 2015 Divya Thaluru <dthaluru@vmware.com> 2.02-1

+-	Updating grub to 2.02

+*	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 2.00-1

+-	Initial build.	First version

@@ -10,7 +10,7 @@

                 "kubernetes", "cyrus-sasl", "openldap", "binutils-devel", "python-iniparse", "psmisc", "etcd", "openssl-devel", 

                 "util-linux-lang", "db-docs", "linux-dev", "linux-docs", "mpc", "json-glib", "json-glib-devel", 

                 "automake", "libpcap", "tcpdump", "elfutils-libelf-devel", "elfutils", "elfutils-devel", "elfutils-devel-static", "elfutils-libelf-devel-static", 

-                "go", "grub-lang", "diffutils", "groff", "man-db", "mpfr-devel", "man-pages", 

+                "go", "grub2","grub2-lang", "diffutils", "groff", "man-db", "mpfr-devel", "man-pages", 

                 "hawkey-devel", "python-hawkey", "libxml2-devel", "ruby", "readline-devel", "wget",

                 "Linux-PAM-lang", "make", "bindutils", "gperf", "lua-devel", "less",

                 "cmake", "gpgme-devel", "parted", "nano", "xz-devel", "xerces-c-devel", "xml-security-c-devel", 

@@ -5,7 +5,7 @@

                 "cracklib", "cracklib-dicts", "cracklib-python", "shadow", 

                 "coreutils", "grep",

                 "findutils",

-                "xz", "grub", "kmod",

+                "xz", "grub2", "kmod",

                 "util-linux", "e2fsprogs",

                 "expat",

                 "linux", "cpio",

@@ -4,7 +4,7 @@

                 "bzip2", "pkg-config", "ncurses", "cracklib", "cracklib-dicts", "shadow", "procps-ng", "e2fsprogs",

                 "iana-etc", "readline", "coreutils", "bash", "bc", "libtool",

                 "inetutils",

-                "xz", "grub", "iproute2", "kbd", "kmod", "libpipeline",

+                "xz", "grub2", "iproute2", "kbd", "kmod", "libpipeline",

                 "util-linux",

                 "openssl", "libffi", "expat",

                 "linux", "curl",

@@ -1,7 +1,7 @@

 {

     "packages":["glibc", "zlib", "filesystem", "binutils", "gmp", "mpfr", "libgcc", "libstdc++","libgomp", 

                 "pkg-config", "ncurses", "readline", "bash", "bzip2", "cracklib", "cracklib-dicts", "shadow", "procps-ng", "iana-etc", "coreutils", "bc", "libtool", "inetutils",

-                "findutils", "xz", "grub", "iproute2", "util-linux", "openssl", "kmod", "linux", "ca-certificates", "curl", "iptables", "Linux-PAM",

+                "findutils", "xz", "grub2", "iproute2", "util-linux", "openssl", "kmod", "linux", "ca-certificates", "curl", "iptables", "Linux-PAM",

                 "attr", "libcap", "systemd", "expat", "dbus", "file", "e2fsprogs", "elfutils-libelf", "lua", "popt", "sqlite-autoconf", "nspr", "nss", "rpm",

                 "openssh", "libffi", "gdbm", "python2", "python2-libs", "pcre", "glib", "libxml2", "libxml2-python",

                 "photon-release",

@@ -34,7 +34,7 @@ Following is the list (extracted from [this link](https://cloud.google.com/compu

       # Change partition table to MBR from GPT

       sgdisk -m 1:2 /dev/sda

-      grub-install /dev/sda

+      grub2-install /dev/sda

       # Enable serial console on grub for GCE.

       cat << EOF >> /etc/default/grub

@@ -44,7 +44,7 @@ Following is the list (extracted from [this link](https://cloud.google.com/compu

       EOF

       # Create new grub.cfg based on the settings in /etc/default/grub

-      grub-mkconfig -o /boot/grub/grub.cfg

+      grub2-mkconfig -o /boot/grub2/grub.cfg

 ##### 2. Install Google Cloud SDK and GCE Packages

       yum install google-daemon google-startup-scripts

@@ -32,21 +32,21 @@ if [ $# -eq 2 ]

 fi

 #

-#	Install grub.

+#	Install grub2.

 #

 UUID=$(blkid -s UUID -o value $PARTITION)

-grub-install --force --boot-directory=$BUILDROOT/boot "$HDD"

-cp boot/unifont.pf2 ${BUILDROOT}/boot/grub/

-mkdir -p ${BUILDROOT}/boot/grub/themes/photon

-cp boot/splash.tga ${BUILDROOT}/boot/grub/themes/photon/photon.tga

-cp boot/terminal_*.tga ${BUILDROOT}/boot/grub/themes/photon/

-cp boot/theme.txt ${BUILDROOT}/boot/grub/themes/photon/

-cat > "$BUILDROOT"/boot/grub/grub.cfg << "EOF"

-# Begin /boot/grub/grub.cfg

+grub2-install --force --boot-directory=$BUILDROOT/boot "$HDD"

+cp boot/unifont.pf2 ${BUILDROOT}/boot/grub2/

+mkdir -p ${BUILDROOT}/boot/grub2/themes/photon

+cp boot/splash.tga ${BUILDROOT}/boot/grub2/themes/photon/photon.tga

+cp boot/terminal_*.tga ${BUILDROOT}/boot/grub2/themes/photon/

+cp boot/theme.txt ${BUILDROOT}/boot/grub2/themes/photon/

+cat > "$BUILDROOT"/boot/grub2/grub.cfg << "EOF"

+# Begin /boot/grub2/grub.cfg

 set default=0

 set timeout=5

 set root=(hd0,2)

-loadfont /boot/grub/unifont.pf2

+loadfont /boot/grub2/unifont.pf2

 insmod gfxterm

 insmod vbe

@@ -57,7 +57,7 @@ gfxpayload=keep

 terminal_output gfxterm

-set theme=/boot/grub/themes/photon/theme.txt

+set theme=/boot/grub2/themes/photon/theme.txt

 menuentry "Photon" {

 	insmod ext2

@@ -65,10 +65,10 @@ menuentry "Photon" {

 	linux /boot/vmlinuz-3.19.2 init=/lib/systemd/systemd root=UUID=UUID_PLACEHOLDER loglevel=3 ro

 	initrd /boot/initrd.img-no-kmods

 }

-# End /boot/grub/grub.cfg

+# End /boot/grub2/grub.cfg

 EOF

-sed -i "s/UUID_PLACEHOLDER/$UUID/" "$BUILDROOT"/boot/grub/grub.cfg > ${LOGFILE}	

+sed -i "s/UUID_PLACEHOLDER/$UUID/" "$BUILDROOT"/boot/grub2/grub.cfg > ${LOGFILE}	

 #Cleanup the workspace directory

 rm -rf "$BUILDROOT"/tools