From 18ad5a6eddde337104ee5b0be436ad537a35e13f Mon Sep 17 00:00:00 2001 From: Ruben Undheim Date: Sun, 23 Sep 2018 10:47:10 +0200 Subject: This patch fixes the install dir Gbp-Pq: Name 01_fix_install_dir.patch --- scripts/Makefile.in | 12 ++++++------ src/Makefile.in | 2 +- tech/Makefile.in | 2 +- tech/osu035/Makefile.in | 2 +- tech/osu050/Makefile.in | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 9d02a97..5be9273 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -12,8 +12,8 @@ INSTALL = @INSTALL@ VERSION = @VERSION@ REVISION = @REVISION@ -QFLOW_LIB_DIR = @QFLOW_LIB_DIR@ -QFLOW_BIN_DIR = @QFLOW_BIN_DIR@ +QFLOW_LIB_DIR = /usr/lib/qflow +QFLOW_BIN_DIR = /usr/bin 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 MAIN_SCRIPT = qflow SCRIPTINSTALL = ${QFLOW_LIB_DIR}/scripts -TECHINSTALL = ${QFLOW_LIB_DIR}/tech +TECHINSTALL = /usr/share/qflow/tech QFLOWEXECPATH = ${QFLOW_LIB_DIR}/bin EXECINSTALL = ${QFLOW_BIN_DIR} @@ -53,9 +53,9 @@ launcher: $(MAIN_SCRIPT).in $(MAIN_SCRIPT).in > $(MAIN_SCRIPT) checkdirs.sh: checkdirs.sh.in - sed -e '/SUBST_TECH_DIR/s#SUBST_TECH_DIR#$(TECHINSTALL)#' \ - -e '/SUBST_SCRIPT_DIR/s#SUBST_SCRIPT_DIR#$(SCRIPTINSTALL)#' \ - -e '/SUBST_BIN_DIR/s#SUBST_BIN_DIR#$(QFLOWEXECPATH)#' \ + sed -e '/SUBST_TECH_DIR/s#SUBST_TECH_DIR#/usr/share/qflow/tech#' \ + -e '/SUBST_SCRIPT_DIR/s#SUBST_SCRIPT_DIR#/usr/lib/qflow/scripts#' \ + -e '/SUBST_BIN_DIR/s#SUBST_BIN_DIR#/usr/lib/qflow/bin#' \ checkdirs.sh.in > checkdirs.sh qflow.sh: qflow.sh.in diff --git a/src/Makefile.in b/src/Makefile.in index 9214646..501bdf9 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -10,7 +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@ diff --git a/tech/Makefile.in b/tech/Makefile.in index 2a28d94..6b0666d 100644 --- a/tech/Makefile.in +++ b/tech/Makefile.in @@ -9,7 +9,7 @@ LIBS = @LIBS@ LDFLAGS = @LDFLAGS@ INSTALL = @INSTALL@ -QFLOW_LIB_DIR = @QFLOW_LIB_DIR@ +QFLOW_LIB_DIR = /usr/share/qflow TECH_DIRS = osu050 osu035 osu018 gscl45nm diff --git a/tech/osu035/Makefile.in b/tech/osu035/Makefile.in index 60d1a75..b6f999c 100644 --- a/tech/osu035/Makefile.in +++ b/tech/osu035/Makefile.in @@ -9,7 +9,7 @@ LIBS = @LIBS@ LDFLAGS = @LDFLAGS@ INSTALL = @INSTALL@ -QFLOW_LIB_DIR = @QFLOW_LIB_DIR@ +QFLOW_LIB_DIR = /usr/share/qflow TECH_FILES = osu035.par osu035_stdcells.lef osu035.sh TECH_FILES += osu035_stdcells.sp osu035.magicrc osu035.prm diff --git a/tech/osu050/Makefile.in b/tech/osu050/Makefile.in index bb2fcf7..db3cba8 100644 --- a/tech/osu050/Makefile.in +++ b/tech/osu050/Makefile.in @@ -9,7 +9,7 @@ LIBS = @LIBS@ LDFLAGS = @LDFLAGS@ INSTALL = @INSTALL@ -QFLOW_LIB_DIR = @QFLOW_LIB_DIR@ +QFLOW_LIB_DIR = /usr/share/qflow TECH_FILES = osu050.par osu050_stdcells.lef osu050.sh TECH_FILES += osu050_stdcells.sp osu050.magicrc osu050.prm -- cgit v1.2.3 From 7fc528967a45f908c7cd94f1e617065e60ca2213 Mon Sep 17 00:00:00 2001 From: Ruben Undheim Date: Sun, 23 Sep 2018 10:47:10 +0200 Subject: Fix the permission on technology files Gbp-Pq: Name permission_technology.patch --- tech/osu018/Makefile.in | 6 +++++- tech/osu035/Makefile.in | 6 +++++- tech/osu050/Makefile.in | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/tech/osu018/Makefile.in b/tech/osu018/Makefile.in index 18b94d6..bcdf057 100644 --- a/tech/osu018/Makefile.in +++ b/tech/osu018/Makefile.in @@ -31,7 +31,11 @@ install: ${TECH_FILES} @echo "Installing osu018 tech files" $(INSTALL) -d $(DESTDIR)$(TECHINSTALL)/osu018 for target in $(TECH_FILES); do \ - $(INSTALL) $$target $(DESTDIR)$(TECHINSTALL)/osu018 ;\ + if [ "$$target" = "osu018.sh" ] ; then \ + $(INSTALL) $$target $(DESTDIR)$(TECHINSTALL)/osu018 ;\ + else \ + $(INSTALL) --mode=644 $$target $(DESTDIR)$(TECHINSTALL)/osu018 ;\ + fi \ done clean: diff --git a/tech/osu035/Makefile.in b/tech/osu035/Makefile.in index b6f999c..10c05fe 100644 --- a/tech/osu035/Makefile.in +++ b/tech/osu035/Makefile.in @@ -31,7 +31,11 @@ install: ${TECH_FILES} @echo "Installing osu035 tech files" $(INSTALL) -d $(DESTDIR)$(TECHINSTALL)/osu035 for target in $(TECH_FILES); do \ - $(INSTALL) $$target $(DESTDIR)$(TECHINSTALL)/osu035 ;\ + if [ "$$target" = "osu035.sh" ] ; then \ + $(INSTALL) $$target $(DESTDIR)$(TECHINSTALL)/osu035 ;\ + else \ + $(INSTALL) --mode=644 $$target $(DESTDIR)$(TECHINSTALL)/osu035 ;\ + fi \ done clean: diff --git a/tech/osu050/Makefile.in b/tech/osu050/Makefile.in index db3cba8..cb5118f 100644 --- a/tech/osu050/Makefile.in +++ b/tech/osu050/Makefile.in @@ -31,7 +31,11 @@ install: ${TECH_FILES} @echo "Installing osu050 tech files" $(INSTALL) -d $(DESTDIR)$(TECHINSTALL)/osu050 for target in $(TECH_FILES); do \ - $(INSTALL) $$target $(DESTDIR)$(TECHINSTALL)/osu050 ;\ + if [ "$$target" = "osu050.sh" ] ; then \ + $(INSTALL) $$target $(DESTDIR)$(TECHINSTALL)/osu050 ;\ + else \ + $(INSTALL) --mode=644 $$target $(DESTDIR)$(TECHINSTALL)/osu050 ;\ + fi \ done clean: -- cgit v1.2.3 From c02b1afd59750ad092c6b16a59a12dccb02ff10b Mon Sep 17 00:00:00 2001 From: Ruben Undheim Date: Sun, 23 Sep 2018 09:40:08 +0200 Subject: This patch fixes the path to the tcsh interpreter. Gbp-Pq: Name fix_tcsh_path.patch --- 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/makesim.sh | 2 +- scripts/migrate.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/vesta.sh | 2 +- tech/osu018/osu018.sh | 2 +- tech/osu035/osu035.sh | 2 +- tech/osu050/osu050.sh | 2 +- 19 files changed, 22 insertions(+), 22 deletions(-) diff --git a/scripts/checkdirs.sh.in b/scripts/checkdirs.sh.in index 3d9878b..1d222d9 100755 --- a/scripts/checkdirs.sh.in +++ b/scripts/checkdirs.sh.in @@ -1,4 +1,4 @@ -#!/bin/tcsh -f +#!/usr/bin/tcsh -f # #------------------------------------------------------------------------- # checkdirs.sh diff --git a/scripts/cleanup.sh b/scripts/cleanup.sh index 99d1777..fa33102 100755 --- a/scripts/cleanup.sh +++ b/scripts/cleanup.sh @@ -1,4 +1,4 @@ -#!/bin/tcsh -f +#!/usr/bin/tcsh -f #---------------------------------------------------------- # 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 @@ -1,4 +1,4 @@ -#!/bin/tcsh -f +#!/usr/bin/tcsh -f #---------------------------------------------------------- # Qflow layout display script using magic-8.0 #---------------------------------------------------------- diff --git a/scripts/drc.sh b/scripts/drc.sh index 509e2c8..0ad344a 100755 --- a/scripts/drc.sh +++ b/scripts/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 @@ -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 @@ -1,4 +1,4 @@ -#!/bin/tcsh -f +#!/usr/bin/tcsh -f #---------------------------------------------------------- # LVS comparison script using magic #---------------------------------------------------------- diff --git a/scripts/makesim.sh b/scripts/makesim.sh index db3af36..e658596 100755 --- a/scripts/makesim.sh +++ b/scripts/makesim.sh @@ -1,4 +1,4 @@ -#!/bin/tcsh -f +#!/usr/bin/tcsh -f # # 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 @@ -1,4 +1,4 @@ -#!/bin/tcsh -f +#!/usr/bin/tcsh -f #---------------------------------------------------------- # Layout and netlist migration script #---------------------------------------------------------- diff --git a/scripts/opensta.sh b/scripts/opensta.sh index 9b71c56..4ac20f7 100755 --- a/scripts/opensta.sh +++ b/scripts/opensta.sh @@ -1,4 +1,4 @@ -#!/bin/tcsh -f +#!/usr/bin/tcsh -f #---------------------------------------------------------- # Static timing analysis script using OpenSTA #---------------------------------------------------------- diff --git a/scripts/opentimer.sh b/scripts/opentimer.sh index d1d3c52..16acad7 100755 --- a/scripts/opentimer.sh +++ b/scripts/opentimer.sh @@ -1,4 +1,4 @@ -#!/bin/tcsh -f +#!/usr/bin/tcsh -f #---------------------------------------------------------- # 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 +++ b/scripts/qflow.in @@ -1,4 +1,4 @@ -#!/bin/tcsh -f +#!/usr/bin/tcsh -f # #------------------------------------------------------------------ # qflow --- main program launcher diff --git a/scripts/qflow.sh.in b/scripts/qflow.sh.in index 8bbdbfb..e6026ae 100644 --- a/scripts/qflow.sh.in +++ b/scripts/qflow.sh.in @@ -1,4 +1,4 @@ -#!/bin/tcsh -f +#!/usr/bin/tcsh -f # #------------------------------------------------------------------ # qflow.sh --- main program shell script @@ -379,7 +379,7 @@ if ( -f $varfile ) then endif endif -echo "#\!/bin/tcsh -f" > ${varfile} +echo "#\!/usr/bin/tcsh -f" > ${varfile} echo "#-------------------------------------------" >> ${varfile} echo "# qflow variables for project ${project}" >> ${varfile} echo "#-------------------------------------------" >> ${varfile} @@ -397,7 +397,7 @@ echo "set logdir=${projectpath}/log" >> ${varfile} echo "#-------------------------------------------" >> ${varfile} echo "" >> ${varfile} -echo "#\!/bin/tcsh -f" > ${execfile} +echo "#\!/usr/bin/tcsh -f" > ${execfile} echo "#-------------------------------------------" >> ${execfile} echo "# qflow exec script for project ${project}" >> ${execfile} echo "#-------------------------------------------" >> ${execfile} @@ -411,7 +411,7 @@ echo "" >> ${execfile} #----------------------------------------------------- if ( ! -f ${userfile} ) then - echo "#\!/bin/tcsh -f" > ${userfile} + echo "#\!/usr/bin/tcsh -f" > ${userfile} 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 @@ -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 @@ -1,4 +1,4 @@ -#!/bin/tcsh -f +#!/usr/bin/tcsh -f # # synthesize.sh: #------------------------------------------------------------------------- diff --git a/scripts/vesta.sh b/scripts/vesta.sh index cbdc02a..5d3c467 100755 --- a/scripts/vesta.sh +++ b/scripts/vesta.sh @@ -1,4 +1,4 @@ -#!/bin/tcsh -f +#!/usr/bin/tcsh -f #---------------------------------------------------------- # Static timing analysis script using vesta #---------------------------------------------------------- diff --git a/tech/osu018/osu018.sh b/tech/osu018/osu018.sh index 16808e8..fac486b 100644 --- a/tech/osu018/osu018.sh +++ b/tech/osu018/osu018.sh @@ -1,4 +1,4 @@ -#!/bin/tcsh +#!/usr/bin/tcsh #--------------------------------------------------------------- # Shell script setting up all variables used by the qflow scripts # for this project diff --git a/tech/osu035/osu035.sh b/tech/osu035/osu035.sh index a848edd..523f034 100644 --- a/tech/osu035/osu035.sh +++ b/tech/osu035/osu035.sh @@ -1,4 +1,4 @@ -#!/bin/tcsh +#!/usr/bin/tcsh #--------------------------------------------------------------- # Shell script setting up all variables used by the qflow scripts # for this project diff --git a/tech/osu050/osu050.sh b/tech/osu050/osu050.sh index a025c66..fe9882a 100755 --- a/tech/osu050/osu050.sh +++ b/tech/osu050/osu050.sh @@ -1,4 +1,4 @@ -#!/bin/tcsh +#!/usr/bin/tcsh #--------------------------------------------------------------- # Shell script setting up all variables used by the qflow scripts # for this project -- cgit v1.2.3 From f3215478352af4db17f29f18ad3e16218316b33f Mon Sep 17 00:00:00 2001 From: Ruben Undheim Date: Sun, 23 Sep 2018 09:40:08 +0200 Subject: qflow doesn't work with versions of yosys with a "+" in the version string. This patch fixes this. Gbp-Pq: Name yosys_version_number_minor.patch --- scripts/synthesize.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 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 -- cgit v1.2.3 From 81fe0bf70ec921c3e878566da81fa22c35c3b777 Mon Sep 17 00:00:00 2001 From: Ruben Undheim Date: Sun, 23 Sep 2018 09:46:01 +0200 Subject: Remove references to excluded files Gbp-Pq: Name 0005-Remove-references-to-excluded-files.patch --- configure.in | 2 +- tech/Makefile.in | 2 +- tech/osu018/Makefile.in | 2 +- tech/osu035/Makefile.in | 2 +- tech/osu050/Makefile.in | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.in b/configure.in index 988e851..4083d77 100644 --- a/configure.in +++ b/configure.in @@ -254,7 +254,7 @@ fi AC_SUBST(HAVE_OPENSTA) -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) echo "" echo "Configuration results:" diff --git a/tech/Makefile.in b/tech/Makefile.in index 6b0666d..73b02a6 100644 --- a/tech/Makefile.in +++ b/tech/Makefile.in @@ -11,7 +11,7 @@ INSTALL = @INSTALL@ QFLOW_LIB_DIR = /usr/share/qflow -TECH_DIRS = osu050 osu035 osu018 gscl45nm +TECH_DIRS = osu050 osu035 osu018 TECHINSTALL = ${QFLOW_LIB_DIR}/tech diff --git a/tech/osu018/Makefile.in b/tech/osu018/Makefile.in index bcdf057..5fc7cbd 100644 --- a/tech/osu018/Makefile.in +++ b/tech/osu018/Makefile.in @@ -14,7 +14,7 @@ QFLOW_LIB_DIR = @QFLOW_LIB_DIR@ TECH_FILES = osu018.par osu018_stdcells.lef osu018.sh TECH_FILES += osu018_stdcells.sp osu018.magicrc osu018.prm TECH_FILES += SCN6M_SUBM.10.tech osu018_stdcells.lib -TECH_FILES += osu018_stdcells.v osu018_setup.tcl osu018_stdcells.gds2 +TECH_FILES += osu018_stdcells.v osu018_setup.tcl TECHINSTALL = ${QFLOW_LIB_DIR}/tech diff --git a/tech/osu035/Makefile.in b/tech/osu035/Makefile.in index 10c05fe..008cc17 100644 --- a/tech/osu035/Makefile.in +++ b/tech/osu035/Makefile.in @@ -14,7 +14,7 @@ QFLOW_LIB_DIR = /usr/share/qflow TECH_FILES = osu035.par osu035_stdcells.lef osu035.sh TECH_FILES += osu035_stdcells.sp osu035.magicrc osu035.prm TECH_FILES += SCN4M_SUBM.20.tech osu035_stdcells.lib -TECH_FILES += osu035_stdcells.v osu035_setup.tcl osu035_stdcells.gds2 +TECH_FILES += osu035_stdcells.v osu035_setup.tcl TECHINSTALL = ${QFLOW_LIB_DIR}/tech diff --git a/tech/osu050/Makefile.in b/tech/osu050/Makefile.in index cb5118f..c7ef43f 100644 --- a/tech/osu050/Makefile.in +++ b/tech/osu050/Makefile.in @@ -14,7 +14,7 @@ QFLOW_LIB_DIR = /usr/share/qflow TECH_FILES = osu050.par osu050_stdcells.lef osu050.sh TECH_FILES += osu050_stdcells.sp osu050.magicrc osu050.prm TECH_FILES += SCN3ME_SUBM.30.tech osu05_stdcells.lib -TECH_FILES += osu05_stdcells.v osu050_setup.tcl osu05_stdcells.gds2 +TECH_FILES += osu05_stdcells.v osu050_setup.tcl TECHINSTALL = ${QFLOW_LIB_DIR}/tech -- cgit v1.2.3