From: Don Zickus <dzickus@xxxxxxxxxx> Don't ignore gitkeep files for ark-infra It was pointed out the the riscv kabi-module directory was missing because it only had a .gitkeep file which is ignored as a '.*' file in .gitignore. Add an entry to redhat/.gitignore to not ignore .gitkeep files. While at it, cleanup redhat/scripts/ci/ark-create-release.sh to include Kconfig.redhat in the ark-infra branch and remove the gitkeep note as it is fixed now. I updated ark-infra branch manually, so it is already resolved. This helps make sure it doesn't break again. Suggested-by: Ondrej Mosnacek <omosnace@xxxxxxxxxx> Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx> diff --git a/redhat/.gitignore b/redhat/.gitignore index blahblah..blahblah 100644 --- a/redhat/.gitignore +++ b/redhat/.gitignore @@ -6,4 +6,6 @@ kabi/Module.kabi_* kabi/kabi-current kabi/kabi-rhel* kabi/kabi-rhel*/* -scripts/uki_addons/uki_addons.json \ No newline at end of file +scripts/uki_addons/uki_addons.json + +!.gitkeep diff --git a/redhat/scripts/ci/ark-create-release.sh b/redhat/scripts/ci/ark-create-release.sh index blahblah..blahblah 100755 --- a/redhat/scripts/ci/ark-create-release.sh +++ b/redhat/scripts/ci/ark-create-release.sh @@ -51,17 +51,15 @@ git reset --hard "$RELEASE" git checkout ark-infra # Using ark-latest because it has latest fixes -rm -rf makefile Makefile.rhelver redhat/ -git archive --format=tar ark-latest makefile Makefile.rhelver redhat/ | tar -x +rm -rf makefile Makefile.rhelver Kconfig.redhat redhat/ +git archive --format=tar ark-latest makefile Makefile.rhelver Kconfig.redhat redhat/ | tar -x # Manually add hook instead of cherry-pick # Add to middle to avoid git merge conflicts # NOTE: commented out but left for future info to rebuild from scratch # sed -i '/# We are using a recursive / i include Makefile.rhelver\n' Makefile -git add makefile Makefile.rhelver Makefile redhat -# Future rebuid note, .gitkeep files are gitignored and need force adding -# git add -f redhat/kabi/kabi-module/kabi* +git add makefile Makefile.rhelver Makefile Kconfig.redhat redhat git commit -m "bulk merge ark-infra as of $(date)" -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3473 -- _______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
