diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-01-08 09:31:03 +0100 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-04-09 17:50:36 +0200 |
| commit | 166471753c218266697f88a521eb1a042523cb1d (patch) | |
| tree | 4bd16e9d105a7314698450470d5101281a6eb3d9 | |
| parent | fb259d8223f79c37e8024d70f144ed612be4b74e (diff) | |
| download | urpmi-166471753c218266697f88a521eb1a042523cb1d.tar urpmi-166471753c218266697f88a521eb1a042523cb1d.tar.gz urpmi-166471753c218266697f88a521eb1a042523cb1d.tar.bz2 urpmi-166471753c218266697f88a521eb1a042523cb1d.tar.xz urpmi-166471753c218266697f88a521eb1a042523cb1d.zip | |
cpan-testers: fix building rpms on FreeBSD
install do not have -d option on FreeBSD
33 files changed, 36 insertions, 34 deletions
@@ -7,6 +7,7 @@ - cpan_testers: o actually needs perl >= 5.10 for //= operator o fix a test with rpm < 4.13.0 + o fix building rpms on FreeBSD o fix failing scriptlets test with rpm < 4.13.0 o fix looking for non existing libnss.so on FreeBSD o fix testsuite errors on CentOs (NVR vs NVRA) diff --git a/t/data/SPECS/arch_to_noarch_1.spec b/t/data/SPECS/arch_to_noarch_1.spec index 8d53796b..1f5f38bf 100644 --- a/t/data/SPECS/arch_to_noarch_1.spec +++ b/t/data/SPECS/arch_to_noarch_1.spec @@ -10,7 +10,7 @@ License: x %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/usr/lib/test-%{name} +mkdir -p $RPM_BUILD_ROOT/usr/lib/test-%{name} cp /sbin/ldconfig $RPM_BUILD_ROOT/usr/lib/test-%{name} %clean diff --git a/t/data/SPECS/arch_to_noarch_2.spec b/t/data/SPECS/arch_to_noarch_2.spec index 6caea952..9898cea3 100644 --- a/t/data/SPECS/arch_to_noarch_2.spec +++ b/t/data/SPECS/arch_to_noarch_2.spec @@ -10,7 +10,7 @@ License: x %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/usr/lib/test-%{name} +mkdir -p $RPM_BUILD_ROOT/usr/lib/test-%{name} cp /sbin/ldconfig $RPM_BUILD_ROOT/usr/lib/test-%{name} %clean diff --git a/t/data/SPECS/arch_to_noarch_3.spec b/t/data/SPECS/arch_to_noarch_3.spec index 4f6624ba..d6ddeac5 100644 --- a/t/data/SPECS/arch_to_noarch_3.spec +++ b/t/data/SPECS/arch_to_noarch_3.spec @@ -11,7 +11,7 @@ BuildArch: noarch %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/usr/lib/test-%{name} +mkdir -p $RPM_BUILD_ROOT/usr/lib/test-%{name} echo foo > $RPM_BUILD_ROOT/usr/lib/test-%{name}/foo %clean diff --git a/t/data/SPECS/arch_to_noarch_4.spec b/t/data/SPECS/arch_to_noarch_4.spec index ad9cda1a..c8e5aaf3 100644 --- a/t/data/SPECS/arch_to_noarch_4.spec +++ b/t/data/SPECS/arch_to_noarch_4.spec @@ -10,7 +10,7 @@ License: x %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/usr/lib/test-%{name} +mkdir -p $RPM_BUILD_ROOT/usr/lib/test-%{name} cp /sbin/ldconfig $RPM_BUILD_ROOT/usr/lib/test-%{name} %clean diff --git a/t/data/SPECS/buildroot_default.spec b/t/data/SPECS/buildroot_default.spec index f5d5695c..33cfc763 100644 --- a/t/data/SPECS/buildroot_default.spec +++ b/t/data/SPECS/buildroot_default.spec @@ -26,7 +26,7 @@ wanted=$(echo %{_buildrootdir}/buildroot-1-1.%{_arch} | sed 's!//!/!') [ "$RPM_BUILD_ROOT" = $wanted ] || { echo "RPM_BUILD_ROOT should be $wanted instead of $RPM_BUILD_ROOT"; exit 1; } [ "%macro_using_buildroot" = $wanted ] || { echo "macro_using_buildroot should be $wanted instead of %buildroot"; exit 1; } -install -d $RPM_BUILD_ROOT/etc +mkdir -p $RPM_BUILD_ROOT/etc echo foo > $RPM_BUILD_ROOT/etc/foo %files diff --git a/t/data/SPECS/file-conflicts/a.spec b/t/data/SPECS/file-conflicts/a.spec index 88f5f0b1..f83557b4 100644 --- a/t/data/SPECS/file-conflicts/a.spec +++ b/t/data/SPECS/file-conflicts/a.spec @@ -10,7 +10,7 @@ x %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc/dir +mkdir -p $RPM_BUILD_ROOT/etc/dir echo a > $RPM_BUILD_ROOT/etc/foo echo bar > $RPM_BUILD_ROOT/etc/bar echo a > $RPM_BUILD_ROOT/etc/dir/a diff --git a/t/data/SPECS/file-conflicts/b.spec b/t/data/SPECS/file-conflicts/b.spec index a9243168..e6385947 100644 --- a/t/data/SPECS/file-conflicts/b.spec +++ b/t/data/SPECS/file-conflicts/b.spec @@ -10,7 +10,7 @@ x %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc +mkdir -p $RPM_BUILD_ROOT/etc echo b > $RPM_BUILD_ROOT/etc/foo %clean diff --git a/t/data/SPECS/file-conflicts/c.spec b/t/data/SPECS/file-conflicts/c.spec index 8b1b31ef..4d279213 100644 --- a/t/data/SPECS/file-conflicts/c.spec +++ b/t/data/SPECS/file-conflicts/c.spec @@ -10,7 +10,7 @@ x %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc +mkdir -p $RPM_BUILD_ROOT/etc echo bar > $RPM_BUILD_ROOT/etc/bar %clean diff --git a/t/data/SPECS/file-conflicts/d.spec b/t/data/SPECS/file-conflicts/d.spec index c12df2f3..60cee05c 100644 --- a/t/data/SPECS/file-conflicts/d.spec +++ b/t/data/SPECS/file-conflicts/d.spec @@ -10,7 +10,7 @@ x %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc/dir +mkdir -p $RPM_BUILD_ROOT/etc/dir echo d > $RPM_BUILD_ROOT/etc/dir/d %clean diff --git a/t/data/SPECS/file-conflicts/e.spec b/t/data/SPECS/file-conflicts/e.spec index 26d02b96..de765e19 100644 --- a/t/data/SPECS/file-conflicts/e.spec +++ b/t/data/SPECS/file-conflicts/e.spec @@ -10,7 +10,7 @@ x %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc +mkdir -p $RPM_BUILD_ROOT/etc ln -s d $RPM_BUILD_ROOT/etc/dir %clean diff --git a/t/data/SPECS/file-conflicts/fa.spec b/t/data/SPECS/file-conflicts/fa.spec index 655411a8..dc14e345 100644 --- a/t/data/SPECS/file-conflicts/fa.spec +++ b/t/data/SPECS/file-conflicts/fa.spec @@ -10,7 +10,7 @@ x %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc +mkdir -p $RPM_BUILD_ROOT/etc ln -s fa $RPM_BUILD_ROOT/etc/foo %clean diff --git a/t/data/SPECS/file-conflicts/fb.spec b/t/data/SPECS/file-conflicts/fb.spec index f54b9830..12488e49 100644 --- a/t/data/SPECS/file-conflicts/fb.spec +++ b/t/data/SPECS/file-conflicts/fb.spec @@ -10,7 +10,7 @@ x %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc +mkdir -p $RPM_BUILD_ROOT/etc ln -s fb $RPM_BUILD_ROOT/etc/foo %clean diff --git a/t/data/SPECS/file-conflicts/ga.spec b/t/data/SPECS/file-conflicts/ga.spec index e2ef85fd..84b78bd5 100644 --- a/t/data/SPECS/file-conflicts/ga.spec +++ b/t/data/SPECS/file-conflicts/ga.spec @@ -10,7 +10,7 @@ x %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc +mkdir -p $RPM_BUILD_ROOT/etc ln -s dir $RPM_BUILD_ROOT/etc/dir_symlink %clean diff --git a/t/data/SPECS/file-conflicts/gc.spec b/t/data/SPECS/file-conflicts/gc.spec index 30b95966..fca0197f 100644 --- a/t/data/SPECS/file-conflicts/gc.spec +++ b/t/data/SPECS/file-conflicts/gc.spec @@ -10,7 +10,7 @@ x %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc/dir_symlink +mkdir -p $RPM_BUILD_ROOT/etc/dir_symlink echo a > $RPM_BUILD_ROOT/etc/dir_symlink/a %clean diff --git a/t/data/SPECS/file-conflicts/gc_.spec b/t/data/SPECS/file-conflicts/gc_.spec index 988b81a5..a8299f7b 100644 --- a/t/data/SPECS/file-conflicts/gc_.spec +++ b/t/data/SPECS/file-conflicts/gc_.spec @@ -10,7 +10,7 @@ x %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc/dir_symlink +mkdir -p $RPM_BUILD_ROOT/etc/dir_symlink echo a > $RPM_BUILD_ROOT/etc/dir_symlink/a %clean diff --git a/t/data/SPECS/file-conflicts/gd.spec b/t/data/SPECS/file-conflicts/gd.spec index 0b112daf..26ee75bb 100644 --- a/t/data/SPECS/file-conflicts/gd.spec +++ b/t/data/SPECS/file-conflicts/gd.spec @@ -10,7 +10,7 @@ x %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc/dir_symlink +mkdir -p $RPM_BUILD_ROOT/etc/dir_symlink echo d > $RPM_BUILD_ROOT/etc/dir_symlink/a %clean diff --git a/t/data/SPECS/file-conflicts/h.spec b/t/data/SPECS/file-conflicts/h.spec index 60bd954d..f7b948df 100644 --- a/t/data/SPECS/file-conflicts/h.spec +++ b/t/data/SPECS/file-conflicts/h.spec @@ -10,7 +10,7 @@ x %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/usr/share/man +mkdir -p $RPM_BUILD_ROOT/usr/share/man echo h > $RPM_BUILD_ROOT/usr/share/man/foo %clean diff --git a/t/data/SPECS/file-conflicts/i.spec b/t/data/SPECS/file-conflicts/i.spec index a612b1aa..00d64553 100644 --- a/t/data/SPECS/file-conflicts/i.spec +++ b/t/data/SPECS/file-conflicts/i.spec @@ -10,7 +10,7 @@ x %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/usr/share/man +mkdir -p $RPM_BUILD_ROOT/usr/share/man echo i > $RPM_BUILD_ROOT/usr/share/man/foo %clean diff --git a/t/data/SPECS/file-conflicts/p-1.spec b/t/data/SPECS/file-conflicts/p-1.spec index 75e55727..39613996 100644 --- a/t/data/SPECS/file-conflicts/p-1.spec +++ b/t/data/SPECS/file-conflicts/p-1.spec @@ -10,8 +10,8 @@ x %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc/foo -install -d $RPM_BUILD_ROOT/var/foo +mkdir -p $RPM_BUILD_ROOT/etc/foo +mkdir -p $RPM_BUILD_ROOT/var/foo echo bar > $RPM_BUILD_ROOT/etc/foo/bar echo boo > $RPM_BUILD_ROOT/var/foo/boo diff --git a/t/data/SPECS/file-conflicts/p-2.spec b/t/data/SPECS/file-conflicts/p-2.spec index 579f690d..461e7ae7 100644 --- a/t/data/SPECS/file-conflicts/p-2.spec +++ b/t/data/SPECS/file-conflicts/p-2.spec @@ -10,8 +10,8 @@ x %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc/foo -install -d $RPM_BUILD_ROOT/var +mkdir -p $RPM_BUILD_ROOT/etc/foo +mkdir -p $RPM_BUILD_ROOT/var echo bar > $RPM_BUILD_ROOT/etc/foo/bar echo boo > $RPM_BUILD_ROOT/etc/foo/boo ln -s ../etc/foo $RPM_BUILD_ROOT/var/foo diff --git a/t/data/SPECS/multi-line-macro.spec b/t/data/SPECS/multi-line-macro.spec index e64f4f7c..06e8eb95 100644 --- a/t/data/SPECS/multi-line-macro.spec +++ b/t/data/SPECS/multi-line-macro.spec @@ -9,7 +9,7 @@ License: x %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc +mkdir -p $RPM_BUILD_ROOT/etc echo foo > $RPM_BUILD_ROOT/etc/foo echo bar > $RPM_BUILD_ROOT/etc/bar diff --git a/t/data/SPECS/multi-line-macro2.spec b/t/data/SPECS/multi-line-macro2.spec index 53029dab..8dddbf92 100644 --- a/t/data/SPECS/multi-line-macro2.spec +++ b/t/data/SPECS/multi-line-macro2.spec @@ -20,5 +20,5 @@ x %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc +mkdir -p $RPM_BUILD_ROOT/etc %foobar diff --git a/t/data/SPECS/obsolete-and-conflict/a.spec b/t/data/SPECS/obsolete-and-conflict/a.spec index f5c3bc7f..f15a27e0 100644 --- a/t/data/SPECS/obsolete-and-conflict/a.spec +++ b/t/data/SPECS/obsolete-and-conflict/a.spec @@ -9,7 +9,7 @@ x %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc +mkdir -p $RPM_BUILD_ROOT/etc echo foo > $RPM_BUILD_ROOT/etc/foo echo bar > $RPM_BUILD_ROOT/etc/bar diff --git a/t/data/SPECS/obsolete-and-conflict/b.spec b/t/data/SPECS/obsolete-and-conflict/b.spec index 272ce35c..96aa265b 100644 --- a/t/data/SPECS/obsolete-and-conflict/b.spec +++ b/t/data/SPECS/obsolete-and-conflict/b.spec @@ -12,7 +12,7 @@ x %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc +mkdir -p $RPM_BUILD_ROOT/etc echo foo > $RPM_BUILD_ROOT/etc/foo %clean diff --git a/t/data/SPECS/obsolete-and-conflict/c.spec b/t/data/SPECS/obsolete-and-conflict/c.spec index 26050403..2cacfc00 100644 --- a/t/data/SPECS/obsolete-and-conflict/c.spec +++ b/t/data/SPECS/obsolete-and-conflict/c.spec @@ -10,7 +10,7 @@ x %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc +mkdir -p $RPM_BUILD_ROOT/etc echo bar > $RPM_BUILD_ROOT/etc/bar %clean diff --git a/t/data/SPECS/ordering-scriptlets/a_1.spec b/t/data/SPECS/ordering-scriptlets/a_1.spec index df4895ae..216f6360 100644 --- a/t/data/SPECS/ordering-scriptlets/a_1.spec +++ b/t/data/SPECS/ordering-scriptlets/a_1.spec @@ -27,7 +27,8 @@ gcc -Wall -static -o a a.c %install rm -rf $RPM_BUILD_ROOT -install -D a $RPM_BUILD_ROOT/bin/a +mkdir -p $RPM_BUILD_ROOT/bin/ +cp a $RPM_BUILD_ROOT/bin/a %clean rm -rf $RPM_BUILD_ROOT diff --git a/t/data/SPECS/rpmnew/a-1.spec b/t/data/SPECS/rpmnew/a-1.spec index b86db465..443e2e6f 100644 --- a/t/data/SPECS/rpmnew/a-1.spec +++ b/t/data/SPECS/rpmnew/a-1.spec @@ -12,7 +12,7 @@ tee %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc +mkdir -p $RPM_BUILD_ROOT/etc echo %{content} > $RPM_BUILD_ROOT/etc/config-noreplace echo %{content} > $RPM_BUILD_ROOT/etc/config echo %{content} > $RPM_BUILD_ROOT/etc/normal diff --git a/t/data/SPECS/rpmnew/a-2.spec b/t/data/SPECS/rpmnew/a-2.spec index a3fa6eed..cc228a93 100644 --- a/t/data/SPECS/rpmnew/a-2.spec +++ b/t/data/SPECS/rpmnew/a-2.spec @@ -12,7 +12,7 @@ tee %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc +mkdir -p $RPM_BUILD_ROOT/etc echo %{content} > $RPM_BUILD_ROOT/etc/config-noreplace echo %{content} > $RPM_BUILD_ROOT/etc/config echo %{content} > $RPM_BUILD_ROOT/etc/normal diff --git a/t/data/SPECS/rpmnew/a-3.spec b/t/data/SPECS/rpmnew/a-3.spec index 7d5f03ca..383f78a3 100644 --- a/t/data/SPECS/rpmnew/a-3.spec +++ b/t/data/SPECS/rpmnew/a-3.spec @@ -12,7 +12,7 @@ tee %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc +mkdir -p $RPM_BUILD_ROOT/etc echo %{content} > $RPM_BUILD_ROOT/etc/config-noreplace echo %{content} > $RPM_BUILD_ROOT/etc/config echo %{content} > $RPM_BUILD_ROOT/etc/normal diff --git a/t/data/SPECS/various.spec b/t/data/SPECS/various.spec index f30661b1..4429fada 100644 --- a/t/data/SPECS/various.spec +++ b/t/data/SPECS/various.spec @@ -15,7 +15,7 @@ for i in /etc/test-%{name} \ /var/lib/test-%{name}/foo1 /var/lib/test-%{name}/foo2 /var/lib/test-%{name}/foo3 \ /usr/share/locale/fr/LC_MESSAGES/test-%{name}.mo \ /usr/test-%{name}/foo; do - install -d `dirname $RPM_BUILD_ROOT$i` + mkdir -p `dirname $RPM_BUILD_ROOT$i` echo foo > $RPM_BUILD_ROOT$i done diff --git a/t/data/SPECS/various2.spec b/t/data/SPECS/various2.spec index 98faf248..d7c55421 100644 --- a/t/data/SPECS/various2.spec +++ b/t/data/SPECS/various2.spec @@ -15,7 +15,7 @@ for i in /etc/test-%{name} \ /var/lib/test-%{name}/foo1 /var/lib/test-%{name}/foo2 /var/lib/test-%{name}/foo3 \ /usr/share/locale/fr/LC_MESSAGES/test-%{name}.mo \ /usr/test-%{name}/foo; do - install -d `dirname $RPM_BUILD_ROOT$i` + mkdir -p `dirname $RPM_BUILD_ROOT$i` echo foo > $RPM_BUILD_ROOT$i done diff --git a/t/data/SPECS/various3.spec b/t/data/SPECS/various3.spec index 00bab529..f018ab25 100644 --- a/t/data/SPECS/various3.spec +++ b/t/data/SPECS/various3.spec @@ -15,7 +15,7 @@ for i in /etc/test-%{name} \ /var/lib/test-%{name}/foo1 /var/lib/test-%{name}/foo2 /var/lib/test-%{name}/foo3 \ /usr/share/locale/fr/LC_MESSAGES/test-%{name}.mo \ /usr/test-%{name}/foo; do - install -d `dirname $RPM_BUILD_ROOT$i` + mkdir -p `dirname $RPM_BUILD_ROOT$i` echo foo > $RPM_BUILD_ROOT$i done |