sig_core/srpmproc
8
0
Fork 0
mirror of https://github.com/rocky-linux/srpmproc.git synced 2024-12-04 18:36:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a flag --upstream-version to migrate a package to an other version.

Browse Source 
This is useful if you wanna import a centos7 package into rocky9.

Example, I want to have `ansible-2.9.27` that is available on EPEL7 on my rocky9 repos.

```
srpmproc \
  --import-branch-prefix "epel"\
  --rpm-prefix "https://src.fedoraproject.org/rpms/"\
  --version 7\
  --upstream-prefix file:///tmp/upstream/git/ \
  --upstream-version 9\
  --branch-prefix "r"\
  --cdn fedora\
  --source-rpm ansible\
  --storage-addr 'file:///tmp/s3/'
```
This commit is contained in:
tlec 2023-06-19 19:32:48 +02:00
parent 40180a342b
commit 6eb95dd278
No known key found for this signature in database
GPG Key ID: BB4A62C1F2F786E8
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/srpmproc/main.go
View File

@ -35,6 +35,7 @@ var (
sshKeyLocation string
sshUser string
upstreamPrefix string
upstreamVersion int
version int
storageAddr string
gitCommitterName string
@ -69,6 +70,7 @@ var root = &cobra.Command{
func mn(_ *cobra.Command, _ []string) {
pd, err := srpmproc.NewProcessData(&srpmproc.ProcessDataRequest{
Version: version,
UpstreamVersion: upstreamVersion,
StorageAddr: storageAddr,
Package: sourceRpm,
ModuleMode: moduleMode,
@ -120,6 +122,8 @@ func main() {
_ = root.MarkFlagRequired("upstream-prefix")
root.Flags().IntVar(&version, "version", 0, "Upstream version")
_ = root.MarkFlagRequired("version")
root.Flags().IntVar(&upstreamVersion, "upstream-version", 0, "Upstream version")
root.Flags().StringVar(&storageAddr, "storage-addr", "", "Bucket to use as blob storage")
_ = root.MarkFlagRequired("storage-addr")

1
pkg/data/process.go
View File

@ -34,6 +34,7 @@ type ProcessData struct {
RpmLocation string
UpstreamPrefix string
Version int
UpstreamVersion int
GitCommitterName string
GitCommitterEmail string
Mode int

10
pkg/srpmproc/process.go
View File

@ -69,6 +69,7 @@ const (
type ProcessDataRequest struct {
// Required
Version int
UpstreamVersion int
StorageAddr string
Package string
@ -170,6 +171,9 @@ func NewProcessData(req *ProcessDataRequest) (*data.ProcessData, error) {
logger := log.New(writer, "", log.LstdFlags)
// Set defaults
if req.UpstreamVersion == 0 {
req.UpstreamVersion = req.Version
}
if req.ModulePrefix == "" {
req.ModulePrefix = ModulePrefixCentOS
}
@ -311,6 +315,7 @@ func NewProcessData(req *ProcessDataRequest) (*data.ProcessData, error) {
RpmLocation: sourceRpmLocation,
UpstreamPrefix: req.UpstreamPrefix,
Version: req.Version,
UpstreamVersion: req.UpstreamVersion,
BlobStorage: blobStorage,
GitCommitterName: req.GitCommitterName,
GitCommitterEmail: req.GitCommitterEmail,
@ -1344,7 +1349,7 @@ func taglessBranchName(fullBranch string, pd *data.ProcessData) string {
// Simple case: if our branch is not a modular stream branch, just return the normal <prefix><version><suffix> pattern
if !strings.HasPrefix(branch, "stream-") {
return fmt.Sprintf("%s%d%s", pd.BranchPrefix, pd.Version, pd.BranchSuffix)
return fmt.Sprintf("%s%d%s", pd.BranchPrefix, pd.UpstreamVersion, pd.BranchSuffix)
}
// index where the "-rhel-" starts near the end of the string
@ -1357,5 +1362,6 @@ func taglessBranchName(fullBranch string, pd *data.ProcessData) string {
majorMinor := branch[rhelSpot+6:]
// return translated modular branch:
return fmt.Sprintf("%s%d%s-%s_%s", pd.BranchPrefix, pd.Version, pd.BranchSuffix, moduleString, majorMinor)
return fmt.Sprintf("%s%d%s-%s_%s", pd.BranchPrefix, pd.UpstreamVersion, pd.BranchSuffix, moduleString, majorMinor)
}