From ef199ab192bbc39e1ba17d754152580d7ba88cb3 Mon Sep 17 00:00:00 2001 From: DrKittens Date: Tue, 24 Aug 2021 23:18:49 +1000 Subject: [PATCH] Fixup control file, alter readme, fixup filestructure to simplify dpkg-deb build process --- README.md | 12 ++++++++++++ {debian => build/DEBIAN}/.editorconfig | 0 {debian => build/DEBIAN}/.gitignore | 0 {debian => build/DEBIAN}/changelog | 0 {debian => build/DEBIAN}/compat | 0 {debian => build/DEBIAN}/control | 22 +++++++++++----------- {debian => build/DEBIAN}/copyright | 0 {debian => build/DEBIAN}/docs | 0 {debian => build/DEBIAN}/gbp.conf | 0 {debian => build/DEBIAN}/rules | 0 build/DEBIAN/source/format | 1 + debian/source/format | 1 - 12 files changed, 24 insertions(+), 12 deletions(-) rename {debian => build/DEBIAN}/.editorconfig (100%) rename {debian => build/DEBIAN}/.gitignore (100%) rename {debian => build/DEBIAN}/changelog (100%) rename {debian => build/DEBIAN}/compat (100%) rename {debian => build/DEBIAN}/control (78%) rename {debian => build/DEBIAN}/copyright (100%) rename {debian => build/DEBIAN}/docs (100%) rename {debian => build/DEBIAN}/gbp.conf (100%) rename {debian => build/DEBIAN}/rules (100%) mode change 100755 => 100644 create mode 100644 build/DEBIAN/source/format delete mode 100644 debian/source/format diff --git a/README.md b/README.md index 44f736b..53312be 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,17 @@ # gcc-10-compat workaround +Copy and fixup of the project https://salsa.debian.org/rpavlik/gcc-10-compat. +Removes some extra steps (delete readme, fixup control file) for building this project on armhf systems with dpkg + +Below readme lists a dead repo so the following instructions are how you should use this. + +1. clone this repo somewhere on a box with dpkg installed +2. open a terminal and cd into the root gcc-10-compat folder +3. enter the command `sudo dpkg-deb --build ./build gcc-10-compat.deb` +4. install the package for your architecture with `sudo apt install ./gcc-10-compat.deb` + + +** Original ReadMe File From https://salsa.debian.org/rpavlik/gcc-10-compat is below** Maintained at: This package exists to fix the buster->bullseye upgrade path, apparently broken diff --git a/debian/.editorconfig b/build/DEBIAN/.editorconfig similarity index 100% rename from debian/.editorconfig rename to build/DEBIAN/.editorconfig diff --git a/debian/.gitignore b/build/DEBIAN/.gitignore similarity index 100% rename from debian/.gitignore rename to build/DEBIAN/.gitignore diff --git a/debian/changelog b/build/DEBIAN/changelog similarity index 100% rename from debian/changelog rename to build/DEBIAN/changelog diff --git a/debian/compat b/build/DEBIAN/compat similarity index 100% rename from debian/compat rename to build/DEBIAN/compat diff --git a/debian/control b/build/DEBIAN/control similarity index 78% rename from debian/control rename to build/DEBIAN/control index 3994849..086747f 100644 --- a/debian/control +++ b/build/DEBIAN/control @@ -4,14 +4,14 @@ Section: oldlibs Priority: optional Build-Depends: debhelper (>= 12) Standards-Version: 4.3.0 +Website: https://salsa.debian.org/rpavlik/gcc-10-compat Package: libgcc1 -Architecture: any +Architecture: armhf Multi-Arch: same -Depends: libgcc-s1 (>=10.1.0-1), - ${misc:Depends} -Provides: libgcc1-armel [armel], - libgcc1-armhf [armhf] +Depends: libgcc-s1 (>=10.1.0-1) +Provides: libgcc1-armhf +Version: 0.0.1 Description: GCC support library (transitional package) This is a transitional package, and can be safely removed after completing a full upgrade. @@ -19,8 +19,8 @@ Description: GCC support library (transitional package) Package: lib64gcc1 Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32 Multi-Arch: same -Depends: lib64gcc-s1 (>=10.1.0-1), - ${misc:Depends} +Depends: lib64gcc-s1 (>=10.1.0-1) +Version: 0.0.1 Description: GCC support library (transitional package) (64bit) This is a transitional package, and can be safely removed after completing a full upgrade. @@ -28,8 +28,8 @@ Description: GCC support library (transitional package) (64bit) Package: lib32gcc1 Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el Multi-Arch: same -Depends: lib32gcc-s1 (>=10.1.0-1), - ${misc:Depends} +Depends: lib32gcc-s1 (>=10.1.0-1) +Version: 0.0.1 Description: GCC support library (transitional package) (32bit) This is a transitional package, and can be safely removed after completing a full upgrade. @@ -37,8 +37,8 @@ Description: GCC support library (transitional package) (32bit) Package: libx32gcc1 Architecture: amd64 i386 Multi-Arch: same -Depends: libx32gcc-s1 (>=10.1.0-1), - ${misc:Depends} +Depends: libx32gcc-s1 (>=10.1.0-1) +Version: 0.0.1 Description: GCC support library (transitional package) (x32) This is a transitional package, and can be safely removed after completing a full upgrade. diff --git a/debian/copyright b/build/DEBIAN/copyright similarity index 100% rename from debian/copyright rename to build/DEBIAN/copyright diff --git a/debian/docs b/build/DEBIAN/docs similarity index 100% rename from debian/docs rename to build/DEBIAN/docs diff --git a/debian/gbp.conf b/build/DEBIAN/gbp.conf similarity index 100% rename from debian/gbp.conf rename to build/DEBIAN/gbp.conf diff --git a/debian/rules b/build/DEBIAN/rules old mode 100755 new mode 100644 similarity index 100% rename from debian/rules rename to build/DEBIAN/rules diff --git a/build/DEBIAN/source/format b/build/DEBIAN/source/format new file mode 100644 index 0000000..9f67427 --- /dev/null +++ b/build/DEBIAN/source/format @@ -0,0 +1 @@ +3.0 (native) \ No newline at end of file diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 89ae9db..0000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (native)