diff --git a/core/filesystem/spkgbuild b/core/filesystem/spkgbuild index be411b4dd..3e07f8849 100755 --- a/core/filesystem/spkgbuild +++ b/core/filesystem/spkgbuild @@ -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 diff --git a/core/scratchpkg/scratchpkg.repo b/core/scratchpkg/scratchpkg.repo index e3c429327..77617dc5f 100644 --- a/core/scratchpkg/scratchpkg.repo +++ b/core/scratchpkg/scratchpkg.repo @@ -5,7 +5,7 @@ # # -/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 diff --git a/core/scratchpkg/spkgbuild b/core/scratchpkg/spkgbuild index 2ee7c4b7c..9b75e795f 100644 --- a/core/scratchpkg/spkgbuild +++ b/core/scratchpkg/spkgbuild @@ -3,7 +3,7 @@ name=scratchpkg version=20230326 -release=1 +release=2 backup="etc/scratchpkg.conf etc/scratchpkg.alias etc/scratchpkg.repo diff --git a/current-release b/current-release index 5186d0706..9f844d434 100644 --- a/current-release +++ b/current-release @@ -1 +1 @@ -4.0 +rolling diff --git a/scripts/build.sh b/scripts/build.sh index 7424889dd..c7e473adb 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -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}" diff --git a/scripts/makeiso.sh b/scripts/makeiso.sh index f35d875dd..c9897f2ee 100755 --- a/scripts/makeiso.sh +++ b/scripts/makeiso.sh @@ -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 \