On Friday 28 March 2008, Robert Millan wrote:
> This patch adds them in their own win32-loader/ directory, so that newer
> versions can get these files from there instead.

At first glance it seems that the Makefile has the same or very similar code
to create a win32-loader.ini file multiple times. Couldn't you add a file
somewhere below the build/boot/ dir and just copy that instead?

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQBH7Sxigm/Kwh6ICoQRAtnZAKDOmeyuZKU7jzmASPHTXsLiN86VXwCfSSbd
RMmUfwu2sVdTw/V+yrgfZS8=
=C27F
-----END PGP SIGNATURE-----

Hi Frans,

Please respect the Reply-To header when sending followups to the BTS, as
described in:

http://www.debian.org/Bugs/Developer#followup

otherwise the BTS won't notify me and I don't notice, unless I actively poll
for replies in the BTS bug page.

(thanks)

On Fri, Mar 28, 2008 at 06:35:20PM +0100, Frans Pop wrote:
> On Friday 28 March 2008, Robert Millan wrote:
> > This patch adds them in their own win32-loader/ directory, so that newer
> > versions can get these files from there instead.
>
> At first glance it seems that the Makefile has the same or very similar code
> to create a win32-loader.ini file multiple times. Couldn't you add a file
> somewhere below the build/boot/ dir and just copy that instead?

Will give that a try tomorrow.

--
Robert Millan

I know my rights; I want my phone call!
What use is a phone call… if you are unable to speak?
(as seen on /.)



--
To UNSUBSCRIBE, email to debian-bugs-dist-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org

On Fri, Mar 28, 2008 at 11:57:56PM +0100, Robert Millan wrote:
> On Fri, Mar 28, 2008 at 06:35:20PM +0100, Frans Pop wrote:
> > On Friday 28 March 2008, Robert Millan wrote:
> > > This patch adds them in their own win32-loader/ directory, so that newer
> > > versions can get these files from there instead.
> >
> > At first glance it seems that the Makefile has the same or very similar code
> > to create a win32-loader.ini file multiple times. Couldn't you add a file
> > somewhere below the build/boot/ dir and just copy that instead?
>
> Will give that a try tomorrow.

I just had a look, and it doesn't seem that simple. This diff is the result
of replacing the second and third blobs with the first one.

As you can see, there are differences in filename paths and such:

--- build/config/x86.cfg~ 2008-03-28 17:21:56.000000000 +0100
+++ build/config/x86.cfg 2008-03-29 00:21:20.000000000 +0100
@@ -193,11 +193,11 @@
(echo -en "[installer]\n"; \
echo -en "arch=$(ARCH)\n"; \
if [ -n "$(INITRD_GTK)" ]; then \
- echo -en "$(ARCH)/linux=install/vmlinuz\n$(ARCH)/initrd=install/initrd.gz\n"; \
- echo -en "$(ARCH)/gtk/linux=install/vmlinuz\n$(ARCH)/gtk/initrd=install/gtk/initrd.gz\n"; \
+ echo -en "$(ARCH)/linux=linux\n$(ARCH)/initrd=initrd.gz\n"; \
+ echo -en "$(ARCH)/gtk/linux=linux\n$(ARCH)/gtk/initrd=initrdg.gz\n"; \
else \
echo -en "user_interface=text\n"; \
- echo -en "$(ARCH)/linux=install/vmlinuz\n$(ARCH)/initrd=install/initrd.gz\n"; \
+ echo -en "$(ARCH)/linux=linux\n$(ARCH)/initrd=initrd.gz\n"; \
fi; \
echo -en "\n[util]\n"; \
echo -en "grub=win32-loader\\\\g2ldr\ngrub.mbr=win32-loader\\\\g2ldr.mbr\n"; \
@@ -250,9 +250,9 @@
# win32-loader.ini
(echo -en "[installer]\n"; \
echo -en "arch=$(ARCH)\n"; \
- if [ "$(TYPE)" = "netboot/gtk" ]; then \
- echo -en "user_interface=graphical\n"; \
- echo -en "$(ARCH)/gtk/linux=linux\n$(ARCH)/gtk/initrd=initrd.gz\n"; \
+ if [ -n "$(INITRD_GTK)" ]; then \
+ echo -en "$(ARCH)/linux=linux\n$(ARCH)/initrd=initrd.gz\n"; \
+ echo -en "$(ARCH)/gtk/linux=linux\n$(ARCH)/gtk/initrd=initrdg.gz\n"; \
else \
echo -en "user_interface=text\n"; \
echo -en "$(ARCH)/linux=linux\n$(ARCH)/initrd=initrd.gz\n"; \

--
Robert Millan

I know my rights; I want my phone call!
What use is a phone call… if you are unable to speak?
(as seen on /.)



--
To UNSUBSCRIBE, email to debian-bugs-dist-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org