From 25993b69abd82285d11d406fd646595d3f605016 Mon Sep 17 00:00:00 2001
From: Andreas Blaesius <andi@unlegacy-android.org>
Date: Mon, 8 Aug 2022 11:23:11 +0200
Subject: [PATCH] scripts: switch to Ubuntu Jammy Jellyfish (22.04) by default

lupin-casper is not available on Ubuntu Jammy Jellyfish, only install
on other Ubuntu versions.
---
 .github/workflows/build-jammy.yml |  1 -
 CONTRIBUTORS.txt                  |  1 +
 scripts/chroot_build.sh           | 10 +++++++++-
 scripts/default_config.sh         |  4 ++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-jammy.yml b/.github/workflows/build-jammy.yml
index ce17a60a..12467880 100644
--- a/.github/workflows/build-jammy.yml
+++ b/.github/workflows/build-jammy.yml
@@ -18,7 +18,6 @@ jobs:
         run: |
           cd scripts
           sed -i -E 's/TARGET_UBUNTU_VERSION=(.*)/TARGET_UBUNTU_VERSION="jammy"/g' default_config.sh
-          sed -i -E '/lupin-casper/d' chroot_build.sh
           ./build.sh -
           cd ..
       - name: Archive artifacts
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index ad028bd5..aab9d462 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -1,3 +1,4 @@
 Marcos Vallim <tischer@gmail.com>
 Ken Gilmer <kgilmer@gmail.com>
 monkey-jsun <>
+Andreas Blaesius <andi@unlegacy-android.org>
diff --git a/scripts/chroot_build.sh b/scripts/chroot_build.sh
index ef1e30a3..b9a9c983 100755
--- a/scripts/chroot_build.sh
+++ b/scripts/chroot_build.sh
@@ -103,7 +103,6 @@ function install_pkg() {
     sudo \
     ubuntu-standard \
     casper \
-    lupin-casper \
     discover \
     laptop-detect \
     os-prober \
@@ -119,6 +118,15 @@ function install_pkg() {
     grub2-common \
     locales
     
+    case $TARGET_UBUNTU_VERSION in
+        "focal" | "bionic")
+            apt-get install -y lupin-casper
+            ;;
+        *)
+            echo "Package lupin-casper is not needed. Skipping."
+            ;;
+    esac
+    
     # install kernel
     apt-get install -y --no-install-recommends $TARGET_KERNEL_PACKAGE
 
diff --git a/scripts/default_config.sh b/scripts/default_config.sh
index e0f03032..02fa6909 100644
--- a/scripts/default_config.sh
+++ b/scripts/default_config.sh
@@ -5,9 +5,9 @@
 # Usage: Copy this file to config.sh and make changes there.  Keep this file (default_config.sh) as-is
 #   so that subsequent changes can be easily merged from upstream.  Keep all customiations in config.sh
 
-# The version of Ubuntu to generate.  Successfully tested: bionic, cosmic, disco, eoan, focal, groovy
+# The version of Ubuntu to generate.  Successfully tested: bionic, cosmic, disco, eoan, focal, groovy, jammy
 # See https://wiki.ubuntu.com/DevelopmentCodeNames for details
-export TARGET_UBUNTU_VERSION="focal"
+export TARGET_UBUNTU_VERSION="jammy"
 
 # The Ubuntu Mirror URL. It's better to change for faster download.
 # More mirrors see: https://launchpad.net/ubuntu/+archivemirrors