Skip to content

Commit

Permalink
add noble64 template (puppylinux-woof-CE#4248)
Browse files Browse the repository at this point in the history
  • Loading branch information
dimkr authored Mar 9, 2024
1 parent 52ff064 commit 2d44010
Show file tree
Hide file tree
Showing 10 changed files with 1,019 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ubuntu-jammy64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: ubuntu-jammy64

on:
schedule:
- cron: '0 0 2,16 * *'
- cron: '0 0 2 * *'

jobs:
build:
Expand All @@ -16,4 +16,4 @@ jobs:
compat-distro-version: jammy64
kernel: ubuntu-jammy
artifact: ${{ github.workflow }}-${{ github.run_number }}
retention: 15
retention: 30
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: devuan-chimaera64
name: ubuntu-noble64

on:
schedule:
- cron: '0 0 2 * *'
- cron: '0 0 2,16 * *'

jobs:
build:
Expand All @@ -12,9 +12,8 @@ jobs:
repo: ${{ github.repository }}
ref: ${{ github.ref }}
arch: x86_64
compat-distro: devuan
compat-distro-version: chimaera64
kernel: debian-bullseye
compat-distro: ubuntu
compat-distro-version: noble64
kernel: ubuntu-noble
artifact: ${{ github.workflow }}-${{ github.run_number }}
retention: 30
runner: 'ubuntu-20.04'
retention: 15
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ Currently supported:
| Distro | Version | Architecture | Status |
| ------------- | ------------- | -------------| -------- |
| Slackware | 15.0 | x86_64, x86 | [![slackware-s15pup](https://github.com/puppylinux-woof-CE/woof-CE/actions/workflows/slackware-s15pup.yml/badge.svg)](https://github.com/puppylinux-woof-CE/woof-CE/actions/workflows/slackware-s15pup.yml) |
| Ubuntu | 24.04 | x86_64 | [![ubuntu-noble64](https://github.com/puppylinux-woof-CE/woof-CE/actions/workflows/ubuntu-noble64.yml/badge.svg)](https://github.com/puppylinux-woof-CE/woof-CE/actions/workflows/ubuntu-noble64.yml) |
| Ubuntu | 22.04 | x86_64 | [![ubuntu-jammy64](https://github.com/puppylinux-woof-CE/woof-CE/actions/workflows/ubuntu-jammy64.yml/badge.svg)](https://github.com/puppylinux-woof-CE/woof-CE/actions/workflows/ubuntu-jammy64.yml) |
| Debian | Unstable | x86_64 | [![debian-sid64](https://github.com/puppylinux-woof-CE/woof-CE/actions/workflows/debian-sid64.yml/badge.svg)](https://github.com/puppylinux-woof-CE/woof-CE/actions/workflows/debian-sid64.yml) |
| Debian | Testing | x86_64 | [![debian-trixie](https://github.com/puppylinux-woof-CE/woof-CE/actions/workflows/debian-trixie.yml/badge.svg)](https://github.com/puppylinux-woof-CE/woof-CE/actions/workflows/debian-trixie.yml) |
| Debian | 12 | x86_64, x86 | [![debian-bookworm](https://github.com/puppylinux-woof-CE/woof-CE/actions/workflows/debian-bookworm.yml/badge.svg)](https://github.com/puppylinux-woof-CE/woof-CE/actions/workflows/debian-bookworm.yml) |
| Debian | 11 | x86_64, x86 | [![debian-bullseye](https://github.com/puppylinux-woof-CE/woof-CE/actions/workflows/debian-bullseye.yml/badge.svg)](https://github.com/puppylinux-woof-CE/woof-CE/actions/workflows/debian-bullseye.yml) |
| Devuan | 5.0 | x86_64 | [![devuan-daedalus64](https://github.com/puppylinux-woof-CE/woof-CE/actions/workflows/devuan-daedalus64.yml/badge.svg)](https://github.com/puppylinux-woof-CE/woof-CE/actions/workflows/devuan-daedalus64.yml) |
| Devuan | 4.0 | x86_64 | [![devuan-chimaera64](https://github.com/puppylinux-woof-CE/woof-CE/actions/workflows/devuan-chimaera64.yml/badge.svg)](https://github.com/puppylinux-woof-CE/woof-CE/actions/workflows/devuan-chimaera64.yml) |
| Void | - | x86_64, x86 | [![void-voidpup](https://github.com/puppylinux-woof-CE/woof-CE/actions/workflows/void-voidpup.yml/badge.svg)](https://github.com/puppylinux-woof-CE/woof-CE/actions/workflows/void-voidpup.yml) |

(Other build configurations might work but they are not built periodically)
Expand Down
8 changes: 6 additions & 2 deletions woof-code/support/mk_iso.sh
Original file line number Diff line number Diff line change
Expand Up @@ -402,10 +402,14 @@ OUT=${WOOF_OUTPUT}/${ISO_BASENAME}.iso
ISOLINUX=`find $PX/usr -maxdepth 3 -type f -name 'isolinux.bin'`
CHAIN32=`find $PX/usr -maxdepth 5 -type f -name 'chain.c32' | grep -v efi`
#FIXUSB=`find $PX/usr -maxdepth 2 -type f -name 'fix-usb.sh'`
if [ -f "devx/usr/lib/shim/shimx64.efi.signed" -a -f "devx/usr/lib/grub/x86_64-efi-signed/gcdx64.efi.signed" -a -f "devx/usr/share/grub/unicode.pf2" ] && [ -f "devx/usr/lib/shim/mmx64.efi.signed" -o -f "devx/usr/lib/shim/mmx64.efi" ] ; then
if [ -f "devx/usr/lib/shim/shimx64.efi.signed" -o -f "devx/usr/lib/shim/shimx64.efi.signed.latest" ] && [ -f "devx/usr/lib/grub/x86_64-efi-signed/gcdx64.efi.signed" -a -f "devx/usr/share/grub/unicode.pf2" ] && [ -f "devx/usr/lib/shim/mmx64.efi.signed" -o -f "devx/usr/lib/shim/mmx64.efi" ] ; then
(
mkdir -p /tmp/grub2/EFI/boot
cp -f devx/usr/lib/shim/shimx64.efi.signed /tmp/grub2/EFI/boot/bootx64.efi
if [ -f devx/usr/lib/shim/shimx64.efi.signed.latest ]; then
cp -f devx/usr/lib/shim/shimx64.efi.signed.latest /tmp/grub2/EFI/boot/bootx64.efi
else
cp -f devx/usr/lib/shim/shimx64.efi.signed /tmp/grub2/EFI/boot/bootx64.efi
fi
if [ -f devx/usr/lib/shim/mmx64.efi.signed ]; then
cp -f devx/usr/lib/shim/mmx64.efi.signed /tmp/grub2/EFI/boot/mmx64.efi
else
Expand Down
54 changes: 54 additions & 0 deletions woof-distro/x86_64/ubuntu/noble64/DISTRO_COMPAT_REPOS-ubuntu-noble
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
#
# Generic DISTRO_COMPAT_REPOS for WCE Upups
#

if [ "$DISTRO_COMPAT_VERSION" = "" ] ; then
[ -f ./DISTRO_SPECS ] && . ./DISTRO_SPECS
fi

case "$DISTRO_TARGETARCH" in
x86) DBIN_ARCH=i386 ;;
x86_64) DBIN_ARCH=amd64 ;;
esac

case $DISTRO_COMPAT_VERSION in
precise|trusty) DDB_COMP=bz2 ;; #older versions
*) DDB_COMP=xz ;;
esac

#----------------------
#PKG_DOCS_DISTRO_COMPAT - where to download the compat-distro pkgs databases from
#---------------------
# 1|2|3
# 1 - domain. for testing the url.
# 2 - full URI of the database file.
# 3 - name of db file when local and after being processed into standard format

PKG_DOCS_DISTRO_COMPAT="
z|http://archive.ubuntu.com/ubuntu/dists/${DISTRO_COMPAT_VERSION}/main/binary-${DBIN_ARCH}/Packages.${DDB_COMP}|Packages-${DISTRO_BINARY_COMPAT}-${DISTRO_COMPAT_VERSION}-main
z|http://archive.ubuntu.com/ubuntu/dists/${DISTRO_COMPAT_VERSION}/universe/binary-${DBIN_ARCH}/Packages.${DDB_COMP}|Packages-${DISTRO_BINARY_COMPAT}-${DISTRO_COMPAT_VERSION}-universe
z|http://archive.ubuntu.com/ubuntu/dists/${DISTRO_COMPAT_VERSION}/multiverse/binary-${DBIN_ARCH}/Packages.${DDB_COMP}|Packages-${DISTRO_BINARY_COMPAT}-${DISTRO_COMPAT_VERSION}-multiverse
z|http://archive.ubuntu.com/ubuntu/dists/${DISTRO_COMPAT_VERSION}/restricted/binary-${DBIN_ARCH}/Packages.${DDB_COMP}|Packages-${DISTRO_BINARY_COMPAT}-${DISTRO_COMPAT_VERSION}-restricted
"

#-------------------
#REPOS_DISTRO_COMPAT - hardcode the compat-distro repos in here...
#-------------------
# 1|2|3
# 1 - domain. for testing the url.
# 2 - full URI of the repo
# 3 - name of db-file(s) associated with that repo. it may have glob wildcards.

REPOS_DISTRO_COMPAT="
z|http://archive.ubuntu.com/ubuntu|Packages-${DISTRO_BINARY_COMPAT}-${DISTRO_COMPAT_VERSION}-*
z|http://mirrors.kernel.org/ubuntu|Packages-${DISTRO_BINARY_COMPAT}-${DISTRO_COMPAT_VERSION}-*
z|ftp.osuosl.org/pub/ubuntu|Packages-${DISTRO_BINARY_COMPAT}-${DISTRO_COMPAT_VERSION}-*
"


#---------------
# fix variables
#---------------
PKG_DOCS_DISTRO_COMPAT="$(echo "$PKG_DOCS_DISTRO_COMPAT" | sed '/^$/d' | tr '\n' ' ' | sed 's% $%%')"
REPOS_DISTRO_COMPAT="$(echo "$REPOS_DISTRO_COMPAT" | sed '/^$/d' | tr '\n' ' ' | sed 's% $%%')"

66 changes: 66 additions & 0 deletions woof-distro/x86_64/ubuntu/noble64/DISTRO_PET_REPOS
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
#------------------
#PKG_DOCS_PET_REPOS - where to download the pet pkgs databases from.
#------------------
# 1|2|3
# 1 - domain. for testing the url.
# 2 - full URI of the database file.
# 3 - name of db file when local and after being processed into standard format
# (in the case of PET databases, the names are the same and no processing is required)

# we don't use pet packages, so it's OK to always use testing
WCE_BRANCH=testing

PKG_DOCS_PET_REPOS="
z|https://raw.githubusercontent.com/puppylinux-woof-CE/woof-CE/${WCE_BRANCH}/woof-distro/Packages-puppy-noarch-official|z
z|https://raw.githubusercontent.com/puppylinux-woof-CE/woof-CE/${WCE_BRANCH}/woof-distro/x86_64/Packages-puppy-common64-official|z
z|https://distro.ibiblio.org/puppylinux/Packages-puppy-bionic64-official|z
z|https://raw.githubusercontent.com/puppylinux-woof-CE/woof-CE/${WCE_BRANCH}/woof-distro/x86_64/ubuntu/xenial64/Packages-puppy-xenial64-official|z
z|https://raw.githubusercontent.com/puppylinux-woof-CE/woof-CE/${WCE_BRANCH}/woof-distro/x86_64/ubuntu/Packages-puppy-tahr64-official|z
z|https://distro.ibiblio.org/puppylinux/Packages-puppy-fossa64-official|z
"

#---------
#PET_REPOS - hardcode the pet repos in here...
#---------
# 1|2|3
# 1 - domain. for testing the url.
# 2 - full URI of the repo
# 3 - name of db-file(s) associated with that repo. it may have glob wildcards.
# ex: Packages-puppy-4-official (note, url paths are in the database)

PET_REPOS='
z|http://distro.ibiblio.org/puppylinux|Packages-puppy-*-official
z|http://ftp.nluug.nl/ftp/pub/os/Linux/distr/puppylinux|Packages-puppy-*-official
z|http://ftp.cc.uoc.gr/mirrors/linux/puppylinux|Packages-puppy-*-official
z|ftp://mirror.aarnet.edu.au/pub/puppylinux|Packages-puppy-*-official
z|http://distro.ibiblio.org/puppylinux|Packages-puppy-*-official
z|http://ftp.nluug.nl/ftp/pub/os/Linux/distr/puppylinux|Packages-puppy-*-official
z|ftp://ftp.vcu.edu/pub/gnu+linux/puppylinux|Packages-puppy-*-official
z|http://ftp.cc.uoc.gr/mirrors/linux/puppylinux|Packages-puppy-*-official
z|http://mirror.aarnet.edu.au/pub/puppylinux|Packages-puppy-*-official
z|http://mirror.internode.on.net/pub/puppylinux|Packages-puppy-*-official
z|https://raw.githubusercontent.com/puppylinux-woof-CE/woof-CE-noarch/master|Packages-puppy-noarch-official
'

#----------------------
#PACKAGELISTS_PET_ORDER
#----------------------
# this defines where Woof (and PPM) looks first and second
# (and third, etc.) for pet pkgs

PACKAGELISTS_PET_ORDER="
Packages-puppy-common64-official
Packages-puppy-noarch-official
Packages-puppy-bionic64-official
Packages-puppy-xenial64-official
Packages-puppy-tahr64-official
Packages-puppy-fossa64-official
"

#---------------
# fix variables
#---------------
PKG_DOCS_PET_REPOS="$(echo $PKG_DOCS_PET_REPOS)"
PET_REPOS="$(echo $PET_REPOS)"
PACKAGELISTS_PET_ORDER="$(echo $PACKAGELISTS_PET_ORDER)"

Loading

0 comments on commit 2d44010

Please sign in to comment.