Ignore:
Timestamp:
03/01/2022 08:09:30 PM (3 years ago)
Author:
Pierre Labastie <pierre.labastie@…>
Branches:
ablfs-more, trunk
Children:
9a86aa58
Parents:
4c36783
Message:

Remove legacy: Remove almost all occurrences of CLFS/clfs

File:
1 edited

Legend:

Unmodified
Added
Removed

  • common/libs/func_wrt_Makefile

    r4c36783 r0fa52f2  
    5858
    5959
    60 #==== PACKAGES NAMES AND VERSIONS ====
    61 
    62 #----------------------------------#
    63 get_package_tarball_name() {       #
    64 #----------------------------------#
    65   local script_name=`echo ${1} | sed -e 's@^[0-9]\{2\}-@@'`
    66 
    67    # The use of 'head' is necessary to limit the return value to the FIRST match..
    68    # hopefully this will not cause problems.
    69    #
    70    case $script_name in
    71      tcl) echo $(grep "^tcl" $JHALFSDIR/pkg_tarball_list | head -n1 )
    72          ;;
    73      iputils) echo $(grep "^iputils" $JHALFSDIR/pkg_tarball_list | head -n1 )
    74          ;;
    75      powerpc-utils) echo $(grep "^powerpc-utils" $JHALFSDIR/pkg_tarball_list | head -n1 )
    76          ;;
    77      uClibc)
    78          if [[ "${PROGNAME}" = "clfs3" ]]; then
    79            echo $(grep "^uClibc-" $JHALFSDIR/pkg_tarball_list | head -n1 )
    80          else
    81            echo $(grep "^$script_name-[[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 )
    82          fi
    83          ;;
    84      linux-headers)
    85          if [[ "${PROGNAME}" = "lfs" ]] || [[ "${PROGNAME}" = "clfs" ]]; then
    86            # Uses kernel headers directly
    87            echo $(grep "^linux-[[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 )
    88          else
    89            # CLFS{2,3} used to use massaged headers package
    90            # echo $(grep "^linux-headers-[[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 )
    91            echo $(grep "^linux-[[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 )
    92          fi
    93          ;;
    94      expect) echo $(grep "^expect" $JHALFSDIR/pkg_tarball_list | head -n1 )
    95          ;;
    96      e2fsprogs-libs) echo $(grep "^e2fsprogs" $JHALFSDIR/pkg_tarball_list | head -n1 )
    97          ;;
    98      libcap) echo $(grep "^libcap" $JHALFSDIR/pkg_tarball_list | head -n1 )
    99          ;;
    100      util-linux-libs | util-linux-pass1) echo $(grep "^util-linux" $JHALFSDIR/pkg_tarball_list | head -n1 )
    101          ;;
    102      xz-utils) echo $(grep "^xz" $JHALFSDIR/pkg_tarball_list | head -n1 )
    103          ;;
    104      sqlite) echo $(grep "^sqlite" $JHALFSDIR/pkg_tarball_list | head -n1 )
    105          ;;
    106      udev) echo $(grep "^systemd" $JHALFSDIR/pkg_tarball_list | head -n1 )
    107          ;;
    108      xml-parser) echo $(grep "^XML" $JHALFSDIR/pkg_tarball_list | head -n1 )
    109          ;;
    110      libdbus) echo $(grep "^dbus" $JHALFSDIR/pkg_tarball_list | head -n1 )
    111          ;;
    112      glibc) echo $(grep "^glibc" $JHALFSDIR/pkg_tarball_list | head -n1 )
    113          ;;
    114      libelf) echo $(grep "^elfutils" $JHALFSDIR/pkg_tarball_list | head -n1 )
    115          ;;
    116      *)  echo $(grep "^$script_name[_-][[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 )
    117          ;;
    118    esac
    119 
    120 }
    121 
    122 #----------------------------------#
    123 get_package_version() {            #
    124 #----------------------------------#
    125 # Those hacks may change depending on the invention of devs for tarball names.
    126 # Normally, we expect -digit to signal the beginning of the version field
    127 # but it may happen that there is no '-' (tcl, expect), that the version
    128 # field is ddd-d (pkg-config-lite-028-1, since sed is greedy, it finds only
    129 # the second dash) or that the first character of the version is not a digit
    130 # (iputils-s20121221)...
    131   case ${1} in
    132      tcl*|expect*|tzdata*|xmlts*|unzip*|lynx*)
    133                            echo ${1} | sed -e 's@^[^[:digit:]]*@@' \
    134                                            -e 's@\(-src\)*\.tar.*@@'
    135         ;;
    136      iputils*)             echo ${1} | sed -e 's@^.*-@@' \
    137                                            -e 's@\.tar.*@@'
    138         ;;
    139      glibc*)               echo ${1} | sed -e 's@^[^-]*-@@' \
    140                                            -e 's@\.tar.*@@'
    141         ;;
    142      LVM*)                 echo ${1} | sed -e 's@^[^.]*\.@@' \
    143                                            -e 's@\.tgz.*@@'
    144         ;;
    145      iproute*)             echo ${1} | sed -e 's@^[^-]*-@@' \
    146                                            -e 's@\.tar.*@@'
    147         ;;
    148      pkg*|udev*|Singular*|XML*)
    149                            echo ${1} | sed -e 's@^.*[a-z]-\([[:digit:]]\)@\1@' \
    150                                            -e 's@\.tar.*@@' \
    151                                            -e 's@\.zip.*@@'
    152         ;;
    153      *)                    echo ${1} | sed -e 's@^.*[-_]\([[:digit:]]\)@\1@' \
    154                                            -e 's@\.tar.*@@' \
    155                                            -e 's@\.zip.*@@'
    156         ;;
    157   esac
    158 
    159 }
    160 #=======================
    161 
    162 
    16360#==== TARGET HEADER ====
    16461
    … …  
    316213  local file=$1
    317214
    318   case ${PROGNAME} in
    319     lfs   ) MOUNT_ENV="LFS" ;;
    320     clfs  ) MOUNT_ENV="CLFS" ;;
    321     clfs2 ) MOUNT_ENV="CLFS" ;;
    322     clfs3 ) MOUNT_ENV="CLFS" ;;
    323     *) echo "undefined progname $PROGNAME"; exit 1 ;;
    324   esac
    325 
    326 (
    327 cat << EOF
    328         @export ${MOUNT_ENV}=\$(MOUNT_PT) && \\
    329         ${PROGNAME}-commands/`dirname $file`/\$@ >>logs/\$@$version 2>&1 && \\
    330         if [ "${PROGNAME}" != lfs ]; then \\
    331             \$(PRT_DU) >>logs/\$@$version; \\
    332         fi
     215(
     216cat << EOF
     217        @export LFS=\$(MOUNT_PT) && \\
     218        ${PROGNAME}-commands/`dirname $file`/\$@ >>logs/\$@$version 2>&1
    333219EOF
    334220) >> $MKFILE.tmp
Note: See TracChangeset for help on using the changeset viewer.