]> git.pld-linux.org Git - packages/util-vserver.git/commitdiff
projects / packages / util-vserver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: deca360)
- set dist dir to pld-ac
authorElan Ruusamäe <glen@pld-linux.org>
Sat, 14 Jan 2006 10:40:56 +0000 (10:40 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    util-vserver-build-poldek.patch -> 1.18
    util-vserver-pld.patch -> 1.6

util-vserver-build-poldek.patch patch | blob | blame | history
util-vserver-pld.patch patch | blob | blame | history

diff --git a/util-vserver-build-poldek.patch b/util-vserver-build-poldek.patch
index 514ca60a38e0ede3ef5dfb020e30f406bcfc15c2..d23542a1186d954a9556cfa2861ac151f3e03012 100644 (file)
--- a/util-vserver-build-poldek.patch
+++ b/util-vserver-build-poldek.patch
@@ -7,25 +7,25 @@ diff -urN -x '*~' util-vserver-0.30.207/distrib/Makefile.am util-vserver-0.30.20
                           fc4/apt/sources.list \
 -                         suse91/apt/sources.list
 +                         suse91/apt/sources.list \
-+                         pld2.0/poldek/poldek.conf
++                         pld-ac/poldek/poldek.conf
  
  AM_INSTALLCHECK_STD_OPTIONS_EXEMPT \
                        =  $(nobase_distrib_SCRIPTS)
 @@ -69,6 +70,11 @@
                                ln -sf ../redhat/initpre  $(DESTDIR)$(distribdir)/$$i/; \
                        done
-                       ln -sf pld2.0 $(DESTDIR)$(distribdir)/pld1.99
-+                      ln -sf pld2.0 $(DESTDIR)$(confdistribdir)/pld1.99
+                       ln -sf pld-ac $(DESTDIR)$(distribdir)/pld1.99
++                      ln -sf pld-ac $(DESTDIR)$(confdistribdir)/pld1.99
 +                      POLDEKARCH=$(shell rpm -E '%{_target_cpu}' 2>/dev/null); \
 +                      if [ -z "$$POLDEKARCH" ] ; then POLDEKARCH=$(shell uname -m) ; fi ; \
-+                      sed "s|%ARCH%|$$POLDEKARCH|g" $(DESTDIR)$(confdistribdir)/pld2.0/poldek/poldek.conf > $(DESTDIR)$(confdistribdir)/pld2.0/poldek/poldek.conf.tmp ; \
-+                      mv $(DESTDIR)$(confdistribdir)/pld2.0/poldek/poldek.conf.tmp $(DESTDIR)$(confdistribdir)/pld2.0/poldek/poldek.conf
++                      sed "s|%ARCH%|$$POLDEKARCH|g" $(DESTDIR)$(confdistribdir)/pld-ac/poldek/poldek.conf > $(DESTDIR)$(confdistribdir)/pld-ac/poldek/poldek.conf.tmp ; \
++                      mv $(DESTDIR)$(confdistribdir)/pld-ac/poldek/poldek.conf.tmp $(DESTDIR)$(confdistribdir)/pld-ac/poldek/poldek.conf
                        $(mkinstalldirs) $(DESTDIR)$(confdir) \
                                $(DESTDIR)$(confdistribdir)/.common/pubkeys \
                                $(DESTDIR)$(confdefaultsdir) \
-diff -urN -x '*~' util-vserver-0.30.207/distrib/pld2.0/poldek/poldek.conf util-vserver-0.30.207-poldek/distrib/pld2.0/poldek/poldek.conf
---- util-vserver-0.30.207/distrib/pld2.0/poldek/poldek.conf    1970-01-01 01:00:00.000000000 +0100
-+++ util-vserver-0.30.207-poldek/distrib/pld2.0/poldek/poldek.conf     2005-05-17 15:21:01.922627888 +0200
+diff -urN -x '*~' util-vserver-0.30.207/distrib/pld-ac/poldek/poldek.conf util-vserver-0.30.207-poldek/distrib/pld-ac/poldek/poldek.conf
+--- util-vserver-0.30.207/distrib/pld-ac/poldek/poldek.conf    1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.207-poldek/distrib/pld-ac/poldek/poldek.conf     2005-05-17 15:21:01.922627888 +0200
 @@ -0,0 +1,100 @@
 +# $Id$
 +
diff --git a/util-vserver-pld.patch b/util-vserver-pld.patch
index 2d066c6ab5ee858da06d55403be972ecc20baae9..427773783250ecf8445d618f8a5419cea9b46c38 100644 (file)
--- a/util-vserver-pld.patch
+++ b/util-vserver-pld.patch
@@ -7,7 +7,7 @@ diff -urN util-vserver-0.30.207/distrib/Makefile.am util-vserver-0.30.207-pld/di
                           suse91/apt/rpmpriorities suse91/pkgs/01 suse91/pkgs/02 \
 -                         suse91/rpm/macros
 +                         suse91/rpm/macros \
-+                         pld2.0/pkgs/01 pld2.0/rpm/macros pld2.0/rpmlist.d/00.lst
++                         pld-ac/pkgs/01 pld-ac/rpm/macros pld-ac/rpmlist.d/00.lst
  
  nobase_confdistrib_DATA       =  rh9/apt/sources.list \
                           fc1/apt/sources.list \
@@ -15,28 +15,28 @@ diff -urN util-vserver-0.30.207/distrib/Makefile.am util-vserver-0.30.207-pld/di
                                ln -sf ../redhat/initpost $(DESTDIR)$(distribdir)/$$i/ && \
                                ln -sf ../redhat/initpre  $(DESTDIR)$(distribdir)/$$i/; \
                        done
-+                      ln -sf pld2.0 $(DESTDIR)$(distribdir)/pld1.99
++                      ln -sf pld-ac $(DESTDIR)$(distribdir)/pld1.99
                        $(mkinstalldirs) $(DESTDIR)$(confdir) \
                                $(DESTDIR)$(confdistribdir)/.common/pubkeys \
                                $(DESTDIR)$(confdefaultsdir) \
-diff -urN util-vserver-0.30.207/distrib/pld2.0/pkgs/01 util-vserver-0.30.207-pld/distrib/pld2.0/pkgs/01
---- util-vserver-0.30.207/distrib/pld2.0/pkgs/01       1970-01-01 01:00:00.000000000 +0100
-+++ util-vserver-0.30.207-pld/distrib/pld2.0/pkgs/01   2005-05-16 19:09:20.000000000 +0200
+diff -urN util-vserver-0.30.207/distrib/pld-ac/pkgs/01 util-vserver-0.30.207-pld/distrib/pld-ac/pkgs/01
+--- util-vserver-0.30.207/distrib/pld-ac/pkgs/01       1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.207-pld/distrib/pld-ac/pkgs/01   2005-05-16 19:09:20.000000000 +0200
 @@ -0,0 +1,3 @@
 +basesystem
 +glibc
 +issue
-diff -urN util-vserver-0.30.207/distrib/pld2.0/rpm/macros util-vserver-0.30.207-pld/distrib/pld2.0/rpm/macros
---- util-vserver-0.30.207/distrib/pld2.0/rpm/macros    1970-01-01 01:00:00.000000000 +0100
-+++ util-vserver-0.30.207-pld/distrib/pld2.0/rpm/macros        2005-05-17 15:23:04.279026888 +0200
+diff -urN util-vserver-0.30.207/distrib/pld-ac/rpm/macros util-vserver-0.30.207-pld/distrib/pld-ac/rpm/macros
+--- util-vserver-0.30.207/distrib/pld-ac/rpm/macros    1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.207-pld/distrib/pld-ac/rpm/macros        2005-05-17 15:23:04.279026888 +0200
 @@ -0,0 +1,4 @@
 +# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
 +# you have to use at least one language beside 'C'
 +%_install_langs               C:en:pl
 +%_netsharedpath               /dev
-diff -urN util-vserver-0.30.207/distrib/pld2.0/rpmlist.d/00.lst util-vserver-0.30.207-pld/distrib/pld2.0/rpmlist.d/00.lst
---- util-vserver-0.30.207/distrib/pld2.0/rpmlist.d/00.lst      1970-01-01 01:00:00.000000000 +0100
-+++ util-vserver-0.30.207-pld/distrib/pld2.0/rpmlist.d/00.lst  2005-05-17 15:15:56.643037440 +0200
+diff -urN util-vserver-0.30.207/distrib/pld-ac/rpmlist.d/00.lst util-vserver-0.30.207-pld/distrib/pld-ac/rpmlist.d/00.lst
+--- util-vserver-0.30.207/distrib/pld-ac/rpmlist.d/00.lst      1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.207-pld/distrib/pld-ac/rpmlist.d/00.lst  2005-05-17 15:15:56.643037440 +0200
 @@ -0,0 +1,8 @@
 +basesystem-*.rpm
 +dev-*.rpm
Linux virtual server utilities
This page took 0.054604 seconds and 4 git commands to generate.