Skip to content

Commit 187bc98

Browse files
mirkobrombinmirkobrombin
committed
update for Vanilla OS
1 parent c6e8d63 commit 187bc98

16 files changed

+52
-77
lines changed

‎.github/workflows/hirsute.yml ‎.github/workflows/jammy.yml

+6-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
1-
name: Ubuntu Cinnamon Remix 21.04 Hirsute Bleeding Edge Daily
1+
name: VanillaOS 22.04.1
22

33
on:
4-
push:
4+
workflow_dispatch:
55
branches: [ master ]
6-
pull_request:
7-
branches: [ master ]
8-
schedule:
9-
- cron: ' 0 14 * * * '
106

117
jobs:
128
build:
13-
runs-on: ubuntu-20.04
9+
runs-on: ubuntu-22.04
1410
container:
1511
image: debian:latest
1612
options: --privileged -it
@@ -24,11 +20,11 @@ jobs:
2420
- name: Build ISO
2521
run: |
2622
cd /
27-
git clone https://github.com/Ubuntu-Cinnamon-Remix/iso-builder-devel
28-
cd iso-builder-devel
23+
git clone https://github.com/Vanilla-OS/iso-builder
24+
cd iso-builder
2925
./build.sh etc/terraform.conf
3026
3127
- uses: actions/upload-artifact@v2
3228
with:
33-
name: Ubuntu Cinnamon Remix 21.04 Hirsute Bleeding Edge Daily
29+
name: VanillaOS 22.04.1
3430
path: /iso-builder-devel/builds/

‎build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ build () {
7878
YYYYMMDD="$(date +%Y%m%d)"
7979
OUTPUT_DIR="$BASE_DIR/builds/$BUILD_ARCH"
8080
mkdir -p "$OUTPUT_DIR"
81-
FNAME="ubuntucinnamon-$VERSION-$CHANNEL.$YYYYMMDD$OUTPUT_SUFFIX"
81+
FNAME="VanillaOS-$VERSION-$CHANNEL.$YYYYMMDD$OUTPUT_SUFFIX"
8282
mv "$BASE_DIR/tmp/$BUILD_ARCH/live-image-$BUILD_ARCH.hybrid.iso" "$OUTPUT_DIR/${FNAME}.iso"
8383

8484
# cd into output to so {FNAME}.sha256.txt only

‎etc/auto/config

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ lb config noauto \
4949

5050

5151
# replace channel and suite
52-
sed -i "s/@CHANNEL/$CHANNEL/" config/archives/*.list*
53-
sed -i "s/@BASECODENAME/$BASECODENAME/" config/archives/*.list*
52+
# sed -i "s/@CHANNEL/$CHANNEL/" config/archives/*.list*
53+
# sed -i "s/@BASECODENAME/$BASECODENAME/" config/archives/*.list*
5454

5555
DATE=$(date +%Y%m%d)
5656
sed -i "s/@CHANNEL/$CHANNEL/" config/includes.binary/.disk/info

‎etc/config/archives/ubuntucinnamonremix.key

-1.11 KB
Binary file not shown.

‎etc/config/archives/ubuntucinnamonremix.list

-2
This file was deleted.

‎etc/config/bootloaders/grub-pc/grub.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ set menu_color_normal=white/black
1010
set menu_color_highlight=black/light-gray
1111

1212
set timeout=5
13-
menuentry "Try or Install Ubuntu Cinnamon Remix" {
13+
menuentry "Try or Install Vanilla OS" {
1414
set gfxpayload=keep
1515
linux /casper/vmlinuz boot=casper quiet splash ---
1616
initrd /casper/initrd.lz
1717
}
18-
menuentry "Try or Install Ubuntu Cinnamon Remix (Safe Graphics)" {
18+
menuentry "Try or Install Vanilla OS (Safe Graphics)" {
1919
set gfxpayload=keep
2020
linux /casper/vmlinuz boot=casper nomodeset quiet splash nomodeset ---
2121
initrd /casper/initrd.lz

‎etc/config/bootloaders/isolinux/live.cfg.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
prompt 0
22

33
MENU HIDDEN
4-
MENU AUTOBOOT Booting Ubuntu Cinnamon Remix live disk in # seconds
4+
MENU AUTOBOOT Booting Vanilla OS live disk in # seconds
55
timeout 50
66

77
label live-@FLAVOUR@
8-
menu label ^Try or install Ubuntu Cinnamon Remix
8+
menu label ^Try or install Vanilla OS
99
menu default
1010
linux /casper/vmlinuz
1111
initrd /casper/initrd.lz
1212
append @APPEND_LIVE@
1313

1414
label live-failsafe
15-
menu label Start Ubuntu Cinnamon Remix (Safe Graphics)
15+
menu label Start Vanilla OS (Safe Graphics)
1616
set gfxpayload=keep
1717
linux /casper/vmlinuz
1818
initrd /casper/initrd.lz

‎etc/config/hooks/live/000-remove-blacklisted-packages.chroot

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ echo "P: Begin executing remove-blacklisted-packages chroot hook..."
1717

1818
#apt-get autoremove --purge -f -q -y bzr
1919

20-
apt-get autoremove --purge -f -q -y metacity unity-greeter unity-settings-daemon unity-control-center
21-
apt-get autoremove --purge -f -q -y gdm3 gnome-shell ubuntu-desktop mutter
20+
apt-get autoremove --purge -f -q -y ubuntu-desktop ubuntu-session
2221
rm -R ../ubuntu-seeds ../platform
2322

2423
cp /etc/rc.local /etc/rc.local.orig

‎etc/config/hooks/live/001-install-flatpaks.chroot

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/sh
2+
# Description: Add Flatpak remotes and install system-wide Flatpaks
3+
4+
apt install -y flatpak
5+
flatpak remote-add --system flathub https://flathub.org/repo/flathub.flatpakrepo

‎etc/config/hooks/live/002-install-vanilla-repo.chroot

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/sh
2+
# Description: Add The Vanilla OS PPA
3+
4+
curl -s --compressed "https://vanilla-os.github.io/ppa/KEY.gpg" | gpg --dearmor | sudo tee /usr/share/keyrings/vanilla-archive-keyring.gpg
5+
sudo curl -s --compressed -o /etc/apt/sources.list.d/vanilla-os.list "https://vanilla-os.github.io/ppa/vanilla-os.list"
6+
sudo apt update

‎etc/config/hooks/live/003-install-default-wallpaper.chroot

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/sh
2+
# Description: Install the default GNOME wallpaper
3+
4+
cat > /usr/share/glib-2.0/schemas/90_ubuntuvanillagnome-wallpaper.gschema.override <<EOF
5+
[org.gnome.desktop.background]
6+
picture-uri='file:///usr/share/backgrounds/gnome/adwaita-l.jpg'
7+
EOF
8+
glib-compile-schemas /usr/share/glib-2.0/schemas/

‎etc/config/hooks/live/004-snap-debloat.chroot

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/sh
2+
# Description: Remove default Snap packages
3+
4+
snap remove --purge firefox
5+
snap remove --purge snap-store

‎etc/config/includes.chroot/etc/hostname

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ubuntucinnamon
1+
vanillaos

‎etc/config/package-lists.ubiquity/desktop.list.chroot_install

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
@XORG_HWE
2-
cargo
3-
rustc
4-
python3.9
5-
ubuntucinnamon-minimal
6-
ubuntucinnamon-standard
7-
ubuntucinnamon-desktop
2+
gpg
3+
curl
4+
vanilla-gnome-desktop
5+
vanilla-gnome-default-settings
6+
plymouth-theme-vanilla
7+
vanilla-distrologo
8+
vanilla-first-setup

‎etc/terraform.conf

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
ARCH="amd64"
33

44
# base codename
5-
BASECODENAME="hirsute"
5+
BASECODENAME="jammy"
66

77
# base version
8-
BASEVERSION="21.04"
8+
BASEVERSION="22.04.1"
99

1010
# distribution codename
11-
CODENAME="Ubuntu Cinnamon Remix"
11+
CODENAME="VanillaOS"
1212

1313
# distribution version
14-
VERSION="21.04"
14+
VERSION="22.04.1"
1515

1616
# distribution channel
1717
CHANNEL="unstable"
1818
#CHANNEL="all"
1919

2020
# distribution name
21-
NAME="ubuntucinnamonremix"
21+
NAME="vanillaos"
2222

2323
# mirror to fetch packages from
2424
MIRROR_URL="http://archive.ubuntu.com/ubuntu/"

‎rebuild-list

-43
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,2 @@
11
# List of rebuilds in case anything goes wrong or anything happens
22

3-
Tue, 18 Aug 2020 20:01:15 -0400
4-
Reason: Possible Debian Build error
5-
Urgency: Medium
6-
7-
Wed, 19 Aug 2020 19:36:28 -0400
8-
Reason: Debian Image failure from yesterday may have been confirmed. Final testing, as also was trying to build for arm64 tests.
9-
Urgency: Medium
10-
11-
Wed, 19 Aug 2020 19:38:68 -0400
12-
Reason: Confirmed: Debian Image is broken. Revert last commit.
13-
Urgency: High
14-
15-
Wed, 19 Aug 2020 23:30:47 -0400
16-
Reason: Ubiquity Switch/Testing. Keeping Calamares just-in-case.
17-
Urgency: Medium
18-
19-
Wed, 19 Aug 2020 23:49:47 -0400
20-
Reason: fwupdate-signed -> fwupdate. Was already mentioned so removed/fixed.
21-
Urgency: Low
22-
23-
Wed, 26 Aug 2020 13:53:24 -0400
24-
Reason: Switch back to calamares due to feature freeze.
25-
Urgency: Medium
26-
27-
Thu, 27 Aug 2020 11:53:04 -0400
28-
Reason: Refire build - Environment is gone (walllpapers, themes, etc).
29-
Urgency: Medium
30-
31-
Fri, 02 Oct 2020 09:07:23 -0400
32-
Reason: Beta Freeze
33-
Urgency: Medium
34-
35-
Thu, 15 Oct 2020 08:57:04 -0400
36-
Reason: Final Freeze - Release RC's
37-
Urgency: Medium
38-
39-
Wed, 21 Oct 2020 22:35:17 -0400
40-
Reason: Release
41-
Urgency: High
42-
43-
Sun, 08 Nov 2020 22:25:51 -0400
44-
Reason: 21.04 Hirsute - Begin Builds
45-
Urgency: Medium

0 commit comments

Comments
 (0)