Fri Dec 27 23:54:04 UTC 2013

1 files changed, 38 insertions, 26 deletions

diff --git a/libre/grub/parabola_grub_mkconfig_fixes.patch b/libre/grub/parabola_grub_mkconfig_fixes.patch
index fbcca19ec..6e3a524f0 100644
--- a/libre/grub/parabola_grub_mkconfig_fixes.patch
+++ b/libre/grub/parabola_grub_mkconfig_fixes.patch
@@ -1,8 +1,8 @@
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 8decc1d..170047f 100644
+index 016ee82..2cdbdd8 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
-@@ -212,6 +212,8 @@ export GRUB_DEFAULT \
+@@ -214,6 +214,8 @@ export GRUB_DEFAULT \
    GRUB_THEME \
    GRUB_GFXPAYLOAD_LINUX \
    GRUB_DISABLE_OS_PROBER \
@@ -12,7 +12,7 @@ index 8decc1d..170047f 100644
    GRUB_SAVEDEFAULT \
    GRUB_ENABLE_CRYPTODISK \
 diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 2c4bb0a..c7120d2 100644
+index d2e7252..8259f45 100644
 --- a/util/grub.d/00_header.in
 +++ b/util/grub.d/00_header.in
 @@ -125,6 +125,14 @@ cat <<EOF
@@ -31,10 +31,10 @@ index 2c4bb0a..c7120d2 100644
  gfxterm=0;
  for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 14402e8..e85f7d6 100644
+index e27d6f7..a946e71 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -31,7 +31,13 @@ CLASS="--class gnu-linux --class gnu --class os"
+@@ -31,7 +31,25 @@ CLASS="--class gnu-linux --class gnu --class os"
  if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
    OS=GNU/Linux
  else
@@ -43,13 +43,25 @@ index 14402e8..e85f7d6 100644
 +      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
 +  elif [ "${GRUB_DISTRIBUTOR}" = "parabola" ] ; then
 +      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
++  elif [ "${GRUB_DISTRIBUTOR}" = "Blag" ] ; then
++      OS="${GRUB_DISTRIBUTOR} Linux and GNU"
++  elif [ "${GRUB_DISTRIBUTOR}" = "blag" ] ; then
++      OS="${GRUB_DISTRIBUTOR} Linux and GNU"
++  elif [ "${GRUB_DISTRIBUTOR}" = "Musix" ] ; then
++      OS="${GRUB_DISTRIBUTOR} GNU+Linux"
++  elif [ "${GRUB_DISTRIBUTOR}" = "musix" ] ; then
++      OS="${GRUB_DISTRIBUTOR} GNU+Linux"
++  elif [ "${GRUB_DISTRIBUTOR}" = "Dragora" ] ; then
++      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
++  elif [ "${GRUB_DISTRIBUTOR}" = "dragora" ] ; then
++      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
 +  else
 +      OS="${GRUB_DISTRIBUTOR} GNU/Linux"
 +  fi
-   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
+   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
  fi
  
-@@ -87,6 +93,8 @@ linux_entry ()
+@@ -87,6 +105,8 @@ linux_entry ()
        case $type in
  	  recovery)
  	      title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
@@ -58,7 +70,7 @@ index 14402e8..e85f7d6 100644
  	  *)
  	      title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
        esac
-@@ -100,7 +108,7 @@ linux_entry ()
+@@ -100,7 +120,7 @@ linux_entry ()
    else
        echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
    fi      
@@ -67,7 +79,7 @@ index 14402e8..e85f7d6 100644
        save_default_entry | grub_add_tab
    fi
  
-@@ -132,7 +140,8 @@ linux_entry ()
+@@ -132,7 +152,8 @@ linux_entry ()
      fi
      printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
    fi
@@ -77,30 +89,30 @@ index 14402e8..e85f7d6 100644
    sed "s/^/$submenu_indentation/" << EOF
  	echo	'$(echo "$message" | grub_quote)'
  	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
-@@ -190,7 +199,22 @@ while [ "x$list" != "x" ] ; do
+@@ -190,7 +211,22 @@ while [ "x$list" != "x" ] ; do
    alt_version=`echo $version | sed -e "s,\.old$,,g"`
    linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
  
-+  if test -e "/etc/arch-release" ; then
-+    if echo "${basename}" | grep -q 'vmlinuz-linux' ; then
-+      version="`echo "${basename}" | sed -e 's,vmlinuz-linux,,g'`"
++  if test -e "/etc/parabola-release" ; then
++    if echo "${basename}" | grep -q 'vmlinuz-linux-libre' ; then
++      version="`echo "${basename}" | sed -e 's,vmlinuz-linux-libre,,g'`"
 +      
 +      if [ "x${version}" = "x" ] ; then
-+        version="core repo kernel"
++        version="libre kernel"
 +      else
 +        version="`echo "${version}" | sed -e 's,-,,g'`"
-+        version="${version} kernel"
++        version="libre ${version} kernel"
 +      fi
 +    fi
 +  fi
-+
++  
    initrd=
 +  initrd_arch="`echo "${basename}" | sed -e 's,vmlinuz,initramfs,g'`"
 +
    for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
  	   "initrd-${version}" "initramfs-${version}.img" \
  	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
-@@ -198,7 +222,8 @@ while [ "x$list" != "x" ] ; do
+@@ -198,7 +234,8 @@ while [ "x$list" != "x" ] ; do
  	   "initramfs-genkernel-${version}" \
  	   "initramfs-genkernel-${alt_version}" \
  	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
@@ -110,11 +122,11 @@ index 14402e8..e85f7d6 100644
      if test -e "${dirname}/${i}" ; then
        initrd="$i"
        break
-@@ -226,6 +251,22 @@ while [ "x$list" != "x" ] ; do
+@@ -226,6 +263,22 @@ while [ "x$list" != "x" ] ; do
      linux_root_device_thisversion=${GRUB_DEVICE}
    fi
  
-+  if test -e "/etc/arch-release" ; then
++  if test -e "/etc/parabola-release" ; then
 +    is_first_entry="false"
 +    
 +    linux_entry "${OS}" "${version}" true \
@@ -130,14 +142,14 @@ index 14402e8..e85f7d6 100644
 +    done
 +  fi
 +
-   if [ "x$is_first_entry" = xtrue ]; then
+   if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
      linux_entry "${OS}" "${version}" simple \
      "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-@@ -239,8 +280,11 @@ while [ "x$list" != "x" ] ; do
-     echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {"
+@@ -240,8 +293,11 @@ while [ "x$list" != "x" ] ; do
+     is_top_level=false
    fi
  
-+  if ! test -e "/etc/arch-release" ; then
++  if ! test -e "/etc/parabola-release" ; then
    linux_entry "${OS}" "${version}" advanced \
                "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
 +  fi
@@ -145,12 +157,12 @@ index 14402e8..e85f7d6 100644
    if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
      linux_entry "${OS}" "${version}" recovery \
                  "single ${GRUB_CMDLINE_LINUX}"
-@@ -252,8 +296,10 @@ done
+@@ -252,8 +308,10 @@ done
  
  # If at least one kernel was found, then we need to
  # add a closing '}' for the submenu command.
-+if ! test -e "/etc/arch-release" ; then
- if [ x"$is_first_entry" != xtrue ]; then
++if ! test -e "/etc/parabola-release" ; then
+ if [ x"$is_top_level" != xtrue ]; then
    echo '}'
  fi
 +fi