Ignore:
Timestamp:
Jul 3, 2009, 11:26:52 AM (15 years ago)
Author:
Jim Gifford <clfs@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
acf32d0
Parents:
2349999
Message:

Updates to Patch Scripts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • scripts/patch/gcc-patch.sh

    r2349999 rd8a9d8b  
    2020# Download GCC Source
    2121#
    22 cd /usr/src
     22install -d ~/tmp
     23cd ~/tmp
    2324if ! [ -e gcc-${VERSION}.tar.bz2  ]; then
    2425  wget ftp://gcc.gnu.org/pub/gcc/releases/gcc-${VERSION}/gcc-${VERSION}.tar.bz2
    … …  
    2728# Set Patch Number
    2829#
    29 cd /usr/src
     30cd ~/tmp
    3031wget http://svn.cross-lfs.org/svn/repos/cross-lfs/trunk/patches/ --no-remove-listing > /dev/null 2>&1
    3132PATCH_NUM=$(cat index.html | grep gcc | grep "${VERSION}" | grep branch_update | cut -f2 -d'"' | cut -f1 -d'"'| cut -f4 -d- | cut -f1 -d. | tail -n 1)
    … …  
    3738# Cleanup Directory
    3839#
     40cd ~/tmp
    3941rm -rf gcc-${VERSION} gcc-${VERSION}.orig
    4042tar xvf gcc-${VERSION}.tar.bz2
    4143mv gcc-${VERSION} gcc-${VERSION}.orig
    42 CURRENTDIR=$(pwd -P)
    4344
    4445# Get Current Updates from SVN
    4546#
    46 cd /usr/src
     47cd ~/tmp
    4748NUM1=$(echo ${VERSION} | cut -f1 -d.)
    4849NUM2=$(echo ${VERSION} | cut -f2 -d.)
    … …  
    5354# Add a custom version string
    5455#
     56cd ~/tmp
    5557DATE_STAMP=$(cat gcc-${VERSION}/gcc/DATESTAMP)
    5658echo "${VERSION}" > gcc-${VERSION}/gcc/BASE-VER
    … …  
    5961# Cleanup
    6062#
     63cd ~/tmp
    6164DIRS="gcc-${VERSION} gcc-${VERSION}.orig"
    6265for DIRECTORY in ${DIRS}; do
    63   cd ${DIRECTORY}
     66  cd ~/tmp/${DIRECTORY}
    6467  REMOVE="ABOUT-NLS COPYING COPYING.LIB MAINTAINERS Makefile.def
    6568    Makefile.in Makefile.tpl README README.SCO BUGS FAQ LAST_UPDATED
    6669    MD5SUMS NEWS bugs.html faq.html gcc/BASE-VER gcc/DEV-PHASE
    67     gcc/f/BUGS gcc/f/NEWS gcc/c-parse.c gcc/gengtype-lex.c gcc/c-parse.y
    68     gcc/gengtype-yacc.c gcc/gengtype-yacc.h gcc/java/parse-scan.c
    69     gcc/java/parse.c gcc/objc/objc-parse.c gcc/objc/objc-parse.y
    70     libjava/classpath/doc/cp-tools.info"
     70    gcc/f/BUGS gcc/f/NEWS gcc/gengtype-lex.c"
    7171  for file in ${REMOVE}; do
    7272    rm -f $file
    7373  done
    7474  for file in $(find . -name "ChangeLog*" | sed -e 's@./@@'); do
    75     rm -f ${file}
     75    rm -fv ${file}
    7676  done
    77   rm -rf INSTALL
    78   rm -f fastjar/*.{1,info} gcc/doc/*.{1,info,7} gcc/fortran/*.{1,info,7}
    79   rm -f gcc/po/*.{gmo,po}  libcpp/po/*.{gmo,po} libgomp/*.{1,info,7}
    80   rm -f libjava/classpath/doc/*.{1,info}
    81   cd ..
     77  REMVOVE_DIRS="INSTALL"
     78  for dir in ${REMOVE_DIRS}; do
     79    rm -rfv ${dir}
     80  done
     81  rm -fv fastjar/*.{1,info} gcc/doc/*.{1,info,7} gcc/fortran/*.{1,info,7} gcc/po/*.{gmo,po}
     82  rm -rf libcpp/po/*.{gmo,po} libgomp/*.{1,info,7} libjava/classpath/doc/*.{1,info}
     83 cd ..
    8284done
    8385
    8486# Create Patch
    8587#
    86 cd /usr/src
    87 echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
    88 echo "Date: `date +%m-%d-%Y`" >> gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
    89 echo "Initial Package Version: ${VERSION}" >> gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
    90 echo "Origin: Upstream" >> gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
    91 echo "Upstream Status: Applied" >> gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
    92 echo "Description: This is a branch update for gcc-${VERSION}, and should be" >> gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
    93 echo "             rechecked periodically." >> gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
    94 echo "" >> gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
    95 echo "This patch was made from Revision # ${REVISION}." >> gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
    96 echo "" >> gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
    97 diff -Naur gcc-${VERSION}.orig gcc-${VERSION} >> gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
    98 echo "Created /usr/src/gcc-${VERSION}-branch_update-${PATCH_NUM}.patch."
     88cd ~/tmp
     89install -d ~/patches
     90echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > ~/patches/gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
     91echo "Date: `date +%m-%d-%Y`" >> ~/patches/gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
     92echo "Initial Package Version: ${VERSION}" >> ~/patches/gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
     93echo "Origin: Upstream" >> ~/patches/gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
     94echo "Upstream Status: Applied" >> ~/patches/gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
     95echo "Description: This is a branch update for gcc-${VERSION}, and should be" >> ~/patches/gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
     96echo "             rechecked periodically." >> ~/patches/gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
     97echo "" >> ~/patches/gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
     98echo "This patch was made from Revision # ${REVISION}." >> ~/patches/gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
     99echo "" >> ~/patches/gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
     100diff -Naur gcc-${VERSION}.orig gcc-${VERSION} >> ~/patches/gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
     101echo "Created ~/patches/gcc-${VERSION}-branch_update-${PATCH_NUM}.patch."
    99102
    100103# Create Another Copy to create fixes patch
    101104#
    102 cd /usr/src
    103 rm -rf gcc-${VERSION}.orig
    104 cp -ar gcc-${VERSION} gcc-${VERSION}.orig
     105cd ~/tmp
     106if [ -e ${PATCH_DIR}/${VERSION} ]; then
     107  rm -rf gcc-${VERSION}.orig
     108  cp -ar gcc-${VERSION} gcc-${VERSION}.orig
    105109
    106 # Apply Patches from directories
    107 #
    108 cd /usr/src/gcc-${VERSION}
    109 if [ -e ${PATCH_DIR}/${VERSION} ]; then
     110  # Apply Patches from directories
     111  #
     112  cd ~/tmp/gcc-${VERSION}
    110113  PATCH_FILES=$(ls ${PATCH_DIR}/${VERSION}/*.patch)
    111114  if [ "${PATCH_FILES}" != "" ]; then
    … …  
    127130    done
    128131  fi
     132
     133  # Cleanup Directory
     134  #
     135  cd ~/tmp/gcc-${VERSION}
     136  rm -f $(find * -name "*~")
     137  rm -f $(find * -name "*.orig")
     138  rm -f $(find * -name "*.rej")
     139  rm -f *.orig *~ *.rej
     140
     141  # Create Patch
     142  #
     143  cd ~/tmp
     144  install -d ~/patches
     145  echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > ~/patches/gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
     146  echo "Date: `date +%m-%d-%Y`" >> ~/patches/gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
     147  echo "Initial Package Version: ${VERSION}" >> ~/patches/gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
     148  echo "Origin: Upstream" >> ~/patches/gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
     149  echo "Upstream Status: Applied" >> ~/patches/gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
     150  echo "Description: This Patch contains fixes for gcc-${VERSION}, and should be" >> ~/patches/gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
     151  echo "             rechecked periodically." >> ~/patches/gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
     152  echo "" >> ~/patches/gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
     153  diff -Naur gcc-${VERSION}.orig gcc-${VERSION} >> ~/patches/gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
     154  echo "Created ~/patches/gcc-${VERSION}-fixes-${PATCH_NUM2}.patch."
    129155fi
    130156
    131157# Cleanup Directory
    132158#
    133 
    134 for dir in $(find * -type d); do
    135   cd /usr/src/gcc-${VERSION}/${dir}
    136   for file in $(find . -name '*~'); do
    137     rm -f ${file}
    138   done
    139   for file in $(find . -name '*.orig'); do
    140     rm -f ${file}
    141   done
    142   for file in $(find . -name '*.rej'); do
    143     rm -f ${file}
    144   done
    145 done
    146 cd /usr/src/gcc-${VERSION}/
    147 rm -rf *.orig *~ *.rej
    148 
    149 # Create Patch
    150 #
    151 cd /usr/src
    152 echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
    153 echo "Date: `date +%m-%d-%Y`" >> gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
    154 echo "Initial Package Version: ${VERSION}" >> gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
    155 echo "Origin: Upstream" >> gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
    156 echo "Upstream Status: Applied" >> gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
    157 echo "Description: This Patch contains fixes for gcc-${VERSION}, and should be" >> gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
    158 echo "             rechecked periodically." >> gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
    159 echo "" >> gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
    160 diff -Naur gcc-${VERSION}.orig gcc-${VERSION} >> gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
    161 echo "Created /usr/src/gcc-${VERSION}-fixes-${PATCH_NUM2}.patch."
     159cd ~/tmp
     160rm -rf gcc-${VERSION} gcc-${VERSION}.orig
Note: See TracChangeset for help on using the changeset viewer.