Changeset 81f7dc1


Ignore:
Timestamp:
02/16/2007 06:24:19 PM (17 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
Children:
ddca240
Parents:
dcf0e25
Message:

Make SHELL=/bin/bash a Makefile variable instead using it inside the sub-make invocations to avoid be propagated to make processes started by the actual build scripts.

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • CLFS/master.sh

    rdcf0e25 r81f7dc1  
    783783mk_SETUP:
    784784        @\$(call echo_SU_request)
    785         @sudo make SHELL=/bin/bash SETUP
     785        @sudo make SETUP
    786786        @touch \$@
    787787
    … …  
    789789mk_CROSS: mk_SETUP
    790790        @\$(call echo_PHASE,Cross and Temporary Tools)
    791         @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash AS_LUSER" )
     791        @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make AS_LUSER" )
    792792        @sudo make restore-luser-env
    793793        @touch \$@
    794794
    795795mk_SUDO: mk_CROSS
    796         @sudo make SHELL=/bin/bash SUDO
     796        @sudo make SUDO
    797797        @touch \$@
    798798#
    … …  
    900900mk_SETUP:
    901901        @\$(call echo_SU_request)
    902         @sudo make SHELL=/bin/bash SETUP
     902        @sudo make SETUP
    903903        @touch \$@
    904904
    … …  
    907907mk_CROSS: mk_SETUP
    908908        @\$(call echo_PHASE,Cross Tool)
    909         @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash AS_LUSER" )
     909        @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make AS_LUSER" )
    910910        @touch \$@
    911911
    912912mk_SUDO: mk_CROSS
    913         @sudo make SHELL=/bin/bash SUDO
     913        @sudo make SUDO
    914914        @touch \$@
    915915

  • CLFS2/master.sh

    rdcf0e25 r81f7dc1  
    438438mk_SETUP:
    439439        @\$(call echo_SU_request)
    440         @sudo make SHELL=/bin/bash SETUP
     440        @sudo make SETUP
    441441        @touch \$@
    442442
    443443mk_LUSER: mk_SETUP
    444444        @\$(call echo_SULUSER_request)
    445         @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash LUSER" )
     445        @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make LUSER" )
    446446        @touch \$@
    447447
    … …  
    450450        @if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
    451451          (sudo \$(SU_LUSER) "mkdir -p $BUILDDIR$TRACKING_DIR"); \\
    452           (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash CUSTOM_TOOLS"); \\
     452          (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make CUSTOM_TOOLS"); \\
    453453        fi;
    454454        @touch \$@
    … …  
    458458        @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
    459459          (sudo \$(SU_LUSER) "mkdir -p $BUILDDIR$TRACKING_DIR"); \\
    460           (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash BLFS_TOOL"); \\
     460          (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make BLFS_TOOL"); \\
    461461        fi;
    462462        @touch \$@
    … …  
    466466        @echo "$VERSION-sysroot - jhalfs build" > clfs-release && \\
    467467        sudo mv clfs-release \$(MOUNT_PT)/etc
    468         @sudo make SHELL=/bin/bash ROOT
     468        @sudo make ROOT
    469469        @touch \$@
    470470

  • CLFS3/master.sh

    rdcf0e25 r81f7dc1  
    123123#-----------------------------#
    124124  echo "${tab_}${GREEN}Processing... ${L_arrow}system prep tools     ( LUSER ) ${R_arrow}"
    125  
    126   for file in systemprep/* ; do       
     125
     126  for file in systemprep/* ; do
    127127    # Keep the script file name
    128128    this_script=`basename $file`
    … …  
    175175#-----------------------------#
    176176  echo "${tab_}${GREEN}Processing... ${L_arrow}cross tools     ( LUSER ) ${R_arrow}"
    177  
    178   for file in cross-tools/* ; do       
     177
     178  for file in cross-tools/* ; do
    179179    # Keep the script file name
    180180    this_script=`basename $file`
    … …  
    491491mk_SETUP:
    492492        @\$(call echo_SU_request)
    493         @sudo make SHELL=/bin/bash SETUP
     493        @sudo make SETUP
    494494        @touch \$@
    495495
    496496mk_LUSER: mk_SETUP
    497497        @\$(call echo_SULUSER_request)
    498         @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash LUSER" )
     498        @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make LUSER" )
    499499        @touch \$@
    500500
    … …  
    503503        @if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
    504504          (sudo \$(SU_LUSER) "mkdir -p $BUILDDIR$TRACKING_DIR"); \\
    505           (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash CUSTOM_TOOLS"); \\
     505          (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make CUSTOM_TOOLS"); \\
    506506        fi;
    507507        @touch \$@
    … …  
    511511        @echo "$VERSION-embedded - jhalfs build" > clfs-release && \\
    512512        sudo mv clfs-release \$(MOUNT_PT)/etc
    513         @sudo make SHELL=/bin/bash ROOT
     513        @sudo make ROOT
    514514        @touch \$@
    515515

  • HLFS/master.sh

    rdcf0e25 r81f7dc1  
    547547mk_SETUP:
    548548        @\$(call echo_SU_request)
    549         @sudo make SHELL=/bin/bash SETUP
     549        @sudo make SETUP
    550550        @touch \$@
    551551
    552552mk_LUSER: mk_SETUP
    553553        @\$(call echo_SULUSER_request)
    554         @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash LUSER" )
     554        @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make LUSER" )
    555555        @sudo make restore-luser-env
    556556        @touch \$@
    557557
    558558mk_SUDO: mk_LUSER
    559         @sudo make SHELL=/bin/bash SUDO
     559        @sudo make SUDO
    560560        @touch \$@
    561561

  • LFS/master.sh

    rdcf0e25 r81f7dc1  
    425425mk_SETUP:
    426426        @\$(call echo_SU_request)
    427         @sudo make SHELL=/bin/bash SETUP
     427        @sudo make SETUP
    428428        @touch \$@
    429429
    430430mk_LUSER: mk_SETUP
    431431        @\$(call echo_SULUSER_request)
    432         @( sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash  LUSER" )
     432        @( sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make LUSER" )
    433433        @sudo make restore-luser-env
    434434        @touch \$@
    435435
    436436mk_SUDO: mk_LUSER
    437         @sudo make SHELL=/bin/bash  SUDO
     437        @sudo make SUDO
    438438        touch \$@
    439439#

  • common/libs/func_wrt_Makefile

    rdcf0e25 r81f7dc1  
    1515# Generated on `date "+%F %X %Z"`
    1616
     17SHELL          = /bin/bash
    1718
    1819SRC            = /sources
Note: See TracChangeset for help on using the changeset viewer.