[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#690501: marked as done (unblock: loadlin/1.6f-1)

Your message dated Mon, 15 Oct 2012 07:56:00 +0200
with message-id <20121015055600.GL17465@radis.cristau.org>
and subject line Re: Bug#690501: unblock: loadlin/1.6f-1
has caused the Debian Bug report #690501,
regarding unblock: loadlin/1.6f-1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
690501: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=690501
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Hello,

Please unblock package loadlin

unblock loadlin/1.6f-1

See the attached debdiff. This is a new "upstream" release (I am
upstream), but it only includes two things:

- the cppcheck patch we had in Debian is now integrated as such
upstream, so this change is a no-op for us.
- the actually interesting thing is the change in loadlin.asm, which is
needed to be able to boot wheezy kernels. The change reduces the buffer
size for the command line (down to 864 characters, still plenty) in
order to release 4KiB room for the setup heap, needed by newer kernels.

I preferred to upload the new upstream 1.6f release itself rather than
adding a patch to avoid confusion for users: since the upstream release
mainly contain the second change, using version name 1.6e in Debian
would let users think that change is not there. Or conversely, people
using 1.6e from Debian would believe that the upstream 1.6e already had
the change.

Thanks,
Samuel
-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.0.4 (SMP w/8 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

-- 
Samuel
> Allez, soyez sympa ... traduisez-lui "linux"
Linux, c'est comme le miel : c'est vachement bon mais ça attire les
mouches. En plus, ça colle aux doigts et on a du mal à s'en défaire.
-+- TP in: Guide du linuxien pervers - "Barrez vous les mouches !"

diff -Nru loadlin-1.6e/debian/changelog loadlin-1.6f/debian/changelog
--- loadlin-1.6e/debian/changelog	2012-04-01 21:32:40.000000000 +0200
+++ loadlin-1.6f/debian/changelog	2012-10-05 02:51:20.000000000 +0200
@@ -1,3 +1,13 @@
+loadlin (1.6f-1) unstable; urgency=low
+
+  * New upstream release. Fixes booting the Wheezy kernels.
+  * debian/rules:
+    - Set BYHAND to yes, as we need a new loadlin.exe uploaded to mirrors to
+    be able to boot the Wheezy kernels.
+  * debian/patches/cppcheck: Drop, merged upstream.
+
+ -- Samuel Thibault <sthibault@debian.org>  Mon, 17 Sep 2012 01:42:31 +0200
+
 loadlin (1.6e-2) unstable; urgency=low
 
   * debian/rules:
diff -Nru loadlin-1.6e/debian/patches/99-yasm.patch loadlin-1.6f/debian/patches/99-yasm.patch
--- loadlin-1.6e/debian/patches/99-yasm.patch	2011-02-21 23:14:56.000000000 +0100
+++ loadlin-1.6f/debian/patches/99-yasm.patch	2012-10-05 02:49:13.000000000 +0200
@@ -10,7 +10,7 @@
 diff -r 56b6cf82d167 -r c8190a00fb15 src/loadlin.asm
 --- a/src/loadlin.asm	Tue Feb 09 03:29:55 2010 +0100
 +++ b/src/loadlin.asm	Wed Apr 28 20:13:19 2010 +0200
-@@ -73,6 +73,10 @@ LOADLIN_VERSION equ '1.6e'
+@@ -73,6 +73,10 @@ LOADLIN_VERSION equ '1.6f'
                locals
                jumps
  
diff -Nru loadlin-1.6e/debian/patches/cppcheck loadlin-1.6f/debian/patches/cppcheck
--- loadlin-1.6e/debian/patches/cppcheck	2012-04-01 21:28:36.000000000 +0200
+++ loadlin-1.6f/debian/patches/cppcheck	1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-# HG changeset patch
-# User Samuel Thibault <samuel.thibault@xensource.com>
-# Date 1293314723 -3600
-# Branch debian
-# Node ID cc08aceb936fadb70ad6feaccb8bc97ba1c1ad6c
-# Parent  70d9a1ffd330c9b79454b5f4496cddfd8474b8f9
-cppcheck fixes
-
-diff -r 70d9a1ffd330 -r cc08aceb936f src/srclinux/pgadjust.c
---- a/src/srclinux/pgadjust.c	Sun Sep 12 00:29:00 2010 +0200
-+++ b/src/srclinux/pgadjust.c	Sat Dec 25 23:05:23 2010 +0100
-@@ -363,13 +363,16 @@
-   PAGELIST->count=i;
-   PAGELIST->blocks[bi-1].tcount=i-PAGELIST->blocks[bi-1].start;
-   PAGELIST->auxbuf=(void *)0x10000000;
-+  fclose(f);
- }
- 
- int main(int argc, char** argv)
- {
-   read_pagelist(argv[1]);
--  printf("count %d nblocks %d\n", PAGELIST->count, PAGELIST->number_of_blocks);
--  if (PAGELIST) adjust();
-+  if (PAGELIST) {
-+    printf("count %d nblocks %d\n", PAGELIST->count, PAGELIST->number_of_blocks);
-+    adjust();
-+  }
-   return 0;
- }
- 
diff -Nru loadlin-1.6e/debian/patches/series loadlin-1.6f/debian/patches/series
--- loadlin-1.6e/debian/patches/series	2012-04-01 21:28:42.000000000 +0200
+++ loadlin-1.6f/debian/patches/series	2012-09-17 01:59:41.000000000 +0200
@@ -1,2 +1 @@
-cppcheck
 99-yasm.patch
diff -Nru loadlin-1.6e/debian/rules loadlin-1.6f/debian/rules
--- loadlin-1.6e/debian/rules	2012-04-01 21:22:46.000000000 +0200
+++ loadlin-1.6f/debian/rules	2012-09-17 01:58:57.000000000 +0200
@@ -3,7 +3,7 @@
 DEB_TARBALL=
 DEB_INSTALL_CHANGELOGS_loadlin=doc/changes
 
-BYHAND ?= no
+BYHAND ?= yes
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 
diff -Nru loadlin-1.6e/doc/changes loadlin-1.6f/doc/changes
--- loadlin-1.6e/doc/changes	2010-08-25 02:48:28.000000000 +0200
+++ loadlin-1.6f/doc/changes	2012-09-17 01:37:40.982396102 +0200
@@ -2,6 +2,16 @@
 			=======
 
 
+LOADLIN-16f
+===========
+Recent Linux kernels have grown their setup code, and thus reduced heap size,
+down to not being bootable at all with just 40 setup+heap sectors.  I have
+sacrificed 1K command line out of 2K, to free some room and get 4K more for the
+setup+heap.  Hopefully that will last some time. Otherwise we will have to
+reconsider the lets-fit-in-64KiB rule.
+
+		Sep 17 2012, Samuel Thibault <samuel.thibault@ens-lyon.org>
+
 LOADLIN-16e
 ===========
 
diff -Nru loadlin-1.6e/doc/lodlin16.lsm loadlin-1.6f/doc/lodlin16.lsm
--- loadlin-1.6e/doc/lodlin16.lsm	2010-08-25 02:48:14.000000000 +0200
+++ loadlin-1.6f/doc/lodlin16.lsm	2012-09-17 01:37:40.986396005 +0200
@@ -1,7 +1,7 @@
 Begin3
 Title:          LOADLIN, loads Linux with command line from DOS
-Version:        1.6e
-Entered-date:   25AUG10
+Version:        1.6f
+Entered-date:   17SEP12
 Description:    This is a boot loader for Linux that runs under MSDOS.
                 It can boot Linux from a DOS prompt or CONFIG.SYS, and fully
                 supports the command line feature of the Linux kernel.
@@ -14,10 +14,9 @@
 Author:         Hans Lermen <lermen@elserv.ffm.fgan.de>
 Maintained-by:  Samuel Thibault <samuel.thibault@ens-lyon.org>
 Original-site:  youpibouh.thefreecat.org loadlin
-                87k loadlin-1.6e.tgz
+                89k loadlin-1.6f.tgz
 Platform:       Linux >= 1.3.73 for bzImage+initrd,
                 Linux >= 0.99.15f for zImage,
                 MSDOS, WINDOWS95's DOS (or compatible operating system)
 Copying-policy: GPL
 End
-
\ Pas de fin de ligne à la fin du fichier
diff -Nru loadlin-1.6e/doc/manual.txt loadlin-1.6f/doc/manual.txt
--- loadlin-1.6e/doc/manual.txt	2010-04-28 21:08:04.000000000 +0200
+++ loadlin-1.6f/doc/manual.txt	2012-09-17 01:37:40.986396005 +0200
@@ -71,7 +71,7 @@
       Most Linux-newbees are too impatient to read the very good (but also
       long) documentation of LILO (the standard Linux loader), and start
       using it incorrectly, resulting in an unbootable DOS after this
-      (the MBR gots overwritten, 'fdisk /MBR' not always repairs).
+      (the MBR gets overwritten, 'fdisk /MBR' not always repairs).
       For those impatient ones LOADLIN is the best loader to start with.
 
       LOADLIN needs not to be installed in any way, it is usable as is
Les fichiers binaires /tmp/p4FY4VKxZH/loadlin-1.6e/loadlin.exe et /tmp/fnniVFj2R3/loadlin-1.6f/loadlin.exe sont différents
diff -Nru loadlin-1.6e/src/loadlin.asm loadlin-1.6f/src/loadlin.asm
--- loadlin-1.6e/src/loadlin.asm	2010-08-25 02:42:30.000000000 +0200
+++ loadlin-1.6f/src/loadlin.asm	2012-09-17 01:37:40.994395810 +0200
@@ -1,5 +1,5 @@
 TESTX = 0
-LOADLIN_VERSION equ '1.6e'
+LOADLIN_VERSION equ '1.6f'
 
 ;   >>> this is file LOADLIN.ASM
 ;============================================================================
@@ -86,7 +86,7 @@
 kernel_start_ equ     01000h     ; here the kernel must go
 kernel_end    equ     09000h
 standard_setup_sects  equ 4      ; number of setup sectors, older kernels
-maximum_setup_sects   equ (40-1) ; max number of setup sectors for newer kernels
+maximum_setup_sects   equ (48-1) ; max number of setup sectors for newer kernels
 High_Seg_     equ     kernel_end  ; here first 512 + 4*512 + n*512 bytes of image must go
 High_Addr_    equ     (High_Seg_*16)
 
@@ -1643,7 +1643,8 @@
 image_name      db    80 dup(?)
 aux_token       db    80 dup(?)
 rdimage_name    db    80 dup(?)
-command_line    db    space2k dup(?)  ; kernel accepts maximum of 2Kb
+;command_line    db    space2k dup(?)  ; kernel accepts maximum of 2Kb
+command_line    db    360h dup(?)  ; limited to 1Kb to get bigger heap
 
 
   ; -------------------------------v
diff -Nru loadlin-1.6e/src/srclinux/pgadjust.c loadlin-1.6f/src/srclinux/pgadjust.c
--- loadlin-1.6e/src/srclinux/pgadjust.c	2010-07-20 22:02:37.000000000 +0200
+++ loadlin-1.6f/src/srclinux/pgadjust.c	2012-09-17 01:37:40.998395712 +0200
@@ -363,13 +363,16 @@
   PAGELIST->count=i;
   PAGELIST->blocks[bi-1].tcount=i-PAGELIST->blocks[bi-1].start;
   PAGELIST->auxbuf=(void *)0x10000000;
+  fclose(f);
 }
 
 int main(int argc, char** argv)
 {
   read_pagelist(argv[1]);
-  printf("count %d nblocks %d\n", PAGELIST->count, PAGELIST->number_of_blocks);
-  if (PAGELIST) adjust();
+  if (PAGELIST) {
+    printf("count %d nblocks %d\n", PAGELIST->count, PAGELIST->number_of_blocks);
+    adjust();
+  }
   return 0;
 }

--- End Message ---
--- Begin Message --- 
On Mon, Oct 15, 2012 at 01:29:51 +0200, Samuel Thibault wrote:

> Package: release.debian.org
> Severity: normal
> User: release.debian.org@packages.debian.org
> Usertags: unblock
> 
> Hello,
> 
> Please unblock package loadlin
> 
Unblocked.

Cheers,
Julien

Attachment: signature.asc
Description: Digital signature


--- End Message ---
Reply to: