openvpn: cleanup Makefile#28679
Merged
Merged
Conversation
Move the 'INSTALL_DIR' creation in the make install target to the location where the files are also installed. This prevents directories that are no longer needed from being forgotten during refactoring. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
This 'INSTALL_DIR' creation are not needed anymore after refactoring. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Each script to be installed is moved to its own line to improve readability. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
By moving the file to a subdirectory, it is easier to track where the file is located on the target without having to check the Makefile every time. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
By moving the file to a subdirectory, it is easier to track where the file is located on the target without having to check the Makefile every time. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Increment PKG_RELEASE by one. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
BKPepe
reviewed
Jul 17, 2026
Comment on lines
+128
to
+129
| files/lib/upgrade/keep.d/openvpn \ | ||
| $(1)/lib/upgrade/keep.d/ |
Member
There was a problem hiding this comment.
Florian, we are having a similar discussion here: #30010 (comment)
Could you please also check if conffiles will work for you? I took a look at the repository, and basically, you are the only one using keep.d in this specific way :-)
Member
Author
There was a problem hiding this comment.
I think this is working as expected.
root@FG2-999991 / # cat /lib/upgrade/keep.d/openvpn
/etc/openvpn/
root@FG2-999991 / # ls -la /etc/openvpn
drwxr-xr-x 1 root root 3488 Jul 17 08:33 .
drwxr-xr-x 1 root root 3488 Jul 15 14:18 ..
-rw-r--r-- 1 root root 0 Jul 17 08:33 test1.sh
-rw-r--r-- 1 root root 0 Jul 17 08:32 test2.sh
root@FG2-999991 / # sysupgrade -l | grep openvpn
/etc/config/openvpn
/etc/config/openvpn_recipes
/etc/openvpn/test1.sh
/etc/openvpn/test2.sh
Member
Author
There was a problem hiding this comment.
Oh, now I get what you mean. I need to add that to the "conffiles" target in the Makefile.
Wait, I'll have to take a look at that and run a build first.
I'll get back to you in a few days.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
📦 Package Details
Maintainer: ?
Description:
cleanup Makefile
✅ Formalities