Skip to content

Commit 51683ac

Browse files
Blivet fix.
1 parent 62ba452 commit 51683ac

File tree

3 files changed

+393
-3
lines changed

3 files changed

+393
-3
lines changed

.github/workflows/build-kernel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
run: |
5454
mkdir /tmp/repo
5555
cp *.rpm /tmp/repo
56-
docker run -t -v "repo":/repo -v "/tmp/repo":/tmp/repo fedora:37 /bin/bash -c "/repo/build.sh"
56+
docker run -t -v "$PWD":/repo -v "/tmp/repo":/tmp/repo fedora:37 /bin/bash -c "/repo/build.sh"
5757
mkdir -p ./d
5858
cp -r /tmp/repo ./deploy
5959

build.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ git checkout ${PATCHES_COMMIT}
3232
echo "=====PREPARING SOURCES====="
3333
cd ~/rpmbuild/SPECS
3434
sed -i 's/# define buildid .local/%define buildid .t2/g' kernel.spec
35-
sed -i "s@Patch0: 0001-remove-btrfs-plugin.patch\n%endif@Patch0: 0001-remove-btrfs-plugin.patch\n%endif\n Patch1: 0002-add-t2-support.patch@g" python-blivet.spec
36-
sed '/License: LGPLv2+/a Patch1: 0002-add-t2-support.patch' python-blivet.spec
35+
mv -f /repo/python-blivet.spec /repo/rpmbuild/SPECS/python-blivet.spec
3736
mv /repo/0002-add-t2-support.patch /root/rpmbuild/SOURCES/0002-add-t2-support.patch
3837
cat /tmp/download/*/extra_config > /root/rpmbuild/SOURCES/kernel-local
3938
rpmbuild -bp kernel.spec

0 commit comments

Comments
 (0)