diff --git a/3aec4fca0b2c13f4477df7e2b634b1d604ef1a9e.patch b/3aec4fca0b2c13f4477df7e2b634b1d604ef1a9e.patch new file mode 100644 index 0000000000000000000000000000000000000000..a91a00a7ed563516cadaf73391f2e04b12409bce --- /dev/null +++ b/3aec4fca0b2c13f4477df7e2b634b1d604ef1a9e.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index 3f724ef22..aceec1384 100755 +--- a/configure ++++ b/configure +@@ -85,7 +85,7 @@ EOF + + found=no + for lib in "-lc" "-lfts"; do +- ${CC} $CFLAGS -Wl,$lib $LDFLAGS conftest.c >/dev/null 2>&1 ++ ${CC} $CFLAGS $LDFLAGS conftest.c -Wl,$lib >/dev/null 2>&1 + ret=$? + if test $ret -eq 0; then + FTS_LIBS="$lib" diff --git a/6685d99448665a1fd29d8b123bbb7255a501fea0.patch b/6685d99448665a1fd29d8b123bbb7255a501fea0.patch new file mode 100644 index 0000000000000000000000000000000000000000..c2b7646edb76e18ca78701dc2b086c2045fdbb25 --- /dev/null +++ b/6685d99448665a1fd29d8b123bbb7255a501fea0.patch @@ -0,0 +1,26 @@ +diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh +index e602bacbd..9a35fb98b 100755 +--- a/modules.d/99base/dracut-lib.sh ++++ b/modules.d/99base/dracut-lib.sh +@@ -6,13 +6,15 @@ if [ -n "$NEWROOT" ]; then + [ -d $NEWROOT ] || mkdir -p -m 0755 $NEWROOT + fi + +-if ! [ -d /run/initramfs ]; then +- mkdir -p -m 0755 /run/initramfs/log +- ln -sfn /run/initramfs/log /var/log +-fi ++if [ -z "$PREFIX" ]; then ++ if ! [ -d /run/initramfs ]; then ++ mkdir -p -m 0755 /run/initramfs/log ++ ln -sfn /run/initramfs/log /var/log ++ fi + +-[ -d /run/lock ] || mkdir -p -m 0755 /run/lock +-[ -d /run/log ] || mkdir -p -m 0755 /run/log ++ [ -d /run/lock ] || mkdir -p -m 0755 /run/lock ++ [ -d /run/log ] || mkdir -p -m 0755 /run/log ++fi + + debug_off() { + set +x diff --git a/dracut.spec b/dracut.spec index a85222233131910388f3d23c3e58b39f36bc6365..bcf0a8815819713e6ffc974854369164a059c849 100644 --- a/dracut.spec +++ b/dracut.spec @@ -9,7 +9,7 @@ Name: dracut Version: 050 -Release: 3 +Release: 4 Summary: Initramfs generator using udev @@ -38,6 +38,8 @@ Patch10: dracut-lib.sh-quote-variables-in-parameter-expansion.patch Patch11: dracut-90crypt-module-setup.sh-fix-force-on-multiple-lines.patch Patch12: Fix-test-in-lsinitrd.patch Patch13: add-option-to-include-file-metadata-in-initramfs.patch +Patch6000: 3aec4fca0b2c13f4477df7e2b634b1d604ef1a9e.patch +Patch6001: 6685d99448665a1fd29d8b123bbb7255a501fea0.patch Source1: https://www.gnu.org/licenses/lgpl-2.1.txt Source2: openEuler.conf.example @@ -488,6 +490,9 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne %endif %changelog +* 20201115083007664094 patch-tracking 050-4 +- append patch file of upstream repository from <3aec4fca0b2c13f4477df7e2b634b1d604ef1a9e> to <6685d99448665a1fd29d8b123bbb7255a501fea0> + * Thu Jul 23 2020 Liquor - 050-1 - Update to 050 @@ -516,4 +521,4 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne - Delete redundant information * Thu Aug 29 2019 openEuler Buildteam - 049-1 -- Package init +- Package init \ No newline at end of file