Skip to content

debian: replace @BUILD_FLAVOR@ in parse and dsc source preparation #1123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rjd15372 wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −2
Open

debian: replace @BUILD_FLAVOR@ in parse and dsc source preparation #1123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Build/Deb.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ sub obsarch {

sub parse {
my ($bconf, $fn) = @_;
my $buildflavor = defined($bconf->{'buildflavor'}) ? $bconf->{'buildflavor'} : '';

# get arch and os from macros and map to debian names
my ($arch, $os) = Build::gettargetarchos($bconf);
Expand All @@ -87,6 +88,11 @@ sub parse {
close F;
chomp @control;
}
if ($buildflavor ne '') {
s/\@BUILD_FLAVOR\@/$buildflavor/g for @control;
} else {
s/\@BUILD_FLAVOR\@//g for @control;
}
splice(@control, 0, 3) if @control > 3 && $control[0] =~ /^-----BEGIN/;
my $name;
my $version;
Expand Down
5 changes: 3 additions & 2 deletions build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,8 +430,9 @@ Known Parameters:
Enable creation of debuginfo packages

--buildflavor FLAVOR
Specify the flavor to build. For rpm builds, it replaces
the @BUILD_FLAVOR@ macro in the spec file.
Specify the flavor to build. For rpm builds, it replaces
@BUILD_FLAVOR@ in the spec file. For Debian dependency
parsing, it replaces @BUILD_FLAVOR@ in control metadata.

--changelog
Append the rpm changelog from a SUSE .changes file to the spec file
Expand Down
17 changes: 17 additions & 0 deletions build-recipe-dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,18 @@ dsc_export_origtar() {
rm -rf "$BUILD_ROOT$TOPDIR/SOURCES/build.origtar"
}

dsc_replace_build_flavor_tokens() {
local f
local build_flavor="${BUILD_FLAVOR:-}"
for f in "$@" ; do
test -f "$f" || continue
local before_count after_count
before_count=$(perl -ne '$c += () = /\@BUILD_FLAVOR\@/g; END { print $c + 0 }' "$f")
perl -i -pe 'BEGIN { $v = shift @ARGV } s/\@BUILD_FLAVOR\@/$v/g' "$build_flavor" "$f" || cleanup_and_exit 1 "failed to substitute @BUILD_FLAVOR@ in $f"
after_count=$(perl -ne '$c += () = /\@BUILD_FLAVOR\@/g; END { print $c + 0 }' "$f")
done
}


recipe_prepare_dsc() {
rm -rf "$BUILD_ROOT$TOPDIR/BUILD"
Expand All @@ -85,12 +97,16 @@ recipe_prepare_dsc() {
mv $BUILD_ROOT$TOPDIR/BUILD/$f $BUILD_ROOT$TOPDIR/BUILD/debian/${f#debian.}
done
fi
dsc_replace_build_flavor_tokens "$BUILD_ROOT$TOPDIR/BUILD/debian/control" "$BUILD_ROOT$TOPDIR/BUILD/debian/rules" "$BUILD_ROOT$TOPDIR/BUILD/debian.control" "$BUILD_ROOT$TOPDIR/BUILD/debian.rules"
return
fi

dsc_replace_build_flavor_tokens $BUILD_ROOT$TOPDIR/SOURCES/$RECIPEFILE

if test -n "$DEB_TRANSFORM" ; then
CHANGELOGARGS=
test -n "$CHANGELOG" -a -f "$BUILD_ROOT/.build-changelog" && CHANGELOGARGS="--changelog $BUILD_ROOT/.build-changelog"
dsc_replace_build_flavor_tokens "$BUILD_ROOT$TOPDIR/SOURCES/debian.control" "$BUILD_ROOT$TOPDIR/SOURCES/debian.rules"
echo "Found files matching debian.*, running debian transformer..."
if [ "$RELEASE" ]; then
echo "release: ($RELEASE), release (DEB) ($DEB_RELEASE)"
Expand Down Expand Up @@ -120,6 +136,7 @@ recipe_prepare_dsc() {

# run/copy sources
chroot $BUILD_ROOT su -c "dpkg-source -x $DEB_SOURCEDIR/$DEB_DSCFILE $TOPDIR/BUILD" - $BUILD_USER
dsc_replace_build_flavor_tokens "$BUILD_ROOT$TOPDIR/BUILD/debian/control" "$BUILD_ROOT$TOPDIR/BUILD/debian/rules"

# Alternative to debtransform: apply OBS release number if tag OBS-DCH-RELEASE is set.
if test -z "$DEB_TRANSFORM" && grep -Eq '^OBS-DCH-RELEASE: 1' $BUILD_ROOT$TOPDIR/SOURCES/$RECIPEFILE; then
Expand Down