diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ca94587..51b0b12 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,6 +16,7 @@ jobs: - name: "Lint" run: | docker run \ + --quiet \ -v "$PWD":/repo \ ghcr.io/t2linux/fedora-dev:latest \ /repo/lint.sh @@ -42,9 +43,7 @@ jobs: - name: "Build" run: | - mkdir -p _output docker run \ - -t \ --privileged \ -v "$PWD":/repo \ ghcr.io/t2linux/fedora-dev:latest \ @@ -54,7 +53,7 @@ jobs: if: startsWith(github.ref, 'refs/tags/v') run: | docker run \ - -t \ + --quiet \ -v $PWD:/repo \ -e RPM_SIGNING_PRIVATE_KEY_B64 \ ghcr.io/t2linux/fedora-dev:latest \ diff --git a/build-packages.sh b/build-packages.sh index 84e9aa4..df8b545 100755 --- a/build-packages.sh +++ b/build-packages.sh @@ -8,7 +8,7 @@ for current_package in "${packages[@]}"; do fi cd /repo/"$current_package" || echo "ERROR: Package $current_package not found" spectool -g "$current_package".spec - mock --quiet --buildsrpm --spec "$current_package".spec --sources . --resultdir /repo/_output + mock --buildsrpm --spec "$current_package".spec --sources . --resultdir /repo/_output done -mock --quiet --rebuild /repo/_output/*.src.rpm --resultdir /repo/_output +mock --rebuild /repo/_output/*.src.rpm --resultdir /repo/_output diff --git a/kernel/kernel.sh b/kernel/kernel.sh index 9cad88a..682d87d 100755 --- a/kernel/kernel.sh +++ b/kernel/kernel.sh @@ -3,10 +3,9 @@ FEDORA_KERNEL_VERSION=6.5.5-200.fc38 PATCHES_COMMIT=3aeff9385079f5f362a5447cdb9f4e2b48962c92 cd /repo/kernel -koji download-build --arch=src "kernel-${FEDORA_KERNEL_VERSION}" -rpmdev-extract "kernel-${FEDORA_KERNEL_VERSION}".src.rpm +koji download-build --quiet --arch=src "kernel-${FEDORA_KERNEL_VERSION}" +rpmdev-extract -q "kernel-${FEDORA_KERNEL_VERSION}".src.rpm mv -n "kernel-${FEDORA_KERNEL_VERSION}".src/* . -rm -r "kernel-${FEDORA_KERNEL_VERSION}".src "kernel-${FEDORA_KERNEL_VERSION}".src.rpm # Fedora devs are against merging kernel-local for all architectures when keys are not properly specified, so we have to patch it in. sed -i "s@for i in %{all_arch_configs}@for i in *.config@g" kernel.spec @@ -18,7 +17,7 @@ sed -i 's/# define buildid .local/%define buildid .t2/g' kernel.spec sed -i "/%define with_debug /c %define with_debug 0" kernel.spec git clone --quiet --single-branch --branch main https://github.com/t2linux/linux-t2-patches patches && cd patches -git checkout ${PATCHES_COMMIT} +git checkout --quiet ${PATCHES_COMMIT} cd .. cat patches/extra_config > kernel-local