| 1 |
commit: 27a8732039fdd2102cd216f421f66c58c905e693 |
| 2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 30 01:28:03 2015 +0000 |
| 4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 30 01:28:03 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=27a87320 |
| 7 |
|
| 8 |
Update sharedir location from /usr/lib/catalyst to /usr/share/catalyst. |
| 9 |
|
| 10 |
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> |
| 11 |
|
| 12 |
README | 2 +- |
| 13 |
catalyst/defaults.py | 4 ++-- |
| 14 |
doc/catalyst-config.5.txt | 4 ++-- |
| 15 |
doc/catalyst-spec.5.txt | 4 ++-- |
| 16 |
etc/catalyst.conf | 2 +- |
| 17 |
examples/livecd-stage2_template.spec | 2 +- |
| 18 |
examples/netboot_template.spec | 2 +- |
| 19 |
setup.py | 4 ++-- |
| 20 |
8 files changed, 12 insertions(+), 12 deletions(-) |
| 21 |
|
| 22 |
diff --git a/README b/README |
| 23 |
index 0674e07..0a0373c 100644 |
| 24 |
--- a/README |
| 25 |
+++ b/README |
| 26 |
@@ -54,7 +54,7 @@ Example catalyst.conf: |
| 27 |
|
| 28 |
distdir="/usr/portage/distfiles" |
| 29 |
options="pkgcache kerncache" |
| 30 |
-sharedir="/usr/lib/catalyst" |
| 31 |
+sharedir="/usr/share/catalyst" |
| 32 |
|
| 33 |
There are many more options that can be set, but those defaults are good |
| 34 |
for out of the box operation. For more documentation on what you can do |
| 35 |
|
| 36 |
diff --git a/catalyst/defaults.py b/catalyst/defaults.py |
| 37 |
index 2f4f429..5cb5e3f 100644 |
| 38 |
--- a/catalyst/defaults.py |
| 39 |
+++ b/catalyst/defaults.py |
| 40 |
@@ -33,8 +33,8 @@ confdefaults={ |
| 41 |
"port_tmpdir": "/var/tmp/portage", |
| 42 |
"PythonDir": "./catalyst", |
| 43 |
"repo_name": "portage", |
| 44 |
- "sharedir": "/usr/lib/catalyst", |
| 45 |
- "shdir": "/usr/lib/catalyst/targets/", |
| 46 |
+ "sharedir": "/usr/share/catalyst", |
| 47 |
+ "shdir": "/usr/share/catalyst/targets/", |
| 48 |
"snapshot_cache": "/var/tmp/catalyst/snapshot_cache", |
| 49 |
"snapshot_name": "portage-", |
| 50 |
"storedir": "/var/tmp/catalyst", |
| 51 |
|
| 52 |
diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt |
| 53 |
index 63a015f..61f3d93 100644 |
| 54 |
--- a/doc/catalyst-config.5.txt |
| 55 |
+++ b/doc/catalyst-config.5.txt |
| 56 |
@@ -30,7 +30,7 @@ distdir="/usr/portage/distfiles" |
| 57 |
envscript="/etc/catalyst/catalystrc" |
| 58 |
options="autoresume bindist kerncache pkgcache seedcache snapcache" |
| 59 |
portdir="/usr/portage" |
| 60 |
-sharedir="/usr/lib/catalyst" |
| 61 |
+sharedir="/usr/share/catalyst" |
| 62 |
snapshot_cache="/var/tmp/catalyst/snapshot_cache" |
| 63 |
storedir="/var/tmp/catalyst" |
| 64 |
--------------------------------- |
| 65 |
@@ -145,7 +145,7 @@ Portage tree location. `/usr/portage/` should work for most default |
| 66 |
installations. |
| 67 |
|
| 68 |
*sharedir*:: |
| 69 |
-Catalyst runtime script location. `/usr/lib/catalyst` should work for |
| 70 |
+Catalyst runtime script location. `/usr/share/catalyst` should work for |
| 71 |
most default installations. If you are running catalyst from a Git |
| 72 |
checkout, you should change this to point to your checkout directory. |
| 73 |
|
| 74 |
|
| 75 |
diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt |
| 76 |
index b3e2bf5..cba3166 100644 |
| 77 |
--- a/doc/catalyst-spec.5.txt |
| 78 |
+++ b/doc/catalyst-spec.5.txt |
| 79 |
@@ -210,7 +210,7 @@ The cdtar is essentially the bootloader for the CD. It also holds the |
| 80 |
main configuration for the bootloader. On x86/amd64, it also can |
| 81 |
include a small memory testing application, called memtest86+ |
| 82 |
(example: |
| 83 |
-`/usr/lib/catalyst/livecd/cdtar/isolinux-2.13-memtest86+-cdtar.tar.bz2`). |
| 84 |
+`/usr/share/catalyst/livecd/cdtar/isolinux-2.13-memtest86+-cdtar.tar.bz2`). |
| 85 |
|
| 86 |
Kernel and boot issues |
| 87 |
~~~~~~~~~~~~~~~~~~~~~~ |
| 88 |
@@ -312,7 +312,7 @@ supported by the `netboot` and `netboot2` targets. |
| 89 |
*netboot/base_tarball*:: |
| 90 |
This is the full path and filename to the tarball to use as the base |
| 91 |
for the netboot image (example: |
| 92 |
-`/usr/lib/catalyst/netboot/netboot-base.tar.bz2`). |
| 93 |
+`/usr/share/catalyst/netboot/netboot-base.tar.bz2`). |
| 94 |
|
| 95 |
Runlevels |
| 96 |
~~~~~~~~~ |
| 97 |
|
| 98 |
diff --git a/etc/catalyst.conf b/etc/catalyst.conf |
| 99 |
index 01708e7..7f56671 100644 |
| 100 |
--- a/etc/catalyst.conf |
| 101 |
+++ b/etc/catalyst.conf |
| 102 |
@@ -78,7 +78,7 @@ portdir="/usr/portage" |
| 103 |
# sharedir specifies where all of the catalyst runtime executables |
| 104 |
# and other shared lib objects are. |
| 105 |
# Most users do not need to change this. |
| 106 |
-sharedir="/usr/lib/catalyst" |
| 107 |
+sharedir="/usr/share/catalyst" |
| 108 |
|
| 109 |
# shdir specifies where all of the catalyst runtime executables are. |
| 110 |
shdir="%(sharedir)s/targets" |
| 111 |
|
| 112 |
diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec |
| 113 |
index ca1ca82..c2c6bf3 100644 |
| 114 |
--- a/examples/livecd-stage2_template.spec |
| 115 |
+++ b/examples/livecd-stage2_template.spec |
| 116 |
@@ -103,7 +103,7 @@ livecd/fsops: |
| 117 |
# configuration for the bootloader. On x86/amd64, it also can include a small |
| 118 |
# memory testing application, called memtest86+. |
| 119 |
# example: |
| 120 |
-# livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-2.13-memtest86+-cdtar.tar.bz2 |
| 121 |
+# livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-2.13-memtest86+-cdtar.tar.bz2 |
| 122 |
livecd/cdtar: |
| 123 |
|
| 124 |
# This is the full path and filename to the ISO image that the livecd-stage2 |
| 125 |
|
| 126 |
diff --git a/examples/netboot_template.spec b/examples/netboot_template.spec |
| 127 |
index 921ddf4..d10b645 100644 |
| 128 |
--- a/examples/netboot_template.spec |
| 129 |
+++ b/examples/netboot_template.spec |
| 130 |
@@ -114,7 +114,7 @@ netboot/busybox_config: |
| 131 |
# This is the full path and filename to the tarball to use as the base for the |
| 132 |
# netboot image. |
| 133 |
# example: |
| 134 |
-# netboot/base_tarball: /usr/lib/catalyst/netboot/netboot-base.tar.bz2 |
| 135 |
+# netboot/base_tarball: /usr/share/catalyst/netboot/netboot-base.tar.bz2 |
| 136 |
netboot/base_tarball: |
| 137 |
|
| 138 |
# These are the packages that will be built for your netboot image using the USE |
| 139 |
|
| 140 |
diff --git a/setup.py b/setup.py |
| 141 |
index 1d421bc..3eb76d7 100755 |
| 142 |
--- a/setup.py |
| 143 |
+++ b/setup.py |
| 144 |
@@ -48,8 +48,8 @@ _data_files = [('/etc/catalyst', ['etc/catalyst.conf','etc/catalystrc']), |
| 145 |
('/usr/share/man/man1', ['files/catalyst.1']), |
| 146 |
('/usr/share/man/man5', ['files/catalyst-config.5', 'files/catalyst-spec.5']) |
| 147 |
] |
| 148 |
-_data_files.extend(_files('lib/catalyst/livecd', 'livecd')) |
| 149 |
-_data_files.extend(_files('lib/catalyst/targets', 'targets')) |
| 150 |
+_data_files.extend(_files('share/catalyst/livecd', 'livecd')) |
| 151 |
+_data_files.extend(_files('share/catalyst/targets', 'targets')) |
| 152 |
|
| 153 |
|
| 154 |
class set_version(_Command): |
Archives