Changeset 3c32719


Ignore:
Timestamp:
Jul 3, 2009, 8:48:04 PM (10 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
fd54d80
Parents:
2cca6fd (diff), 03e0e3d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Fixed changelog

Files:
4 added
12 edited

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/common/mpfr.xml

    r2cca6fd r3c32719  
    3535
    3636<screen os="b"><userinput>CC="gcc -isystem /usr/include" LDFLAGS="-Wl,-rpath-link,/lib" \
    37     ./configure --prefix=/usr --enable-shared</userinput></screen>
     37    ./configure --prefix=/usr --enable-shared \
     38        --with-gmp=/usr</userinput></screen>
    3839
    3940    <para os="c">Compile the package:</para>
  • BOOK/introduction/common/changelog.xml

    r2cca6fd r3c32719  
    4141      <itemizedlist>
    4242        <listitem>
    43           <para>[Chris] - Updated lists of installed programs and libraries
    44           for several packages.</para>
     43          <para>[Winkie] - Explicitly link MPFR against our GMP.</para>
     44        </listitem>
     45      </itemizedlist>
     46    </listitem>
     47
     48    <listitem>
     49      <para>July 3, 2009</para>
     50      <itemizedlist>
     51        <listitem>
     52          <para>[Jim] - Updated Rsyslog to 4.2.0.</para>
     53        </listitem>
     54        <listitem>
     55          <para>[Jim] - Updated Sed to 4.2.1.</para>
    4556        </listitem>
    4657      </itemizedlist>
  • BOOK/packages.ent

    r2cca6fd r3c32719  
    357357<!ENTITY readline-home "http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html">
    358358
    359 <!ENTITY rsyslog-version "3.22.0">
    360 <!ENTITY rsyslog-size "1,303 KB">
     359<!ENTITY rsyslog-version "4.2.0">
     360<!ENTITY rsyslog-size "1,365 KB">
    361361<!ENTITY rsyslog-url "http://download.rsyslog.com/rsyslog/rsyslog-&rsyslog-version;.tar.gz">
    362 <!ENTITY rsyslog-md5 "df43878d3aa206a258e414eae59dc797">
     362<!ENTITY rsyslog-md5 "c66650e961f23253fc926da5d35bd71f">
    363363<!ENTITY rsyslog-home "http://www.rsyslog.com/">
    364364
    365 <!ENTITY sed-version "4.2">
    366 <!ENTITY sed-size "1,030 KB">
    367 <!ENTITY sed-url "&gnu;sed/sed-&sed-version;.tar.gz">
    368 <!ENTITY sed-md5 "31580bee0c109c0fc8f31c4cf204757e">
     365<!ENTITY sed-version "4.2.1">
     366<!ENTITY sed-size "878 KB">
     367<!ENTITY sed-url "&gnu;sed/sed-&sed-version;.tar.bz2">
     368<!ENTITY sed-md5 "7d310fbd76e01a01115075c1fd3f455a">
    369369<!ENTITY sed-home "&gnu-software;sed">
    370370
  • BOOK/temp-system/common/mpfr.xml

    r2cca6fd r3c32719  
    3535<screen os="b"><userinput>./configure --prefix=/tools \
    3636    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    37     --enable-shared</userinput></screen>
     37    --enable-shared --with-gmp=/tools</userinput></screen>
    3838
    3939    <para os="c">Compile the package:</para>
  • scripts/fetch/eglibc.sh

    r2cca6fd r3c32719  
    2020rm -rf ~/tmp
    2121
     22# Set Patch Directory
     23#
     24PATCH_DIR=$(pwd -P)/eglibc
     25
    2226# Get Current Eglibc from SVN
    2327#
     
    2529cd ~/tmp
    2630FIXEDVERSION=$(echo ${VERSION} | sed -e 's/\./_/g')
    27 DL_REVISION=$(svn info svn://svn.eglibc.org/branches/eglibc-${FIXEDVERSION} | grep -i "Last Changed Rev" | cut -f2 -d: | sed -e 's/ //g')
     31DL_REVISION=$(svn info svn://svn.eglibc.org/branches/eglibc-${FIXEDVERSION} | grep "Last Changed Rev" | cut -f2 -d: | sed -e 's/ //g')
    2832echo "Retreiving Revision #${DL_REVISION} from SVN eglibc-${SOURCEVERSION}..."
    2933svn export -r ${DL_REVISION} svn://svn.eglibc.org/branches/eglibc-${FIXEDVERSION} eglibc-${SOURCEVERSION}
     
    3943# Customize the version string, so we know it's patched
    4044#
     45install -d ~/tmp/eglibc-${SOURCEVERSION}
    4146cd ~/tmp/eglibc-${SOURCEVERSION}
    4247DL_DATE=$(date +%Y%m%d)
     
    8691tst-fgetwc-ENV = LOCPATH=$(common-objpfx)localedata' libio/Makefile
    8792
     93# Apply Patches from directories
     94#
     95cd ~/tmp/eglibc-${SOURCEVERSION}/libc
     96if [ -e ${PATCH_DIR}/${VERSION} ]; then
     97  PATCH_FILES=$(ls ${PATCH_DIR}/${VERSION}/*.patch)
     98  if [ "${PATCH_FILES}" != "" ]; then
     99    for pfile in ${PATCH_FILES}; do
     100      echo "Applying - ${pfile}..."
     101      for pvalue in $(seq 0 5); do
     102        patch --dry-run -Np${pvalue} -i ${pfile} > /dev/null 2>&1
     103        if [ "${?}" = "0" ]; then
     104          PVALUE=${pvalue}
     105          break
     106        fi
     107      done
     108      if [ "${PVALUE}" != "" ]; then
     109        patch -Np${PVALUE} -i ${pfile}
     110      else
     111        echo "Patch: ${pfile} Failed to Apply..."
     112        exit 255
     113      fi
     114    done
     115  fi
     116fi
     117
     118# Cleanup Directory
     119#
     120for dir in $(find * -type d); do
     121  cd ~/tmp/eglibc-${SOURCEVERSION}/libc
     122  for file in $(find . -name '*~'); do
     123    rm -f ${file}
     124  done
     125  for file in $(find . -name '*.orig'); do
     126    rm -f ${file}
     127  done
     128  for file in $(find . -name '*.rej'); do
     129    rm -f ${file}
     130  done
     131done
     132cd ~/tmp/eglibc-${SOURCEVERSION}/libc
     133rm -rf *.orig *~ *.rej
     134
    88135# Create Patch
    89136#
    90137cd ~/tmp/eglibc-${SOURCEVERSION}
    91 echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" >  ~/public_html/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
    92 echo "Date: `date +%m-%d-%Y`" >>  ~/public_html/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
    93 echo "Initial Package Version: ${SOURCEVERSION}" >>  ~/public_html/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
    94 echo "Origin: Upstream" >>  ~/public_html/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
    95 echo "Upstream Status: Applied" >>  ~/public_html/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
    96 echo "Description: These are fixes eglibc-${SOURCEVERSION}, and should be" >>  ~/public_html/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
    97 echo "             rechecked periodically." >>  ~/public_html/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
    98 echo "" >>  ~/public_html/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
    99 diff -Naur libc.orig libc >>  ~/public_html/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
    100 echo "Created  ~/public_html/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch."
     138install -d ~/patches/
     139echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" >  ~/patches/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
     140echo "Date: `date +%m-%d-%Y`" >>  ~/patches/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
     141echo "Initial Package Version: ${SOURCEVERSION}" >>  ~/patches/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
     142echo "Origin: Upstream" >>  ~/patches/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
     143echo "Upstream Status: Applied" >>  ~/patches/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
     144echo "Description: These are fixes eglibc-${SOURCEVERSION}, and should be" >>  ~/patches/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
     145echo "             rechecked periodically." >>  ~/patches/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
     146echo "" >>  ~/patches/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
     147diff -Naur libc.orig libc >>  ~/patches/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
     148echo "Created  ~/patches/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch."
    101149
    102150# Remove Patched Copy
     
    109157#
    110158cd ~/tmp/eglibc-${SOURCEVERSION}
     159install -d ~/packages
    111160echo "Creating Tarball for Eglibc Ports ${SOURCEVERSION}...."
    112 tar cjf ~/public_html/eglibc-ports-${SOURCEVERSION}-${DL_DATE}-r${DL_REVISION}.tar.bz2 ports
     161tar cjf ~/packages/eglibc-ports-${SOURCEVERSION}-${DL_DATE}-r${DL_REVISION}.tar.bz2 ports
    113162rm -rf ports
    114163echo "Creating Tarball for Eglibc Linuxthreads ${SOURCEVERSION}...."
    115 tar cjf ~/public_html/eglibc-linuxthreads-${SOURCEVERSION}-${DL_DATE}-r${DL_REVISION}.tar.bz2 linuxthreads
     164tar cjf ~/packages/eglibc-linuxthreads-${SOURCEVERSION}-${DL_DATE}-r${DL_REVISION}.tar.bz2 linuxthreads
    116165rm -rf linuxthreads
    117166echo "Creating Tarball for Eglibc LocaleDef ${SOURCEVERSION}...."
    118 tar cjf ~/public_html/eglibc-localedef-${SOURCEVERSION}-${DL_DATE}-r${DL_REVISION}.tar.bz2 localedef
     167tar cjf ~/packages/eglibc-localedef-${SOURCEVERSION}-${DL_DATE}-r${DL_REVISION}.tar.bz2 localedef
    119168rm -rf localedef
    120169mv libc eglibc-${SOURCEVERSION}
    121170echo "Creating Tarball for Eglibc ${SOURCEVERSION}...."
    122 tar cjf ~/public_html/eglibc-${SOURCEVERSION}-${DL_DATE}-r${DL_REVISION}.tar.bz2 eglibc-${SOURCEVERSION}
     171tar cjf ~/packages/eglibc-${SOURCEVERSION}-${DL_DATE}-r${DL_REVISION}.tar.bz2 eglibc-${SOURCEVERSION}
    123172
    124173# Clean up Directores
     
    126175cd ~/tmp
    127176rm -rf eglibc-${SOURCEVERSION}
    128 
  • scripts/patch/bash-patch.sh

    r2cca6fd r3c32719  
    1616# Get the # of Patches
    1717#
    18 cd /usr/src
     18install -d ~/tmp
     19cd ~/tmp
    1920wget ftp://ftp.cwru.edu/pub/bash/bash-${VERSION}-patches/ --no-remove-listing
    2021VERSION2=$(echo ${VERSION} | sed -e 's/\.//g')
     
    3334# Set Patch Number
    3435#
    35 cd /usr/src
     36cd ~/tmp
    3637wget http://svn.cross-lfs.org/svn/repos/cross-lfs/trunk/patches/ --no-remove-listing
    3738PATCH_NUM=$(cat index.html | grep bash | grep "${VERSION}" | grep branch_update | cut -f2 -d'"' | cut -f1 -d'"'| cut -f4 -d- | cut -f1 -d. | tail -n 1)
     
    4142# Cleanup Directory
    4243#
     44cd ~/tmp
    4345rm -rf bash-${VERSION} bash-${VERSION}.orig
    4446tar xvf bash-${VERSION}.tar.gz
    4547cp -ar bash-${VERSION} bash-${VERSION}.orig
    46 cd bash-${VERSION}
    47 CURRENTDIR=$(pwd -P)
    4848
    4949# Download and Apply Patches
    5050#
     51install -d ~/tmp/bash-${VERSION}-patches
     52cd ~/tmp/bash-${VERSION}
     53CURRENTDIR=$(pwd -P)
    5154PATCHURL=ftp://ftp.cwru.edu/pub/bash/bash-${VERSION}-patches
    52 mkdir /tmp/bash-${VERSION}
    5355COUNT=1
    5456while [ ${COUNT} -le ${FILES} ]; do
    55   cd /tmp/bash-${VERSION}           
     57  cd ~/tmp/bash-${VERSION}           
    5658  DLCOUNT="${COUNT}"
    5759  SKIPME=no
     
    7173  if [ "${SKIPME}" != "yes" ]; then
    7274    if ! [ -e ${VERSION}.${DLCOUNT} ]; then
     75      cd ~/tmp/bash-${VERSION}-patches
    7376      wget --quiet ${PATCHURL}/bash${VERSION2}-${DLCOUNT}
    7477    fi
    7578    cd ${CURRENTDIR}
    76     patch --dry-run -s -f -Np0 -i /tmp/bash-${VERSION}/bash${VERSION2}-${DLCOUNT}
     79    patch --dry-run -s -f -Np0 -i ~/tmp/bash-${VERSION}-patches/bash${VERSION2}-${DLCOUNT}
    7780    if [ "$?" = "0" ]; then
    7881      echo "Patch bash${VERSION2}-${DLCOUNT} applied"
    79       patch -s -Np0 -i /tmp/bash-${VERSION}/bash${VERSION2}-${DLCOUNT}
     82      patch -s -Np0 -i ~/tmp/bash-${VERSION}-patches/bash${VERSION2}-${DLCOUNT}
    8083    else
    8184     echo "Patch bash${VERSION2}-${DLCOUNT} not applied"
    82      rm -f /tmp/bash-${VERSION}/bash${VERSION2}-${DLCOUNT}
     85     rm -f ~/tmp/bash-${VERSION}-patches/bash${VERSION2}-${DLCOUNT}
    8386     SKIPPED="${SKIPPED} ${DLCOUNT}"
    8487    fi
     
    8992# Cleanup Directory
    9093#
    91 
     94cd ~/tmp/bash-${VERSION}
    9295for dir in $(find * -type d); do
    93   cd /usr/src/bash-${VERSION}/${dir}
     96  cd ~/tmp/bash-${VERSION}/${dir}
    9497  for file in $(find . -name '*~'); do
    9598    rm -f ${file}
     
    99102  done
    100103done
    101 cd /usr/src/bash-${VERSION}
     104cd ~/tmp/bash-${VERSION}
    102105rm -f *~ *.orig
    103106
    104107# Create Patch
    105108#
    106 cd /usr/src
    107 echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > bash-${VERSION}-branch_update-${PATCH_NUM}.patch
    108 echo "Date: `date +%m-%d-%Y`" >> bash-${VERSION}-branch_update-${PATCH_NUM}.patch
    109 echo "Initial Package Version: ${VERSION}" >> bash-${VERSION}-branch_update-${PATCH_NUM}.patch
    110 echo "Origin: Upstream" >> bash-${VERSION}-branch_update-${PATCH_NUM}.patch
    111 echo "Upstream Status: Applied" >> bash-${VERSION}-branch_update-${PATCH_NUM}.patch
    112 echo "Description: Contains all upstream patches up to ${VERSION}-${FILES}" >> bash-${VERSION}-branch_update-${PATCH_NUM}.patch
     109cd ~/tmp
     110install -d ~/patches
     111echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
     112echo "Date: `date +%m-%d-%Y`" >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
     113echo "Initial Package Version: ${VERSION}" >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
     114echo "Origin: Upstream" >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
     115echo "Upstream Status: Applied" >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
     116echo "Description: Contains all upstream patches up to ${VERSION}-${FILES}" >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
    113117if [ -n "${SKIPPED}" ]; then
    114   echo "             The following patches were skipped" >> bash-${VERSION}-branch_update-${PATCH_NUM}.patch
    115   echo "            ${SKIPPED}" >> bash-${VERSION}-branch_update-${PATCH_NUM}.patch
     118  echo "             The following patches were skipped" >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
     119  echo "            ${SKIPPED}" >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
    116120fi
    117 echo "" >> bash-${VERSION}-branch_update-${PATCH_NUM}.patch
    118 diff -Naur bash-${VERSION}.orig bash-${VERSION} >> bash-${VERSION}-branch_update-${PATCH_NUM}.patch
    119 echo "Created /usr/src/bash-${VERSION}-branch_update-${PATCH_NUM}.patch."
     121echo "" >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
     122diff -Naur bash-${VERSION}.orig bash-${VERSION} >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
     123echo "Created ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch."
     124
     125# Cleanup Directory
     126#
     127cd ~/tmp
     128rm -rf bash-${VERSION} bash-${VERSION}.orig
  • scripts/patch/binutils-patch.sh

    r2cca6fd r3c32719  
    1919# Download Binutils Source
    2020#
    21 cd /usr/src
     21install -d ~/tmp
     22cd ~/tmp
    2223if ! [ -e binutils-${SOURCEVERSION}.tar.bz2  ]; then
    2324  wget ftp://ftp.gnu.org/gnu/binutils/binutils-${SOURCEVERSION}.tar.bz2
     
    2627# Set Patch Number
    2728#
    28 cd /usr/src
     29cd ~/tmp
    2930wget http://svn.cross-lfs.org/svn/repos/cross-lfs/trunk/patches/ --no-remove-listing
    3031PATCH_NUM=$(cat index.html | grep binutils | grep "${SOURCEVERSION}" | grep branch_update | cut -f2 -d'"' | cut -f1 -d'"'| cut -f4 -d- | cut -f1 -d. | tail -n 1)
    3132PATCH_NUM=$(expr ${PATCH_NUM} + 1)
     33PATCH_NUM2=$(cat index.html | grep binutils | grep "${SOURCEVERSION}" | grep fixes | cut -f2 -d'"' | cut -f1 -d'"'| cut -f4 -d- | cut -f1 -d. | tail -n 1)
     34PATCH_NUM2=$(expr ${PATCH_NUM2} + 1)
    3235rm -f index.html
    3336
    3437# Cleanup Directory
    3538#
     39cd ~/tmp
    3640rm -rf binutils-${SOURCEVERSION} binutils-${SOURCEVERSION}.orig
    3741tar xvf binutils-${SOURCEVERSION}.tar.bz2
    38 mv binutils-${SOURCEVERSION} binutils-${SOURCEVERSION}.orig
    39 CURRENTDIR=$(pwd -P)
    4042
    4143# Get Current Updates from CVS
    4244#
    43 cd /usr/src
     45cd ~/tmp
     46mv binutils-${SOURCEVERSION} binutils-${SOURCEVERSION}.orig
     47CURRENTDIR=$(pwd -P)
    4448FIXEDVERSION=$(echo ${VERSION} | sed -e 's/\./_/g')
    4549cvs -z 9 -d :pserver:anoncvs@sourceware.org:/cvs/src export -rbinutils-${FIXEDVERSION}-branch binutils
     
    4852# Cleanup
    4953#
     54cd ~/tmp
    5055DIRS="binutils-${SOURCEVERSION} binutils-${SOURCEVERSION}.orig"
    5156for DIRECTORY in ${DIRS}; do
    52   cd /usr/src/${DIRECTORY}
     57  cd ~/tmp/${DIRECTORY}
    5358  FILE_LIST=".cvsignore *.gmo"
    5459  for files in ${FILE_LIST}; do
     
    6671    cd ..
    6772done
    68 cd /usr/src/binutils-${SOURCEVERSION}
    69 rm -f /usr/src/binutils-${SOURCEVERSION}.orig/md5.sum
     73cd ~/tmp/binutils-${SOURCEVERSION}
     74rm -f ~/tmp/binutils-${SOURCEVERSION}.orig/md5.sum
    7075
    7176# Make Binutils a Release
    7277#
    73 cd /usr/src/binutils-${SOURCEVERSION}
     78cd ~/tmp/binutils-${SOURCEVERSION}
    7479sed -i 's/# RELEASE=y/RELEASE=y/g' bfd/Makefile.am
    7580sed -i 's/# RELEASE=y/RELEASE=y/g' bfd/Makefile.in
     
    7782# Customize the version string, so we know it's patched
    7883#
    79 cd /usr/src/binutils-${SOURCEVERSION}
     84cd ~/tmp/binutils-${SOURCEVERSION}
    8085DATE_STAMP=$(date +%Y%m%d)
    81 cd /usr/src/binutils-${SOURCEVERSION}
     86cd ~/tmp/binutils-${SOURCEVERSION}
    8287sed -i "s:@PKGVERSION@:(GNU Binutils for Cross-LFS) :" bfd/Makefile.in
    8388sed -i "s:^[[:space:]]VERSION=\(.*\)$: VERSION=\1.${DATE_STAMP}:g" bfd/configure
     
    8590# Create Patch
    8691#
    87 cd /usr/src
    88 echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
    89 echo "Date: `date +%m-%d-%Y`" >> binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
    90 echo "Initial Package Version: ${SOURCEVERSION}" >> binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
    91 echo "Origin: Upstream" >> binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
    92 echo "Upstream Status: Applied" >> binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
    93 echo "Description: This is a branch update for binutils-${SOURCEVERSION}, and should be" >> binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
    94 echo "             rechecked periodically." >> binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
    95 echo "" >> binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
    96 echo "This patch was created on ${DATE_STAMP}" >> binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
    97 echo "" >> binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
    98 diff -Naur binutils-${SOURCEVERSION}.orig binutils-${SOURCEVERSION} >> binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
    99 echo "Created /usr/src/binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch."
     92cd ~/tmp
     93install -d ~/patches
     94echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > ~/patches/binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
     95echo "Date: `date +%m-%d-%Y`" >>  ~/patches/binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
     96echo "Initial Package Version: ${SOURCEVERSION}" >>  ~/patches/binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
     97echo "Origin: Upstream" >>  ~/patches/binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
     98echo "Upstream Status: Applied" >>  ~/patches/binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
     99echo "Description: This is a branch update for binutils-${SOURCEVERSION}, and should be" >>  ~/patches/binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
     100echo "             rechecked periodically." >>  ~/patches/binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
     101echo "" >>  ~/patches/binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
     102echo "This patch was created on ${DATE_STAMP}" >>  ~/patches/binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
     103echo "" >>  ~/patches/binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
     104diff -Naur binutils-${SOURCEVERSION}.orig binutils-${SOURCEVERSION} >>  ~/patches/binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
     105echo "Created ~/patches/binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch."
    100106
    101107# Cleanliness is the name of my game!
    102108#
    103109unset DATE_STAMP
     110
     111# Create Another Copy to create fixes patch
     112#
     113cd ~/tmp
     114if [ -e ${PATCH_DIR}/${VERSION} ]; then
     115  rm -rf binutils-${SOURCEVERSION}.orig
     116  cp -ar binutils-${SOURCEVERSION} binutils-${SOURCEVERSION}.orig
     117
     118  # Apply Patches from directories
     119  #
     120  cd ~/tmp/binutils-${SOURCEVERSION}
     121  PATCH_FILES=$(ls ${PATCH_DIR}/${VERSION}/*.patch)
     122  if [ "${PATCH_FILES}" != "" ]; then
     123    for pfile in ${PATCH_FILES}; do
     124      echo "Applying - ${pfile}..."
     125      for pvalue in $(seq 0 5); do
     126        patch --dry-run -Np${pvalue} -i ${pfile} > /dev/null 2>&1
     127        if [ "${?}" = "0" ]; then
     128          PVALUE=${pvalue}
     129          break
     130        fi
     131      done
     132      if [ "${PVALUE}" != "" ]; then
     133        patch -Np${PVALUE} -i ${pfile}
     134      else
     135        echo "Patch: ${pfile} Failed to Apply..."
     136        exit 255
     137      fi
     138    done
     139  fi
     140
     141  # Cleanup Directory
     142  #
     143  cd ~/tmp/binutils-${SOURCEVERSION}
     144  rm -f $(find * -name "*~")
     145  rm -f $(find * -name "*.orig")
     146  rm -f $(find * -name "*.rej")
     147  rm -f *.orig *~ *.rej
     148
     149  # Create Patch
     150  #
     151  cd ~/tmp
     152  install -d ~/patches
     153  echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > ~/patches/binutils-${SOURCEVERSION}-fixes-${PATCH_NUM2}.patch
     154  echo "Date: `date +%m-%d-%Y`" >> ~/patches/binutils-${SOURCEVERSION}-fixes-${PATCH_NUM2}.patch
     155  echo "Initial Package Version: ${VERSION}" >> ~/patches/binutils-${SOURCEVERSION}-fixes-${PATCH_NUM2}.patch
     156  echo "Origin: Upstream" >> ~/patches/binutils-${SOURCEVERSION}-fixes-${PATCH_NUM2}.patch
     157  echo "Upstream Status: Applied" >> ~/patches/binutils-${SOURCEVERSION}-fixes-${PATCH_NUM2}.patch
     158  echo "Description: This Patch contains fixes for binutils-${SOURCEVERSION}, and should be" >> ~/patches/binutils-${SOURCEVERSION}-fixes-${PATCH_NUM2}.patch
     159  echo "             rechecked periodically." >> ~/patches/binutils-${SOURCEVERSION}-fixes-${PATCH_NUM2}.patch
     160  echo "" >> ~/patches/binutils-${SOURCEVERSION}-fixes-${PATCH_NUM2}.patch
     161  diff -Naur binutils-${SOURCEVERSION}.orig binutils-${SOURCEVERSION} >> ~/patches/binutils-${SOURCEVERSION}-fixes-${PATCH_NUM2}.patch
     162  echo "Created ~/patches/binutils-${SOURCEVERSION}-fixes-${PATCH_NUM2}.patch."
     163fi
     164
     165# Cleanup Directory
     166#
     167cd ~/tmp
     168rm -rf binutils-${SOURCEVERSION} binutils-${SOURCEVERSION}.orig
  • scripts/patch/gcc-patch.sh

    r2cca6fd r3c32719  
    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
  • scripts/patch/gcc-specs-patch.sh

    r2cca6fd r3c32719  
    1616# Download GCC Source
    1717#
    18 cd /usr/src
     18cd ~/tmp
    1919if ! [ -e gcc-${VERSION}.tar.bz2  ]; then
    2020  wget ftp://gcc.gnu.org/pub/gcc/releases/gcc-${VERSION}/gcc-${VERSION}.tar.bz2
     
    2323# Cleanup Directory
    2424#
     25cd ~/tmp
    2526rm -rf gcc-${VERSION} gcc-${VERSION}.orig
    2627tar xvf gcc-${VERSION}.tar.bz2
    2728cp -ar gcc-${VERSION} gcc-${VERSION}.orig
    28 CURRENTDIR=$(pwd -P)
    2929
    3030# Modify the Data
    3131#
    32 cd /usr/src/gcc-${VERSION}
     32cd ~/tmp/gcc-${VERSION}
    3333for file in $(find gcc/config -name "*.h"); do
    3434  if [ "$(echo ${file} | grep -c bsd)" = "0" ]; then
     
    5353# Create Patch
    5454#
    55 cd /usr/src
    56 echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > gcc-${VERSION}-specs-x.patch
    57 echo "Date: `date +%m-%d-%Y`" >> gcc-${VERSION}-specs-x.patch
    58 echo "Initial Package Version: ${VERSION}" >> gcc-${VERSION}-specs-x.patch
    59 echo "Origin: Idea originally developed by Ryan Oliver and Greg Schafer for" >> gcc-${VERSION}-specs-x.patch
    60 echo "        the Pure LFS project." >> gcc-${VERSION}-specs-x.patch
    61 echo "Upstream Status: Not Applied" >> gcc-${VERSION}-specs-x.patch
    62 echo "Description: This patch modifies the location of the dynamic linker for gcc-${VERSION}." >> gcc-${VERSION}-specs-x.patch
    63 echo "" >> gcc-${VERSION}-specs-x.patch
    64 diff -Naur gcc-${VERSION}.orig gcc-${VERSION} >> gcc-${VERSION}-specs-x.patch
     55cd ~/tmp
     56install -d ~/patches
     57echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > ~/patches/gcc-${VERSION}-specs-x.patch
     58echo "Date: `date +%m-%d-%Y`" >> ~/patches/gcc-${VERSION}-specs-x.patch
     59echo "Initial Package Version: ${VERSION}" >> ~/patches/gcc-${VERSION}-specs-x.patch
     60echo "Origin: Idea originally developed by Ryan Oliver and Greg Schafer for" >> ~/patches/gcc-${VERSION}-specs-x.patch
     61echo "        the Pure LFS project." >> ~/patches/gcc-${VERSION}-specs-x.patch
     62echo "Upstream Status: Not Applied" >> ~/patches/gcc-${VERSION}-specs-x.patch
     63echo "Description: This patch modifies the location of the dynamic linker for gcc-${VERSION}." >> ~/patches/gcc-${VERSION}-specs-x.patch
     64echo "" >> ~/patches/gcc-${VERSION}-specs-x.patch
     65diff -Naur gcc-${VERSION}.orig gcc-${VERSION} >> ~/patches/gcc-${VERSION}-specs-x.patch
    6566
    6667# Cleanup Directory
    6768#
     69cd ~/tmp
    6870rm -rf gcc-${VERSION} gcc-${VERSION}.orig
    6971tar xvf gcc-${VERSION}.tar.bz2
    7072cp -ar gcc-${VERSION} gcc-${VERSION}.orig
    71 CURRENTDIR=$(pwd -P)
    7273
    7374# Modify the Data
    7475#
    75 cd /usr/src/gcc-${VERSION}
     76cd ~/tmp/gcc-${VERSION}
    7677for file in $(find gcc/config -name "*.h"); do
    7778  if [ "$(echo ${file} | grep -c bsd)" = "0" ]; then
     
    9899# Create Patch
    99100#
    100 cd /usr/src
    101 echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > gcc-${VERSION}-pure64_specs-x.patch
    102 echo "Date: `date +%m-%d-%Y`" >> gcc-${VERSION}-pure64_specs-x.patch
    103 echo "Initial Package Version: ${VERSION}" >> gcc-${VERSION}-pure64_specs-x.patch
    104 echo "Origin: Idea originally developed by Ryan Oliver and Greg Schafer for" >> gcc-${VERSION}-pure64_specs-x.patch
    105 echo "        the Pure LFS project." >> gcc-${VERSION}-pure64_specs-x.patch
    106 echo "Upstream Status: Not Applied" >> gcc-${VERSION}-pure64_specs-x.patch
    107 echo "Description: This patch modifies the location of the dynamic linker for gcc-${VERSION}." >> gcc-${VERSION}-pure64_specs-x.patch
    108 echo "" >> gcc-${VERSION}-pure64_specs-x.patch
    109 diff -Naur gcc-${VERSION}.orig gcc-${VERSION} >> gcc-${VERSION}-pure64_specs-x.patch
     101cd ~/tmp
     102install -d ~/patches
     103echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > ~/patches/gcc-${VERSION}-pure64_specs-x.patch
     104echo "Date: `date +%m-%d-%Y`" >> ~/patches/gcc-${VERSION}-pure64_specs-x.patch
     105echo "Initial Package Version: ${VERSION}" >> ~/patches/gcc-${VERSION}-pure64_specs-x.patch
     106echo "Origin: Idea originally developed by Ryan Oliver and Greg Schafer for" >> ~/patches/gcc-${VERSION}-pure64_specs-x.patch
     107echo "        the Pure LFS project." >> ~/patches/gcc-${VERSION}-pure64_specs-x.patch
     108echo "Upstream Status: Not Applied" >> ~/patches/gcc-${VERSION}-pure64_specs-x.patch
     109echo "Description: This patch modifies the location of the dynamic linker for gcc-${VERSION}." >> ~/patches/gcc-${VERSION}-pure64_specs-x.patch
     110echo "" >> ~/patches/gcc-${VERSION}-pure64_specs-x.patch
     111diff -Naur gcc-${VERSION}.orig gcc-${VERSION} >> ~/patches/gcc-${VERSION}-pure64_specs-x.patch
    110112
    111113# Cleanup Directory
    112114#
     115cd ~/tmp
    113116rm -rf gcc-${VERSION} gcc-${VERSION}.orig
    114117tar xvf gcc-${VERSION}.tar.bz2
     
    118121# Modify the Data
    119122#
    120 cd /usr/src/gcc-${VERSION}
     123cd ~/tmp/gcc-${VERSION}
    121124for file in $(find gcc/config -name "*.h"); do
    122125  if [ "$(echo ${file} | grep -c bsd)" = "0" ]; then
     
    151154# Create Patch
    152155#
    153 cd /usr/src
    154 echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > gcc-${VERSION}-pure64-x.patch
    155 echo "Date: `date +%m-%d-%Y`" >> gcc-${VERSION}-pure64-x.patch
    156 echo "Initial Package Version: ${VERSION}" >> gcc-${VERSION}-pure64-x.patch
    157 echo "Origin: Idea originally developed by Ryan Oliver and Greg Schafer for" >> gcc-${VERSION}-pure64-x.patch
    158 echo "        the Pure LFS project." >> gcc-${VERSION}-pure64-x.patch
    159 echo "Upstream Status: Not Applied" >> gcc-${VERSION}-pure64-x.patch
    160 echo "Description: This patch modifies the location of the dynamic linker for gcc-${VERSION}." >> gcc-${VERSION}-pure64-x.patch
    161 echo "" >> gcc-${VERSION}-pure64-x.patch
    162 diff -Naur gcc-${VERSION}.orig gcc-${VERSION} >> gcc-${VERSION}-pure64-x.patch
     156cd ~/tmp
     157install -d ~/patches
     158echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > ~/patches/gcc-${VERSION}-pure64-x.patch
     159echo "Date: `date +%m-%d-%Y`" >> ~/patches/gcc-${VERSION}-pure64-x.patch
     160echo "Initial Package Version: ${VERSION}" >> ~/patches/gcc-${VERSION}-pure64-x.patch
     161echo "Origin: Idea originally developed by Ryan Oliver and Greg Schafer for" >> ~/patches/gcc-${VERSION}-pure64-x.patch
     162echo "        the Pure LFS project." >> ~/patches/gcc-${VERSION}-pure64-x.patch
     163echo "Upstream Status: Not Applied" >> ~/patches/gcc-${VERSION}-pure64-x.patch
     164echo "Description: This patch modifies the location of the dynamic linker for gcc-${VERSION}." >> ~/patches/gcc-${VERSION}-pure64-x.patch
     165echo "" >> ~/patches/gcc-${VERSION}-pure64-x.patch
     166diff -Naur gcc-${VERSION}.orig gcc-${VERSION} >> ~/patches/gcc-${VERSION}-pure64-x.patch
    163167
    164 echo "Created /usr/src/gcc-${VERSION}-specs-x.patch."
    165 echo "Created /usr/src/gcc-${VERSION}-pure64_specs-x.patch."
    166 echo "Created /usr/src/gcc-${VERSION}-pure64-x.patch."
     168echo "Created ~/patches/gcc-${VERSION}-specs-x.patch."
     169echo "Created ~/patches/gcc-${VERSION}-pure64_specs-x.patch."
     170echo "Created ~/patches/gcc-${VERSION}-pure64-x.patch."
     171
     172# Cleanup Directory
     173#
     174cd ~/tmp
     175rm -rf gcc-${VERSION} gcc-${VERSION}.orig
  • scripts/patch/ncurses-patch.sh

    r2cca6fd r3c32719  
    1616# Get Patch Names
    1717#
    18 cd /usr/src
     18cd ~/tmp
    1919wget ftp://invisible-island.net/ncurses/${VERSION}/ --no-remove-listing
    2020ROLLUP=$(cat index.html | grep bz2 | cut -f2 -d'>' | cut -f1 -d'<' | tail -n 1)
     
    2626# Download Ncurses Source
    2727#
     28cd ~/tmp
    2829if ! [ -e ncurses-${VERSION}.tar.gz ]; then
    2930  wget ftp://invisible-island.net/ncurses/ncurses-${VERSION}.tar.gz
     
    3233# Set Patch Number
    3334#
    34 cd /usr/src
     35cd ~/tmp
    3536wget http://svn.cross-lfs.org/svn/repos/cross-lfs/trunk/patches/ --no-remove-listing
    3637PATCH_NUM=$(cat index.html | grep ncurses | grep "${VERSION}" | grep branch_update | cut -f2 -d'"' | cut -f1 -d'"'| cut -f4 -d- | cut -f1 -d. | tail -n 1)
     
    4041# Cleanup Directory
    4142#
     43cd ~/tmp
    4244rm -rf ncurses-${VERSION} ncurses-${VERSION}.orig
    4345tar xvf ncurses-${VERSION}.tar.gz
    4446cp -ar ncurses-${VERSION} ncurses-${VERSION}.orig
    45 cd ncurses-${VERSION}
    4647
    4748# Download and Apply Rollup Patch
    4849#
     50cd ~/tmp/ncurses-${VERSION}
    4951CURRENTDIR=$(pwd -P)
    50 mkdir /tmp/ncurses-${VERSION}
    51 cd /tmp/ncurses-${VERSION}
     52mkdir ~/tmp/ncurses-${VERSION}-patches
     53cd ~/tmp/ncurses-${VERSION}
    5254if [ "${ROLLUP}" != "" ]; then
    5355  echo "Getting Rollup ${ROLLUP} Patch..."
     56  cd ~/tmp/ncurses-${VERSION}-patches
    5457  wget --quiet ftp://invisible-island.net/ncurses/${VERSION}/${ROLLUP}
    5558  cd ${CURRENTDIR}
    5659  echo "Applying Rollup ${ROLLUP} Patch..."
    57   cp /tmp/ncurses-${VERSION}/${ROLLUP} ${CURRENTDIR}/${ROLLUP}
     60  cp ~/tmp/ncurses-${VERSION}-patches/${ROLLUP} ${CURRENTDIR}/${ROLLUP}
    5861  bunzip2 ${ROLLUP}
    5962  ROLLUP2=$(echo ${ROLLUP} | sed -e 's/.bz2//g')
     
    6366# Download and Apply Patches
    6467#
     68install -d ~/tmp/ncurses-${VERSION}-patches
     69cd ~/tmp/ncurses-${VERSION}
     70CURRENTDIR=$(pwd -P)
    6571for file in ${FILES}; do
    6672  if [ "${ROLLPATCH}" != "" ]; then
     
    7076  fi
    7177  if [ "${TEST}" = "0" ]; then
    72     cd /tmp/ncurses-${VERSION}
     78    cd ~/tmp/ncurses-${VERSION}-patches
    7379    echo "Getting Patch ${file}..."
    7480    wget --quiet ftp://invisible-island.net/ncurses/${VERSION}/${file}
    7581    cd ${CURRENTDIR}
    76     gunzip -c /tmp/ncurses-${VERSION}/${file} | patch --dry-run -s -f -Np1
     82    gunzip -c ~/tmp/ncurses-${VERSION}-patches/${file} | patch --dry-run -s -f -Np1
    7783    if [ "$?" = "0" ]; then
    7884      echo "Apply Patch ${file}..."
    79       gunzip -c /tmp/ncurses-${VERSION}/${file} | patch -Np1
     85      gunzip -c ~/tmp/ncurses-${VERSION}-patches/${file} | patch -Np1
    8086      LASTFILE=$(echo ${file} | cut -f2 -d. | cut -f2 -d-)
    8187    fi
     
    8591# Cleanup Directory
    8692#
    87 # Cleanup Directory
    88 #
     93cd ~/tmp
     94cd ncurses-${VERSION}
    8995for dir in $(find * -type d); do
    90   cd /usr/src/ncurses-${VERSION}/${dir}
     96  cd ~/tmp/ncurses-${VERSION}/${dir}
    9197  for file in $(find . -name '*~'); do
    9298    rm -f ${file}
     
    96102  done
    97103done
    98 cd /usr/src/ncurses-${VERSION}
     104cd ~/tmp/ncurses-${VERSION}
    99105rm -f *~ *.orig
    100106
    101107# Create Patch
    102108#
    103 cd /usr/src
    104 echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
    105 echo "Date: `date +%m-%d-%Y`" >> ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
    106 echo "Initial Package Version: ${VERSION}" >> ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
    107 echo "Origin: Upstream" >> ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
    108 echo "Upstream Status: Applied" >> ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
    109 echo "Description: This is a branch update for NCurses-${VERSION}, and should be" >> ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
    110 echo "             rechecked periodically. This patch covers up to ${VERSION}-${LASTFILE}." >> ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
    111 echo "" >> ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
    112 diff -Naur ncurses-${VERSION}.orig ncurses-${VERSION} >> ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
    113 echo "Created /usr/src/ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch."
     109cd ~/tmp
     110echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > ~/patches/ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
     111echo "Date: `date +%m-%d-%Y`" >> ~/patches/ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
     112echo "Initial Package Version: ${VERSION}" >> ~/patches/ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
     113echo "Origin: Upstream" >> ~/patches/ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
     114echo "Upstream Status: Applied" >> ~/patches/ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
     115echo "Description: This is a branch update for NCurses-${VERSION}, and should be" >> ~/patches/ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
     116echo "             rechecked periodically. This patch covers up to ${VERSION}-${LASTFILE}." >> ~/patches/ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
     117echo "" >> ~/patches/ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
     118diff -Naur ncurses-${VERSION}.orig ncurses-${VERSION} >> ~/patches/ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
     119echo "Created ~/patches/ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch."
     120
     121# Cleanup Directory
     122#
     123cd ~/tmp
     124rm -rf ncurses-${VERSION} ncurses-${VERSION}.orig
  • scripts/patch/readline-patch.sh

    r2cca6fd r3c32719  
    1616# Get the # of Patches
    1717#
    18 cd /usr/src
     18cd ~/tmp
    1919wget ftp://ftp.cwru.edu/pub/bash/readline-${VERSION}-patches/ --no-remove-listing
    2020VERSION2=$(echo ${VERSION} | sed -e 's/\.//g')
     
    2727# Download Readline Source
    2828#
     29cd ~/tmp
    2930if ! [ -e readline-${VERSION}.tar.gz ]; then
    3031  wget ftp://ftp.cwru.edu/pub/bash/readline-${VERSION}.tar.gz
     
    3334# Set Patch Number
    3435#
    35 cd /usr/src
     36cd ~/tmp
    3637wget http://svn.cross-lfs.org/svn/repos/cross-lfs/trunk/patches/ --no-remove-listing
    3738PATCH_NUM=$(cat index.html | grep readline | grep "${VERSION}" | grep branch_update | cut -f2 -d'"' | cut -f1 -d'"'| cut -f4 -d- | cut -f1 -d. | tail -n 1)
     
    4142# Cleanup Directory
    4243#
     44cd ~/tmp
    4345rm -rf readline-${VERSION} readline-${VERSION}.orig
    4446tar xvf readline-${VERSION}.tar.gz
    4547cp -ar readline-${VERSION} readline-${VERSION}.orig
    46 cd readline-${VERSION}
    47 CURRENTDIR=$(pwd -P)
    4848
    4949# Download and Apply Patches
    5050#
     51install -d ~/tmp/readline-${VERSION}-patches
     52cd ~/tmp/readline-${VERSION}
     53CURRENTDIR=$(pwd -P)
    5154PATCHURL=ftp://ftp.cwru.edu/pub/bash/readline-${VERSION}-patches
    5255mkdir /tmp/readline-${VERSION}
    5356COUNT=1
    5457while [ ${COUNT} -le ${FILES} ]; do
    55   cd /tmp/readline-${VERSION}           
     58  cd ~/tmp/readline-${VERSION}           
    5659  DLCOUNT="${COUNT}"
    5760  SKIPME=no
     
    7174  if [ "${SKIPME}" != "yes" ]; then
    7275    if ! [ -e ${VERSION}.${DLCOUNT} ]; then
     76      cd ~/tmp/readline-${VERSION}-patches
    7377      wget --quiet ${PATCHURL}/readline${VERSION2}-${DLCOUNT}
    7478    fi
    7579    cd ${CURRENTDIR}
    76     patch --dry-run -s -f -Np0 -i /tmp/readline-${VERSION}/readline${VERSION2}-${DLCOUNT}
     80    patch --dry-run -s -f -Np0 -i ~/tmp/readline-${VERSION}-patches/readline${VERSION2}-${DLCOUNT}
    7781    if [ "$?" = "0" ]; then
    7882      echo "Patch readline${VERSION2}-${DLCOUNT} applied"
    79       patch -s -Np0 -i /tmp/readline-${VERSION}/readline${VERSION2}-${DLCOUNT}
     83      patch -s -Np0 -i ~/tmp/readline-${VERSION}-patches/readline${VERSION2}-${DLCOUNT}
    8084    else
    8185      echo "Patch readline${VERSION2}-${DLCOUNT} not applied"
    82       rm -f /tmp/readline-${VERSION}/readline${VERSION2}-${DLCOUNT}
     86      rm -f ~/tmp/readline-${VERSION}-patches/readline${VERSION2}-${DLCOUNT}
    8387      SKIPPED="${SKIPPED} ${DLCOUNT}"
    8488     fi
     
    9296#
    9397for dir in $(find * -type d); do
    94   cd /usr/src/readline-${VERSION}/${dir}
     98  cd ~/tmp/readline-${VERSION}/${dir}
    9599  for file in $(find . -name '*~'); do
    96100    rm -f ${file}
     
    100104  done
    101105done
    102 cd /usr/src/readline-${VERSION}
     106cd ~/tmp/readline-${VERSION}
    103107rm -f *~ *.orig
    104108
    105109# Create Patch
    106110#
    107 cd /usr/src
    108 echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > readline-${VERSION}-branch_update-${PATCH_NUM}.patch
    109 echo "Date: `date +%m-%d-%Y`" >> readline-${VERSION}-branch_update-${PATCH_NUM}.patch
    110 echo "Initial Package Version: ${VERSION}" >> readline-${VERSION}-branch_update-${PATCH_NUM}.patch
    111 echo "Origin: Upstream" >> readline-${VERSION}-branch_update-${PATCH_NUM}.patch
    112 echo "Upstream Status: Applied" >> readline-${VERSION}-branch_update-${PATCH_NUM}.patch
    113 echo "Description: Contains all upstream patches up to ${VERSION}-${FILES}" >> readline-${VERSION}-branch_update-${PATCH_NUM}.patch
     111cd ~/tmp
     112echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > ~/patches/readline-${VERSION}-branch_update-${PATCH_NUM}.patch
     113echo "Date: `date +%m-%d-%Y`" >> ~/patches/readline-${VERSION}-branch_update-${PATCH_NUM}.patch
     114echo "Initial Package Version: ${VERSION}" >> ~/patches/readline-${VERSION}-branch_update-${PATCH_NUM}.patch
     115echo "Origin: Upstream" >> ~/patches/readline-${VERSION}-branch_update-${PATCH_NUM}.patch
     116echo "Upstream Status: Applied" >> ~/patches/readline-${VERSION}-branch_update-${PATCH_NUM}.patch
     117echo "Description: Contains all upstream patches up to ${VERSION}-${FILES}" >> ~/patches/readline-${VERSION}-branch_update-${PATCH_NUM}.patch
    114118if [ -n "${SKIPPED}" ]; then
    115   echo "            Thee following patches were skipped" >> readline-${VERSION}-branch_update-${PATCH_NUM}.patch
    116   echo "            ${SKIPPED}" >> readline-${VERSION}-branch_update-${PATCH_NUM}.patch
     119  echo "            Thee following patches were skipped" >> ~/patches/readline-${VERSION}-branch_update-${PATCH_NUM}.patch
     120  echo "            ${SKIPPED}" >> ~/patches/readline-${VERSION}-branch_update-${PATCH_NUM}.patch
    117121fi
    118 echo "" >> readline-${VERSION}-branch_update-${PATCH_NUM}.patch
    119 diff -Naur readline-${VERSION}.orig readline-${VERSION} >> readline-${VERSION}-branch_update-${PATCH_NUM}.patch
    120 echo "Created /usr/src/readline-${VERSION}-branch_update-${PATCH_NUM}.patch."
     122echo "" >> ~/patches/readline-${VERSION}-branch_update-${PATCH_NUM}.patch
     123diff -Naur readline-${VERSION}.orig readline-${VERSION} >> ~/patches/readline-${VERSION}-branch_update-${PATCH_NUM}.patch
     124echo "Created ~/patches/readline-${VERSION}-branch_update-${PATCH_NUM}.patch."
     125
     126# Cleanup Directory
     127#
     128cd ~/tmp
     129rm -rf readline-${VERSION} readline-${VERSION}.orig
  • scripts/patch/vim-patch.sh

    r2cca6fd r3c32719  
    1616# Get the # of Patches
    1717#
    18 cd /usr/src
     18cd ~/tmp
    1919wget ftp://ftp.vim.org/pub/vim/patches/${VERSION}/ --no-remove-listing
    2020FILES=$(cat index.html | grep "${VERSION}" | cut -f6 -d. | cut -f1 -d'"' | sed '/^$/d' | tail -n 1)
     
    3333# Set Patch Number
    3434#
    35 cd /usr/src
     35cd ~/tmp
    3636wget http://svn.cross-lfs.org/svn/repos/cross-lfs/trunk/patches/ --no-remove-listing
    3737PATCH_NUM=$(cat index.html | grep vim | grep "${VERSION}" | grep branch_update | cut -f2 -d'"' | cut -f1 -d'"'| cut -f4 -d- | cut -f1 -d. | tail -n 1)
     
    4444tar xvf vim-${VERSION}.tar.bz2
    4545cp -ar vim${SERIES} vim${SERIES}.orig
    46 cd vim${SERIES}
    47 CURRENTDIR=$(pwd -P)
    4846
    4947# Download and Apply Patches
    5048#
     49install -d ~/tmp/vim-${VERSION}-patches
     50cd ~/tmp/vim${SERIES}
     51CURRENTDIR=$(pwd -P)
    5152PATCHURL=ftp://ftp.vim.org/pub/vim/patches/${VERSION}
    52 mkdir /tmp/vim-${VERSION}
    5353COUNT=1
    5454while [ ${COUNT} -le ${FILES} ]; do
    55   cd /tmp/vim-${VERSION}           
     55  cd ~/tmp/vim${SERIES}
    5656  DLCOUNT="${COUNT}"
    5757  SKIPME=no
     
    7171  if [ "${SKIPME}" != "yes" ]; then
    7272    if ! [ -e ${VERSION}.${DLCOUNT} ]; then
     73      cd ~/tmp/vim-${VERSION}-patches
    7374      wget --quiet $PATCHURL/${VERSION}.${DLCOUNT}
    7475    fi
    7576    cd $CURRENTDIR
    76     patch --dry-run -s -f -Np0 -i /tmp/vim-${VERSION}/${VERSION}.${DLCOUNT}
     77    patch --dry-run -s -f -Np0 -i ~/tmp/vim-${VERSION}-patches/${VERSION}.${DLCOUNT}
    7778    if [ "$?" = "0" ]; then
    7879      echo "Patch ${VERSION}.${DLCOUNT} applied"
    79       patch -s -Np0 -i /tmp/vim-${VERSION}/${VERSION}.${DLCOUNT}
     80      patch -s -Np0 -i ~/tmp/vim-${VERSION}-patches/${VERSION}.${DLCOUNT}
    8081    else
    8182      echo "Patch ${VERSION}.${DLCOUNT} not applied"
    82       rm -f /tmp/vim-${VERSION}/${VERSION}.${DLCOUNT}
    8383      SKIPPED="${SKIPPED} ${DLCOUNT}"
    8484    fi
     
    9090#
    9191for dir in $(find * -type d); do
    92   cd /usr/src/vim${SERIES}
     92  cd ~/tmp/vim${SERIES}
    9393  for file in $(find . -name '*~'); do
    9494    rm -f ${file}
     
    9898  done
    9999done
    100 cd /usr/src/vim${SERIES}
     100cd ~/tmp/vim${SERIES}
    101101rm -f *~ *.orig
    102102
    103103# Create Patch
    104104#
    105 cd /usr/src
    106 echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > vim-${VERSION}-branch_update-${PATCH_NUM}.patch
    107 echo "Date: `date +%m-%d-%Y`" >> vim-${VERSION}-branch_update-${PATCH_NUM}.patch
    108 echo "Initial Package Version: ${VERSION}" >> vim-${VERSION}-branch_update-${PATCH_NUM}.patch
    109 echo "Origin: Upstream" >> vim-${VERSION}-branch_update-${PATCH_NUM}.patch
    110 echo "Upstream Status: Applied" >> vim-${VERSION}-branch_update-${PATCH_NUM}.patch
    111 echo "Description: Contains all upstream patches up to ${VERSION}.${FILES}" >> vim-${VERSION}-branch_update-${PATCH_NUM}.patch
     105cd ~/tmp
     106echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > ~/patches/vim-${VERSION}-branch_update-${PATCH_NUM}.patch
     107echo "Date: `date +%m-%d-%Y`" >> ~/patches/vim-${VERSION}-branch_update-${PATCH_NUM}.patch
     108echo "Initial Package Version: ${VERSION}" >> ~/patches/vim-${VERSION}-branch_update-${PATCH_NUM}.patch
     109echo "Origin: Upstream" >> ~/patches/vim-${VERSION}-branch_update-${PATCH_NUM}.patch
     110echo "Upstream Status: Applied" >> ~/patches/vim-${VERSION}-branch_update-${PATCH_NUM}.patch
     111echo "Description: Contains all upstream patches up to ${VERSION}.${FILES}" >> ~/patches/vim-${VERSION}-branch_update-${PATCH_NUM}.patch
    112112if [ -n "${SKIPPED}" ]; then
    113   echo "             The following patches were skipped" >> vim-${VERSION}-branch_update-${PATCH_NUM}.patch
    114   echo "            ${SKIPPED}" >> vim-${VERSION}-branch_update-${PATCH_NUM}.patch
     113  echo "             The following patches were skipped" >> ~/patches/vim-${VERSION}-branch_update-${PATCH_NUM}.patch
     114  echo "            ${SKIPPED}" >> ~/patches/vim-${VERSION}-branch_update-${PATCH_NUM}.patch
    115115fi
    116 echo "" >> vim-${VERSION}-branch_update-${PATCH_NUM}.patch
    117 diff -Naur vim${SERIES}.orig vim${SERIES} >> vim-${VERSION}-branch_update-${PATCH_NUM}.patch
    118 echo "Created /usr/src/vim-${VERSION}-branch_update-${PATCH_NUM}.patch."
     116echo "" >> ~/patches/vim-${VERSION}-branch_update-${PATCH_NUM}.patch
     117diff -Naur vim${SERIES}.orig vim${SERIES} >> ~/patches/vim-${VERSION}-branch_update-${PATCH_NUM}.patch
     118echo "Created ~/patches/vim-${VERSION}-branch_update-${PATCH_NUM}.patch."
     119
     120# Cleanup Directory
     121#
     122rm -rf vim${SERIES} vim${SERIES}.orig
Note: See TracChangeset for help on using the changeset viewer.