Drop debian/patches/fix-win32-loader, merged in Debian. Only remaining change is the above one.
Raphaël Hertzog
10 years ago
| 2 | 2 |
* Ensure xfsprogs and jfsutils are available in the ISO. Otherwise users
|
| 3 | 3 |
opting for XFS and JFS and installing without network won't have them and
|
| 4 | 4 |
the (first) boot can be interrupted due to this.
|
|
5 |
* Drop debian/patches/fix-win32-loader, merged in Debian. Only remaining
|
|
6 |
change is the above one.
|
| 5 | 7 |
|
| 6 | 8 |
-- Raphaël Hertzog <[email protected]> Mon, 26 Aug 2013 18:38:06 +0200
|
| 7 | 9 |
|
debian/patches/fix-win32-loader
less
more
| 0 | |
Description: Fix generation of win32-loader.ini.
|
| 1 | |
It was lacking proper entry of the GTK kernel/initrd due to a bad check.
|
| 2 | |
And it was wrongly hardcoding the architecture in some keys.
|
| 3 | |
--- a/scripts/build/binary_win32-loader
|
| 4 | |
+++ b/scripts/build/binary_win32-loader
|
| 5 | |
@@ -85,16 +85,16 @@ cat > binary/win32-loader.ini << EOF
|
| 6 | |
kernel=linux
|
| 7 | |
arch=${LB_ARCHITECTURES}
|
| 8 | |
default_desktop=gnome
|
| 9 | |
-i386/linux=install/vmlinuz
|
| 10 | |
-i386/initrd=install/initrd.gz
|
| 11 | |
+${LB_ARCHITECTURES}/linux=install/vmlinuz
|
| 12 | |
+${LB_ARCHITECTURES}/initrd=install/initrd.gz
|
| 13 | |
EOF
|
| 14 | |
|
| 15 | |
- if [ -e install/gtk ]
|
| 16 | |
+ if [ -e binary/install/gtk ]
|
| 17 | |
then
|
| 18 | |
|
| 19 | |
cat >> binary/win32-loader.ini << EOF
|
| 20 | |
-i386/gtk/linux=install/vmlinuz
|
| 21 | |
-i386/gtk/initrd=install/gtk/initrd.gz
|
| 22 | |
+${LB_ARCHITECTURES}/gtk/linux=install/vmlinuz
|
| 23 | |
+${LB_ARCHITECTURES}/gtk/initrd=install/gtk/initrd.gz
|
| 24 | |
EOF
|
| 25 | |
|
| 26 | |
fi
|
| 0 | |
fix-win32-loader
|
| 1 | 0 |
add-xfsprogs-jfsutils-to-d-i.patch
|