diff options
| author | Michał Łyszczek <michal.lyszczek@bofc.pl> | 2018-10-29 22:43:38 +0100 |
|---|---|---|
| committer | Michał Łyszczek <michal.lyszczek@bofc.pl> | 2018-10-29 22:45:29 +0100 |
| commit | 228927bcc0931c8e5279bc10a649cb59d18575a5 (patch) | |
| tree | 7ad04400d30688d05fafef09c18032911fdb2c71 | |
| parent | 2920ff9a07d5258889ec8089544dd77490aed4bc (diff) | |
| download | librb-228927bcc0931c8e5279bc10a649cb59d18575a5.tar.gz librb-228927bcc0931c8e5279bc10a649cb59d18575a5.tar.bz2 librb-228927bcc0931c8e5279bc10a649cb59d18575a5.zip | |
update rpm create-pkg to work on opensuse
no_buildbot
| -rw-r--r-- | pkg/rpm/create-pkg.sh | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/pkg/rpm/create-pkg.sh b/pkg/rpm/create-pkg.sh index 960f1a4..58d91fa 100644 --- a/pkg/rpm/create-pkg.sh +++ b/pkg/rpm/create-pkg.sh @@ -48,14 +48,31 @@ rpmbuild -ba SPECS/${project}-${pkg_version}.spec || exit 1 # verify # -yum -y install "RPMS/${arch}/${project}-${pkg_version}-${rel_version}.${arch}.rpm" \ - "RPMS/${arch}/${project}-devel-${pkg_version}-${rel_version}.${arch}.rpm" +if type zypper >/dev/null +then + # looks like we are dealing with opensuse + + zypper install -y --allow-unsigned-rpm \ + "RPMS/${arch}/${project}-${pkg_version}-${rel_version}.${arch}.rpm" \ + "RPMS/${arch}/${project}-devel-${pkg_version}-${rel_version}.${arch}.rpm" +else + # else, assume rhel or centos or fedora or whatever that uses yum + + yum -y install \ + "RPMS/${arch}/${project}-${pkg_version}-${rel_version}.${arch}.rpm" \ + "RPMS/${arch}/${project}-devel-${pkg_version}-${rel_version}.${arch}.rpm" +fi failure=0 gcc "BUILD/${project}-${git_version}/pkg/test.c" -lrb -o /tmp/librb-test || failure=1 /tmp/librb-test || failure=1 -yum -y remove "${project}" "${project}-devel" +if type zypper >/dev/null +then + zypper remove -y "${project}" "${project}-devel" +else + yum -y remove "${project}" "${project}-devel" +fi if [ ${failure} -eq 1 ] then |