[neon/forks/live-build/Neon/release] debian/patches: update ubuntu-make-genisoimage-more-flexible.patch for our change to xorriso and note we may want to change back to match ubuntu

[Jonathan Esk-Riddell]

Git commit 662cb2c0f5a7e3bce0e265514b814bc6cdf04ecf by Jonathan Esk-Riddell.
Committed on 26/05/2022 at 10:52.
Pushed by jriddell into branch 'Neon/release'.

update ubuntu-make-genisoimage-more-flexible.patch for our change to xorriso and note we may want to change back to match ubuntu

M  +10   -10   debian/patches/ubuntu-make-genisoimage-more-flexible.patch

https://invent.kde.org/neon/forks/live-build/commit/662cb2c0f5a7e3bce0e265514b814bc6cdf04ecf

diff --git a/debian/patches/ubuntu-make-genisoimage-more-flexible.patch b/debian/patches/ubuntu-make-genisoimage-more-flexible.patch
index 1174312..6713103 100644
--- a/debian/patches/ubuntu-make-genisoimage-more-flexible.patch
+++ b/debian/patches/ubuntu-make-genisoimage-more-flexible.patch
@@ -3,23 +3,23 @@
 ##   so I will like to upstream a patch which using by OEM team which extended an extra option for mkisoimage.
 ## Origin/Author: Hugh Chao (hugh.chao at canonical.com)
 ## Bug: https://bugs.launchpad.net/oem-priority/+bug/1864426
-Index: live-build-3.0~a57/scripts/build/lb_binary_iso
+Index: live-build/scripts/build/lb_binary_iso
 ===================================================================
---- live-build-3.0~a57.orig/scripts/build/lb_binary_iso
-+++ live-build-3.0~a57/scripts/build/lb_binary_iso
-@@ -193,7 +193,7 @@ fi
+--- live-build.orig/scripts/build/lb_binary_iso
++++ live-build/scripts/build/lb_binary_iso
+@@ -203,6 +203,8 @@ fi
  
  cat >> binary.sh << EOF
  
--genisoimage ${GENISOIMAGE_OPTIONS} -o ${IMAGE} binary
-+genisoimage ${GENISOIMAGE_OPTIONS} ${GENISOIMAGE_OPTIONS_EXTRA} -o ${IMAGE} binary
++# neon switched to xorriso in 2016 which diverges from Ubuntu, TODO check if it can be switched back
++# genisoimage ${GENISOIMAGE_OPTIONS} ${GENISOIMAGE_OPTIONS_EXTRA} -o ${IMAGE} binary
+ xorriso ${XORRISO_OPTIONS} -o ${IMAGE} binary
  EOF
  
- if [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ]
-Index: live-build-3.0~a57/scripts/build/lb_config
+Index: live-build/scripts/build/lb_config
 ===================================================================
---- live-build-3.0~a57.orig/scripts/build/lb_config
-+++ live-build-3.0~a57/scripts/build/lb_config
+--- live-build.orig/scripts/build/lb_config
++++ live-build/scripts/build/lb_config
 @@ -1107,6 +1107,7 @@ APT_OPTIONS="${APT_OPTIONS}"
  APTITUDE_OPTIONS="${APTITUDE_OPTIONS}"
  GZIP_OPTIONS="${GZIP_OPTIONS}"