s390-tools/s390-tools-sles15sp5-fix-chown-commands-syntax.patch
Mark Post f1cde68d53 Accepting request 1042407 from home:ngueorguiev:branches:Base:System
- Updated to version 2.25.0 (jsc#PED-627)
  * __v2.25.0 (2022-12-12)__
  For Linux kernel version: 6.1
  Changes of existing tools:
  - ap_tools: Use new mdevctl installation location
  - lsdasd/tunedasd/zdev: Add support to handle copy pair relations presented by the DASD driver
  - zdev: Add --shell command line switch to generate output suitable for shell environments
  - zipl: Add List-Directed IPL from ECKD DASD to support secure boot
  Bug Fixes:
  - ipl_tools: Fix chreipl node for NVMes with CONFIG_NVME_MULTIPATH
  - libdasd: Fix bug that prevented positive ioctl return codes
- Updated s390-tools-sles15sp5-fix-chown-commands-syntax.patch to fit the current version
- Removed obsolete Patch002, and Patch003
  # Patch002:       s390-tools-sles15sp5-util_lockfile-fix-includes.patch
  # Patch003:       s390-tools-sles15sp5-ap_tools-ap-check-use-new-mdevctl-install-location.patch

OBS-URL: https://build.opensuse.org/request/show/1042407
OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=141
2022-12-12 15:17:09 +00:00

121 lines
5.4 KiB
Diff

--- s390-tools-2.25.0/ap_tools/Makefile 2022-11-09 11:11:48.000000000 -0500
+++ s390-tools-2.25.0/ap_tools/Makefile 2022-12-01 15:33:30.953373912 -0500
@@ -26,9 +26,9 @@
install: all
@if [ ! -d $(DESTDIR)$(MDEVCTL_CALLOUTS) ]; then \
mkdir -p $(DESTDIR)$(MDEVCTL_CALLOUTS); \
- chown $(OWNER).$(GROUP) $(DESTDIR)$(MDEVCTL_DIR); \
- chown $(OWNER).$(GROUP) $(DESTDIR)$(MDEVCTL_SCRIPTS); \
- chown $(OWNER).$(GROUP) $(DESTDIR)$(MDEVCTL_CALLOUTS); \
+ chown $(OWNER):$(GROUP) $(DESTDIR)$(MDEVCTL_DIR); \
+ chown $(OWNER):$(GROUP) $(DESTDIR)$(MDEVCTL_SCRIPTS); \
+ chown $(OWNER):$(GROUP) $(DESTDIR)$(MDEVCTL_CALLOUTS); \
chmod 755 $(DESTDIR)$(MDEVCTL_DIR); \
chmod 755 $(DESTDIR)$(MDEVCTL_SCRIPTS); \
chmod 755 $(DESTDIR)$(MDEVCTL_CALLOUTS); \
@@ -37,9 +37,9 @@
$(DESTDIR)$(MDEVCTL_CALLOUTS)
@if [ ! -d $(DESTDIR)$(MDEVCTL_DEP_CALLOUTS) ]; then \
mkdir -p $(DESTDIR)$(MDEVCTL_DEP_CALLOUTS); \
- chown $(OWNER).$(GROUP) $(DESTDIR)$(MDEVCTL_DEP_DIR); \
- chown $(OWNER).$(GROUP) $(DESTDIR)$(MDEVCTL_DEP_SCRIPTS); \
- chown $(OWNER).$(GROUP) $(DESTDIR)$(MDEVCTL_DEP_CALLOUTS); \
+ chown $(OWNER):$(GROUP) $(DESTDIR)$(MDEVCTL_DEP_DIR); \
+ chown $(OWNER):$(GROUP) $(DESTDIR)$(MDEVCTL_DEP_SCRIPTS); \
+ chown $(OWNER):$(GROUP) $(DESTDIR)$(MDEVCTL_DEP_CALLOUTS); \
chmod 755 $(DESTDIR)$(MDEVCTL_DEP_DIR); \
chmod 755 $(DESTDIR)$(MDEVCTL_DEP_SCRIPTS); \
chmod 755 $(DESTDIR)$(MDEVCTL_DEP_CALLOUTS); \
--- s390-tools-2.25.0/hmcdrvfs/Makefile2022-11-09 11:11:48.000000000 -0500
+++ s390-tools-2.25.0/hmcdrvfs/Makefile 2022-12-01 15:33:42.825238489 -0500
@@ -52,7 +52,7 @@
cat $$i | \
sed -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
>$(DESTDIR)$(USRSBINDIR)/$$i; \
- chown $(OWNER).$(GROUP) $(DESTDIR)$(USRSBINDIR)/$$i; \
+ chown $(OWNER):$(GROUP) $(DESTDIR)$(USRSBINDIR)/$$i; \
chmod 755 $(DESTDIR)$(USRSBINDIR)/$$i; \
done
--- s390-tools-2.25.0/hsci/Makefile 2022-11-09 11:11:48.000000000 -0500
+++ s390-tools-2.25.0/hsci/Makefile 2022-12-01 15:33:53.029122092 -0500
@@ -5,7 +5,7 @@
install: hsci
$(SED) -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
< hsci >$(DESTDIR)$(BINDIR)/hsci; \
- chown $(OWNER).$(GROUP) $(DESTDIR)$(BINDIR)/hsci; \
+ chown $(OWNER):$(GROUP) $(DESTDIR)$(BINDIR)/hsci; \
chmod 755 $(DESTDIR)$(BINDIR)/hsci; \
$(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man8
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 hsci.8 \
--- s390-tools-2.25.0/ip_watcher/Makefile 2022-11-09 11:11:48.000000000 -0500
+++ s390-tools-2.25.0/ip_watcher/Makefile 2022-12-01 15:34:09.116938576 -0500
@@ -12,7 +12,7 @@
install: ip_watcher.pl xcec-bridge start_hsnc.sh
$(SED) -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
< start_hsnc.sh >$(DESTDIR)$(USRSBINDIR)/start_hsnc.sh; \
- chown $(OWNER).$(GROUP) $(DESTDIR)$(USRSBINDIR)/start_hsnc.sh; \
+ chown $(OWNER):$(GROUP) $(DESTDIR)$(USRSBINDIR)/start_hsnc.sh; \
chmod 755 $(DESTDIR)$(USRSBINDIR)/start_hsnc.sh; \
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 ip_watcher.pl \
$(DESTDIR)$(USRSBINDIR)
--- s390-tools-2.25.0/netboot/Makefile 2022-11-09 11:11:48.000000000 -0500
+++ s390-tools-2.25.0/netboot/Makefile 2022-12-01 15:34:28.212720750 -0500
@@ -15,13 +15,13 @@
install-scripts: $(SCRIPTS)
@if [ ! -d $(DESTDIR)$(NETBOOT_SAMPLEDIR) ]; then \
mkdir -p $(DESTDIR)$(NETBOOT_SAMPLEDIR); \
- chown $(OWNER).$(GROUP) $(DESTDIR)$(NETBOOT_SAMPLEDIR); \
+ chown $(OWNER):$(GROUP) $(DESTDIR)$(NETBOOT_SAMPLEDIR); \
chmod 755 $(DESTDIR)$(NETBOOT_SAMPLEDIR); \
fi; \
for i in $^; do \
$(SED) -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
< $$i >$(DESTDIR)$(NETBOOT_SAMPLEDIR)/$$i; \
- chown $(OWNER).$(GROUP) $(DESTDIR)$(NETBOOT_SAMPLEDIR)/$$i; \
+ chown $(OWNER):$(GROUP) $(DESTDIR)$(NETBOOT_SAMPLEDIR)/$$i; \
chmod 755 $(DESTDIR)$(NETBOOT_SAMPLEDIR)/$$i; \
done
--- s390-tools-2.25.0/qethconf/Makefile 2022-11-09 11:11:48.000000000 -0500
+++ s390-tools-2.25.0/qethconf/Makefile 2022-12-01 15:34:39.356593630 -0500
@@ -5,7 +5,7 @@
install: qethconf
$(SED) -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
< qethconf >$(DESTDIR)$(BINDIR)/qethconf; \
- chown $(OWNER).$(GROUP) $(DESTDIR)$(BINDIR)/qethconf; \
+ chown $(OWNER):$(GROUP) $(DESTDIR)$(BINDIR)/qethconf; \
chmod 755 $(DESTDIR)$(BINDIR)/qethconf; \
$(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man8
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 qethconf.8 \
--- s390-tools-2.25.0/zconf/Makefile 2022-11-09 11:11:48.000000000 -0500
+++ s390-tools-2.25.0/zconf/Makefile 2022-12-01 15:36:10.583552975 -0500
@@ -25,7 +25,7 @@
cat $$i | \
sed -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
>$(DESTDIR)$(BINDIR)/$$i; \
- chown $(OWNER).$(GROUP) $(DESTDIR)$(BINDIR)/$$i; \
+ chown $(OWNER):$(GROUP) $(DESTDIR)$(BINDIR)/$$i; \
chmod 755 $(DESTDIR)$(BINDIR)/$$i; \
done
@@ -34,15 +34,15 @@
cat $$i | \
sed -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
>$(DESTDIR)$(USRSBINDIR)/$$i; \
- chown $(OWNER).$(GROUP) $(DESTDIR)$(USRSBINDIR)/$$i; \
+ chown $(OWNER):$(GROUP) $(DESTDIR)$(USRSBINDIR)/$$i; \
chmod 755 $(DESTDIR)$(USRSBINDIR)/$$i; \
done
install-manpages: $(MANPAGES)
@if [ ! -d $(DESTDIR)$(MANDIR) ]; then \
mkdir -p $(DESTDIR)$(MANDIR)/man8; \
- chown $(OWNER).$(GROUP) $(DESTDIR)$(MANDIR); \
- chown $(OWNER).$(GROUP) $(DESTDIR)$(MANDIR)/man8; \
+ chown $(OWNER):$(GROUP) $(DESTDIR)$(MANDIR); \
+ chown $(OWNER):$(GROUP) $(DESTDIR)$(MANDIR)/man8; \
chmod 755 $(DESTDIR)$(MANDIR); \
chmod 755 $(DESTDIR)$(MANDIR)/man8; \
fi; \