diff --git a/5ae6dce983e6a25c75655afc46a6d4277f52d3f8.patch b/5ae6dce983e6a25c75655afc46a6d4277f52d3f8.patch new file mode 100644 index 0000000000000000000000000000000000000000..bad5ed7e2711746d093228e1de4ca757c69ff830 --- /dev/null +++ b/5ae6dce983e6a25c75655afc46a6d4277f52d3f8.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 6a4981b60..2e04715ff 100644 +--- a/Makefile ++++ b/Makefile +@@ -111,7 +111,7 @@ local: + @echo "The archive is in $(PKGNAME)-$(VERSION).tar.gz" + + test-in-copy: +- rsync -aP --exclude=.git /lorax-ro/ /lorax/ ++ rsync -a --exclude=.git /lorax-ro/ /lorax/ + make -C /lorax/ $(RUN_TESTS) + cp /lorax/.coverage /test-results/ + diff --git a/78eec89cda687f9689978eedb5482d041577577a.patch b/78eec89cda687f9689978eedb5482d041577577a.patch new file mode 100644 index 0000000000000000000000000000000000000000..9c76d9dbf223148d3d215f86a40aaa90ce0ac1c5 --- /dev/null +++ b/78eec89cda687f9689978eedb5482d041577577a.patch @@ -0,0 +1,13 @@ +diff --git a/src/pylorax/installer.py b/src/pylorax/installer.py +index b882ecfe6..9d0a8527b 100644 +--- a/src/pylorax/installer.py ++++ b/src/pylorax/installer.py +@@ -355,7 +355,7 @@ def novirt_install(opts, disk_img, disk_size, cancel_func=None, tar_img=None): + if os.path.isdir(path): + shutil.rmtree(path) + +- args = ["--kickstart", opts.ks[0], "--cmdline", "--loglevel", "debug"] ++ args = ["--kickstart", opts.ks[0], "--cmdline"] + if opts.anaconda_args: + for arg in opts.anaconda_args: + args += arg.split(" ", 1) diff --git a/c0ec02b3ed5bf34f46d4fd1d56946733c27442b0.patch b/c0ec02b3ed5bf34f46d4fd1d56946733c27442b0.patch new file mode 100644 index 0000000000000000000000000000000000000000..d1853de73ab19de4846676b7c4b361177a4077cf --- /dev/null +++ b/c0ec02b3ed5bf34f46d4fd1d56946733c27442b0.patch @@ -0,0 +1,74 @@ +diff --git a/.coveragerc b/.coveragerc +index 2b9abc36e..3a4ce4c5a 100644 +--- a/.coveragerc ++++ b/.coveragerc +@@ -1,3 +1,5 @@ + [paths] + source = . + /lorax/ ++[run] ++relative_files = True +diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml +new file mode 100644 +index 000000000..7860f5831 +--- /dev/null ++++ b/.github/workflows/tests.yml +@@ -0,0 +1,28 @@ ++name: Tests and Coverage ++# Make sure only one action triggers the job, otherwise pushing to a ++# pull-request will run it twice. ++on: ++ pull_request: ++ branches: ++ - "*" ++ push: ++ branches: ++ - master ++ - rhel8-branch ++ - rhel7-branch ++ - f31-branch ++ - f32-branch ++ - f33-branch ++ ++jobs: ++ unit-tests: ++ runs-on: ubuntu-latest ++ steps: ++ - name: "Clone Repository" ++ uses: actions/checkout@v2 ++ - name: Run lorax tests in podman ++ run: make test-in-docker && cp .test-results/.coverage .coverage ++ - name: Coveralls ++ uses: AndreMiras/coveralls-python-action@develop ++ with: ++ github-token: ${{ secrets.GITHUB_TOKEN }} +diff --git a/.travis.yml b/.travis.yml +deleted file mode 100644 +index f252ebbb1..000000000 +--- a/.travis.yml ++++ /dev/null +@@ -1,24 +0,0 @@ +-sudo: required +-language: python +-services: +- - docker +- +-env: +- - DOCKER=docker +- +-script: +- - make test-in-docker +- +-after_success: +- - | +- +- cp .test-results/.coverage ./.coverage.docker +- +- pip install coverage coveralls +- coverage combine +- coveralls +- +-notifications: +- email: +- on_failure: change +- on_success: never diff --git a/lorax.spec b/lorax.spec index 3ed4224bb81179a2c53ae388ed0d257226a53723..156c8bb2419cb22811cc59086ca2c2f23bff56cb 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ Name: lorax Version: 33.6 -Release: 2 +Release: 3 Summary: A set of tools used to create bootable images License: GPLv2+ URL: https://github.com/weldr/lorax @@ -20,6 +20,9 @@ Patch9007: eliminate-difference.patch Patch9008: lorax-enable-GUI-installation.patch Patch9009: lorax-enable-anaconda-KdumpSpoke.patch Patch9010: lorax-delete-udisk2-iscsi.patch +Patch9011: c0ec02b3ed5bf34f46d4fd1d56946733c27442b0.patch +Patch9012: 5ae6dce983e6a25c75655afc46a6d4277f52d3f8.patch +Patch9013: 78eec89cda687f9689978eedb5482d041577577a.patch BuildRequires: python3-devel python3-sphinx_rtd_theme python3-magic @@ -203,6 +206,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/*.1* %changelog +* 20201119033007626393 patch-tracking 33.6-3 +- append patch file of upstream repository from to <78eec89cda687f9689978eedb5482d041577577a> + * Feb Oct 13 2020 yuboyun - 33.6-2 - add yaml file @@ -304,4 +310,3 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin ignore the dir that without kernel version add text mode in aarch64 installation -