diff --git a/Containerfile b/Containerfile index 1a659b3..48f8503 100644 --- a/Containerfile +++ b/Containerfile @@ -15,7 +15,7 @@ # - "base" # # "aurora", "bazzite", "bluefin" or "ucore" may also be used but have different suffixes. -ARG SOURCE_IMAGE="aurora" +ARG SOURCE_IMAGE="silverlue" ## SOURCE_SUFFIX arg should include a hyphen and the appropriate suffix name # These examples all work for silverblue/kinoite/sericea/onyx/lazurite/vauxite/base @@ -33,7 +33,7 @@ ARG SOURCE_IMAGE="aurora" # - stable-zfs # - stable-nvidia-zfs # - (and the above with testing rather than stable) -ARG SOURCE_SUFFIX="-dx" +ARG SOURCE_SUFFIX="-main" ## SOURCE_TAG arg must be a version built for the specific image: eg, 39, 40, gts, latest ARG SOURCE_TAG="40" @@ -45,7 +45,7 @@ FROM ghcr.io/ublue-os/${SOURCE_IMAGE}${SOURCE_SUFFIX}:${SOURCE_TAG} ### 2.1 Add ZFS RPMS and matching kernel RPMs COPY --from=ghcr.io/0ranki/sb-zfs-kernel /rpms/ /tmp/rpms -COPY --from=ghcr.io/0ranki/sb-zfs-kernel /kernel/ /tmp/kernel +COPY --from=ghcr.io/0ranki/sb-zfs-kernel /kernel/ /tmp/rpms ### 3. MODIFICATIONS diff --git a/build.sh b/build.sh index ced7f01..cca9ee3 100755 --- a/build.sh +++ b/build.sh @@ -6,6 +6,16 @@ RELEASE="$(rpm -E %fedora)" ZFS_KERNEL_VERSION="$(find /tmp/rpms/kmods/zfs/ -name "kmod-zfs*.rpm" ! -name "*devel*" | sed 's/.*\/kmod-zfs-//; s/\.fc.*$//g' | head -1)" +cat < EOF >> /etc/yum.repos.d/local.repo +name=Local override packages +baseurl=file:///tmp/rpms +enabled=1 +gpgcheck=0 +protect=1 +EOF + +rpm-ostree install createrepo +createrepo /tmp/rpms ### Install packages @@ -15,14 +25,18 @@ ZFS_KERNEL_VERSION="$(find /tmp/rpms/kmods/zfs/ -name "kmod-zfs*.rpm" ! -name "* # https://mirrors.rpmfusion.org/mirrorlist?path=free/fedora/updates/39/x86_64/repoview/index.html&protocol=https&redirect=1 # this installs a package from fedora repos -ls -la /tmp/kernel #rpm-ostree override remove kernel kernel-core kernel-modules kernel-modules-extra --replace /tmp/kernel/kernel*.rpm -rpm-ostree install /tmp/kernel/kernel*.rpm --uninstall kernel kernel-core kernel-modules kernel-modules-extra -rpm-ostree override remove zfs-fuse --install /tmp/rpms/kmods/zfs/*.rpm +#rpm-ostree override install /tmp/ker/kernel*.rpm --uninstall kernel kernel-core kernel-modules kernel-modules-extra + +rpm-ostree override remove kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra zfs-fuse --install kernel-${ZFS_KERNEL_VERSION} zfs + + + +#rpm-ostree override remove zfs-fuse --install /tmp/rpms/kmods/zfs/*.rpm # this would install a package from rpmfusion # rpm-ostree install vlc #### Example for enabling a System Unit File -systemctl enable podman.socket +#systemctl enable podman.socket