[Starlingx-discuss] What's the preferred patch directory structure
Brent, I have noticed that we have a number of different patch directory layouts with in the stx-* repos. In some cases there are files/ or <pkg-name>/ directory at the top level such as sudo (files) or cluster-resource-agents (<pkg-name>), some have files/ and patches/ at the top level such as net-snmp. Others have patches/ and/or files/ under the centos directory. Additional some of these directory contain patches with the same name. I am starting to do some clean-up to reduce some of the duplicate patches and want to look at making the directories more consistent also. Maybe this has been discussed and I lost it in the mix. Is there a spec / document showing what the correct layout should be? Thanks Sau!
The original thinking was .... 1) Patching a centos src.rpm a/<pkg-name>/centos/patches/ a/<pkg-name>/centos/meta-patches/ a/<pkg-name>/centos/files/ a/<pkg-name>/centos/srpm_path a/<pkg-name>/centos/build_srpm.data 2) Patching a downloaded tarball, we supply the packaging. b/downloads/<pkg-ver.tar.gz> a/<pkg-name>/patches/ a/<pkg-name>/files/ a/<pkg-name>/centos/<pkg-name>.spec a/<pkg-name>/centos/build_srpm.data Note: build_srpm.data provides SRC_DIR=$STX_BASE/downloads/<pkg-name> Note: This assumed the patches/files we add are distro agnostic. If our added content is centos specific, move patches/files under centos. 3) packaging our own content (small packages) a/<pkg-name>/<pkg-name[-opt-version]> or possibly .../<pkg-name>/src/ a/<pkg-name>/centos/<pkg-name>.spec a/<pkg-name>/centos/build_srpm.data Note: build_srpm.data provides SRC_DIR=$PKG_BASE/git/<pkg-name> 4a) packaging our own content, large package sored in a separate git. 4b) packaging 3rd party git b/git/<pkg-name> a/<pkg-name>/centos/<pkg-name>.spec a/<pkg-name>/centos/build_srpm.data Note: build_srpm.data provides SRC_DIR=$STX_BASE/git/<pkg-name> Scott On 18-10-03 12:44 PM, Saul Wold wrote:
Brent,
I have noticed that we have a number of different patch directory layouts with in the stx-* repos.
In some cases there are files/ or <pkg-name>/ directory at the top level such as sudo (files) or cluster-resource-agents (<pkg-name>), some have files/ and patches/ at the top level such as net-snmp. Others have patches/ and/or files/ under the centos directory. Additional some of these directory contain patches with the same name.
I am starting to do some clean-up to reduce some of the duplicate patches and want to look at making the directories more consistent also.
Maybe this has been discussed and I lost it in the mix. Is there a spec / document showing what the correct layout should be?
Thanks Sau!
_______________________________________________ Starlingx-discuss mailing list Starlingx-discuss@lists.starlingx.io http://lists.starlingx.io/cgi-bin/mailman/listinfo/starlingx-discuss
Ok, this is a good start, currently, I am not sure all the directories match this pattern, and I know that's OK for now. I would like to suggest some tweaks to this given we are thinking about supporting multi OS, there maybe "files" (configuration, inittialization, ...) and possibly patches that are common to mutliple OSes. Would you please propose a Spec (in stx-specs) for consideration, so we can better document this structure in Spec form, thanks. I think as we work on updating patches, we move toward a common pattern. On 10/03/2018 10:31 AM, Scott Little wrote:
The original thinking was ....
1) Patching a centos src.rpm
a/<pkg-name>/centos/patches/ a/<pkg-name>/centos/meta-patches/ a/<pkg-name>/centos/files/ a/<pkg-name>/centos/srpm_path a/<pkg-name>/centos/build_srpm.data
For Ubuntu: a/<pkg-name>/debian/patches a/<pkg-name>/debian/source (See: https://www.debian.org/doc/manuals/debmake-doc/ch04.en.html) a/<pkg-name>/patches a/<pkg-name>/files I think this pattern more or less applies to the other examples you list below. Sau!
2) Patching a downloaded tarball, we supply the packaging.
b/downloads/<pkg-ver.tar.gz> a/<pkg-name>/patches/ a/<pkg-name>/files/ a/<pkg-name>/centos/<pkg-name>.spec a/<pkg-name>/centos/build_srpm.data
Note: build_srpm.data provides SRC_DIR=$STX_BASE/downloads/<pkg-name> Note: This assumed the patches/files we add are distro agnostic. If our added content is centos specific, move patches/files under centos.
3) packaging our own content (small packages)
a/<pkg-name>/<pkg-name[-opt-version]> or possibly .../<pkg-name>/src/ a/<pkg-name>/centos/<pkg-name>.spec a/<pkg-name>/centos/build_srpm.data
Note: build_srpm.data provides SRC_DIR=$PKG_BASE/git/<pkg-name>
4a) packaging our own content, large package sored in a separate git. 4b) packaging 3rd party git
b/git/<pkg-name> a/<pkg-name>/centos/<pkg-name>.spec a/<pkg-name>/centos/build_srpm.data
Note: build_srpm.data provides SRC_DIR=$STX_BASE/git/<pkg-name>
Scott
On 18-10-03 12:44 PM, Saul Wold wrote:
Brent,
I have noticed that we have a number of different patch directory layouts with in the stx-* repos.
In some cases there are files/ or <pkg-name>/ directory at the top level such as sudo (files) or cluster-resource-agents (<pkg-name>), some have files/ and patches/ at the top level such as net-snmp. Others have patches/ and/or files/ under the centos directory. Additional some of these directory contain patches with the same name.
I am starting to do some clean-up to reduce some of the duplicate patches and want to look at making the directories more consistent also.
Maybe this has been discussed and I lost it in the mix. Is there a spec / document showing what the correct layout should be?
Thanks Sau!
_______________________________________________ Starlingx-discuss mailing list Starlingx-discuss@lists.starlingx.io http://lists.starlingx.io/cgi-bin/mailman/listinfo/starlingx-discuss
_______________________________________________ Starlingx-discuss mailing list Starlingx-discuss@lists.starlingx.io http://lists.starlingx.io/cgi-bin/mailman/listinfo/starlingx-discuss
participants (2)
-
Saul Wold
-
Scott Little