feat: enable macro override for component definitions in srpm build (#356)

Author: Binu Jose Philip

defaultconfigs/content/distros/azl/azl.distro.toml

@@ -25,3 +25,4 @@ spec = { type = "upstream", upstream-distro = { name = "fedora", version = "42"
 dist = ".azl4"
 vendor = "Microsoft Corporation"
 distribution = "Azure Linux"
+azl = "4"

internal/app/azldev/core/componentbuilder/componentbuilder.go

@@ -17,6 +17,7 @@ import (
 	"github.com/microsoft/azldev/internal/app/azldev/core/workdir"
 	"github.com/microsoft/azldev/internal/buildenv"
 	"github.com/microsoft/azldev/internal/global/opctx"
+	"github.com/microsoft/azldev/internal/rpm/mock"
 	"github.com/microsoft/azldev/internal/utils/fileutils"
 )
 
@@ -144,7 +145,16 @@ func (b *Builder) buildSRPMFromPreparedSources(
 
 	defer srpmEvent.End()
 
-	srpmOptions := buildenv.SRPMBuildOptions{}
+	componentConfig := component.GetConfig()
+
+	srpmOptions := buildenv.SRPMBuildOptions{
+		CommonBuildOptions: mock.CommonBuildOptions{
+			With:           componentConfig.Build.With,
+			Without:        componentConfig.Build.Without,
+			Defines:        componentConfig.Build.Defines,
+			LocalRepoPaths: []string{},
+		},
+	}
 
 	err = buildEnv.BuildSRPM(ctx, preparedSpecPath, preparedSourcesDir, srpmOutputDir, srpmOptions)
 	if err != nil {
@@ -205,10 +215,14 @@ func (b *Builder) buildRPM(
 
 	// Compose RPM build options, based on our parameters and the component's default configuration.
 	rpmOptions := buildenv.RPMBuildOptions{
-		RunChecks: runChecks,
-		With:      componentConfig.Build.With,
-		Without:   componentConfig.Build.Without,
-		Defines:   componentConfig.Build.Defines,
+		CommonBuildOptions: mock.CommonBuildOptions{
+			With:           componentConfig.Build.With,
+			Without:        componentConfig.Build.Without,
+			Defines:        componentConfig.Build.Defines,
+			LocalRepoPaths: []string{},
+		},
+		RunChecks:    runChecks,
+		ForceRebuild: false, // Could be added to config if needed
 	}
 
 	err = buildEnv.BuildRPM(ctx, srpmPath, tempRPMDir, rpmOptions)

internal/buildenv/buildenv.go

@@ -31,11 +31,11 @@ type BuildEnv interface {
 	Destroy(ctx opctx.Ctx) error
 }
 
-// SRPMBuildOptions encapsulates options that may be specified when building a source RPM package
+// SRPMBuildOptions encapsulates options that may be specified when building source RPM packages
 // using an [RPMAwareBuildEnv].
 type SRPMBuildOptions = mock.SRPMBuildOptions
 
-// SRPMBuildOptions encapsulates options that may be specified when building binary RPM packages
+// RPMBuildOptions encapsulates options that may be specified when building binary RPM packages
 // using an [RPMAwareBuildEnv].
 type RPMBuildOptions = mock.RPMBuildOptions
 

internal/rpm/mock/mock.go

@@ -232,11 +232,30 @@ func (r *Runner) GetRootPath(ctx context.Context) (string, error) {
 	return strings.TrimSpace(rootPath), nil
 }
 
-// Encapsulates the options for building an SRPM using mock.
-type SRPMBuildOptions struct {
+// CommonBuildOptions encapsulates options that are shared between SRPM and RPM builds.
+type CommonBuildOptions struct {
+	With    []string
+	Without []string
+	Defines map[string]string
+
 	LocalRepoPaths []string
 }
 
+// SRPMBuildOptions encapsulates options for building source RPMs using mock.
+type SRPMBuildOptions struct {
+	CommonBuildOptions
+	// Add any SRPM-specific options here in the future if needed
+}
+
+// RPMBuildOptions encapsulates options for building binary RPMs using mock.
+type RPMBuildOptions struct {
+	CommonBuildOptions
+
+	// Binary RPM specific options
+	RunChecks    bool
+	ForceRebuild bool
+}
+
 // Builds a Source RPM (SRPM) using mock.
 func (r *Runner) BuildSRPM(
 	ctx context.Context, specPath, sourceDirPath, outputDirPath string, options SRPMBuildOptions,
@@ -255,6 +274,21 @@ func (r *Runner) BuildSRPM(
 		"--resultdir", outputDirPath,
 	)
 
+	// Add 'with'-style enabled conditionals.
+	for _, with := range options.With {
+		args = append(args, "--with", with)
+	}
+
+	// Add 'without'-style disabled conditionals.
+	for _, without := range options.Without {
+		args = append(args, "--without", without)
+	}
+
+	// Add override macros.
+	for macro, value := range options.Defines {
+		args = append(args, "--define", macro+" "+value)
+	}
+
 	// If provided, pass along extra local repo dirs.
 	for _, localRepoPath := range options.LocalRepoPaths {
 		args = append(args, "--addrepo", localRepoPath)
@@ -287,18 +321,6 @@ func (r *Runner) BuildSRPM(
 	return nil
 }
 
-// Encapsulates the options for building a binary RPM using mock.
-type RPMBuildOptions struct {
-	RunChecks    bool
-	ForceRebuild bool
-
-	With    []string
-	Without []string
-	Defines map[string]string
-
-	LocalRepoPaths []string
-}
-
 // Given a path to a Source RPM (SRPM), invokes mock to build a binary RPM.
 func (r *Runner) BuildRPM(ctx context.Context, srpmPath, outputDirPath string, options RPMBuildOptions) error {
 	slog.Debug("Building RPM", "SRPM", srpmPath)

internal/rpm/mock/mock_test.go

@@ -173,10 +173,12 @@ func TestBuildRPM(t *testing.T) {
 
 	runner := mock.NewRunner(ctx, testMockConfigPath)
 	mockOptions := mock.RPMBuildOptions{
+		CommonBuildOptions: mock.CommonBuildOptions{
+			Without: []string{withoutFeature},
+			With:    []string{withFeature},
+			Defines: map[string]string{macroName: macroValue},
+		},
 		RunChecks: false,
-		Without:   []string{withoutFeature},
-		With:      []string{withFeature},
-		Defines:   map[string]string{macroName: macroValue},
 	}
 
 	err := runner.BuildRPM(ctx, testSRPMPath, testOutputDirPath, mockOptions)