Changeset aafcfa9 for common/libs


Ignore:
Timestamp:
09/27/2007 08:41:58 PM (17 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
experimental
Children:
41d8577
Parents:
111d25a
Message:

Makefile envars and fuctions revised.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • common/libs/func_wrt_Makefile

    r111d25a raafcfa9  
    1818SHELL = /bin/bash
    1919
     20MOUNT_PT       = $BUILDDIR
     21SCRIPT_ROOT    = $SCRIPT_ROOT
     22CMDSDIR        = $PROGNAME-commands
    2023SRC            = /sources
    21 MOUNT_PT       = $BUILDDIR
     24SRCSDIR        = \$(MOUNT_PT)\$(SRC)
     25FILELOGDIR     = /\$(SCRIPT_ROOT)/$FILELOGDIRBASE
     26
    2227LUSER          = $LUSER
    2328LGROUP         = $LGROUP
    2429LHOME          = $LHOME
    25 SCRIPT_ROOT    = $SCRIPT_ROOT
    26 
    27 BASEDIR        = \$(MOUNT_PT)
    28 SRCSDIR        = \$(BASEDIR)/sources
    29 CMDSDIR        = \$(BASEDIR)/\$(SCRIPT_ROOT)/$PROGNAME-commands
    30 LOGDIR         = \$(BASEDIR)/\$(SCRIPT_ROOT)/$LOGDIRBASE
    31 TESTLOGDIR     = \$(BASEDIR)/\$(SCRIPT_ROOT)/$TESTLOGDIRBASE
    32 
    33 crCMDSDIR      = /\$(SCRIPT_ROOT)/$PROGNAME-commands
    34 crLOGDIR       = /\$(SCRIPT_ROOT)/$LOGDIRBASE
    35 crTESTLOGDIR   = /\$(SCRIPT_ROOT)/$TESTLOGDIRBASE
    36 crFILELOGDIR   = /\$(SCRIPT_ROOT)/$FILELOGDIRBASE
    37 
     30LUSER_HOME     = \$(LHOME)/\$(LUSER)
    3831SU_LUSER       = su - \$(LUSER) -c
    39 LUSER_HOME     = \$(LHOME)/\$(LUSER)
    4032
    4133ADD_REPORT       = $REPORT
    … …  
    5850
    5951#----------------------------------#
    60 LUSER_wrt_target() {               # Create target
    61 #----------------------------------#
    62   local i=$1
    63   local PREV=$2
    64 (
    65 cat << EOF
    66 
    67 $i:  $PREV
    68         @\$(call echo_message, Building)
    69         @export BASHBIN=\$(SHELL) && \$(SHELL) progress_bar.sh \$@ \$\$PPID &
    70 EOF
    71 ) >> $MKFILE.tmp
    72 }
    73 
    74 #----------------------------------#
    75 CHROOT_wrt_target() {              #
     52wrt_target() {                     # Create target
    7653#----------------------------------#
    7754  local i=$1
    … …  
    9067
    9168
    92 #======== RUN AS =======
     69#======== RUN THE SCRIPT =======
    9370
    9471#----------------------------------#
    95 wrt_RunAsRoot() {                  # Some scripts must be run as root..
     72wrt_RunAsRoot() {                  # Some not-chroot scripts must be run as root..
    9673#----------------------------------#
    9774  local MOUNT_ENV
    … …  
    10986(
    11087cat << EOF
    111         @export ${MOUNT_ENV}=\$(MOUNT_PT) && ${PROGNAME}-commands/`dirname $file`/\$@ > $LOGDIRBASE/\$@ 2>&1
     88        @export ${MOUNT_ENV}=\$(MOUNT_PT) && \$(CMDSDIR)/`dirname $file`/\$@ > $LOGDIRBASE/\$@ 2>&1
    11289EOF
    11390) >> $MKFILE.tmp
    … …  
    11592
    11693#----------------------------------#
    117 LUSER_wrt_RunAsUser() {            #
     94wrt_RunScript() {                  #
    11895#----------------------------------#
    11996  local file=$1
    … …  
    126103}
    127104
    128 #----------------------------------#
    129 CHROOT_wrt_RunAsRoot() {           #
    130 #----------------------------------#
    131   local file=$1
    132 (
    133 cat << EOF
    134         @\$(crCMDSDIR)/`dirname $file`/\$@ > $LOGDIRBASE/\$@ 2>&1
    135 EOF
    136 ) >> $MKFILE.tmp
    137 
    138 }
    139 
    140105#=======================
    141106
    … …  
    144109
    145110#----------------------------------#
    146 LUSER_wrt_CopyFstab() {            #
     111LUSER_wrt_CopyFstab() {            # Needed for CLFS Sysroot and Embedded
    147112#----------------------------------#
    148113(
    … …  
    154119
    155120#----------------------------------#
    156 CHROOT_wrt_CopyFstab() {           #
     121wrt_CopyFstab() {                  #
    157122#----------------------------------#
    158123(
    … …  
    169134
    170135#----------------------------------#
    171 LUSER_wrt_TouchTimestamp() {       #
     136LUSER_wrt_TouchTimestamp() {       # Needed for CLFS Sysroot and Embedded
    172137#----------------------------------#
    173138(
    … …  
    179144
    180145#----------------------------------#
    181 CHROOT_wrt_TouchTimestamp() {      #
     146wrt_TouchTimestamp() {             #
    182147#----------------------------------#
    183148(
    … …  
    189154
    190155#----------------------------------#
    191 LUSER_wrt_LogNewFiles() {          #
     156LUSER_wrt_LogNewFiles() {          # Needed for CLFS Sysroot and Embedded
    192157#----------------------------------#
    193158  local name=$1
    … …  
    200165
    201166#----------------------------------#
    202 CHROOT_wrt_LogNewFiles() {         #
     167wrt_LogNewFiles() {                #
    203168#----------------------------------#
    204169  local name=$1
Note: See TracChangeset for help on using the changeset viewer.