Magellan Linux

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

    Diff of /smage/trunk/core/busybox/busybox-1.29.2-r1.smage2

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

    revision 11850 by niro, Wed Aug 15 13:51:36 2018 UTC revision 11851 by niro, Wed Aug 15 14:32:05 2018 UTC
    # Line 34  PROVIDE="virtual/bzip2 Line 34  PROVIDE="virtual/bzip2
    34   virtual/xz-utils"   virtual/xz-utils"
    35    
    36  # busbox config revision  # busbox config revision
    37  CFG_REV=1.21  CFG_REV=1.22
    38  # udhcpc client script revision  # udhcpc client script revision
    39  UDHCPC_REV=1.1  UDHCPC_REV=1.1
    40  # busybox.tmpfilesd revision  # busybox.tmpfilesd revision
    # Line 112  src_prepare() Line 112  src_prepare()
    112   # using a custom config   # using a custom config
    113   cp ${SOURCEDIR}/${PNAME}/config-${CFG_REV} .config || die   cp ${SOURCEDIR}/${PNAME}/config-${CFG_REV} .config || die
    114    
    115   # fix a missing include with linux-musl-headers  # not required for busybox-1.29 anymore
    116   sed -i '1i#include <sys/resource.h>' include/libbb.h || die  # # fix a missing include with linux-musl-headers
    117    # sed -i '1i#include <sys/resource.h>' include/libbb.h || die
    118    
    119  # now included in config 1.19  # now included in config 1.19
    120  # # disable swapon & swapoff; systemd requires the util-linux version  # # disable swapon & swapoff; systemd requires the util-linux version
    # Line 160  src_prepare() Line 161  src_prepare()
    161  # sed -i -e 's/.*\(CONFIG_STAT\).*/#\ \1 is not set/' .config || die  # sed -i -e 's/.*\(CONFIG_STAT\).*/#\ \1 is not set/' .config || die
    162  # sed -i -e 's/.*\(CONFIG_DATE\).*/#\ \1 is not set/' .config || die  # sed -i -e 's/.*\(CONFIG_DATE\).*/#\ \1 is not set/' .config || die
    163    
    164   # re-enable date, stat, sed  # now included in config 1.22
    165   sed -i -e 's/#\ \(CONFIG_DATE\) is not set/\1=y/' \  # # re-enable date, stat, sed
    166   -e 's/#\ \(CONFIG_FEATURE_DATE_ISOFMT\) is not set/\1=y/' \  # sed -i -e 's/#\ \(CONFIG_DATE\) is not set/\1=y/' \
    167   -e 's/#\ \(CONFIG_FEATURE_DATE_NANO\) is not set/\1=y/' \  # -e 's/#\ \(CONFIG_FEATURE_DATE_ISOFMT\) is not set/\1=y/' \
    168   -e 's/#\ \(CONFIG_FEATURE_DATE_COMPAT\) is not set/\1=y/' \  # -e 's/#\ \(CONFIG_FEATURE_DATE_NANO\) is not set/\1=y/' \
    169   .config || die  # -e 's/#\ \(CONFIG_FEATURE_DATE_COMPAT\) is not set/\1=y/' \
    170   sed -i -e 's/#\ \(CONFIG_STAT\) is not set/\1=y/' \  # .config || die
    171   -e 's/#\ \(CONFIG_FEATURE_STAT_FORMAT\) is not set/\1=y/' \  # sed -i -e 's/#\ \(CONFIG_STAT\) is not set/\1=y/' \
    172   -e 's/#\ \(CONFIG_FEATURE_STAT_FILESYSTEM\) is not set/\1=y/' \  # -e 's/#\ \(CONFIG_FEATURE_STAT_FORMAT\) is not set/\1=y/' \
    173   .config || die  # -e 's/#\ \(CONFIG_FEATURE_STAT_FILESYSTEM\) is not set/\1=y/' \
    174   sed -i -e 's/#\ \(CONFIG_SED\) is not set/\1=y/' .config || die  # .config || die
    175    # sed -i -e 's/#\ \(CONFIG_SED\) is not set/\1=y/' .config || die
    176   # build a static busybox with musl  
    177   sed -i -e 's/#\ \(CONFIG_STATIC\) is not set/\1=y/' .config || die  # now included in config-1.22
    178    # # build a static busybox with musl
    179   # these vi options breaks with musl-gcc  # sed -i -e 's/#\ \(CONFIG_STATIC\) is not set/\1=y/' .config || die
    180   sed -i -e 's/.*\(CONFIG_FEATURE_VI_8BIT\).*/#\ \1 is not set/' \  #
    181   -e 's/.*\(CONFIG_FEATURE_VI_REGEX_SEARCH\).*/#\ \1 is not set/' \  # # these vi options breaks with musl-gcc
    182   .config || die  # sed -i -e 's/.*\(CONFIG_FEATURE_VI_8BIT\).*/#\ \1 is not set/' \
    183    # -e 's/.*\(CONFIG_FEATURE_VI_REGEX_SEARCH\).*/#\ \1 is not set/' \
    184    # .config || die
    185  }  }
    186    
    187  src_compile()  src_compile()
    # Line 263  src_install() Line 266  src_install()
    266   # install service configuration files and keep needed directories   # install service configuration files and keep needed directories
    267   mkeepdir /var/spool/cron/crontabs || die   mkeepdir /var/spool/cron/crontabs || die
    268    
    269   # install a busybox compilant zgrep script, at last needed by plymouth   # install a busybox compilant zgrep script, at least needed by plymouth
    270   minstallexec -s zgrep.sh /usr/bin/zgrep || die   minstallexec -s zgrep.sh /usr/bin/zgrep || die
    271    
    272   # install consolefont and trans from kbd-1.15.5 to fully emulate kbd   # install consolefont and trans from kbd-1.15.5 to fully emulate kbd
    Legend:
    Removed from v.11850  
    changed lines
      Added in v.11851