From 5e1e5acd6872321328b09446692700446e4c73c4 Mon Sep 17 00:00:00 2001 From: David Schmenk Date: Wed, 12 May 2021 15:44:01 -0700 Subject: [PATCH] Update Pi ROM signature to not conflict with Slinky RAM drivers --- client/STARTUP#FC0801 | Bin 509 -> 628 bytes debian/changelog | 6 ++++++ debian/postinst | 12 ++++++------ pidrive/pirom.s | 6 +++--- share/{A2PI-1.6.PO => A2PI-1.7.PO} | Bin 143360 -> 143360 bytes 5 files changed, 15 insertions(+), 9 deletions(-) rename share/{A2PI-1.6.PO => A2PI-1.7.PO} (99%) diff --git a/client/STARTUP#FC0801 b/client/STARTUP#FC0801 index 580fa8aeaaacac28f6080a3b629b6468a1c7b903..9b51216bfbf42c4ad99d26c4b4cafac45c4083a1 100755 GIT binary patch delta 264 zcmey%{Do!0J1Up|aunO?JV8GzYna9u=e8KRbIYR_z z1%q4o1rtj{Q==0`re>#t85U12W%S}$$vKUoiQypUWJM-1+dG^mAQ}t}46K3!ESVWHKo=NcxO)=EL4ehSY1er}%bN({d_?=UnlFfcFy0HEnEasU7T diff --git a/debian/changelog b/debian/changelog index 48b33e9..a4596d2 100755 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +a2pi (0.2.3-10) unstable; urgency=medium + + * Change PIROM signature to not conflict with Slinky RAM drivers + + -- David Schmenk Wed, 12 May 2021 15:40:00 -0800 + a2pi (0.2.3-5) unstable; urgency=medium * Flush writes to piDrives diff --git a/debian/postinst b/debian/postinst index c762305..493c3af 100755 --- a/debian/postinst +++ b/debian/postinst @@ -80,10 +80,10 @@ case "$1" in # Set up PIDRIVEs # #if [ ! -s /usr/share/a2pi/A2VD1.PO ] ; then - if [ -e /usr/share/a2pi/A2VD1.PO ] || [ -L /usr/share/a2pi/A2VD1.PO ] ; then + if [ -e /usr/share/a2pi/A2VD1.PO ] || [ -L /usr/share/a2pi/A2VD1.PO ] ; then rm /usr/share/a2pi/A2VD1.PO fi - ln -s /usr/share/a2pi/A2PI-1.6.PO /usr/share/a2pi/A2VD1.PO + ln -s /usr/share/a2pi/A2PI-1.7.PO /usr/share/a2pi/A2VD1.PO #fi if [ ! -s /usr/share/a2pi/A2VD2.PO ] ; then if [ -e /usr/share/a2pi/A2VD2.PO ] || [ -L /usrshare/a2pi/A2VD2.PO ] ; then @@ -94,16 +94,16 @@ case "$1" in # # Add schmenk.is-a-geek.com to apt sources # - if [ "$(grep schmenk /etc/apt/sources.list)" = "" ] ; then - echo "deb http://schmenk.is-a-geek.com/raspbian stretch contrib" >> /etc/apt/sources.list - fi + #if [ "$(grep schmenk /etc/apt/sources.list)" = "" ] ; then + # echo "deb http://schmenk.is-a-geek.com/raspbian stretch contrib" >> /etc/apt/sources.list + #fi # # Add a2pi service to systemd # if [ -f /usr/share/a2pi/a2pi.service ] && [ -d /lib/systemd/system ] ; then cp /usr/share/a2pi/a2pi.service /lib/systemd/system systemctl enable a2pi - fi + fi ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/pidrive/pirom.s b/pidrive/pirom.s index 150eb26..eb994ed 100755 --- a/pidrive/pirom.s +++ b/pidrive/pirom.s @@ -5,9 +5,9 @@ ;**************************************** PIROM = 1 -.DEFINE SIG "PI" +.DEFINE SIG "DS" .INCLUDE "romincs.s" - + ;**************************************** ;* ;* PER-SLOT ROM @ $Cx00 @@ -47,7 +47,7 @@ BANKSEL EQU $C0EF BANKSEL EQU $C0FF .INCLUDE "cxrom.s" .ENDSCOPE - + ;**************************************** ;* ;* OPTION ROM SPACE @ $C800 diff --git a/share/A2PI-1.6.PO b/share/A2PI-1.7.PO similarity index 99% rename from share/A2PI-1.6.PO rename to share/A2PI-1.7.PO index 827737a1a19aa9ac10027205b1e2ddf0424b212b..744b7baccff675a01d0df69e64d854b16fdf2969 100644 GIT binary patch delta 44 zcmV+{0Mq|~;0S==2(SzU0XLK31rxI%1jCIEHaN}VC`MPvGBq(N&^Uwfk+<=Y0S}&j Cg%Rlh delta 44 zcmV+{0Mq|~;0S==2(SzU0XCE21rxI%1jCIEI55rPC`MPvGBq(N&^Lqek+<=Y0S}&i C*Ad|W