22.04: Compilable image

luwrain · Jul 8, 2022 · 8e628ea · 8e628ea
1 parent 7c8825e
commit 8e628ea
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/ubuntu/22.04/scripts/base.sh b/ubuntu/22.04/scripts/base.sh
@@ -1,6 +1,6 @@
 
-UBUNTU_RELEASE=impish
-LWRISO_BOOT_VER=21.10
+UBUNTU_RELEASE=jammy
+LWRISO_BOOT_VER=22.04
 LWRISO_USER=luwrain
 LWRISO_ARCH=amd64
 LWRISO_DATE="$(date +%Y%m%d)"
@@ -28,7 +28,6 @@ rm-pkg()
 chroot-run apt-get --yes remove --ignore-missing --no-download $@
 }
 
-
 remove-pkg-prefix()
 {
  remove-pkg $(apt-cache search "$1" | grep "^$1" | cut -f1 -d' ')

diff --git a/ubuntu/22.04/scripts/scripts.d/03-sources.list b/ubuntu/22.04/scripts/scripts.d/03-sources.list
@@ -1,6 +1,6 @@
 
 cat <<EOF > /etc/apt/sources.list
-deb http:https://security.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse
+deb http:https://security.ubuntu.com/ubuntu/ $UBUNTU_RELEASE-security main restricted universe multiverse
 deb http:https://ru.archive.ubuntu.com/ubuntu/ $UBUNTU_RELEASE-updates main restricted universe multiverse
 deb http:https://ru.archive.ubuntu.com/ubuntu/ $UBUNTU_RELEASE main restricted universe multiverse
 EOF

diff --git a/ubuntu/22.04/scripts/scripts.d/11-dist b/ubuntu/22.04/scripts/scripts.d/11-dist
@@ -5,14 +5,14 @@ find ./dist -name .gitignore -delete
 [ -d ./dist/bin ] && cp -r ./dist/bin/. $LWRISO_ROOT/usr/local/bin/ ||:
 [ -d ./dist/sbin ] && cp -r ./dist/sbin/. $LWRISO_ROOT/sbin/ ||:
 
-pushd $LWRISO_ROOT/opt
-if ! [ -e luwrain ]; then
- wget -q "http:https://download.luwrain.org/nightly/latest/$(latest-iso)"
- tar xf luwrain*.tar.gz
- rm -f luwrain*.tar.gz
- mv luwrain-iso* luwrain
- pushd luwrain/jar 
- wget -q https://download.luwrain.org/jni/luwrain-jni-ubuntu-21.10-x64.jar
- popd
-fi
-popd
+#pushd $LWRISO_ROOT/opt
+#if ! [ -e luwrain ]; then
+# wget -q "http:https://download.luwrain.org/nightly/latest/$(latest-iso)"
+# tar xf luwrain*.tar.gz
+# rm -f luwrain*.tar.gz
+# mv luwrain-iso* luwrain
+# pushd luwrain/jar 
+# wget -q https://download.luwrain.org/jni/luwrain-jni-ubuntu-21.10-x64.jar
+# popd
+#fi
+#popd