diff options
author | Oliver Smith <osmith@sysmocom.de> | 2021-01-15 14:54:12 +0100 |
---|---|---|
committer | Oliver Smith <osmith@sysmocom.de> | 2021-01-15 16:51:12 +0100 |
commit | b7f05a92e57650369b975d47b639989a6143454e (patch) | |
tree | a140133f3b1bab5c487d29f5a11aa23a41db6315 | |
parent | 12416b8f5c0ba295c644cd9ba04ab6477f604ac4 (diff) |
OBS: rename osmo_obs_add_debian_dependency
Change name to osmo_obs_add_depend_deb. I'll add a _rpm function in a
future patch, and so we get consistent names.
Related: OS#4733
Change-Id: Icf444b86df993184c9fe4db8d3e67ab4bb06bd47
-rw-r--r-- | scripts/common-obs.sh | 2 | ||||
-rwxr-xr-x | scripts/osmocom-latest-packages.sh | 2 | ||||
-rwxr-xr-x | scripts/osmocom-nightly-packages.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scripts/common-obs.sh b/scripts/common-obs.sh index ea1c5cb..1566def 100644 --- a/scripts/common-obs.sh +++ b/scripts/common-obs.sh @@ -19,7 +19,7 @@ osmo_cmd_require \ # Add dependency to all (sub)packages in debian/control and commit the change. # $1: path to debian/control file # $2: name of the package to depend on -osmo_obs_add_debian_dependency() { +osmo_obs_add_depend_deb() { # Note: adding the comma at the end should be fine. If there is a Depends: line, it is most likely not empty. It # should at least have ${misc:Depends} according to lintian. sed "s/^Depends: /Depends: $2, /g" -i "$1" diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index 308efbc..271824f 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -73,7 +73,7 @@ build() { ./git-version-gen . > .tarball-version 2>/dev/null fi - osmo_obs_add_debian_dependency "./debian/control" "osmocom-latest" + osmo_obs_add_depend_deb "./debian/control" "osmocom-latest" if [ "$project" = "open5gs" ]; then # we cannot control the output directory of the generated source :( diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 1d09299..4234021 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -129,7 +129,7 @@ build() { if [ "$changelog" = "commit" ] ; then VER=$(get_commit_version) - osmo_obs_add_debian_dependency "./debian/control" "osmocom-$FEED" + osmo_obs_add_depend_deb "./debian/control" "osmocom-$FEED" dch -b -v "$VER" -m "Snapshot build" git commit -m "$VER snapshot" debian/ fi |