From 9c5cda8b7b98616d9ce43c424f01acb98e818c5d Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Sun, 26 Aug 2018 02:20:17 +0300
Subject: adapt for perl-5.28

---
 rescue/NEWS     |  2 ++
 rescue/list.xml | 38 +++++++++++++++++++++-----------------
 2 files changed, 23 insertions(+), 17 deletions(-)

(limited to 'rescue')

diff --git a/rescue/NEWS b/rescue/NEWS
index eb7b9df1b..06f7dccbd 100644
--- a/rescue/NEWS
+++ b/rescue/NEWS
@@ -1,3 +1,5 @@
+- adapt for perl-5.28
+
 Version 1.57 - 10 February 2018 by Thierry Vignaud
 
 - add more udev rules (syncing with regular stage2)
diff --git a/rescue/list.xml b/rescue/list.xml
index dca8cb5bb..cc501cd3b 100644
--- a/rescue/list.xml
+++ b/rescue/list.xml
@@ -203,27 +203,31 @@
   Exporter.pm
   File/Path.pm
   File/Basename.pm
-  ARCH-linux-thread-multi/re.pm
-  ARCH-linux-thread-multi/Cwd.pm
-  ARCH-linux-thread-multi/auto/Cwd/Cwd.so
-  ARCH-linux-thread-multi/auto/POSIX/POSIX.so
-  ARCH-linux-thread-multi/POSIX.pm
   XSLoader.pm
-  ARCH-linux-thread-multi/lib.pm
-  ARCH-linux-thread-multi/Socket.pm
-  ARCH-linux-thread-multi/IO/Socket.pm
-  ARCH-linux-thread-multi/IO.pm
-  ARCH-linux-thread-multi/IO/Handle.pm
-  ARCH-linux-thread-multi/Encode/Symbol.pm
   Symbol.pm
   SelectSaver.pm
-  ARCH-linux-thread-multi/DynaLoader.pm
-  ARCH-linux-thread-multi/auto/IO/IO.so
-  ARCH-linux-thread-multi/auto/Socket/Socket.so
-  ARCH-linux-thread-multi/Errno.pm
-  ARCH-linux-thread-multi/IO/Socket/INET.pm
-  ARCH-linux-thread-multi/IO/Socket/UNIX.pm
 </from>
+
+<from expand="main-perl-bin">
+  re.pm
+  Cwd.pm
+  auto/Cwd/Cwd.so
+  auto/POSIX/POSIX.so
+  POSIX.pm
+  lib.pm
+  Socket.pm
+  IO/Socket.pm
+  IO.pm
+  IO/Handle.pm
+  Encode/Symbol.pm
+  DynaLoader.pm
+  auto/IO/IO.so
+  auto/Socket/Socket.so
+  Errno.pm
+  IO/Socket/INET.pm
+  IO/Socket/UNIX.pm
+</from>
+
 <from expand="perl">
   packdrake.pm
   MDV/Packdrakeng.pm
-- 
cgit v1.2.1