diff options
author | Ruben Undheim <ruben.undheim@gmail.com> | 2019-03-28 20:22:11 +0000 |
---|---|---|
committer | Ruben Undheim <ruben.undheim@gmail.com> | 2019-03-28 20:24:11 +0000 |
commit | c483a31623b6682052bd004a13831c41cf8d480b (patch) | |
tree | 58a639d29f70f6e2e5cadd163539bd3d774a1c9e | |
parent | 32ff20f871c754c62cc1de9dddf914c0068289d6 (diff) |
Refreshed patches
-rw-r--r-- | debian/patches/0005-Remove-references-to-excluded-files.patch | 6 | ||||
-rw-r--r-- | debian/patches/01_fix_install_dir.patch | 19 | ||||
-rw-r--r-- | debian/patches/fix_tcsh_path.patch | 127 | ||||
-rw-r--r-- | debian/patches/yosys_version_number_minor.patch | 14 |
4 files changed, 89 insertions, 77 deletions
diff --git a/debian/patches/0005-Remove-references-to-excluded-files.patch b/debian/patches/0005-Remove-references-to-excluded-files.patch index e9c5410..81f31c1 100644 --- a/debian/patches/0005-Remove-references-to-excluded-files.patch +++ b/debian/patches/0005-Remove-references-to-excluded-files.patch @@ -11,12 +11,12 @@ Subject: Remove references to excluded files 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.in b/configure.in -index 988e851..4083d77 100644 +index dada971..dae3d18 100644 --- a/configure.in +++ b/configure.in -@@ -254,7 +254,7 @@ fi +@@ -311,7 +311,7 @@ fi - AC_SUBST(HAVE_OPENSTA) + AC_SUBST(HAVE_QROUTER) -AC_OUTPUT(Makefile scripts/Makefile src/Makefile tech/Makefile tech/osu050/Makefile tech/osu035/Makefile tech/osu018/Makefile tech/gscl45nm/Makefile) +AC_OUTPUT(Makefile scripts/Makefile src/Makefile tech/Makefile tech/osu050/Makefile tech/osu035/Makefile tech/osu018/Makefile) diff --git a/debian/patches/01_fix_install_dir.patch b/debian/patches/01_fix_install_dir.patch index eaddf57..a793a6f 100644 --- a/debian/patches/01_fix_install_dir.patch +++ b/debian/patches/01_fix_install_dir.patch @@ -4,14 +4,14 @@ Subject: This patch fixes the install dir --- scripts/Makefile.in | 12 ++++++------ - src/Makefile.in | 2 +- + src/Makefile.in | 3 +-- tech/Makefile.in | 2 +- tech/osu035/Makefile.in | 2 +- tech/osu050/Makefile.in | 2 +- - 5 files changed, 10 insertions(+), 10 deletions(-) + 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/scripts/Makefile.in b/scripts/Makefile.in -index 9d02a97..5be9273 100644 +index 8918b18..bdac8bf 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -12,8 +12,8 @@ INSTALL = @INSTALL@ @@ -25,7 +25,7 @@ index 9d02a97..5be9273 100644 TCLSH_PATH = @TCLSH_PATH@ ENV_PATH = @ENV_PATH@ HAVE_PYTHON3 = @HAVE_PYTHON3@ -@@ -41,7 +41,7 @@ SHELL_SCRIPTS += drc.sh lvs.sh gdsii.sh migrate.sh +@@ -66,7 +66,7 @@ SHELL_SCRIPTS += cleanup.sh MAIN_SCRIPT = qflow SCRIPTINSTALL = ${QFLOW_LIB_DIR}/scripts @@ -34,7 +34,7 @@ index 9d02a97..5be9273 100644 QFLOWEXECPATH = ${QFLOW_LIB_DIR}/bin EXECINSTALL = ${QFLOW_BIN_DIR} -@@ -53,9 +53,9 @@ launcher: $(MAIN_SCRIPT).in +@@ -78,9 +78,9 @@ launcher: $(MAIN_SCRIPT).in $(MAIN_SCRIPT).in > $(MAIN_SCRIPT) checkdirs.sh: checkdirs.sh.in @@ -48,18 +48,19 @@ index 9d02a97..5be9273 100644 qflow.sh: qflow.sh.in diff --git a/src/Makefile.in b/src/Makefile.in -index 9214646..501bdf9 100644 +index 7f3b846..258ad81 100644 --- a/src/Makefile.in +++ b/src/Makefile.in -@@ -10,7 +10,7 @@ INSTALL = @INSTALL@ +@@ -10,8 +10,7 @@ INSTALL = @INSTALL@ DEFS = @DEFS@ -DQFLOW_VERSION=\"@VERSION@\" -DQFLOW_REVISION=\"@REVISION@\" -QFLOW_LIB_DIR = @QFLOW_LIB_DIR@ +- +QFLOW_LIB_DIR = /usr/lib/qflow QFLOW_GRAYWOLF_PATH = @QFLOW_GRAYWOLF_PATH@ - QFLOW_QROUTER_PATH = @QFLOW_QROUTER_PATH@ - QFLOW_ABC_PATH = @QFLOW_ABC_PATH@ + QFLOW_REPLACE_PATH = @QFLOW_REPLACE_PATH@ + QFLOW_NTUPLACE3_PATH = @QFLOW_NTUPLACE3_PATH@ diff --git a/tech/Makefile.in b/tech/Makefile.in index 2a28d94..6b0666d 100644 --- a/tech/Makefile.in diff --git a/debian/patches/fix_tcsh_path.patch b/debian/patches/fix_tcsh_path.patch index f5a1fde..2d0d954 100644 --- a/debian/patches/fix_tcsh_path.patch +++ b/debian/patches/fix_tcsh_path.patch @@ -5,24 +5,25 @@ Subject: This patch fixes the path to the tcsh interpreter. --- scripts/checkdirs.sh.in | 2 +- scripts/cleanup.sh | 2 +- - scripts/display.sh | 2 +- - scripts/drc.sh | 2 +- - scripts/gdsii.sh | 2 +- - scripts/lvs.sh | 2 +- + scripts/graywolf.sh | 2 +- + scripts/magic_db.sh | 2 +- + scripts/magic_drc.sh | 2 +- + scripts/magic_gds.sh | 2 +- + scripts/magic_view.sh | 2 +- scripts/makesim.sh | 2 +- - scripts/migrate.sh | 2 +- + scripts/netgen_lvs.sh | 2 +- scripts/opensta.sh | 2 +- scripts/opentimer.sh | 2 +- - scripts/placement.sh | 2 +- scripts/qflow.in | 2 +- scripts/qflow.sh.in | 8 ++++---- - scripts/router.sh | 2 +- - scripts/synthesize.sh | 2 +- + scripts/qrouter.sh | 2 +- + scripts/replace.sh | 2 +- scripts/vesta.sh | 2 +- + scripts/yosys.sh | 2 +- tech/osu018/osu018.sh | 2 +- tech/osu035/osu035.sh | 2 +- tech/osu050/osu050.sh | 2 +- - 19 files changed, 22 insertions(+), 22 deletions(-) + 20 files changed, 23 insertions(+), 23 deletions(-) diff --git a/scripts/checkdirs.sh.in b/scripts/checkdirs.sh.in index 3d9878b..1d222d9 100755 @@ -35,7 +36,7 @@ index 3d9878b..1d222d9 100755 #------------------------------------------------------------------------- # checkdirs.sh diff --git a/scripts/cleanup.sh b/scripts/cleanup.sh -index 99d1777..fa33102 100755 +index 311136b..528c408 100755 --- a/scripts/cleanup.sh +++ b/scripts/cleanup.sh @@ -1,4 +1,4 @@ @@ -44,45 +45,55 @@ index 99d1777..fa33102 100755 #---------------------------------------------------------- # Workspace cleanup script for qflow #---------------------------------------------------------- -diff --git a/scripts/display.sh b/scripts/display.sh -index 5a4ea56..f3b397e 100755 ---- a/scripts/display.sh -+++ b/scripts/display.sh +diff --git a/scripts/graywolf.sh b/scripts/graywolf.sh +index 8f2ab84..0a47801 100755 +--- a/scripts/graywolf.sh ++++ b/scripts/graywolf.sh @@ -1,4 +1,4 @@ -#!/bin/tcsh -f +#!/usr/bin/tcsh -f #---------------------------------------------------------- - # Qflow layout display script using magic-8.0 + # Placement script using GrayWolf + # Prerequisites: Mapped verilog netlist from synthesis. +diff --git a/scripts/magic_db.sh b/scripts/magic_db.sh +index 247dd1e..292d9be 100755 +--- a/scripts/magic_db.sh ++++ b/scripts/magic_db.sh +@@ -1,4 +1,4 @@ +-#!/bin/tcsh -f ++#!/usr/bin/tcsh -f + #---------------------------------------------------------- + # Layout and netlist migration script using magic database #---------------------------------------------------------- -diff --git a/scripts/drc.sh b/scripts/drc.sh -index 509e2c8..0ad344a 100755 ---- a/scripts/drc.sh -+++ b/scripts/drc.sh +diff --git a/scripts/magic_drc.sh b/scripts/magic_drc.sh +index 4ff6139..f360cb0 100755 +--- a/scripts/magic_drc.sh ++++ b/scripts/magic_drc.sh @@ -1,4 +1,4 @@ -#!/bin/tcsh -f +#!/usr/bin/tcsh -f #---------------------------------------------------------- # DRC error checking script using magic #---------------------------------------------------------- -diff --git a/scripts/gdsii.sh b/scripts/gdsii.sh -index d6ea267..4c2ac41 100755 ---- a/scripts/gdsii.sh -+++ b/scripts/gdsii.sh +diff --git a/scripts/magic_gds.sh b/scripts/magic_gds.sh +index cef0044..e6777a3 100755 +--- a/scripts/magic_gds.sh ++++ b/scripts/magic_gds.sh @@ -1,4 +1,4 @@ -#!/bin/tcsh -f +#!/usr/bin/tcsh -f #---------------------------------------------------------- # GDSII output generating script using magic #---------------------------------------------------------- -diff --git a/scripts/lvs.sh b/scripts/lvs.sh -index 977668c..dadc591 100755 ---- a/scripts/lvs.sh -+++ b/scripts/lvs.sh +diff --git a/scripts/magic_view.sh b/scripts/magic_view.sh +index bb505b8..687d5ea 100755 +--- a/scripts/magic_view.sh ++++ b/scripts/magic_view.sh @@ -1,4 +1,4 @@ -#!/bin/tcsh -f +#!/usr/bin/tcsh -f #---------------------------------------------------------- - # LVS comparison script using magic + # Qflow layout display script using magic-8.X #---------------------------------------------------------- diff --git a/scripts/makesim.sh b/scripts/makesim.sh index db3af36..e658596 100755 @@ -94,18 +105,18 @@ index db3af36..e658596 100755 # # makesim.sh cellname # -diff --git a/scripts/migrate.sh b/scripts/migrate.sh -index 9924a85..79b74b5 100755 ---- a/scripts/migrate.sh -+++ b/scripts/migrate.sh +diff --git a/scripts/netgen_lvs.sh b/scripts/netgen_lvs.sh +index 0361bbf..fceabba 100755 +--- a/scripts/netgen_lvs.sh ++++ b/scripts/netgen_lvs.sh @@ -1,4 +1,4 @@ -#!/bin/tcsh -f +#!/usr/bin/tcsh -f #---------------------------------------------------------- - # Layout and netlist migration script + # LVS comparison script using netgen #---------------------------------------------------------- diff --git a/scripts/opensta.sh b/scripts/opensta.sh -index 9b71c56..4ac20f7 100755 +index eab9c48..9b14998 100755 --- a/scripts/opensta.sh +++ b/scripts/opensta.sh @@ -1,4 +1,4 @@ @@ -115,7 +126,7 @@ index 9b71c56..4ac20f7 100755 # Static timing analysis script using OpenSTA #---------------------------------------------------------- diff --git a/scripts/opentimer.sh b/scripts/opentimer.sh -index d1d3c52..16acad7 100755 +index 2d607d2..f05b084 100755 --- a/scripts/opentimer.sh +++ b/scripts/opentimer.sh @@ -1,4 +1,4 @@ @@ -124,16 +135,6 @@ index d1d3c52..16acad7 100755 #---------------------------------------------------------- # Static timing analysis script using OpenTimer #---------------------------------------------------------- -diff --git a/scripts/placement.sh b/scripts/placement.sh -index 832d833..73e3068 100755 ---- a/scripts/placement.sh -+++ b/scripts/placement.sh -@@ -1,4 +1,4 @@ --#!/bin/tcsh -f -+#!/usr/bin/tcsh -f - #---------------------------------------------------------- - # Placement script using GrayWolf - # diff --git a/scripts/qflow.in b/scripts/qflow.in index 2b6dfd7..3fa2076 100755 --- a/scripts/qflow.in @@ -145,7 +146,7 @@ index 2b6dfd7..3fa2076 100755 #------------------------------------------------------------------ # qflow --- main program launcher diff --git a/scripts/qflow.sh.in b/scripts/qflow.sh.in -index 8bbdbfb..e6026ae 100644 +index 8403453..6b2552d 100644 --- a/scripts/qflow.sh.in +++ b/scripts/qflow.sh.in @@ -1,4 +1,4 @@ @@ -172,7 +173,7 @@ index 8bbdbfb..e6026ae 100644 echo "#-------------------------------------------" >> ${execfile} echo "# qflow exec script for project ${project}" >> ${execfile} echo "#-------------------------------------------" >> ${execfile} -@@ -411,7 +411,7 @@ echo "" >> ${execfile} +@@ -469,7 +469,7 @@ endif #----------------------------------------------------- if ( ! -f ${userfile} ) then @@ -181,28 +182,28 @@ index 8bbdbfb..e6026ae 100644 echo "#------------------------------------------------------------" >> ${userfile} echo "# project variables for project ${project}" >> ${userfile} echo "#------------------------------------------------------------" >> ${userfile} -diff --git a/scripts/router.sh b/scripts/router.sh -index 851f55a..6fa5081 100755 ---- a/scripts/router.sh -+++ b/scripts/router.sh +diff --git a/scripts/qrouter.sh b/scripts/qrouter.sh +index 9d7eff0..32efcc5 100755 +--- a/scripts/qrouter.sh ++++ b/scripts/qrouter.sh @@ -1,4 +1,4 @@ -#!/bin/tcsh -f +#!/usr/bin/tcsh -f #---------------------------------------------------------- # Route script using qrouter #---------------------------------------------------------- -diff --git a/scripts/synthesize.sh b/scripts/synthesize.sh -index fe187ab..c938baa 100755 ---- a/scripts/synthesize.sh -+++ b/scripts/synthesize.sh +diff --git a/scripts/replace.sh b/scripts/replace.sh +index 1419f6f..30c58af 100755 +--- a/scripts/replace.sh ++++ b/scripts/replace.sh @@ -1,4 +1,4 @@ -#!/bin/tcsh -f +#!/usr/bin/tcsh -f + #---------------------------------------------------------- + # Placement script using abk-openroad RePlAce # - # synthesize.sh: - #------------------------------------------------------------------------- diff --git a/scripts/vesta.sh b/scripts/vesta.sh -index cbdc02a..5d3c467 100755 +index d314e7d..df4608a 100755 --- a/scripts/vesta.sh +++ b/scripts/vesta.sh @@ -1,4 +1,4 @@ @@ -211,6 +212,16 @@ index cbdc02a..5d3c467 100755 #---------------------------------------------------------- # Static timing analysis script using vesta #---------------------------------------------------------- +diff --git a/scripts/yosys.sh b/scripts/yosys.sh +index 004aaa5..3bded35 100755 +--- a/scripts/yosys.sh ++++ b/scripts/yosys.sh +@@ -1,4 +1,4 @@ +-#!/bin/tcsh -f ++#!/usr/bin/tcsh -f + # + # yosys.sh: + #------------------------------------------------------------------------- diff --git a/tech/osu018/osu018.sh b/tech/osu018/osu018.sh index 16808e8..fac486b 100644 --- a/tech/osu018/osu018.sh diff --git a/debian/patches/yosys_version_number_minor.patch b/debian/patches/yosys_version_number_minor.patch index fa3bc21..d2d9efd 100644 --- a/debian/patches/yosys_version_number_minor.patch +++ b/debian/patches/yosys_version_number_minor.patch @@ -4,18 +4,18 @@ Subject: qflow doesn't work with versions of yosys with a "+" in the version string. This patch fixes this. --- - scripts/synthesize.sh | 1 + + scripts/yosys.sh | 1 + 1 file changed, 1 insertion(+) -diff --git a/scripts/synthesize.sh b/scripts/synthesize.sh -index c938baa..75031e9 100755 ---- a/scripts/synthesize.sh -+++ b/scripts/synthesize.sh -@@ -138,6 +138,7 @@ else +diff --git a/scripts/yosys.sh b/scripts/yosys.sh +index 3bded35..c5b0786 100755 +--- a/scripts/yosys.sh ++++ b/scripts/yosys.sh +@@ -157,6 +157,7 @@ else set subrevision = ${minortest} endif +set minor = `echo ${minor} | sed 's/+//'` + # Check if "yosys_options" specifies a script to use for yosys. - if ( ! ${?yosys_options} ) then |