Remove build number from SUSE filenames

pkg/pkg/centos.go

@@ -22,6 +22,10 @@ func (pkg *CentOSPackage) Filename() string {
 	return pkg.NameOfFile
 }
 
+func (pkg *CentOSPackage) BTFFilename() string {
+	return pkg.NameOfFile
+}
+
 func (pkg *CentOSPackage) Version() kernel.Version {
 	return pkg.KernelVersion
 }

pkg/pkg/fedora.go

@@ -22,6 +22,10 @@ func (pkg *FedoraPackage) Filename() string {
 	return pkg.NameOfFile
 }
 
+func (pkg *FedoraPackage) BTFFilename() string {
+	return pkg.NameOfFile
+}
+
 func (pkg *FedoraPackage) Version() kernel.Version {
 	return pkg.KernelVersion
 }

pkg/pkg/package.go

@@ -13,23 +13,24 @@ import (
 type Package interface {
 	String() string
 	Filename() string
+	BTFFilename() string
 	Version() kernel.Version
 	Download(ctx context.Context, dir string, force bool) (string, error)
 	ExtractKernel(ctx context.Context, pkgpath string, vmlinuxPath string) error
 }
 
 func PackageBTFExists(p Package, workDir string) bool {
-	fp := filepath.Join(workDir, fmt.Sprintf("%s.btf.tar.xz", p.Filename()))
+	fp := filepath.Join(workDir, fmt.Sprintf("%s.btf.tar.xz", p.BTFFilename()))
 	return utils.Exists(fp)
 }
 
 func PackageFailed(p Package, workDir string) bool {
-	fp := filepath.Join(workDir, fmt.Sprintf("%s.failed", p.Filename()))
+	fp := filepath.Join(workDir, fmt.Sprintf("%s.failed", p.BTFFilename()))
 	return utils.Exists(fp)
 }
 
 func hasBTFPath(p Package, workDir string) string {
-	return filepath.Join(workDir, fmt.Sprintf("%s.hasbtf", p.Filename()))
+	return filepath.Join(workDir, fmt.Sprintf("%s.hasbtf", p.BTFFilename()))
 }
 
 func MarkPackageHasBTF(p Package, workDir string) error {

pkg/pkg/rhel.go

@@ -22,6 +22,10 @@ func (pkg *RHELPackage) Filename() string {
 	return pkg.NameOfFile
 }
 
+func (pkg *RHELPackage) BTFFilename() string {
+	return pkg.NameOfFile
+}
+
 func (pkg *RHELPackage) Version() kernel.Version {
 	return pkg.KernelVersion
 }

pkg/pkg/suse.go

@@ -13,6 +13,7 @@ import (
 type SUSEPackage struct {
 	Name          string
 	NameOfFile    string
+	NameOfBTFFile string
 	Architecture  string
 	KernelVersion kernel.Version
 	Repo          string
@@ -24,6 +25,10 @@ func (pkg *SUSEPackage) Filename() string {
 	return pkg.NameOfFile
 }
 
+func (pkg *SUSEPackage) BTFFilename() string {
+	return pkg.NameOfBTFFile
+}
+
 func (pkg *SUSEPackage) Version() kernel.Version {
 	return pkg.KernelVersion
 }

pkg/pkg/ubuntu.go

@@ -38,6 +38,10 @@ func (pkg *UbuntuPackage) Filename() string {
 	return pkg.NameOfFile
 }
 
+func (pkg *UbuntuPackage) BTFFilename() string {
+	return pkg.NameOfFile
+}
+
 func (pkg *UbuntuPackage) Version() kernel.Version {
 	return pkg.KernelVersion
 }

pkg/repo/suse.go

@@ -41,6 +41,9 @@ func (d *suseRepo) GetKernelPackages(ctx context.Context, dir string, release st
 	var repos []string
 
 	switch release {
+	case "12.3":
+		repos = append(repos, fmt.Sprintf("SUSE_Linux_Enterprise_Server_12_SP3_%s:SLES12-SP3-Debuginfo-Pool", arch))
+		repos = append(repos, fmt.Sprintf("SUSE_Linux_Enterprise_Server_12_SP3_%s:SLES12-SP3-Debuginfo-Updates", arch))
 	case "12.5":
 		repos = append(repos, fmt.Sprintf("SUSE_Linux_Enterprise_Server_%s:SLES12-SP5-Debuginfo-Pool", arch))
 		repos = append(repos, fmt.Sprintf("SUSE_Linux_Enterprise_Server_%s:SLES12-SP5-Debuginfo-Updates", arch))
@@ -178,9 +181,14 @@ func (d *suseRepo) parseZypperPackages(rdr io.Reader, arch string) ([]*pkg.SUSEP
 				continue
 			}
 
+			// remove final .x because it is just a build counter and not included in `uname -r`
+			parts := strings.Split(ver, ".")
+			btfver := strings.Join(parts[:len(parts)-1], ".")
+
 			p := &pkg.SUSEPackage{
 				Name:          name,
-				NameOfFile:    fmt.Sprintf("%s-%s", ver, match[1]),
+				NameOfFile:    fmt.Sprintf("%s-%s", ver, flavor),
+				NameOfBTFFile: fmt.Sprintf("%s-%s", btfver, flavor),
 				KernelVersion: kernel.NewKernelVersion(ver),
 				Architecture:  pkgarch,
 				Repo:          repo,

pkg/repo/utils.go

@@ -83,9 +83,9 @@ func processPackage(
 	jobChan chan<- job.Job,
 ) error {
 
-	btfName := fmt.Sprintf("%s.btf", p.Filename())
+	btfName := fmt.Sprintf("%s.btf", p.BTFFilename())
 	btfPath := filepath.Join(workDir, btfName)
-	btfTarName := fmt.Sprintf("%s.btf.tar.xz", p.Filename())
+	btfTarName := fmt.Sprintf("%s.btf.tar.xz", p.BTFFilename())
 	btfTarPath := filepath.Join(workDir, btfTarName)
 
 	if pkg.PackageHasBTF(p, workDir) {