github-personal/ports
1
0
Fork 0
mirror of https://github.com/outbackdingo/ports.git synced 2026-01-27 10:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

updates for rolling release

Browse Source
This commit is contained in:
emmett1
2023-05-07 02:19:12 +08:00
parent 1212b4b3af
commit e2ac4a9450
6 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/filesystem/spkgbuild
View File

@@ -2,8 +2,8 @@
name=filesystem
version=4.0
venom_release=$(echo $version | sed 's/_/-/')
release=1
venom_release=rolling
release=2
backup="etc/passwd
etc/locale.conf
etc/resolv.conf

2
core/scratchpkg/scratchpkg.repo
View File

@@ -5,7 +5,7 @@
# <repo directory> <repo url for sync>
#
/usr/ports/core https://github.com/venomlinux/ports/tree/venom4/core
/usr/ports/core https://github.com/venomlinux/ports/tree/repos/core
/usr/ports/main https://github.com/venomlinux/ports/tree/repos/main
#/usr/ports/multilib https://github.com/venomlinux/ports/tree/repos/multilib
#/usr/ports/nonfree https://github.com/venomlinux/ports/tree/repos/nonfree

2
core/scratchpkg/spkgbuild
View File

@@ -3,7 +3,7 @@
name=scratchpkg
version=20230326
release=1
release=2
backup="etc/scratchpkg.conf
etc/scratchpkg.alias
etc/scratchpkg.repo

2
current-release
View File

@@ -1 +1 @@
4.0
rolling

14
scripts/build.sh
View File

@@ -126,7 +126,7 @@ zap_rootfs() {
msg "Extracting tarball image: $TARBALLIMG"
tar -xf $TARBALLIMG -C $ROOTFS || die "Error extracting tarball image"
tmp_scratchpkgconf
chrootrun portsync || die 'failed sync ports'
#chrootrun portsync || die 'failed sync ports'
#set_release_info
generatelocales
unset ZAP
@@ -188,7 +188,7 @@ restore_scratchpkgconf() {
tmp_scratchpkgconf() {
if [ ! -f "$ROOTFS"/etc/scratchpkg.repo.spkgnew ]; then
mv "$ROOTFS"/etc/scratchpkg.repo "$ROOTFS"/etc/scratchpkg.repo.spkgnew
echo "/usr/ports/core https://github.com/venomlinux/ports/tree/venom${RELEASE%%.*}/core" > "$ROOTFS"/etc/scratchpkg.repo
#echo "/usr/ports/core https://github.com/venomlinux/ports/tree/venom${RELEASE%%.*}/core" > "$ROOTFS"/etc/scratchpkg.repo
for i in $REPO; do
echo "/usr/ports/$i" >> "$ROOTFS"/etc/scratchpkg.repo
done
@@ -238,7 +238,7 @@ make_iso() {
done
#cp "$FILESDIR/splash.png" "$ISODIR/isolinux"
cp "$ROOTFS/usr/share/syslinux/splash.png" "$ISODIR/isolinux"
sed "s/Venom Linux/Venom Linux $RELEASE/g" "$ROOTFS/usr/share/syslinux/isolinux.cfg" > "$ISODIR/isolinux/isolinux.cfg"
#sed "s/Venom Linux/Venom Linux $RELEASE/g" "$ROOTFS/usr/share/syslinux/isolinux.cfg" > "$ISODIR/isolinux/isolinux.cfg"
[ -d "$PORTSDIR/virootfs" ] && {
cp -aR "$PORTSDIR/virootfs" "$ISODIR"
@@ -334,10 +334,6 @@ checktool() {
if [ "$ISO" ]; then
check mksquashfs squashfs-tools || err=1
check xorriso libisoburn || err=1
if [ ! -d /usr/lib/grub/x86_64-efi/ ]; then
echo "'grub-efi' files not found"
err=1
fi
fi
[ "$err" = 1 ] && exit 1
}
@@ -493,14 +489,14 @@ parse_opts "$@"
ARCH=$(uname -m)
RELEASE=$(cat $PORTSDIR/current-release)
TARBALLIMG="$PORTSDIR/venomlinux-rootfs-$RELEASE-$ARCH.tar.xz"
TARBALLIMG="$PORTSDIR/venomlinux-rootfs-$ARCH.tar.xz"
SRCDIR="${SRCDIR:-/var/cache/scratchpkg/sources}"
PKGDIR="${PKGDIR:-/var/cache/scratchpkg/packages}"
ROOTFS="${ROOTFS:-$PORTSDIR/rootfs}"
CCACHE_DIR="${CCACHEDIR:-/var/lib/ccache}"
JOBS="${JOBS:-$(nproc)}"
REPO="main multilib nonfree testing"
REPO="core main multilib nonfree testing"
# iso
ISODIR="${ISODIR:-/tmp/venomiso}"

2
scripts/makeiso.sh
View File

@@ -30,7 +30,7 @@ THEME_PKG="arcbox paper-icon-theme osx-arc-theme ttf-liberation picom dunst neof
# theme: arc-gtk-theme xfce4-whiskermenu-plugin pop-icon-theme
RELEASE=$(cat $PORTSDIR/current-release)
outputiso="$PORTSDIR/venomlinux-$RELEASE-$INIT-$(uname -m)-$(date +%Y%m%d).iso"
outputiso="$PORTSDIR/venomlinux-$INIT-$(uname -m)-$(date +%Y%m%d).iso"
pkgs="$(echo $MUST_PKG $XORG_PKG $MAIN_PKG $OPENBOX_PKG $THEME_PKG | tr ' ' ',')"
as_root $SCRIPTDIR/build.sh \