diff options
| -rw-r--r-- | scripts/common-obs.sh | 30 | ||||
| -rwxr-xr-x | scripts/osmocom-latest-packages.sh | 6 | ||||
| -rwxr-xr-x | scripts/osmocom-nightly-packages.sh | 1 |
3 files changed, 35 insertions, 2 deletions
diff --git a/scripts/common-obs.sh b/scripts/common-obs.sh index 2b33039..5e21574 100644 --- a/scripts/common-obs.sh +++ b/scripts/common-obs.sh @@ -77,3 +77,33 @@ osmo_obs_add_debian_dependency() { git -C "$(dirname "$1")" commit -m "auto-commit: debian: depend on $2" . } + +# Copy a project's rpm spec.in file to the osc package dir, set the version/source and 'osc add' it +# $1: oscdir (path to checked out OSC package) +# $2: repodir (path to git repository) +# $3: name (e.g. libosmocore) +osmo_obs_add_rpm_spec() { + local oscdir="$1" + local repodir="$2" + local name="$3" + local spec="$(find "$repodir" -name "$name.spec.in")" + local tarball + local version + + if [ -z "$spec" ]; then + echo "WARNING: RPM spec missing: $name.spec.in" + return + fi + + cp "$spec" "$oscdir/$name.spec" + + # Set version + version="$(grep "^Version: " "$oscdir"/*.dsc | cut -d: -f2 | xargs)" + sed -i "s/^Version:.*/Version: $version/g" "$oscdir/$name.spec" + + # Set source file + tarball="$(ls -1 "${name}_"*".tar."*)" + sed -i "s/^Source:.*/Source: $tarball/g" "$oscdir/$name.spec" + + osc add "$name.spec" +} diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index ae57ab2..88c5094 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -119,6 +119,7 @@ build() { mv "$output/"*.tar* "$TOP/$PROJ/$project/" cd "$TOP/$PROJ" osc add "$project" + osmo_obs_add_rpm_spec "$TOP/$PROJ/$project" "$output" "$project" else cd "$TOP/$PROJ/$project" @@ -128,8 +129,9 @@ build() { osc rm ./* || true mv "$output/"*.dsc . mv "$output/"*.tar* . - osc add ./* - fi + osc add ./* + osmo_obs_add_rpm_spec "$PWD" "$output" "$project" + fi fi cd "$TOP" } diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 77552a6..b3f0461 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -130,6 +130,7 @@ build() { cd "$oscdir" osc add -- *.tar* *.dsc + osmo_obs_add_rpm_spec "$oscdir" "$repodir" "$name" osc ci -m "Snapshot $name $DT" } |