Skip to content

Commit 63673ab

Browse files
mmtrtmmtrt
committed
use focal base
1 parent 4347542 commit 63673ab

File tree

3 files changed

+48
-67
lines changed

3 files changed

+48
-67
lines changed

‎wine-devel.yml

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -27,28 +27,27 @@ AppDir:
2727
apt:
2828
arch: [amd64, i386]
2929
sources:
30-
- sourceline: 'deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse'
31-
- sourceline: 'deb http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse'
32-
- sourceline: 'deb http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse'
30+
- sourceline: 'deb http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse'
31+
- sourceline: 'deb http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse'
32+
- sourceline: 'deb http://archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse'
3333
key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x871920D1991BC93C'
34-
- sourceline: 'deb https://dl.winehq.org/wine-builds/ubuntu/ jammy main'
34+
- sourceline: 'deb https://dl.winehq.org/wine-builds/ubuntu/ focal main'
3535
key_url: 'https://dl.winehq.org/wine-builds/winehq.key'
36-
# - sourceline: 'deb http://ppa.launchpad.net/graphics-drivers/ppa/ubuntu/ jammy main'
36+
# - sourceline: 'deb http://ppa.launchpad.net/graphics-drivers/ppa/ubuntu/ focal main'
3737
# key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xFCAE110B1118213C'
38-
- sourceline: 'deb https://ppa.launchpadcontent.net/kisak/kisak-mesa/ubuntu jammy main'
38+
- sourceline: 'deb https://ppa.launchpadcontent.net/kisak/kisak-mesa/ubuntu focal main'
3939
key_url: 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xf63f0f2b90935439'
4040

4141
include:
42-
- wine-staging-i386=7.22~jammy-1
43-
- wine-staging-amd64=7.22~jammy-1
42+
- wine-staging-i386=7.22~focal-1
43+
- wine-staging-amd64=7.22~focal-1
4444
- bash
4545
- cabextract
4646
- cups
4747
- dash
4848
- perl
4949
- coreutils
5050
- mesa-utils
51-
- mesa-utils-bin
5251
- unionfs-fuse
5352
- vulkan-tools
5453
- libcups2
@@ -167,23 +166,16 @@ AppDir:
167166
# Patch wrapper script
168167
sed -i 's|wine-appimage|wine-appimage-devel-v8|' AppDir/wrapper
169168
170-
# Check for rc builds
171-
# if [ $(wget -qO- https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-amd64/ | grep wine-devel | tail -n1 | grep -c ~rc) -gt 0 ]; then
172-
# WINE_VER="$(wget -qO- https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-amd64/ | grep wine-devel | sed 's|_| |g;s|~| |2' | awk '{print $5}' | tail -n1)"
173-
# else
174-
# WINE_VER="$(wget -qO- https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-amd64/ | grep wine-devel | sed 's|_| |g;s|~| |g' | awk '{print $5}' | tail -n1)"
175-
# fi
176-
177169
WINE_VER="8.21"
178170
179-
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-i386/wine-devel_${WINE_VER}~jammy-1_i386.deb
180-
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-i386/wine-devel-i386_${WINE_VER}~jammy-1_i386.deb
181-
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-amd64/wine-devel_${WINE_VER}~jammy-1_amd64.deb
182-
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-amd64/wine-devel-amd64_${WINE_VER}~jammy-1_amd64.deb
183-
dpkg -x "wine-devel_${WINE_VER}~jammy-1_i386.deb" AppDir/
184-
dpkg -x "wine-devel-i386_${WINE_VER}~jammy-1_i386.deb" AppDir/
185-
dpkg -x "wine-devel_${WINE_VER}~jammy-1_amd64.deb" AppDir/
186-
dpkg -x "wine-devel-amd64_${WINE_VER}~jammy-1_amd64.deb" AppDir/
171+
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/focal/main/binary-i386/wine-devel_${WINE_VER}~focal-1_i386.deb
172+
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/focal/main/binary-i386/wine-devel-i386_${WINE_VER}~focal-1_i386.deb
173+
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/focal/main/binary-amd64/wine-devel_${WINE_VER}~focal-1_amd64.deb
174+
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/focal/main/binary-amd64/wine-devel-amd64_${WINE_VER}~focal-1_amd64.deb
175+
dpkg -x "wine-devel_${WINE_VER}~focal-1_i386.deb" AppDir/
176+
dpkg -x "wine-devel-i386_${WINE_VER}~focal-1_i386.deb" AppDir/
177+
dpkg -x "wine-devel_${WINE_VER}~focal-1_amd64.deb" AppDir/
178+
dpkg -x "wine-devel-amd64_${WINE_VER}~focal-1_amd64.deb" AppDir/
187179
(cd AppDir/usr/bin; ln -s "../../opt/wine-devel/bin/"* .)
188180
189181
# Cleanup

‎wine-stable.yml

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,28 +27,27 @@ AppDir:
2727
apt:
2828
arch: [amd64, i386]
2929
sources:
30-
- sourceline: 'deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse'
31-
- sourceline: 'deb http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse'
32-
- sourceline: 'deb http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse'
30+
- sourceline: 'deb http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse'
31+
- sourceline: 'deb http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse'
32+
- sourceline: 'deb http://archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse'
3333
key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x871920D1991BC93C'
34-
- sourceline: 'deb https://dl.winehq.org/wine-builds/ubuntu/ jammy main'
34+
- sourceline: 'deb https://dl.winehq.org/wine-builds/ubuntu/ focal main'
3535
key_url: 'https://dl.winehq.org/wine-builds/winehq.key'
36-
# - sourceline: 'deb http://ppa.launchpad.net/graphics-drivers/ppa/ubuntu/ jammy main'
36+
# - sourceline: 'deb http://ppa.launchpad.net/graphics-drivers/ppa/ubuntu/ focal main'
3737
# key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xFCAE110B1118213C'
38-
- sourceline: 'deb https://ppa.launchpadcontent.net/kisak/kisak-mesa/ubuntu jammy main'
38+
- sourceline: 'deb https://ppa.launchpadcontent.net/kisak/kisak-mesa/ubuntu focal main'
3939
key_url: 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xf63f0f2b90935439'
4040

4141
include:
42-
- wine-staging-i386=7.22~jammy-1
43-
- wine-staging-amd64=7.22~jammy-1
42+
- wine-staging-i386=7.22~focal-1
43+
- wine-staging-amd64=7.22~focal-1
4444
- bash
4545
- cabextract
4646
- cups
4747
- dash
4848
- perl
4949
- coreutils
5050
- mesa-utils
51-
- mesa-utils-bin
5251
- unionfs-fuse
5352
- vulkan-tools
5453
- libcups2
@@ -167,18 +166,16 @@ AppDir:
167166
# Patch wrapper script
168167
sed -i 's|wine-appimage|wine-appimage-stable-v8|' AppDir/wrapper
169168
170-
# WINE_VER="$(wget -qO- https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-amd64/ | grep wine-stable | sed 's|_| |g;s|~| |g' | awk '{print $5}' | tail -n1)"
171-
172169
WINE_VER="8.0.2"
173170
174-
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-i386/wine-stable_${WINE_VER}~jammy-1_i386.deb
175-
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-i386/wine-stable-i386_${WINE_VER}~jammy-1_i386.deb
176-
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-amd64/wine-stable_${WINE_VER}~jammy-1_amd64.deb
177-
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-amd64/wine-stable-amd64_${WINE_VER}~jammy-1_amd64.deb
178-
dpkg -x "wine-stable_${WINE_VER}~jammy-1_i386.deb" AppDir/
179-
dpkg -x "wine-stable-i386_${WINE_VER}~jammy-1_i386.deb" AppDir/
180-
dpkg -x "wine-stable_${WINE_VER}~jammy-1_amd64.deb" AppDir/
181-
dpkg -x "wine-stable-amd64_${WINE_VER}~jammy-1_amd64.deb" AppDir/
171+
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/focal/main/binary-i386/wine-stable_${WINE_VER}~focal-1_i386.deb
172+
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/focal/main/binary-i386/wine-stable-i386_${WINE_VER}~focal-1_i386.deb
173+
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/focal/main/binary-amd64/wine-stable_${WINE_VER}~focal-1_amd64.deb
174+
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/focal/main/binary-amd64/wine-stable-amd64_${WINE_VER}~focal-1_amd64.deb
175+
dpkg -x "wine-stable_${WINE_VER}~focal-1_i386.deb" AppDir/
176+
dpkg -x "wine-stable-i386_${WINE_VER}~focal-1_i386.deb" AppDir/
177+
dpkg -x "wine-stable_${WINE_VER}~focal-1_amd64.deb" AppDir/
178+
dpkg -x "wine-stable-amd64_${WINE_VER}~focal-1_amd64.deb" AppDir/
182179
(cd AppDir/usr/bin; ln -s "../../opt/wine-stable/bin/"* .)
183180
184181
# Cleanup

‎wine-staging.yml

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -27,28 +27,27 @@ AppDir:
2727
apt:
2828
arch: [amd64, i386]
2929
sources:
30-
- sourceline: 'deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse'
31-
- sourceline: 'deb http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse'
32-
- sourceline: 'deb http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse'
30+
- sourceline: 'deb http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse'
31+
- sourceline: 'deb http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse'
32+
- sourceline: 'deb http://archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse'
3333
key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x871920D1991BC93C'
34-
- sourceline: 'deb https://dl.winehq.org/wine-builds/ubuntu/ jammy main'
34+
- sourceline: 'deb https://dl.winehq.org/wine-builds/ubuntu/ focal main'
3535
key_url: 'https://dl.winehq.org/wine-builds/winehq.key'
36-
# - sourceline: 'deb http://ppa.launchpad.net/graphics-drivers/ppa/ubuntu/ jammy main'
36+
# - sourceline: 'deb http://ppa.launchpad.net/graphics-drivers/ppa/ubuntu/ focal main'
3737
# key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xFCAE110B1118213C'
38-
- sourceline: 'deb https://ppa.launchpadcontent.net/kisak/kisak-mesa/ubuntu jammy main'
38+
- sourceline: 'deb https://ppa.launchpadcontent.net/kisak/kisak-mesa/ubuntu focal main'
3939
key_url: 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xf63f0f2b90935439'
4040

4141
include:
42-
- wine-devel-i386=7.22~jammy-1
43-
- wine-devel-amd64=7.22~jammy-1
42+
- wine-devel-i386=7.22~focal-1
43+
- wine-devel-amd64=7.22~focal-1
4444
- bash
4545
- cabextract
4646
- cups
4747
- dash
4848
- perl
4949
- coreutils
5050
- mesa-utils
51-
- mesa-utils-bin
5251
- unionfs-fuse
5352
- vulkan-tools
5453
- libcups2
@@ -167,23 +166,16 @@ AppDir:
167166
# Patch wrapper script
168167
sed -i 's|wine-appimage|wine-appimage-staging-v8|' AppDir/wrapper
169168
170-
# Check for rc builds
171-
# if [ $(wget -qO- https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-amd64/ | grep wine-staging | tail -n1 | grep -c ~rc) -gt 0 ]; then
172-
# WINE_VER="$(wget -qO- https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-amd64/ | grep wine-staging | sed 's|_| |g;s|~| |2' | awk '{print $5}' | tail -n1)"
173-
# else
174-
# WINE_VER="$(wget -qO- https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-amd64/ | grep wine-staging | sed 's|_| |g;s|~| |g' | awk '{print $5}' | tail -n1)"
175-
# fi
176-
177169
WINE_VER="8.21"
178170
179-
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-i386/wine-staging_${WINE_VER}~jammy-1_i386.deb
180-
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-i386/wine-staging-i386_${WINE_VER}~jammy-1_i386.deb
181-
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-amd64/wine-staging_${WINE_VER}~jammy-1_amd64.deb
182-
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-amd64/wine-staging-amd64_${WINE_VER}~jammy-1_amd64.deb
183-
dpkg -x "wine-staging_${WINE_VER}~jammy-1_i386.deb" AppDir/
184-
dpkg -x "wine-staging-i386_${WINE_VER}~jammy-1_i386.deb" AppDir/
185-
dpkg -x "wine-staging_${WINE_VER}~jammy-1_amd64.deb" AppDir/
186-
dpkg -x "wine-staging-amd64_${WINE_VER}~jammy-1_amd64.deb" AppDir/
171+
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/focal/main/binary-i386/wine-staging_${WINE_VER}~focal-1_i386.deb
172+
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/focal/main/binary-i386/wine-staging-i386_${WINE_VER}~focal-1_i386.deb
173+
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/focal/main/binary-amd64/wine-staging_${WINE_VER}~focal-1_amd64.deb
174+
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/focal/main/binary-amd64/wine-staging-amd64_${WINE_VER}~focal-1_amd64.deb
175+
dpkg -x "wine-staging_${WINE_VER}~focal-1_i386.deb" AppDir/
176+
dpkg -x "wine-staging-i386_${WINE_VER}~focal-1_i386.deb" AppDir/
177+
dpkg -x "wine-staging_${WINE_VER}~focal-1_amd64.deb" AppDir/
178+
dpkg -x "wine-staging-amd64_${WINE_VER}~focal-1_amd64.deb" AppDir/
187179
(cd AppDir/usr/bin; ln -s "../../opt/wine-staging/bin/"* .)
188180
189181
# Cleanup

0 commit comments

Comments
 (0)