Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dpkg: update to 1.22.11 #8710

Closed
wants to merge 1 commit into from
Closed

dpkg: update to 1.22.11 #8710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...date-alternatives/patches/0001-HACK-feat-data-add-AOSC-OS-specific-armv4-architectu.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
From 72467c8121e6c25c2707ec9c6c64ff101f8934fc Mon Sep 17 00:00:00 2001
From adb2a1cd428584e23b990d8fd69aff6182871fff Mon Sep 17 00:00:00 2001
From: Mingcong Bai <[email protected]>
Date: Tue, 30 Apr 2024 00:42:36 -0700
Subject: [PATCH 1/8] [HACK] feat(data): add AOSC OS-specific armv4
Subject: [PATCH 1/9] [HACK] feat(data): add AOSC OS-specific armv4
architecture

---
data/cputable | 1 +
1 file changed, 1 insertion(+)

diff --git a/data/cputable b/data/cputable
index 575c008e..72d065af 100644
index 575c008e3..72d065af0 100644
--- a/data/cputable
+++ b/data/cputable
@@ -21,6 +21,7 @@
Expand All @@ -21,5 +21,5 @@ index 575c008e..72d065af 100644
arm arm arm.* 32 little
arm64 aarch64 aarch64 64 little
--
2.45.2
2.48.1

8 changes: 4 additions & 4 deletions ...ernatives/patches/0002-HACK-ARMV6HF-fix-data-rename-armhf-as-AOSC-OS-specif.patch.armv6hf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
From 5a5d8672a16863e4a33f0cfecbc4f245324d0355 Mon Sep 17 00:00:00 2001
From 1ca82d9ba32d556eb76c3a6880118b27757f2e10 Mon Sep 17 00:00:00 2001
From: Mingcong Bai <[email protected]>
Date: Tue, 30 Apr 2024 00:43:52 -0700
Subject: [PATCH 2/8] [HACK] [ARMV6HF] fix(data): rename armhf as AOSC
Subject: [PATCH 2/9] [HACK] [ARMV6HF] fix(data): rename armhf as AOSC
OS-specific armv6hf

---
data/tupletable | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/tupletable b/data/tupletable
index ae9f2ddb..b91ace61 100644
index ae9f2ddb4..b91ace617 100644
--- a/data/tupletable
+++ b/data/tupletable
@@ -25,7 +25,7 @@ eabi-uclibc-linux-arm uclibc-linux-armel
Expand All @@ -22,5 +22,5 @@ index ae9f2ddb..b91ace61 100644
abin32-gnu-linux-mips64r6el mipsn32r6el
abin32-gnu-linux-mips64r6 mipsn32r6
--
2.45.2
2.48.1

10 changes: 4 additions & 6 deletions ...ernatives/patches/0002-HACK-ARMV7HF-fix-data-rename-armhf-as-AOSC-OS-specif.patch.armv7hf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
DERIVED FROM [ARMV6HF].

From 5a5d8672a16863e4a33f0cfecbc4f245324d0355 Mon Sep 17 00:00:00 2001
From 1ca82d9ba32d556eb76c3a6880118b27757f2e10 Mon Sep 17 00:00:00 2001
From: Mingcong Bai <[email protected]>
Date: Tue, 30 Apr 2024 00:43:52 -0700
Subject: [PATCH 2/8] [HACK] [ARMV7HF] fix(data): rename armhf as AOSC
Subject: [PATCH 2/9] [HACK] [ARMV7HF] fix(data): rename armhf as AOSC
OS-specific armv7hf

---
data/tupletable | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/tupletable b/data/tupletable
index ae9f2ddb..b91ace61 100644
index ae9f2ddb4..b91ace617 100644
--- a/data/tupletable
+++ b/data/tupletable
@@ -25,7 +25,7 @@ eabi-uclibc-linux-arm uclibc-linux-armel
Expand All @@ -24,5 +22,5 @@ index ae9f2ddb..b91ace61 100644
abin32-gnu-linux-mips64r6el mipsn32r6el
abin32-gnu-linux-mips64r6 mipsn32r6
--
2.45.2
2.48.1

8 changes: 4 additions & 4 deletions ...update-alternatives/patches/0003-HACK-fix-data-rename-i-86-as-AOSC-OS-specific-i486.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From 9dae1bcd1943804a215c827c59a967325cfd1fdb Mon Sep 17 00:00:00 2001
From e885e7dcc220bdf4df4a297d0b5ca9bfa1ca2dba Mon Sep 17 00:00:00 2001
From: Mingcong Bai <[email protected]>
Date: Tue, 30 Apr 2024 00:45:44 -0700
Subject: [PATCH 3/8] [HACK] fix(data): rename i*86 as AOSC OS-specific i486
Subject: [PATCH 3/9] [HACK] fix(data): rename i*86 as AOSC OS-specific i486

---
data/cputable | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/cputable b/data/cputable
index 72d065af..ca2d6b30 100644
index 72d065af0..ca2d6b308 100644
--- a/data/cputable
+++ b/data/cputable
@@ -27,7 +27,7 @@ arm arm arm.* 32 little
Expand All @@ -21,5 +21,5 @@ index 72d065af..ca2d6b30 100644
m68k m68k m68k 32 big
mips mips mips(eb)? 32 big
--
2.45.2
2.48.1

8 changes: 4 additions & 4 deletions ...date-alternatives/patches/0004-HACK-fix-data-rename-loong64-as-AOSC-OS-specific-loo.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
From 6b32f345022c7bd409f723f9c3d2148db04f7c12 Mon Sep 17 00:00:00 2001
From 7cad56d17c6202e092f6d160bc4c33c78d0ff02a Mon Sep 17 00:00:00 2001
From: Mingcong Bai <[email protected]>
Date: Tue, 30 Apr 2024 00:46:13 -0700
Subject: [PATCH 4/8] [HACK] fix(data): rename loong64 as AOSC OS-specific
Subject: [PATCH 4/9] [HACK] fix(data): rename loong64 as AOSC OS-specific
loongarch64

---
data/cputable | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/cputable b/data/cputable
index ca2d6b30..9d79de9a 100644
index ca2d6b308..9d79de9a7 100644
--- a/data/cputable
+++ b/data/cputable
@@ -26,7 +26,7 @@ armeb armeb arm.*b 32 big
Expand All @@ -22,5 +22,5 @@ index ca2d6b30..9d79de9a 100644
ia64 ia64 ia64 64 little
m68k m68k m68k 32 big
--
2.45.2
2.48.1

25 changes: 13 additions & 12 deletions ...atives/patches/0005-HACK-LOONGSON2F-fix-data-rename-mips64el-as-AOSC-OS-.patch.loongson2f
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
From af7861bcd35eba7746f04126dbefb8089ac3d635 Mon Sep 17 00:00:00 2001
From b4e1cf8bd091914ebde9762d14f9a84ab0a712c5 Mon Sep 17 00:00:00 2001
From: Mingcong Bai <[email protected]>
Date: Tue, 30 Apr 2024 00:47:00 -0700
Subject: [PATCH 5/8] [HACK] [LOONGSON2F] fix(data): rename mips64el as AOSC
OS-specific loongson2
Subject: [PATCH 5/9] [HACK] [LOONGSON2F] fix(data): rename mips64el as AOSC
OS-specific loongson2f

---
data/cputable | 2 +-
data/tupletable | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
data/tupletable | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/cputable b/data/cputable
index 9d79de9a..f6e1a2d2 100644
index 9d79de9a7..f6e1a2d26 100644
--- a/data/cputable
+++ b/data/cputable
@@ -35,7 +35,7 @@ mipsel mipsel mipsel 32 little
Expand All @@ -23,17 +23,18 @@ index 9d79de9a..f6e1a2d2 100644
mips64r6el mipsisa64r6el mipsisa64r6el 64 little
nios2 nios2 nios2 32 little
diff --git a/data/tupletable b/data/tupletable
index b91ace61..2e220f0f 100644
index b91ace617..9ea7a2e4e 100644
--- a/data/tupletable
+++ b/data/tupletable
@@ -35,6 +35,7 @@ abi64-gnu-linux-mips64r6el mips64r6el
@@ -33,7 +33,7 @@ abin32-gnu-linux-mips64el mipsn32el
abin32-gnu-linux-mips64 mipsn32
abi64-gnu-linux-mips64r6el mips64r6el
abi64-gnu-linux-mips64r6 mips64r6
abi64-gnu-linux-mips64el mips64el
-abi64-gnu-linux-mips64el mips64el
+abi64-gnu-linux-mips64el loongson2f
abi64-gnu-linux-mips64 mips64
+abi64-gnu-linux-loongson2f loongson2f
spe-gnu-linux-powerpc powerpcspe
x32-gnu-linux-amd64 x32
base-gnu-linux-<cpu> <cpu>
--
2.45.2
2.48.1

25 changes: 12 additions & 13 deletions ...rnatives/patches/0005-HACK-LOONGSON3-fix-data-rename-mips64el-as-AOSC-OS-.patch.loongson3
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
Derived from [LOONGSON2F]

From af7861bcd35eba7746f04126dbefb8089ac3d635 Mon Sep 17 00:00:00 2001
From b4e1cf8bd091914ebde9762d14f9a84ab0a712c5 Mon Sep 17 00:00:00 2001
From: Mingcong Bai <[email protected]>
Date: Tue, 30 Apr 2024 00:47:00 -0700
Subject: [PATCH 5/8] [HACK] [LOONGSON3] fix(data): rename mips64el as AOSC
Subject: [PATCH 5/9] [HACK] [LOONGSON3] fix(data): rename mips64el as AOSC
OS-specific loongson3

---
data/cputable | 2 +-
data/tupletable | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
data/tupletable | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/cputable b/data/cputable
index 9d79de9a..f6e1a2d2 100644
index 9d79de9a7..f6e1a2d26 100644
--- a/data/cputable
+++ b/data/cputable
@@ -35,7 +35,7 @@ mipsel mipsel mipsel 32 little
Expand All @@ -25,17 +23,18 @@ index 9d79de9a..f6e1a2d2 100644
mips64r6el mipsisa64r6el mipsisa64r6el 64 little
nios2 nios2 nios2 32 little
diff --git a/data/tupletable b/data/tupletable
index b91ace61..2e220f0f 100644
index b91ace617..9ea7a2e4e 100644
--- a/data/tupletable
+++ b/data/tupletable
@@ -35,6 +35,7 @@ abi64-gnu-linux-mips64r6el mips64r6el
@@ -33,7 +33,7 @@ abin32-gnu-linux-mips64el mipsn32el
abin32-gnu-linux-mips64 mipsn32
abi64-gnu-linux-mips64r6el mips64r6el
abi64-gnu-linux-mips64r6 mips64r6
abi64-gnu-linux-mips64el mips64el
-abi64-gnu-linux-mips64el mips64el
+abi64-gnu-linux-mips64el loongson3
abi64-gnu-linux-mips64 mips64
+abi64-gnu-linux-loongson3 loongson3
spe-gnu-linux-powerpc powerpcspe
x32-gnu-linux-amd64 x32
base-gnu-linux-<cpu> <cpu>
--
2.45.2
2.48.1

8 changes: 4 additions & 4 deletions ...date-alternatives/patches/0006-feat-drop-multiarch-features-add-remove-architecture.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 73c78ce29d409fa2c765bde066201473de8b1d3b Mon Sep 17 00:00:00 2001
From 0989dde2a112d9652c7757cd4a835c827bd79eed Mon Sep 17 00:00:00 2001
From: eatradish <[email protected]>
Date: Sun, 5 May 2024 16:06:18 +0800
Subject: [PATCH 6/8] feat: drop multiarch features
Subject: [PATCH 6/9] feat: drop multiarch features
(--{add,remove}-architectures)

AOSC OS does not offer multiarch or any way to install foreign-architecture
Expand All @@ -18,7 +18,7 @@ Co-authored-by: Mingcong Bai <[email protected]>
1 file changed, 4 insertions(+), 60 deletions(-)

diff --git a/src/main/main.c b/src/main/main.c
index ecaed5f3..1bc5eb6c 100644
index ecaed5f32..1bc5eb6c4 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -456,73 +456,17 @@ run_status_loggers(struct invoke_list *hook_list)
Expand Down Expand Up @@ -100,5 +100,5 @@ index ecaed5f3..1bc5eb6c 100644

int execbackend(const char *const *argv) DPKG_ATTR_NORET;
--
2.45.2
2.48.1

Loading