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

Bug#473144: marked as done (provide {loadlin,gzip,cpio}.exe for dynamic use)

Your message dated Mon, 17 Mar 2014 19:05:54 +0100
with message-id <20140317180554.GA4046@mraw.org>
and subject line Re: Bug#473144: provide {loadlin,gzip,cpio}.exe for dynamic use
has caused the Debian Bug report #473144,
regarding provide {loadlin,gzip,cpio}.exe for dynamic use
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.)


-- 
473144: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473144
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: debian-installer
Severity: wishlist
Tags: patch

Currently, win32-loader is linking in loadlin.exe, gzip.exe and cpio.exe
statically into the executable, which is less than ideal for the propagation
of upgraded versions.

This patch adds them in their own win32-loader/ directory, so that newer
versions can get these files from there instead.

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.18-6-amd64 (SMP w/2 CPU cores)
Locale: LANG=ca_AD.UTF-8, LC_CTYPE=ca_AD.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Index: build/config/x86.cfg
===================================================================
--- build/config/x86.cfg	(revision 52185)
+++ build/config/x86.cfg	(working copy)
@@ -82,9 +82,14 @@
 	fi || echo "*** Failed to add boot logo, probably out of space." >&2
 
 	# win32-loader
-	(mcopy -i$(TEMP_BOOT) /usr/lib/win32-loader/win32-loader.exe	::setup.exe ; \
-	mcopy -i$(TEMP_BOOT) /usr/lib/win32-loader/g2ldr		::g2ldr ; \
-	mcopy -i$(TEMP_BOOT) /usr/lib/win32-loader/g2ldr.mbr		::g2ldr.mbr ; \
+	(mmd -i$(TEMP_BOOT) ::win32-loader ; \
+	mcopy -i$(TEMP_BOOT) /usr/lib/win32-loader/win32-loader.exe	::setup.exe ; \
+	mcopy -i$(TEMP_BOOT) /usr/lib/win32-loader/g2ldr		::win32-loader\\g2ldr ; \
+	mcopy -i$(TEMP_BOOT) /usr/lib/win32-loader/g2ldr.mbr		::win32-loader\\g2ldr.mbr ; \
+	mcopy -i$(TEMP_BOOT) /usr/share/win32/gzip.exe			::win32-loader\\gzip.exe ; \
+	mcopy -i$(TEMP_BOOT) /usr/share/win32/cpio.exe			::win32-loader\\cpio.exe ; \
+	gunzip /usr/lib/loadlin/loadlin.exe.gz -c > $(TEMP)/loadlin.exe ; \
+	mcopy -i$(TEMP_BOOT) $(TEMP)/loadlin.exe			::win32-loader\\loadlin.exe ; \
 	\
 	(echo -en "[installer]\n"; \
 	echo -en "arch=$(ARCH)\n"; \
@@ -95,9 +100,15 @@
 		echo -en "user_interface=text\n"; \
 		echo -en "$(ARCH)/linux=linux\n$(ARCH)/initrd=initrd.gz\n"; \
 	fi; \
-	echo -en "\n[grub]\ng2ldr=g2ldr\ng2ldr.mbr=g2ldr.mbr\n") \
+	echo -en "\n[util]\n"; \
+	echo -en "grub=win32-loader\\\\g2ldr\ngrub.mbr=win32-loader\\\\g2ldr.mbr\n"; \
+	echo -en "gzip=win32-loader\\\\gzip.exe\n"; \
+	echo -en "cpio=win32-loader\\\\cpio.exe\n"; \
+	echo -en "loadlin=win32-loader\\\\loadlin.exe\n"; \
+	echo -en "\n; deprecated section\n[grub]\ng2ldr=win32-loader\\\\g2ldr\ng2ldr.mbr=win32-loader\\\\g2ldr.mbr\n") \
 		| todos | mcopy -i$(TEMP_BOOT) - ::win32-loader.ini) \
-	|| (mdel -i$(TEMP_BOOT) ::setup.exe ::g2ldr ::g2ldr.mbr ::win32-loader.ini ; \
+	|| (mdel -i$(TEMP_BOOT) ::setup.exe ::win32-loader.ini ; \
+		mdeltree -i$(TEMP_BOOT) ::win32-loader ; \
 		echo "*** Failed to add win32-loader, probably out of space." >&2)
 
 	$(if $(GZIPPED),gzip -v9f $(TEMP_BOOT))
@@ -169,8 +180,14 @@
 
 	# win32-loader
 	cp /usr/lib/win32-loader/win32-loader.exe	$(TEMP_CD_INFO_DIR)/setup.exe
-	cp /usr/lib/win32-loader/g2ldr			$(TEMP_CD_INFO_DIR)/g2ldr
-	cp /usr/lib/win32-loader/g2ldr.mbr		$(TEMP_CD_INFO_DIR)/g2ldr.mbr
+	mkdir -p					$(TEMP_CD_INFO_DIR)/win32-loader
+	cp \
+		/usr/lib/win32-loader/g2ldr \
+		/usr/lib/win32-loader/g2ldr.mbr \
+		/usr/share/win32/gzip.exe \
+		/usr/share/win32/cpio.exe \
+							$(TEMP_CD_INFO_DIR)/win32-loader/
+	gunzip /usr/lib/loadlin/loadlin.exe.gz -c >	$(TEMP_CD_INFO_DIR)/win32-loader/loadlin.exe
 
 	# win32-loader.ini
 	(echo -en "[installer]\n"; \
@@ -182,7 +199,12 @@
 		echo -en "user_interface=text\n"; \
 		echo -en "$(ARCH)/linux=install/vmlinuz\n$(ARCH)/initrd=install/initrd.gz\n"; \
 	fi; \
-	echo -en "\n[grub]\ng2ldr=g2ldr\ng2ldr.mbr=g2ldr.mbr\n") \
+	echo -en "\n[util]\n"; \
+	echo -en "grub=win32-loader\\\\g2ldr\ngrub.mbr=win32-loader\\\\g2ldr.mbr\n"; \
+	echo -en "gzip=win32-loader\\\\gzip.exe\n"; \
+	echo -en "cpio=win32-loader\\\\cpio.exe\n"; \
+	echo -en "loadlin=win32-loader\\\\loadlin.exe\n"; \
+	echo -en "\n; deprecated section\n[grub]\ng2ldr=win32-loader\\\\g2ldr\ng2ldr.mbr=win32-loader\\\\g2ldr.mbr\n") \
 		| todos > $(TEMP_CD_INFO_DIR)/win32-loader.ini
 
 .PHONY: arch_miniiso
@@ -216,8 +238,14 @@
 	
 	# win32-loader
 	cp /usr/lib/win32-loader/win32-loader.exe	$(TEMP_CD_TREE)/setup.exe
-	cp /usr/lib/win32-loader/g2ldr			$(TEMP_CD_TREE)/g2ldr
-	cp /usr/lib/win32-loader/g2ldr.mbr		$(TEMP_CD_TREE)/g2ldr.mbr
+	mkdir -p					$(TEMP_CD_TREE)/win32-loader
+	cp \
+		/usr/lib/win32-loader/g2ldr \
+		/usr/lib/win32-loader/g2ldr.mbr \
+		/usr/share/win32/gzip.exe \
+		/usr/share/win32/cpio.exe \
+							$(TEMP_CD_TREE)/win32-loader/
+	gunzip /usr/lib/loadlin/loadlin.exe.gz -c >	$(TEMP_CD_TREE)/win32-loader/loadlin.exe
 
 	# win32-loader.ini
 	(echo -en "[installer]\n"; \
@@ -229,7 +257,12 @@
 		echo -en "user_interface=text\n"; \
 		echo -en "$(ARCH)/linux=linux\n$(ARCH)/initrd=initrd.gz\n"; \
 	fi; \
-	echo -en "\n[grub]\ng2ldr=g2ldr\ng2ldr.mbr=g2ldr.mbr\n") \
+	echo -en "\n[util]\n"; \
+	echo -en "grub=win32-loader\\\\g2ldr\ngrub.mbr=win32-loader\\\\g2ldr.mbr\n"; \
+	echo -en "gzip=win32-loader\\\\gzip.exe\n"; \
+	echo -en "cpio=win32-loader\\\\cpio.exe\n"; \
+	echo -en "loadlin=win32-loader\\\\loadlin.exe\n"; \
+	echo -en "\n; deprecated section\n[grub]\ng2ldr=win32-loader\\\\g2ldr\ng2ldr.mbr=win32-loader\\\\g2ldr.mbr\n") \
 		| todos > $(TEMP_CD_TREE)/win32-loader.ini
 
 	mkisofs -r -J -b isolinux.bin -c boot.cat \
Index: debian/control
===================================================================
--- debian/control	(revision 52185)
+++ debian/control	(working copy)
@@ -160,6 +160,9 @@
 #		Used to encrypt a firmware image so an ARM based device
 #		(Thecus N2100) will accept it.
 #	- win32-loader [i386 amd64 kfreebsd-i386 kfreebsd-amd64]
+#	- loadlin [i386 amd64 kfreebsd-i386 kfreebsd-amd64]
+#	- cpio-win32 [i386 amd64 kfreebsd-i386 kfreebsd-amd64]
+#	- gzip-win32 [i386 amd64 kfreebsd-i386 kfreebsd-amd64]
 #		Alternative boot method for win32 platforms.
 
 Package: debian-installer

--- End Message ---
--- Begin Message --- 
Didier 'OdyX' Raboud <odyx@debian.org> (2014-03-17):
> Hi Cyril,
> 
> Le lundi, 17 mars 2014, 02.33:03 Cyril Brulebois a écrit :
> > any opinion on the following (rather old) bug report?
> 
> Yes; thanks for pinging.
> 
> > Robert Millan <rmh@aybabtu.com> (2008-03-28):
> > > Currently, win32-loader is linking in loadlin.exe, gzip.exe and
> > > cpio.exe statically into the executable, which is less than ideal
> > > for the propagation of upgraded versions.
> > > 
> > > This patch adds them in their own win32-loader/ directory, so that
> > > newer versions can get these files from there instead.
> 
> While this would be certainly possible and possibly interesting in the 
> context of the installer, win32-loader.exe now also ships to 
> /debian/tools/win32-loader on the mirrors where it now additionally 
> bundles debian-archive-keyring and gpgv.exe to actually verify that the 
> things it downloads can be trusted.
> 
> So, while working on this could _reduce_ the bundling of win32-loader 
> with {loadlin, gzip, cpio}.exe, it still needs to be bundled with 
> gpgv.exe and debian-archive-keyring for another variant. All-in-all, 
> given that a arch:all upload isn't that hard afterall, I'd rather be in 
> favour of uploading these more frequently (to bundle the changes in 
> these other sources) and tag this bug +wontfix.

I guess -done@ instead will do then, thanks for the details.

Mraw,
KiBi.

Attachment: signature.asc
Description: Digital signature


--- End Message ---
Reply to: