Skip to content

Commit

Permalink
fix: remove loongarch64 ABI1.0 patch.
Browse files Browse the repository at this point in the history
  • Loading branch information
Zeno-sole committed Mar 13, 2024
1 parent b0d8c3e commit 324b805
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 3 deletions.
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
grub2 (2.12-1deepin3) unstable; urgency=medium

* remove loongarch64 patch.

-- LiChengGang <[email protected]> Wed, 13 Mar 2024 11:18:10 +0800

grub2 (2.12-1deepin2) unstable; urgency=medium

* Apply patches from deepin grub2 2.06
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Content-Transfer-Encoding: 8bit
;;
x*)
-if [ $ARCH_NAME != "loongson" ];then
+if [ $ARCH_NAME != "loongson" ] && [ "$machine" != "aarch64" ];then
+if [ "$machine" != "aarch64" ];then
cat << EOF
terminal_output ${GRUB_TERMINAL_OUTPUT}
EOF
Expand Down
5 changes: 3 additions & 2 deletions debian/patches/series
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ grub-install-removable-shim.patch
uniontech0028-forbid-menu-edit.patch
uniontech0029-make-users-parameter-work.patch
uniontech0029-make-users-parameter-work-2.patch
uniontech0032-bugfix-ignore-gfxterm-output.patch
uniontech0033-enable-grub-background-on-huawei.patch
#uniontech0032-bugfix-ignore-gfxterm-output.patch
#uniontech0033-enable-grub-background-on-huawei.patch
uniontech0034-enable-os-prober.patch
fix-remove-system-setup-on-huawei-pc.patch
uniontech0033-enable-grub-background-on-huawei-2
39 changes: 39 additions & 0 deletions debian/patches/uniontech0033-enable-grub-background-on-huawei-2
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
--- grub2-2.12.orig/util/grub.d/00_header.in
+++ grub2-2.12/util/grub.d/00_header.in
@@ -17,6 +17,13 @@ set -e
# You should have received a copy of the GNU General Public License
# along with GRUB. If not, see <http://www.gnu.org/licenses/>.

+PC_TYPE=$(dmidecode -s system-product-name|awk '{print $NF}')
+case "$PC_TYPE" in
+ KLVV*|KLVU*|PGUV*|PGUW*)
+ background_support=true
+ ;;
+esac
+
prefix="@prefix@"
exec_prefix="@exec_prefix@"
datarootdir="@datarootdir@"
@@ -154,7 +161,7 @@ EOF
else
# If all_video.mod isn't available load all modules available
# with versions prior to introduction of all_video.mod
-if [ "$machine" = "aarch64" ];then
+if [ "$machine" = "aarch64" ] && [ "x$background_support" = "x" ];then
cat <<EOF
echo
EOF
@@ -288,6 +295,13 @@ terminal_output ${GRUB_TERMINAL_OUTPUT}
EOF

fi
+
+if [ "x$background_support" = x"true" ];then
+ cat << EOF
+terminal_output ${GRUB_TERMINAL_OUTPUT}
+EOF
+fi
+
;;
esac

0 comments on commit 324b805

Please sign in to comment.