CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

casper: update helper fix FTBFS

Browse source
This commit is contained in:
Luis Guzmán 2024-10-11 15:02:44 +00:00
parent a1d2d2e353
commit bc80830fb1
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
helpers/DATA/casper/set_trisquel_iso_suggestion.patch
View file

@ -1,6 +1,8 @@
--- a/scripts/casper 2023-02-13 23:53:18.908768968 -0600 diff --git a/scripts/casper b/scripts/casper
+++ b/scripts/casper 2023-02-21 03:28:55.176581755 -0600 index 36a724d2..1b9a6faf 100644
@@ -376,18 +376,18 @@ --- a/scripts/casper
+++ b/scripts/casper
@@ -379,18 +379,18 @@ do_interactive_netmount() {
# maybe make livecd-rootfs embed something in the casper initrd? # maybe make livecd-rootfs embed something in the casper initrd?
case $PRETTY_NAME in case $PRETTY_NAME in
*development*) *development*)
@ -12,14 +14,14 @@
*) *)
case $DPKG_ARCH in case $DPKG_ARCH in
amd64) amd64)
- server_url=https://releases.ubuntu.com/$UBUNTU_CODENAME/ubuntu-$VERSION_ID-live-server-$DPKG_ARCH.iso - server_url=https://releases.ubuntu.com/$UBUNTU_CODENAME/ubuntu-$VERSION_ID-latest-live-server-$DPKG_ARCH.iso
- desktop_url=https://releases.ubuntu.com/$UBUNTU_CODENAME/ubuntu-$VERSION_ID-desktop-$DPKG_ARCH.iso - desktop_url=https://releases.ubuntu.com/$UBUNTU_CODENAME/ubuntu-$VERSION_ID-latest-desktop-$DPKG_ARCH.iso
+ server_url=http://cdimage.trisquel.org/trisquel-images/${ID}-netinst_${VERSION_ID}_${DPKG_ARCH}.iso + server_url=http://cdimage.trisquel.org/trisquel-images/${ID}-netinst_${VERSION_ID}_${DPKG_ARCH}.iso
+ desktop_url=http://cdimage.trisquel.org/trisquel-images/${ID}_${VERSION_ID}_${DPKG_ARCH}.iso + desktop_url=http://cdimage.trisquel.org/trisquel-images/${ID}_${VERSION_ID}_${DPKG_ARCH}.iso
;; ;;
*) *)
- server_url=http://cdimage.ubuntu.com/releases/$UBUNTU_CODENAME/release/ubuntu-$VERSION_ID-live-server-$DPKG_ARCH.iso - server_url=http://cdimage.ubuntu.com/releases/$UBUNTU_CODENAME/release/ubuntu-$VERSION_ID-latest-live-server-$DPKG_ARCH.iso
- desktop_url=http://cdimage.ubuntu.com/releases/$UBUNTU_CODENAME/release/ubuntu-$VERSION_ID-desktop-$DPKG_ARCH.iso - desktop_url=http://cdimage.ubuntu.com/releases/$UBUNTU_CODENAME/release/ubuntu-$VERSION_ID-latest-desktop-$DPKG_ARCH.iso
+ server_url=http://cdimage.trisquel.org/trisquel-images/${ID}-netinst_${VERSION_ID}_${DPKG_ARCH}.iso + server_url=http://cdimage.trisquel.org/trisquel-images/${ID}-netinst_${VERSION_ID}_${DPKG_ARCH}.iso
+ desktop_url=http://cdimage.trisquel.org/trisquel-images/${ID}_${VERSION_ID}_${DPKG_ARCH}.iso + desktop_url=http://cdimage.trisquel.org/trisquel-images/${ID}_${VERSION_ID}_${DPKG_ARCH}.iso
;; ;;

3
helpers/make-casper
View file

@ -25,9 +25,6 @@ VERSION=18
# Only generate the locale selected at boot # Only generate the locale selected at boot
sed 's/keep-existing/keep-existing $LANG/' -i scripts/casper-bottom/14locales sed 's/keep-existing/keep-existing $LANG/' -i scripts/casper-bottom/14locales
# Make sure we disable ureadahead
sed 's/readahead-list/ureadahead/' -i scripts/casper-bottom/25configure_init
# Enable a11y on mate # Enable a11y on mate
sed '/gset org.gnome.desktop.interface toolkit-accessibility true/a \ \ \ \ \ \ \ \ gset org.mate.desktop.interface accessibility true' -i bin/casper-a11y-enable sed '/gset org.gnome.desktop.interface toolkit-accessibility true/a \ \ \ \ \ \ \ \ gset org.mate.desktop.interface accessibility true' -i bin/casper-a11y-enable
sed "/gset org.gnome.desktop.interface toolkit-accessibility true/a \ \ \ \ \ \ \ \ gset com.canonical.a11y-profile-manager active-profile \"'blindness\'\"" -i bin/casper-a11y-enable sed "/gset org.gnome.desktop.interface toolkit-accessibility true/a \ \ \ \ \ \ \ \ gset com.canonical.a11y-profile-manager active-profile \"'blindness\'\"" -i bin/casper-a11y-enable