diff options
| author | Łukasz Stelmach <l.stelmach@samsung.com> | 2014-11-27 15:44:12 +0100 |
|---|---|---|
| committer | Lukasz Stelmach <l.stelmach@samsung.com> | 2014-11-27 08:21:28 -0800 |
| commit | d962be480686977a9573650fe4b05c477d5d0eea (patch) | |
| tree | 5cb0caedd1acd084b9a6b9ecf263c4fccf527f6f | |
| parent | fbac5c17e9f395d436a0dd57ce2e4ceda758d756 (diff) | |
| download | rpm-d962be480686977a9573650fe4b05c477d5d0eea.tar.gz rpm-d962be480686977a9573650fe4b05c477d5d0eea.tar.bz2 rpm-d962be480686977a9573650fe4b05c477d5d0eea.zip | |
Adapt for Yocto, remove pushd/popd bashisms
Apparently Yocto and BitBake do not use bash(1) as /bin/sh and break
when fed with bashisms like pushd/popd.
Bug-Tizen: BTY-21
Change-Id: I1a2781f97968b7290954297820b083759f11f0ed
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
| -rw-r--r-- | packaging/rpm.spec | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/packaging/rpm.spec b/packaging/rpm.spec index 9ac417e6c..9555fca7d 100644 --- a/packaging/rpm.spec +++ b/packaging/rpm.spec @@ -193,20 +193,18 @@ mkdir -p %{buildroot}%{_sysconfdir}/rpm chmod 755 %{buildroot}%{_sysconfdir}/rpm mkdir -p %{buildroot}%{rpmhome}/macros.d # remove some nonsense or non-working scripts -pushd %{buildroot}%{rpmhome}/ for f in rpm2cpio.sh rpm.daily rpmdiff* rpm.log rpm.xinetd freshen.sh u_pkg.sh \ magic magic.mgc magic.mime* rpmfile *.pl javadeps brp-redhat \ brp-strip-static-archive vpkg-provides*.sh http.req sql.req tcl.req \ rpmdb_* brp-sparc64-linux brp-strip-comment-note brp-java-gcjcompile do - rm -f $f + rm -f %{buildroot}%{rpmhome}/$f done for i in %{_datadir}/automake-*/*; do - if test -f "$i" && test -f "${i##*/}"; then - rm -f "${i##*/}" + if test -f "$i" && test -f %{buildroot}%{rpmhome}/"${i##*/}"; then + rm -f %{buildroot}%{rpmhome}/"${i##*/}" fi done -popd %ifarch aarch64 ppc64le install -m 755 config.guess %{buildroot}/usr/lib/rpm install -m 755 config.sub %{buildroot}/usr/lib/rpm |