posix-ln.patch (2941B)
1 diff --git a/Makefile-tests.am b/Makefile-tests.am 2 index 29de6c7..af0d433 100644 3 --- a/Makefile-tests.am 4 +++ b/Makefile-tests.am 5 @@ -415,7 +415,7 @@ EXTRA_DIST += \ 6 7 tests/libreaddir-rand.so: Makefile 8 mkdir -p tests/ 9 - $(AM_V_GEN) ln -fns ../.libs/libreaddir-rand.so tests/ 10 + $(AM_V_GEN) ln -fs ../.libs/libreaddir-rand.so tests/ 11 ALL_LOCAL_RULES += tests/libreaddir-rand.so 12 CLEANFILES += tests/libreaddir-rand.so tests/ostree-symlink-stamp \ 13 tests/ostree-prepare-root-symlink-stamp tests/ostree-remount-symlink-stamp \ 14 diff --git a/Makefile.in b/Makefile.in 15 index 6312f3e..d1a9f8b 100644 16 --- a/Makefile.in 17 +++ b/Makefile.in 18 @@ -9934,7 +9934,7 @@ src/ostree/parse-datetime.c: src/ostree/parse-datetime.y Makefile 19 20 tests/libreaddir-rand.so: Makefile 21 mkdir -p tests/ 22 - $(AM_V_GEN) ln -fns ../.libs/libreaddir-rand.so tests/ 23 + $(AM_V_GEN) ln -fs ../.libs/libreaddir-rand.so tests/ 24 25 tests/%-symlink-stamp: % Makefile 26 $(AM_V_GEN) set -e; \ 27 diff --git a/tests/admin-test.sh b/tests/admin-test.sh 28 index 366dece..da38730 100644 29 --- a/tests/admin-test.sh 30 +++ b/tests/admin-test.sh 31 @@ -362,7 +362,7 @@ echo "ok remote add physical sysroot" 32 33 # Now a hack...symlink ${deployment}/sysroot to the sysroot in lieu of a bind 34 # mount which we can't do in unit tests. 35 -ln -sr sysroot ${deployment}/sysroot 36 +ln -s sysroot ${deployment}/sysroot 37 ln -s sysroot/ostree ${deployment}/ostree 38 ${CMD_PREFIX} ostree --sysroot=${deployment} remote add --set=gpg-verify=false remote-test-nonphysical file://$(pwd)/testos-repo 39 assert_not_file_has_content sysroot/ostree/repo/config remote-test-nonphysical 40 diff --git a/tests/basic-test.sh b/tests/basic-test.sh 41 index 04506c3..18725f0 100644 42 --- a/tests/basic-test.sh 43 +++ b/tests/basic-test.sh 44 @@ -609,9 +609,9 @@ $OSTREE cat test2 /yet/another/tree/green > greenfile-contents 45 assert_file_has_content greenfile-contents "leaf" 46 $OSTREE checkout test2 checkout-test2 47 ls -alR checkout-test2 48 -ln -sr checkout-test2/{four,four-link} 49 -ln -sr checkout-test2/{baz/cow,cow-link} 50 -ln -sr checkout-test2/{cow-link,cow-link-link} 51 +ln -s checkout-test2/{four,four-link} 52 +ln -s checkout-test2/{baz/cow,cow-link} 53 +ln -s checkout-test2/{cow-link,cow-link-link} 54 $OSTREE commit -b test2-withlink --tree=dir=checkout-test2 55 if $OSTREE cat test2-withlink /four-link 2>err.txt; then 56 assert_not_reached "cat directory" 57 diff --git a/tests/libtest.sh b/tests/libtest.sh 58 index 686f08d..c481f61 100755 59 --- a/tests/libtest.sh 60 +++ b/tests/libtest.sh 61 @@ -315,13 +315,13 @@ setup_fake_remote_repo2() { 62 mkdir repo 63 ostree_repo_init repo --mode=$mode 64 # Backcompat 65 - ln -sr repo gnomerepo 66 + ln -s repo gnomerepo 67 # Initialize content 68 mkdir files 69 cd files 70 mkdir -p usr/{etc,bin,lib,share} 71 - ln -sr usr/bin bin 72 - ln -sr usr/lib lib 73 + ln -s usr/bin bin 74 + ln -s usr/lib lib 75 tar xf ${test_srcdir}/fah-deltadata-old.tar.xz 76 remote_ref=exampleos/42/x86_64/main 77 cd ..