Magellan Linux

  • Back to homepage
    • /[alx-svn]/smage/trunk/core/grub/grub-2.04-r1.smage2

    Diff of /smage/trunk/core/grub/grub-2.04-r1.smage2

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 14268 by niro, Tue Jul 7 11:56:33 2020 UTC revision 14272 by niro, Tue Jul 7 14:18:15 2020 UTC
    # Line 43  sminclude mtools alx-split Line 43  sminclude mtools alx-split
    43  SRC_URI+=(  SRC_URI+=(
    44   gnu://${PNAME}/${SRCFILE}   gnu://${PNAME}/${SRCFILE}
    45   mirror://${PNAME}/${SRCFILE}   mirror://${PNAME}/${SRCFILE}
    46   mirror://${PNAME}/${PNAME}-2.02-confd-2.patch   mirror://${PNAME}/${PNAME}-2.04-confd.patch
    47   mirror://${PNAME}/${PNAME}-2.02-cosmetic.patch   mirror://${PNAME}/${PNAME}-2.02-cosmetic.patch
    48   mirror://${PNAME}/${PNAME}-2.00-10_linux-pretty-names-from-etc-os-release.patch   mirror://${PNAME}/${PNAME}-2.00-10_linux-pretty-names-from-etc-os-release.patch
    49   mirror://${PNAME}/${PNAME}-2.00-alx-add-includedir-function.patch   mirror://${PNAME}/${PNAME}-2.00-alx-add-includedir-function.patch
    50   mirror://${PNAME}/${PNAME}-2.02-busybox-linux-install.patch   mirror://${PNAME}/${PNAME}-2.04-grub-mkconfig-fallback-to-blkid-instead-of-grub-probe-for-unknown-root-partition-types.patch
      mirror://${PNAME}/${PNAME}-2.00-grub-mkconfig-fallback-to-blkid-instead-of-grub-probe-for-unknown-root-partition-types.patch  
    51  )  )
    52    
    53  UP2DATE="updatecmd_gnu ${PNAME} gz"  UP2DATE="updatecmd_gnu ${PNAME} gz"
    # Line 57  UP2DATE="updatecmd_gnu ${PNAME} gz" Line 56  UP2DATE="updatecmd_gnu ${PNAME} gz"
    56  # and do you really want that at your bootloader ??  # and do you really want that at your bootloader ??
    57  unset CFLAGS  unset CFLAGS
    58  unset CXXFLAGS  unset CXXFLAGS
    59    unset CPPFLAGS
    60    unset LDFLAGS
    61    unset MAKEFLAGS
    62    
    63  src_prepare()  src_prepare()
    64  {  {
    # Line 64  src_prepare() Line 66  src_prepare()
    66   cd ${SRCDIR}   cd ${SRCDIR}
    67    
    68   # use /etc/conf.d/grub instead of /etc/default/grub   # use /etc/conf.d/grub instead of /etc/default/grub
    69   mpatch ${PNAME}-2.02-confd-2.patch || die   mpatch ${PNAME}-2.04-confd.patch || die
    70   # cosmetic fixes   # cosmetic fixes
    71   mpatch ${PNAME}-2.02-cosmetic.patch || die   mpatch ${PNAME}-2.02-cosmetic.patch || die
    72   # generate pretty names from os-release if GRUB_DISTRIBUTOR is not set   # generate pretty names from os-release if GRUB_DISTRIBUTOR is not set
    73   mpatch ${PNAME}-2.00-10_linux-pretty-names-from-etc-os-release.patch   mpatch ${PNAME}-2.00-10_linux-pretty-names-from-etc-os-release.patch
    74   # grub-mkconfig: fallback to blkid instead of grub probe for unknown root partition types like f2fs   # grub-mkconfig: fallback to blkid instead of grub probe for unknown root partition types like f2fs
    75   mpatch ${PNAME}-2.00-grub-mkconfig-fallback-to-blkid-instead-of-grub-probe-for-unknown-root-partition-types.patch || die   mpatch ${PNAME}-2.04-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  
    76    
    77   # add includedir() function to grub-mkconfig_lib   # add includedir() function to grub-mkconfig_lib
    78   # includedir() includes all grub configuration snippets of given directory   # includedir() includes all grub configuration snippets of given directory
    # Line 86  src_compile() Line 83  src_compile()
    83  {  {
    84   cd ${SRCDIR}   cd ${SRCDIR}
    85    
    86   mconfigure --disable-efiemu --disable-werror --disable-nls || die   local myarch
    87     local myopts
    88    
    89     # no efiemi on x86
    90     case ${ARCH} in
    91     x86_64) myopts+=" --enable-efiemu" ;;
    92     i*86) myopts+=" --disable-efiemu" ;;
    93     esac
    94    
    95     # disable werror
    96     myopts+=" --disable-werror"
    97    
    98     # enable boot time statistics collection
    99     myopts+=" --enable-boot-time"
    100    
    101     # alx
    102     myopts+=" --disable-nls"
    103    
    104     # bios build, enforce i386
    105     myarch="i386"
    106     ../configure --with-platform=pc --target="${myarch}" ${myopts} || die
    107   mmake || die   mmake || die
    108  }  }
    109    
    Legend:
    Removed from v.14268  
    changed lines
      Added in v.14272