فهرست منبع

do not run 'installplatform' script, it is not needed by OpenPKG and just makes trouble

Ralf S. Engelschall 22 سال پیش
والد
کامیت
0a98ef81ed
2فایلهای تغییر یافته به همراه36 افزوده شده و 10 حذف شده
  1. 32 6
      openpkg/rpm.patch.feature
  2. 4 4
      openpkg/rpm.patch.porting

+ 32 - 6
openpkg/rpm.patch.feature

@@ -22,10 +22,11 @@
 | anyway.
 | Use a plain "rpmpopt" file without any trailing version.
 | Adjust paths to conform to OpenPKG filesystem layout.
+| Do not run the "installplatform" script, because not needed for OpenPKG.
 +---------------------------------------------------------------------------
 Index: Makefile.am
 --- Makefile.am	29 May 2003 18:20:28 -0000	1.1.1.17
-+++ Makefile.am	26 Aug 2003 08:14:57 -0000
++++ Makefile.am	1 Sep 2003 07:11:35 -0000
 @@ -12,9 +12,9 @@
  	xmlspec/examples/*.sh xmlspec/examples/*.lst \
  	xmlspec/examples/*.xmlspec \
@@ -100,7 +101,19 @@ Index: Makefile.am
  	done
  	@for dir in BUILD RPMS SOURCES SPECS SRPMS ; do\
  	    $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/$$dir;\
-@@ -198,10 +195,10 @@
+@@ -174,11 +171,6 @@
+ 	*)	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/@host_cpu@ ;;\
+ 	esac
+ 	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/noarch
+-	@case "@host_os@" in \
+-	mint) $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/m68kmint ;;\
+-	solaris*|linux*) \
+-	   chmod u+x ./installplatform; DESTDIR="$(DESTDIR)" pkglibdir="$(pkglibdir)" ./installplatform rpmrc macros platform ;; \
+-	esac
+ 	@$(mkinstalldirs) $(DESTDIR)/var/tmp
+ 
+ .PHONY:	setperms
+@@ -198,10 +190,10 @@
  	    $(__CHOWN) ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(pkglibdir)/$$f ;\
  	done
  	@$(__CHOWN) ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(pkglibdir)
@@ -115,7 +128,7 @@ Index: Makefile.am
  
  .PHONY:	unsetgid
  unsetgid:
-@@ -244,7 +241,7 @@
+@@ -244,7 +236,7 @@
  	@sudo ./rpm -ta rpm-$(VERSION).tar.gz
  
  .PHONY:	doxygen
@@ -131,10 +144,11 @@ Index: Makefile.am
 | anyway.
 | Use a plain "rpmpopt" file without any trailing version.
 | Adjust paths to conform to OpenPKG filesystem layout.
+| Do not run the "installplatform" script, because not needed for OpenPKG.
 +---------------------------------------------------------------------------
 Index: Makefile.in
 --- Makefile.in	16 Jul 2003 17:05:42 -0000	1.1.1.23
-+++ Makefile.in	26 Aug 2003 08:15:04 -0000
++++ Makefile.in	1 Sep 2003 07:11:43 -0000
 @@ -265,10 +265,10 @@
  	xmlspec/examples/*.sh xmlspec/examples/*.lst \
  	xmlspec/examples/*.xmlspec \
@@ -214,7 +228,19 @@ Index: Makefile.in
  	done
  	@for dir in BUILD RPMS SOURCES SPECS SRPMS ; do\
  	    $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/$$dir;\
-@@ -1171,10 +1169,10 @@
+@@ -1147,11 +1145,6 @@
+ 	*)	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/@host_cpu@ ;;\
+ 	esac
+ 	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/noarch
+-	@case "@host_os@" in \
+-	mint) $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/m68kmint ;;\
+-	solaris*|linux*) \
+-	   chmod u+x ./installplatform; DESTDIR="$(DESTDIR)" pkglibdir="$(pkglibdir)" ./installplatform rpmrc macros platform ;; \
+-	esac
+ 	@$(mkinstalldirs) $(DESTDIR)/var/tmp
+ 
+ .PHONY:	setperms
+@@ -1171,10 +1164,10 @@
  	    $(__CHOWN) ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(pkglibdir)/$$f ;\
  	done
  	@$(__CHOWN) ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(pkglibdir)
@@ -229,7 +255,7 @@ Index: Makefile.in
  
  .PHONY:	unsetgid
  unsetgid:
-@@ -1217,7 +1215,7 @@
+@@ -1217,7 +1210,7 @@
  	@sudo ./rpm -ta rpm-$(VERSION).tar.gz
  
  .PHONY:	doxygen

+ 4 - 4
openpkg/rpm.patch.porting

@@ -337,7 +337,7 @@ Index: rpmio/Makefile.in
  	touch $@
 
 +---------------------------------------------------------------------------
-| Add FreeBSD support.
+| Add FreeBSD/NetBSD/OpenBSD support.
 +---------------------------------------------------------------------------
 Index: rpmio/fts.c
 --- rpmio/fts.c	18 Jan 2003 16:13:17 -0000	1.1.1.3
@@ -385,9 +385,9 @@ Index: rpmio/rpmio.h
  #include <unistd.h>
 
 +---------------------------------------------------------------------------
-| Make this whole "dirent" fiddling at least working on FreeBSD,
-| Solaris and HPUX. This certainly is a bad corner of RPM which
-| inherently leads to portability problems.
+| Make this whole "dirent" fiddling at least working on
+| FreeBSD/NetBSD/OpenBSD, Solaris and HPUX. This certainly is a bad
+| corner of RPM which inherently leads to portability problems.
 +---------------------------------------------------------------------------
 Index: rpmio/rpmrpc.c
 --- rpmio/rpmrpc.c	29 May 2003 22:14:04 -0000	1.1.1.8