From fd07e33e1f6bd623a928dfd409e05baca1f415a0 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Thu, 27 May 2010 13:57:07 +0000 Subject: [PATCH] Small error in patch file. --- bootstrap/buildCoriolis.py | 6 +++--- bootstrap/coriolis2-for-distribution.patch | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bootstrap/buildCoriolis.py b/bootstrap/buildCoriolis.py index d8da542d..478b7db5 100755 --- a/bootstrap/buildCoriolis.py +++ b/bootstrap/buildCoriolis.py @@ -459,9 +459,9 @@ class ProjectBuilder: self._execute ( command, "rm of %s failed" % item) os.chdir ( self._archiveDir ) - command = [ "/bin/patch", "--remove-empty-files" - , "--no-backup-if-mismatch" - , "-p0", "-i", self._distribPatch ] + command = [ "/usr/bin/patch", "--remove-empty-files" + , "--no-backup-if-mismatch" + , "-p0", "-i", self._distribPatch ] self._execute ( command, "patch for distribution command failed" ) os.chdir ( self._tarballDir ) diff --git a/bootstrap/coriolis2-for-distribution.patch b/bootstrap/coriolis2-for-distribution.patch index 4de47c57..f7b87e8d 100644 --- a/bootstrap/coriolis2-for-distribution.patch +++ b/bootstrap/coriolis2-for-distribution.patch @@ -57,7 +57,7 @@ diff --exclude=.svn -uNr crlcore/etc.soc/CMakeLists.txt crlcore/etc/CMakeLists.t install ( FILES environment.alliance.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) install ( FILES technology.symbolic.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) - install ( FILES technology.cmos130.s2r.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) -- install ( FILES technology.mos65.s2r.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) +- install ( FILES technology.cmos65.s2r.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) - install ( FILES technology.freePDK45.s2r.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) install ( FILES technology.fake.s2r.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) install ( FILES display.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 )