From c9a88b4a331dc99335f7b0b1fca2907a94cb0212 Mon Sep 17 00:00:00 2001 From: Joachim Wiedorn Date: Wed, 19 Jan 2011 00:42:26 +0100 Subject: [PATCH] Fix: remove obsolete workaround (see 22.2-3.1) --- debian/changelog | 3 +- .../11_remove-obsolete-bios-workaround.patch | 38 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 debian/patches/11_remove-obsolete-bios-workaround.patch diff --git a/debian/changelog b/debian/changelog index 3bcc1ed..325dd0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -65,8 +65,9 @@ lilo (1:23.1-1) unstable; urgency=low - Add usage hints about -H option in src/lilo.c. (Closes: #459714) - su-to-root command without path in debian/lilo.menu. (Closes: #431077) - Diffs for NMUs already included. (Closes: #504267, #409663) + - Remove old obsolete workaround (see bugreport 146350#25). - -- Joachim Wiedorn Mon, 17 Jan 2011 19:45:55 +0100 + -- Joachim Wiedorn Tue, 18 Jan 2011 23:38:32 +0100 lilo (1:22.8-10) unstable; urgency=low diff --git a/debian/patches/11_remove-obsolete-bios-workaround.patch b/debian/patches/11_remove-obsolete-bios-workaround.patch new file mode 100644 index 0000000..7d2a759 --- /dev/null +++ b/debian/patches/11_remove-obsolete-bios-workaround.patch @@ -0,0 +1,38 @@ +Package: lilo +Subject: remove obsolete bios workaround +Author: Joachim Wiedorn +Forwarded: yes +Last-Update: 2011-01-18 + +In the changelog of Debian lilo 22.2-3.1 (from 2002-05-10) was noted: + + * This upstream version uses int15,0xe820 to fetch the memory map. + However, sufficiently many systems don't implement this interrupt + correctly. We avoid the errant code for now. The next upstream + release fixes this problem for real. Note to Russell: this patch + must be removed for the next upstream release. + +Unfortunately nobody had remembered to this note and removed this +workaround with the new upstream release. But the upstream release +22.3 (from 2002-10-19) of have the following note in its CHANGES: + + - Compensate for buggy BIOS in int 15h, fn E820h call to avoid + overlapping memory areas + +Now I remove this very old workaround because it is obsolete since +May 2002! +--- + +diff -urN s10/src/second.S s11/src/second.S +--- s10/src/second.S 2010-06-20 00:20:26.000000000 +0200 ++++ s11/src/second.S 2011-01-18 20:18:55.903147359 +0100 +@@ -2927,8 +2927,7 @@ + xor edx,edx ; flag nothing found + xor esi,esi ; flag size==0 + xor ebx,ebx +- ;jmp e8go ; circumvented due to BIOS problems +- br no_e801 ; skip to backup plan ++ jmp e8go + e8go2: or ebx,ebx ; test for end + jz e8go5 + e8go: push edx ; save best prospect diff --git a/debian/patches/series b/debian/patches/series index 3ff9196..91d30f0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ 08_install-also-dat-files.patch 09_use-of-newer-debhelper.patch 10_add-info-about-h-option.patch +11_remove-obsolete-bios-workaround.patch -- 2.39.2