2 commits - client/tools rel-eng/packages
by Miroslav Suchý
client/tools/rhncfg/rhncfg.spec | 13 ++++++++++++-
client/tools/rhnpush/rhnpush.spec | 11 ++++++++++-
rel-eng/packages/rhncfg | 2 +-
rel-eng/packages/rhnpush | 2 +-
4 files changed, 24 insertions(+), 4 deletions(-)
New commits:
commit b0a7d5dc55f4347fe89bd0429759e4c05ba13514
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 18 17:05:01 2010 +0200
Automatic commit of package [rhnpush] release [5.5.1-1].
diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec
index 5a62b85..6edb084 100644
--- a/client/tools/rhnpush/rhnpush.spec
+++ b/client/tools/rhnpush/rhnpush.spec
@@ -5,7 +5,7 @@ Summary: Common programs needed to be installed on the RHN servers/proxies
Group: Applications/System
License: GPLv2
URL: http://fedorahosted.org/spacewalk
-Version: 5.4.14
+Version: 5.5.1
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,6 +50,15 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/solaris2mpm.8*
%changelog
+* Tue May 18 2010 Miroslav Suchý <msuchy(a)redhat.com> 5.5.1-1
+- 470154 - arch can be optional, do not freak out if it is not present
+- 514805 - recognize X86 arch as i386
+- 516898 - workaround for patches which do not have packed most top directory
+- no need to copy file, we can operate directly on original
+- do not read one file twice
+- 559092 - recognize new sun patch cluster format
+- 569946 - normalize solaris "x86" value to rhn known value
+
* Mon Apr 19 2010 Michael Mraka <michael.mraka(a)redhat.com> 5.4.14-1
- 563630 - Enable proxy support for rhnpush
diff --git a/rel-eng/packages/rhnpush b/rel-eng/packages/rhnpush
index 76504b0..4cf6b1f 100644
--- a/rel-eng/packages/rhnpush
+++ b/rel-eng/packages/rhnpush
@@ -1 +1 @@
-5.4.14-1 client/tools/rhnpush/
+5.5.1-1 client/tools/rhnpush/
commit fb33af46f247e926e02759edbcb6139b369ee4d5
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 18 17:00:19 2010 +0200
Automatic commit of package [rhncfg] release [5.9.21-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 65d794a..fbff830 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2 and Python
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.9.20
+Version: 5.9.21
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -97,6 +97,17 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Tue May 18 2010 Miroslav Suchý <msuchy(a)redhat.com> 5.9.21-1
+- 515637 - add newline at the end so solaris will not strip last line
+- 515637 - add newline at the end of file
+- Add new rhncfg-client verify --only option to manpage
+ (joshua.roys(a)gtri.gatech.edu)
+- 587285 - provide a useful error message when lsetfilecon fails
+ (joshua.roys(a)gtri.gatech.edu)
+- Add an 'only' mode of operation to rhncfg-client verify
+ (joshua.roys(a)gtri.gatech.edu)
+- Make rhncfg-client verify use lstat (joshua.roys(a)gtri.gatech.edu)
+
* Mon Apr 19 2010 Michael Mraka <michael.mraka(a)redhat.com> 5.9.20-1
- More support for symlinks in rhncfg tools
- Add selinux output to rhncfg-client verify
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index b28f459..2d37d74 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.9.20-1 client/tools/rhncfg/
+5.9.21-1 client/tools/rhncfg/
13 years, 11 months
Changes to 'refs/tags/spacewalk-backend-1.1.14-1'
by Michael Mraka
Tag 'spacewalk-backend-1.1.14-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-05-18 14:41 +0000
Tagging package [spacewalk-backend] version [1.1.14-1] in directory [backend/].
Changes since spacewalk-utils-1.1.5-1:
Jan Pazdziora (2):
584780 - move the firstboot _gui.* files to rhn-setup-gnome.
The bugzilla 556290 had errata released, python-setuptools should be pulled in by python-coverage.
Justin Sherrill (1):
563859 - fixing issue where adding errata to x86_64 channels would only get packages of one arch, even if the errata had two (lib packages)
Michael Mraka (5):
partially reverted commit 9ad7fbe8fd05accec78d8de5e65fb192e1ba4f6f
made _hash_object_id 3 times faster
time.strftime is 25% faster
exceptions are very expensive; if instance(..) is 60% faster
Automatic commit of package [spacewalk-backend] release [1.1.14-1].
Miroslav Suchý (3):
555659 - do not freak out when SUNW_PATCHID do not have SUN format
515637 - add newline at the end so solaris will not srip last line
adding rpm2pkg script for creating solaris pkg files from rpm packages
---
backend/satellite_tools/satsync.py | 79 +++-
backend/satellite_tools/syncCache.py | 16
backend/satellite_tools/sync_handlers.py | 3
backend/satellite_tools/xmlSource.py | 12
backend/server/importlib/backendLib.py | 2
backend/spacewalk-backend.spec | 5
client/rhel/rhn-client-tools/rhn-client-tools.spec | 21 -
client/solaris/smartpm/smart/backends/solaris/loader.py | 6
client/tools/rhncfg/config_management/rhncfg-manager.conf | 3
java/code/src/com/redhat/rhn/frontend/action/channel/manage/ConfirmErrataAction.java | 4
rel-eng/packages/spacewalk-backend | 2
rel-eng/rpm2pkg/rpm2pkg | 192 ++++++++++
rel-eng/rpm2pkg/rpm2pkg-reloc.txt | 31 +
13 files changed, 321 insertions(+), 55 deletions(-)
---
13 years, 11 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 8bb634e661667bb71323670f74b2fee648704144
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue May 18 16:41:24 2010 +0200
Automatic commit of package [spacewalk-backend] release [1.1.14-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 9178385..c4793a7 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -8,7 +8,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.1.13
+Version: 1.1.14
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -632,6 +632,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue May 18 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.1.14-1
+- satellite-sync optimization
+
* Fri May 14 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.1.13-1
- fixed performance issue in satellite-sync
- update po files
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 72946a2..78f1d52 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.1.13-1 backend/
+1.1.14-1 backend/
13 years, 11 months
4 commits - backend/satellite_tools backend/server
by Michael Mraka
backend/satellite_tools/satsync.py | 79 +++++++++++++++++++++++--------
backend/satellite_tools/syncCache.py | 16 ++----
backend/satellite_tools/sync_handlers.py | 3 +
backend/satellite_tools/xmlSource.py | 12 ++--
backend/server/importlib/backendLib.py | 2
5 files changed, 75 insertions(+), 37 deletions(-)
New commits:
commit dd70feb83dec51eb7b96b68cf34a17c738f6ec06
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue May 18 14:07:01 2010 +0200
exceptions are very expensive; if instance(..) is 60% faster
diff --git a/backend/satellite_tools/xmlSource.py b/backend/satellite_tools/xmlSource.py
index 7901f13..4b77fbd 100644
--- a/backend/satellite_tools/xmlSource.py
+++ b/backend/satellite_tools/xmlSource.py
@@ -342,18 +342,18 @@ def _stringify(data):
# Accelerate the most common cases
if isinstance(data, types.StringType):
return data
- try: return data.encode('UTF8')
- except AttributeError: pass
+ elif isinstance(data, types.UnicodeType):
+ return data.encode('UTF8')
return str(data)
def _dict_to_utf8(d):
# Convert the dictionary to have non-unocide key-value pairs
ret = {}
for k, v in d.items():
- try: k = k.encode('UTF8')
- except AttributeError: pass
- try: v = v.encode('UTF8')
- except AttributeError: pass
+ if isinstance(k,types.UnicodeType):
+ k = k.encode('UTF8')
+ if isinstance(v, types.UnicodeType):
+ v = v.encode('UTF8')
ret[k] = v
return ret
commit c1af4b827cbbd2d7347541aa34d58b1d8f6cac73
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue May 18 10:39:37 2010 +0200
time.strftime is 25% faster
save couple of minutes here
diff --git a/backend/server/importlib/backendLib.py b/backend/server/importlib/backendLib.py
index f3f890d..260b2e5 100644
--- a/backend/server/importlib/backendLib.py
+++ b/backend/server/importlib/backendLib.py
@@ -31,7 +31,7 @@ def localtime(timestamp):
return _format_time(time.localtime(float(timestamp)))
def _format_time(time_tuple):
- return "%d-%02d-%02d %02d:%02d:%02d" % time_tuple[:6]
+ return time.strftime("%Y-%m-%d %H:%M:%S", time_tuple)
# Database datatypes
class DBtype:
commit 8dfcb8bdcc0bc86295532832a8ffc9a135e553b4
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 14 22:21:28 2010 +0200
made _hash_object_id 3 times faster
diff --git a/backend/satellite_tools/syncCache.py b/backend/satellite_tools/syncCache.py
index 2d7c0b5..c8662fb 100644
--- a/backend/satellite_tools/syncCache.py
+++ b/backend/satellite_tools/syncCache.py
@@ -56,17 +56,13 @@ class BaseCache:
def _hash_object_id(self, object_id, factor):
"""Given an object id (assumed to be <label>-<number>), returns the
- last few digits for the number. For instance, (812345, 1000) should
+ last few digits for the number. For instance, (812345, 3) should
return 345"""
- object_id = str(object_id)
- # Compute the number of digits we need from the hash
- format = int(math.ceil(math.log10(factor)))
- # Format the template
- format = '%0' + str(format) + 'd'
# Grab the digits after -
num_id = string.split(object_id, '-')[-1]
- num_id = int(num_id) % factor
- return format % num_id
+ # get last 'factor' numbers
+ num_id = num_id[-factor:]
+ return num_id.rjust(factor,'0')
class ChannelCache(BaseCache):
def _get_key(self, object_id):
@@ -75,7 +71,7 @@ class ChannelCache(BaseCache):
class BasePackageCache(BaseCache):
_subdir = "__unknown__"
def _get_key(self, object_id):
- hash_val = self._hash_object_id(object_id, 100)
+ hash_val = self._hash_object_id(object_id, 2)
return os.path.join("satsync", self._subdir, hash_val, str(object_id))
class ShortPackageCache(BasePackageCache):
@@ -91,7 +87,7 @@ class SourcePackageCache(BasePackageCache):
class ErratumCache(BaseCache):
_subdir = "errata"
def _get_key(self, object_id):
- hash_val = self._hash_object_id(object_id, 10)
+ hash_val = self._hash_object_id(object_id, 1)
return os.path.join("satsync", self._subdir, hash_val, str(object_id))
class KickstartableTreesCache(BaseCache):
commit dddbef429d26067d482df5ade2909c276cacee56
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue May 18 16:03:50 2010 +0200
partially reverted commit 9ad7fbe8fd05accec78d8de5e65fb192e1ba4f6f
and ressurected short_packages
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 8c8adef..5f9fb35 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -88,6 +88,7 @@ class Runner:
'channels' : ['channel-families'],
'channel-families' : ['blacklists'],
'blacklists' : ['arches'],
+ 'short' : [''],
'download-errata' : ['errata'],
'download-packages' : [''],
'download-source-packages' : [''],
@@ -102,6 +103,7 @@ class Runner:
'arches',
'channels',
'blacklists',
+ 'short',
'download-packages',
'rpms',
'packages',
@@ -298,6 +300,16 @@ class Runner:
def _step_blacklists(self):
return self.syncer.processBlacklists()
+ def _step_short(self):
+ try:
+ return self.syncer.processShortPackages()
+ except xmlDiskSource.MissingXmlDiskSourceFileError, e:
+ msg= "ERROR: The dump is missing package data, use --no-rpms to skip this step or fix the content to include package data."
+ log2disk(-1, msg)
+ log2stderr(-1, msg, cleanYN=1)
+ sys.exit(25)
+
+
def _step_download_packages(self):
return self.syncer.download_package_metadata()
@@ -840,6 +852,37 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
self._channel_packages[chn] = package_ids
self._avail_channel_packages[chn] = avail_package_ids
+ def processShortPackages(self):
+ log(1, ["", "Retrieving short package metadata (used for indexing)"])
+
+ # Compute the unique packages and populate self._channel_packages
+ self._compute_unique_packages()
+
+ h = sync_handlers.get_short_package_handler()
+ stream_loader = StreamProducer(h)
+ if self.mountpoint:
+ s = xmlDiskSource.ShortPackageDiskSource(self.mountpoint)
+ stream_loader.set_disk_loader(s)
+ else:
+ s = self.xmlWireServer.getChannelShortPackagesXmlStream
+ stream_loader.set_wire_loader(s)
+
+ # OK, now uq_channel_packages only has the unique packages
+ for channel_label, package_ids in self._channel_packages.items():
+ # Pretend we fetch all packages
+ log(1, " Retrieving / parsing short package metadata: %s (%s)" %
+ (channel_label, len(package_ids)))
+
+ lm = self._channel_collection.get_channel_timestamp(channel_label)
+ channel_last_modified = int(rhnLib.timestamp(lm))
+
+ stream_loader.set_args(channel_label, channel_last_modified)
+ stream_loader.process(package_ids)
+
+ h.close()
+
+ self._diff_packages()
+
_query_compare_packages = """
select p.id, c.checksum_type, c.checksum, p.path, p.package_size,
TO_CHAR(p.last_modified, 'YYYYMMDDHH24MISS') last_modified
@@ -853,7 +896,7 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
"""
# XXX the "is null" condition will have to change in multiorg satellites
def _diff_packages(self):
- package_collection = sync_handlers.PackageCollection()
+ package_collection = sync_handlers.ShortPackageCollection()
h = rhnSQL.prepare(self._query_compare_packages)
missing_channel_packages = {}
@@ -987,6 +1030,7 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
if errcode:
# file doesn't match
fs_package = package_id
+ channel_package = package_id
path = db_path
else:
# upload package and reimport metadata
@@ -1024,6 +1068,7 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
missing_packages = {}
# First, determine what has to be downloaded
+ short_package_collection = sync_handlers.ShortPackageCollection()
package_collection = sync_handlers.PackageCollection()
for channel, pids in self._missing_channel_packages.items():
missing_packages[channel] = mp = []
@@ -1034,7 +1079,7 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
for pid in pids:
# XXX Catch errors
- timestamp = package_collection.get_package_timestamp(pid)
+ timestamp = short_package_collection.get_package_timestamp(pid)
if not package_collection.has_package(pid, timestamp):
# not in the cache
mp.append(pid)
@@ -1042,9 +1087,9 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
return missing_packages
def download_package_metadata(self):
-
- # Compute the unique packages and populate self._channel_packages
- self._compute_unique_packages()
+ log(1, ["", "Downloading package metadata"])
+ # Get the missing but uncached packages
+ missing_packages = self._missing_not_cached_packages()
h = sync_handlers.get_package_handler()
stream_loader = StreamProducer(h)
@@ -1055,12 +1100,7 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
s = self.xmlWireServer.getPackageXmlStream
stream_loader.set_wire_loader(s)
- log(1, ["", "Downloading package metadata"])
- # Get the missing but uncached packages
-# missing_packages = self._missing_not_cached_packages()
-
-
- for channel, pids in self._channel_packages.items():
+ for channel, pids in missing_packages.items():
package_count = len(pids)
log(1, messages.package_parsing % (channel,
@@ -1075,9 +1115,6 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
pb.redrawYN = 0
pb.printAll(1)
- lm = self._channel_collection.get_channel_timestamp(channel)
- channel_last_modified = int(rhnLib.timestamp(lm))
-
ss = SequenceServer(pids[:], nevermorethan=self._batch_size)
while not ss.doneYN():
chunk = ss.getChunk()
@@ -1090,8 +1127,6 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
h.close()
- self._diff_packages()
-
# Double-check that we got all the packages
missing_packages = self._missing_not_cached_packages()
for channel, pids in missing_packages.items():
@@ -1726,11 +1761,12 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
def _link_channel_packages(self):
log(1, ["", messages.link_channel_packages])
+ short_package_collection = sync_handlers.ShortPackageCollection()
package_collection = sync_handlers.PackageCollection()
uq_packages = {}
for chn, package_ids in self._missing_channel_packages.items():
for pid in package_ids:
- timestamp = package_collection.get_package_timestamp(pid)
+ timestamp = short_package_collection.get_package_timestamp(pid)
package = package_collection.get_package(pid, timestamp)
assert package is not None
channel_obj = {'label' : chn}
@@ -1764,13 +1800,14 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
""" short-circuit the most common case"""
if not chunk:
return []
+ short_package_collection = sync_handlers.ShortPackageCollection()
if sources:
package_collection = sync_handlers.SourcePackageCollection()
else:
package_collection = sync_handlers.PackageCollection()
batch = []
for pid in chunk:
- timestamp = package_collection.get_package_timestamp(pid)
+ timestamp = short_package_collection.get_package_timestamp(pid)
package = package_collection.get_package(pid, timestamp)
if package is None:
# not in the cache
@@ -1817,7 +1854,7 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
def _fix_erratum(self, erratum):
""" Replace the list of packages with references to short packages"""
- sp_coll = sync_handlers.PackageCollection()
+ sp_coll = sync_handlers.ShortPackageCollection()
pids = unique(erratum['packages'])
# map all the pkgs objects to the erratum
packages = []
@@ -1873,6 +1910,7 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
def _fetch_packages(self, channel, missing_fs_packages, sources=0):
+ short_package_collection = sync_handlers.ShortPackageCollection()
if sources:
# acronym = "SRPM"
package_collection = sync_handlers.SourcePackageCollection()
@@ -1887,7 +1925,7 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
cfg = config.initUp2dateConfig()
for package_id, path in missing_fs_packages:
pkg_current = pkg_current + 1
- timestamp = package_collection.get_package_timestamp(package_id)
+ timestamp = short_package_collection.get_package_timestamp(package_id)
package = package_collection.get_package(package_id, timestamp)
checksum_type = package['checksum_type']
@@ -2351,6 +2389,7 @@ def processCommandline():
if actionDict['no-packages']:
actionDict['packages'] = 0
+ actionDict['short'] = 0
actionDict['download-packages'] = 0
actionDict['rpms'] = 0
diff --git a/backend/satellite_tools/sync_handlers.py b/backend/satellite_tools/sync_handlers.py
index 59c74f8..7e79c3c 100644
--- a/backend/satellite_tools/sync_handlers.py
+++ b/backend/satellite_tools/sync_handlers.py
@@ -288,6 +288,9 @@ class PackageCollection(ShortPackageCollection):
def _init_cache(self):
self._cache = syncCache.PackageCache()
+ def get_package_timestamp(self, package_id):
+ raise NotImplementedError
+
class PackageContainer(xmlSource.PackageContainer):
def endItemCallback(self):
13 years, 11 months
Branch 'yum-repo-sync' - java/code
by Shannon Hughes
java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/validation/repoForm.xsd | 18 ++++++++++
1 file changed, 18 insertions(+)
New commits:
commit 9ad6ebad8be986e7e28cbdad3e2added82a970e9
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Tue May 18 10:45:26 2010 -0400
repo validation xsd schema
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/validation/repoForm.xsd b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/validation/repoForm.xsd
new file mode 100644
index 0000000..83726c1
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/validation/repoForm.xsd
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+
+<schema targetNamespace="http://rhn.redhat.com"
+ xmlns="http://www.w3.org/1999/XMLSchema"
+ xmlns:rhn="http://rhn.redhat.com">
+
+ <attribute name="label">
+ <simpleType baseType="string">
+ <minLength value="1" />
+ </simpleType>
+ </attribute>
+ <attribute name="url">
+ <simpleType baseType="string">
+ <minLength value="1" />
+ </simpleType>
+ </attribute>
+
+</schema>
\ No newline at end of file
13 years, 11 months
Branch 'yum-repo-sync' - java/code
by Shannon Hughes
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit ff0cb1fb5ed37ee07a8503f5da2770b3e6e32d99
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Tue May 18 10:36:47 2010 -0400
adding nav entries for repo create and edit
diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
index d42fd7d..fbb7420 100644
--- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
+++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
@@ -157,6 +157,8 @@
<rhn-tab name="Manage Repositories" acl="user_role(channel_admin)" node-id="manage_repos">
<rhn-tab-directory>/rhn/channels/manage/repos</rhn-tab-directory>
<rhn-tab-url>/rhn/channels/manage/repos/RepoList.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/channels/manage/repos/RepoEdit.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/channels/manage/repos/RepoCreate.do</rhn-tab-url>
</rhn-tab>
</rhn-tab>
</rhn-tab>
13 years, 11 months
Branch 'yum-repo-sync' - java/code
by Shannon Hughes
java/code/webapp/WEB-INF/struts-config.xml | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
New commits:
commit 30233e32bc8e5e776f253132ec0f523abdb19335
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Tue May 18 10:33:35 2010 -0400
struts entries for repo create and edit pages
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index cecdc4e..3e6dfae 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -6611,6 +6611,34 @@
path="/WEB-INF/pages/channel/manage/repo/repos.jsp"/>
</action>
+ <action path="/channels/manage/repos/RepoCreate"
+ scope="request"
+ validate="false"
+ name="contentSourceForm"
+ parameter="create_mode"
+ type="com.redhat.rhn.frontend.action.channel.manage.repo.RepoDetailsAction"
+ className="com.redhat.rhn.frontend.struts.RhnActionMapping">
+ <set-property property="acls" value="org_entitlement(rhn_provisioning); user_role(config_admin)"/>
+ <forward name="default"
+ path="/WEB-INF/pages/channel/repo/repodetails.jsp"/>
+ <forward name="success"
+ path="/channels/manage/repo/RepoEdit.do" redirect = "true"
+ />
+ </action>
+
+ <action path="/channels/manage/repos/RepoEdit"
+ scope="request"
+ name="contentSourceForm"
+ parameter="edit_mode"
+ type="com.redhat.rhn.frontend.action.channel.manage.repo.RepoDetailsAction"
+ className="com.redhat.rhn.frontend.struts.RhnActionMapping">
+ <set-property property="acls" value="org_entitlement(rhn_provisioning); user_role(config_admin)"/>
+ <forward name="default"
+ path="/WEB-INF/pages/channel/repo/repodetails.jsp"/>
+ <forward name="success"
+ path="/channels/manage/repo/RepoEdit.do" redirect = "true"/>
+ </action>
+
<!-- end repo -->
<action path="/common/DownloadFile"
13 years, 11 months
Branch 'yum-repo-sync' - 4 commits - client/rhel client/tools rel-eng/rpm2pkg
by Shannon Hughes
client/rhel/rhn-client-tools/rhn-client-tools.spec | 2
client/tools/rhncfg/config_management/rhncfg-manager.conf | 3
rel-eng/rpm2pkg/rpm2pkg | 192 ++++++++++++++
rel-eng/rpm2pkg/rpm2pkg-reloc.txt | 31 ++
4 files changed, 225 insertions(+), 3 deletions(-)
New commits:
commit c9e274286d6154ec8e2352c904714b90d5bf1f03
Merge: 2675a5c... 4519a97...
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Tue May 18 10:16:34 2010 -0400
Merge branch 'master' into repo
commit 4519a971a6019fbba34357f62769d2c974a8445d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 18 15:44:53 2010 +0200
adding rpm2pkg script for creating solaris pkg files from rpm packages
diff --git a/rel-eng/rpm2pkg/rpm2pkg b/rel-eng/rpm2pkg/rpm2pkg
new file mode 100755
index 0000000..ca02a98
--- /dev/null
+++ b/rel-eng/rpm2pkg/rpm2pkg
@@ -0,0 +1,192 @@
+#!/bin/bash
+
+# set -x
+
+usage() {
+ echo <<EOF
+Usage: $0 name-version-release.arch.rpm pkg_name
+
+pkg_name is without RHAT prefix. Resulting package will be stored as:
+ RHATpkg_namename-version-release.arch.pkg
+EOF
+ exit 1
+}
+
+munge () { dir=$1
+
+ # Match non-path character
+ NPC="[^A-Za-z0-9_\\.-]"
+
+ find $dir -type f | while read filepath ; do
+ if file $filepath | grep "ELF.*bit .SB " 2>&1 > /dev/null; then
+ echo " skipping file [$filepath] (ELF binary)"
+ continue
+ fi
+ if file $filepath | grep "gzip compressed data" 2>&1 > /dev/null; then
+ echo " skipping file [$filepath] (gzipped data)"
+ continue
+ fi
+ sed -i.origorig \
+ -e "s|#!/usr/bin/python|#!/opt/redhat/rhn/solaris/bin/python|g" \
+ -e "s|\($NPC\)/usr/sbin/rhn_check|\1/opt/redhat/rhn/solaris/usr/sbin/rhn_check|g" \
+ -e "s|\($NPC\)/usr/share/rhn|\1/opt/redhat/rhn/solaris/usr/share/rhn|g" \
+ -e "s|\($NPC\)/etc/sysconfig/rhn|\1/opt/redhat/rhn/solaris/etc/sysconfig/rhn|g" \
+ -e 's|^PREFIX="/"$|PREFIX="/opt/redhat/rhn/solaris/"|g' $filepath
+ if cmp -s $filepath.origorig $filepath ; then
+ mv $filepath.origorig $filepath
+ else
+ echo " [$filepath] munged"
+ rm -f $filepath.origorig
+ fi
+ done
+}
+
+unpack_man_pages () {
+ dir=$1
+
+ find $dir/opt/redhat/rhn/solaris/man -name '*.[1-9].gz' | while read file ; do
+ echo " ungzipping man page [$file]"
+ gunzip $file
+ done
+}
+
+relocate () {
+ dir=$1
+
+ grep '/.* /' $RELOCATION_DEFINITIONS | while read src dst ; do
+ if [ -f "$dir$src" ] ; then
+ echo " relocating file [$src] to [$dst]"
+ mv "$dir$src" "$dir$dst"
+ elif [ -d "$dir$src" ] ; then
+ if [ -d "$dir$dst" ] ; then
+ echo " relocating dir [$src] to [$dst], moving content"
+ for i in $dir$src/* ; do mv $i $dir$dst ; done
+ rm -rf $dir$src
+ else
+ echo " relocating dir [$src] to [$dst]"
+ mkdir -p $( dirname $dir$dst )
+ mv $dir$src $dir$dst
+ fi
+ fi
+ done
+
+ find $dir -type l | while read link ; do
+ target=$( readlink $link )
+ cat $RELOCATION_DEFINITIONS | while read src dst ; do
+ if [ -n "$src" -a -n "$dst" -a ${target:0:${#src}} = $src ] ; then
+ result=$dst${target:${#src}}
+ echo " updating symlink [$link] from [$target] to [$result]"
+ ln -sf $result $link
+ continue
+ fi
+ done
+
+ done
+
+ found_empty=1
+ while [ $found_empty -eq 1 ] ; do
+ found_empty=0
+ while read d ; do
+ echo " purging empty dir [$d]"
+ rmdir $d
+ found_empty=1
+ done < <( find $dir -type d -empty )
+ done
+}
+
+[ $# -ne 2 ] && usage
+
+RELOCATION_DEFINITIONS=`dirname $0`/rpm2pkg-reloc.txt
+if [ ! -f $RELOCATION_DEFINITIONS ] ; then
+ echo "$0: relocation definition file [$RELOCATION_DEFINITIONS] does not exist."
+ exit 1
+fi
+
+RPM_FILE=$1
+if [ ! -f $RPM_FILE ] ; then
+ echo "$0: input file [$RPM_FILE] does not exist."
+ exit 1
+fi
+echo "rpm file [$RPM_FILE]"
+RPM_DIR=${RPM_FILE%.rpm}
+if [ $RPM_DIR = $RPM_FILE ] ; then
+ RPM_DIR="$RPM_DIR-dir"
+fi
+
+echo " unpacking to directory [$RPM_DIR]"
+rm -rf $RPM_DIR
+mkdir -p $RPM_DIR/root
+rpm2cpio $RPM_FILE | ( cd $RPM_DIR/root && cpio --quiet -idm )
+
+echo " munging paths in files in [$RPM_DIR/root]"
+munge $RPM_DIR/root
+
+relocate $RPM_DIR/root
+
+unpack_man_pages $RPM_DIR/root
+
+PKG_NAME=RHAT$2
+
+{
+ read RPM_NAME
+ read RPM_VERSION
+ read RPM_RELEASE
+ read RPM_ARCH
+ if [ "$RPM_ARCH" == 'sparc64' ] ; then RPM_ARCH='sparce' ; fi
+ read RPM_SUMMARY
+} < <( rpm -qp --nosignature --qf '%{name}\n%{version}\n%{release}\n%{arch}\n%{summary}\n' $RPM_FILE )
+PKG_FILE=$( echo $RPM_FILE | sed -e 's!\.noarch\.rpm$!.rpm!' -e "s!^.*\(-.*-.*\)\.rpm\$!$PKG_NAME\1.pkg!" )
+
+STAMP=$( date '+%Y%m%d-%H%M%S' )
+if [ -f $PKG_FILE ] ; then
+ echo "making backup of [$PKG_FILE] to [$PKG_FILE.$STAMP]"
+ mv $PKG_FILE $PKG_FILE.$STAMP
+fi
+
+echo "package [$PKG_NAME]"
+echo " creating [pkginfo]"
+cat <<EOS > $RPM_DIR/pkginfo
+PKG="$PKG_NAME"
+NAME="$RPM_NAME $RPM_VERSION"
+VERSION="$RPM_VERSION,REV=$RPM_RELEASE"
+ARCH="$RPM_ARCH"
+CATEGORY="utility"
+DESC="$RPM_SUMMARY"
+PSTAMP=RHAT_RHN
+CLASSES=none
+VENDOR="Red Hat"
+SUNW_PKG_THISZONE=true
+EOS
+
+PROTO_FILE=$PKG_NAME.proto
+PROTO_FILENAME=$RPM_DIR/$PROTO_FILE
+echo " creating prototype [$PROTO_FILE]"
+echo "i pkginfo" > $PROTO_FILENAME
+( cd $RPM_DIR && find root/ ) | sed 's!^root!!' |
+ while read p ; do
+ if [ -L $RPM_DIR/root$p ] ; then
+ target=$( readlink $RPM_DIR/root$p )
+ echo "s none $p=$target"
+ elif [ -d $RPM_DIR/root$p ] ; then
+ echo "d none $p ? ? ?"
+ elif [ -f $RPM_DIR/root$p ] ; then
+ stat=$( stat --printf '0%a' $RPM_DIR/root$p )
+ echo "f none $p $stat root root"
+ else
+ "unsupported type [$RPM_DIR/root$p]"
+ exit 1
+ fi
+ done >> $PROTO_FILENAME
+
+echo "running pkgmk with root [$RPM_DIR/root] out [$RPM_DIR/pkg] prototype [$PROTO_FILENAME]"
+mkdir $RPM_DIR/pkg
+pkgmk -o -r $RPM_DIR/root -d $RPM_DIR/pkg -f $PROTO_FILENAME
+
+echo "running pkgtrans [$RPM_DIR/pkg] to [$PKG_FILE] for [$PKG_NAME]"
+pkgtrans -o -s $RPM_DIR/pkg ../../$PKG_FILE "$PKG_NAME.*"
+
+echo "cleaning up $RPM_DIR"
+rm -rf $RPM_DIR
+
+exit 0
+
diff --git a/rel-eng/rpm2pkg/rpm2pkg-reloc.txt b/rel-eng/rpm2pkg/rpm2pkg-reloc.txt
new file mode 100644
index 0000000..b4ca81b
--- /dev/null
+++ b/rel-eng/rpm2pkg/rpm2pkg-reloc.txt
@@ -0,0 +1,31 @@
+/etc/sysconfig /opt/redhat/rhn/solaris/etc/sysconfig
+/usr/bin /opt/redhat/rhn/solaris/usr/bin
+/usr/sbin /opt/redhat/rhn/solaris/usr/sbin
+/var/log /opt/redhat/rhn/solaris/var/log
+/var/run /opt/redhat/rhn/solaris/var/run
+/usr/lib/python1.5 /opt/redhat/rhn/solaris/lib/python2.4
+/usr/lib/python2.2 /opt/redhat/rhn/solaris/lib/python2.4
+/usr/lib/python2.3 /opt/redhat/rhn/solaris/lib/python2.4
+/usr/lib/python2.4 /opt/redhat/rhn/solaris/lib/python2.4
+/usr/local/lib/python2.2 /opt/redhat/rhn/solaris/lib/python2.4
+/usr/local/lib/python2.3 /opt/redhat/rhn/solaris/lib/python2.4
+/usr/local/lib/python2.4 /opt/redhat/rhn/solaris/lib/python2.4
+/usr/share/doc /opt/redhat/rhn/solaris/doc
+/usr/share/man /opt/redhat/rhn/solaris/man
+
+# rhncfg-* relocations
+/usr/share/rhn/config_common /opt/redhat/rhn/solaris/lib/python2.4/site-packages/config_common
+/usr/share/rhn/actions /opt/redhat/rhn/solaris/lib/python2.4/site-packages/rhn/actions
+/usr/share/rhn/config_client /opt/redhat/rhn/solaris/lib/python2.4/site-packages/config_client
+/usr/share/rhn/config_management /opt/redhat/rhn/solaris/lib/python2.4/site-packages/config_management
+/usr/share/rhn/rhnpush /opt/redhat/rhn/solaris/lib/python2.4/site-packages/rhnpush
+
+# Generic relocate
+/usr/share/rhn /opt/redhat/rhn/solaris/usr/share/rhn
+
+# Symlink relocation
+../../usr/share/rhn/config_common ../../lib/python2.4/site-packages/config_common
+../../usr/share/rhn/actions ../../lib/python2.4/site-packages/rhn/actions
+../../usr/share/rhn/config_client ../../lib/python2.4/site-packages/config_client
+../../usr/share/rhn/config_management ../../lib/python2.4/site-packages/config_management
+#../../usr/share/rhn ../../lib/python2.4/site-packages/
commit 4795911395bbd1d99040162a99f017d09e7b9795
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 18 11:02:36 2010 +0200
515637 - add newline at the end so solaris will not srip last line
diff --git a/client/tools/rhncfg/config_management/rhncfg-manager.conf b/client/tools/rhncfg/config_management/rhncfg-manager.conf
index 4d343a3..dc79942 100644
--- a/client/tools/rhncfg/config_management/rhncfg-manager.conf
+++ b/client/tools/rhncfg/config_management/rhncfg-manager.conf
@@ -39,4 +39,5 @@ server_url = %(proto)s://%(server_name)s%(server_handler)s
# httpProxy = some.proxy.example.com:3030
# proxyUser = proxy_user_name
# proxyPassword = proxy_password
-# sslCACert = /usr/share/rhn/RHNS-CA-CERT
\ No newline at end of file
+# sslCACert = /usr/share/rhn/RHNS-CA-CERT
+
commit fa301aeea5a97b1b7529000e09b8cdbf6c1c25d0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 18 08:29:36 2010 +0200
The bugzilla 556290 had errata released, python-setuptools should be pulled in by python-coverage.
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 3128f7e..fdfa1cb 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -40,8 +40,6 @@ BuildRequires: desktop-file-utils
%if 0%{?fedora} >= 12
BuildRequires: python-coverage
BuildRequires: rhnlib
-# python-setuptools can be removed when 556290 gets fixed
-BuildRequires: python-setuptools
BuildRequires: rpm-python
%endif
13 years, 11 months
rel-eng/rpm2pkg
by Miroslav Suchý
rel-eng/rpm2pkg/rpm2pkg | 192 ++++++++++++++++++++++++++++++++++++++
rel-eng/rpm2pkg/rpm2pkg-reloc.txt | 31 ++++++
2 files changed, 223 insertions(+)
New commits:
commit 4519a971a6019fbba34357f62769d2c974a8445d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 18 15:44:53 2010 +0200
adding rpm2pkg script for creating solaris pkg files from rpm packages
diff --git a/rel-eng/rpm2pkg/rpm2pkg b/rel-eng/rpm2pkg/rpm2pkg
new file mode 100755
index 0000000..ca02a98
--- /dev/null
+++ b/rel-eng/rpm2pkg/rpm2pkg
@@ -0,0 +1,192 @@
+#!/bin/bash
+
+# set -x
+
+usage() {
+ echo <<EOF
+Usage: $0 name-version-release.arch.rpm pkg_name
+
+pkg_name is without RHAT prefix. Resulting package will be stored as:
+ RHATpkg_namename-version-release.arch.pkg
+EOF
+ exit 1
+}
+
+munge () { dir=$1
+
+ # Match non-path character
+ NPC="[^A-Za-z0-9_\\.-]"
+
+ find $dir -type f | while read filepath ; do
+ if file $filepath | grep "ELF.*bit .SB " 2>&1 > /dev/null; then
+ echo " skipping file [$filepath] (ELF binary)"
+ continue
+ fi
+ if file $filepath | grep "gzip compressed data" 2>&1 > /dev/null; then
+ echo " skipping file [$filepath] (gzipped data)"
+ continue
+ fi
+ sed -i.origorig \
+ -e "s|#!/usr/bin/python|#!/opt/redhat/rhn/solaris/bin/python|g" \
+ -e "s|\($NPC\)/usr/sbin/rhn_check|\1/opt/redhat/rhn/solaris/usr/sbin/rhn_check|g" \
+ -e "s|\($NPC\)/usr/share/rhn|\1/opt/redhat/rhn/solaris/usr/share/rhn|g" \
+ -e "s|\($NPC\)/etc/sysconfig/rhn|\1/opt/redhat/rhn/solaris/etc/sysconfig/rhn|g" \
+ -e 's|^PREFIX="/"$|PREFIX="/opt/redhat/rhn/solaris/"|g' $filepath
+ if cmp -s $filepath.origorig $filepath ; then
+ mv $filepath.origorig $filepath
+ else
+ echo " [$filepath] munged"
+ rm -f $filepath.origorig
+ fi
+ done
+}
+
+unpack_man_pages () {
+ dir=$1
+
+ find $dir/opt/redhat/rhn/solaris/man -name '*.[1-9].gz' | while read file ; do
+ echo " ungzipping man page [$file]"
+ gunzip $file
+ done
+}
+
+relocate () {
+ dir=$1
+
+ grep '/.* /' $RELOCATION_DEFINITIONS | while read src dst ; do
+ if [ -f "$dir$src" ] ; then
+ echo " relocating file [$src] to [$dst]"
+ mv "$dir$src" "$dir$dst"
+ elif [ -d "$dir$src" ] ; then
+ if [ -d "$dir$dst" ] ; then
+ echo " relocating dir [$src] to [$dst], moving content"
+ for i in $dir$src/* ; do mv $i $dir$dst ; done
+ rm -rf $dir$src
+ else
+ echo " relocating dir [$src] to [$dst]"
+ mkdir -p $( dirname $dir$dst )
+ mv $dir$src $dir$dst
+ fi
+ fi
+ done
+
+ find $dir -type l | while read link ; do
+ target=$( readlink $link )
+ cat $RELOCATION_DEFINITIONS | while read src dst ; do
+ if [ -n "$src" -a -n "$dst" -a ${target:0:${#src}} = $src ] ; then
+ result=$dst${target:${#src}}
+ echo " updating symlink [$link] from [$target] to [$result]"
+ ln -sf $result $link
+ continue
+ fi
+ done
+
+ done
+
+ found_empty=1
+ while [ $found_empty -eq 1 ] ; do
+ found_empty=0
+ while read d ; do
+ echo " purging empty dir [$d]"
+ rmdir $d
+ found_empty=1
+ done < <( find $dir -type d -empty )
+ done
+}
+
+[ $# -ne 2 ] && usage
+
+RELOCATION_DEFINITIONS=`dirname $0`/rpm2pkg-reloc.txt
+if [ ! -f $RELOCATION_DEFINITIONS ] ; then
+ echo "$0: relocation definition file [$RELOCATION_DEFINITIONS] does not exist."
+ exit 1
+fi
+
+RPM_FILE=$1
+if [ ! -f $RPM_FILE ] ; then
+ echo "$0: input file [$RPM_FILE] does not exist."
+ exit 1
+fi
+echo "rpm file [$RPM_FILE]"
+RPM_DIR=${RPM_FILE%.rpm}
+if [ $RPM_DIR = $RPM_FILE ] ; then
+ RPM_DIR="$RPM_DIR-dir"
+fi
+
+echo " unpacking to directory [$RPM_DIR]"
+rm -rf $RPM_DIR
+mkdir -p $RPM_DIR/root
+rpm2cpio $RPM_FILE | ( cd $RPM_DIR/root && cpio --quiet -idm )
+
+echo " munging paths in files in [$RPM_DIR/root]"
+munge $RPM_DIR/root
+
+relocate $RPM_DIR/root
+
+unpack_man_pages $RPM_DIR/root
+
+PKG_NAME=RHAT$2
+
+{
+ read RPM_NAME
+ read RPM_VERSION
+ read RPM_RELEASE
+ read RPM_ARCH
+ if [ "$RPM_ARCH" == 'sparc64' ] ; then RPM_ARCH='sparce' ; fi
+ read RPM_SUMMARY
+} < <( rpm -qp --nosignature --qf '%{name}\n%{version}\n%{release}\n%{arch}\n%{summary}\n' $RPM_FILE )
+PKG_FILE=$( echo $RPM_FILE | sed -e 's!\.noarch\.rpm$!.rpm!' -e "s!^.*\(-.*-.*\)\.rpm\$!$PKG_NAME\1.pkg!" )
+
+STAMP=$( date '+%Y%m%d-%H%M%S' )
+if [ -f $PKG_FILE ] ; then
+ echo "making backup of [$PKG_FILE] to [$PKG_FILE.$STAMP]"
+ mv $PKG_FILE $PKG_FILE.$STAMP
+fi
+
+echo "package [$PKG_NAME]"
+echo " creating [pkginfo]"
+cat <<EOS > $RPM_DIR/pkginfo
+PKG="$PKG_NAME"
+NAME="$RPM_NAME $RPM_VERSION"
+VERSION="$RPM_VERSION,REV=$RPM_RELEASE"
+ARCH="$RPM_ARCH"
+CATEGORY="utility"
+DESC="$RPM_SUMMARY"
+PSTAMP=RHAT_RHN
+CLASSES=none
+VENDOR="Red Hat"
+SUNW_PKG_THISZONE=true
+EOS
+
+PROTO_FILE=$PKG_NAME.proto
+PROTO_FILENAME=$RPM_DIR/$PROTO_FILE
+echo " creating prototype [$PROTO_FILE]"
+echo "i pkginfo" > $PROTO_FILENAME
+( cd $RPM_DIR && find root/ ) | sed 's!^root!!' |
+ while read p ; do
+ if [ -L $RPM_DIR/root$p ] ; then
+ target=$( readlink $RPM_DIR/root$p )
+ echo "s none $p=$target"
+ elif [ -d $RPM_DIR/root$p ] ; then
+ echo "d none $p ? ? ?"
+ elif [ -f $RPM_DIR/root$p ] ; then
+ stat=$( stat --printf '0%a' $RPM_DIR/root$p )
+ echo "f none $p $stat root root"
+ else
+ "unsupported type [$RPM_DIR/root$p]"
+ exit 1
+ fi
+ done >> $PROTO_FILENAME
+
+echo "running pkgmk with root [$RPM_DIR/root] out [$RPM_DIR/pkg] prototype [$PROTO_FILENAME]"
+mkdir $RPM_DIR/pkg
+pkgmk -o -r $RPM_DIR/root -d $RPM_DIR/pkg -f $PROTO_FILENAME
+
+echo "running pkgtrans [$RPM_DIR/pkg] to [$PKG_FILE] for [$PKG_NAME]"
+pkgtrans -o -s $RPM_DIR/pkg ../../$PKG_FILE "$PKG_NAME.*"
+
+echo "cleaning up $RPM_DIR"
+rm -rf $RPM_DIR
+
+exit 0
+
diff --git a/rel-eng/rpm2pkg/rpm2pkg-reloc.txt b/rel-eng/rpm2pkg/rpm2pkg-reloc.txt
new file mode 100644
index 0000000..b4ca81b
--- /dev/null
+++ b/rel-eng/rpm2pkg/rpm2pkg-reloc.txt
@@ -0,0 +1,31 @@
+/etc/sysconfig /opt/redhat/rhn/solaris/etc/sysconfig
+/usr/bin /opt/redhat/rhn/solaris/usr/bin
+/usr/sbin /opt/redhat/rhn/solaris/usr/sbin
+/var/log /opt/redhat/rhn/solaris/var/log
+/var/run /opt/redhat/rhn/solaris/var/run
+/usr/lib/python1.5 /opt/redhat/rhn/solaris/lib/python2.4
+/usr/lib/python2.2 /opt/redhat/rhn/solaris/lib/python2.4
+/usr/lib/python2.3 /opt/redhat/rhn/solaris/lib/python2.4
+/usr/lib/python2.4 /opt/redhat/rhn/solaris/lib/python2.4
+/usr/local/lib/python2.2 /opt/redhat/rhn/solaris/lib/python2.4
+/usr/local/lib/python2.3 /opt/redhat/rhn/solaris/lib/python2.4
+/usr/local/lib/python2.4 /opt/redhat/rhn/solaris/lib/python2.4
+/usr/share/doc /opt/redhat/rhn/solaris/doc
+/usr/share/man /opt/redhat/rhn/solaris/man
+
+# rhncfg-* relocations
+/usr/share/rhn/config_common /opt/redhat/rhn/solaris/lib/python2.4/site-packages/config_common
+/usr/share/rhn/actions /opt/redhat/rhn/solaris/lib/python2.4/site-packages/rhn/actions
+/usr/share/rhn/config_client /opt/redhat/rhn/solaris/lib/python2.4/site-packages/config_client
+/usr/share/rhn/config_management /opt/redhat/rhn/solaris/lib/python2.4/site-packages/config_management
+/usr/share/rhn/rhnpush /opt/redhat/rhn/solaris/lib/python2.4/site-packages/rhnpush
+
+# Generic relocate
+/usr/share/rhn /opt/redhat/rhn/solaris/usr/share/rhn
+
+# Symlink relocation
+../../usr/share/rhn/config_common ../../lib/python2.4/site-packages/config_common
+../../usr/share/rhn/actions ../../lib/python2.4/site-packages/rhn/actions
+../../usr/share/rhn/config_client ../../lib/python2.4/site-packages/config_client
+../../usr/share/rhn/config_management ../../lib/python2.4/site-packages/config_management
+#../../usr/share/rhn ../../lib/python2.4/site-packages/
13 years, 11 months
client/tools
by Miroslav Suchý
client/tools/rhncfg/config_management/rhncfg-manager.conf | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 4795911395bbd1d99040162a99f017d09e7b9795
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 18 11:02:36 2010 +0200
515637 - add newline at the end so solaris will not srip last line
diff --git a/client/tools/rhncfg/config_management/rhncfg-manager.conf b/client/tools/rhncfg/config_management/rhncfg-manager.conf
index 4d343a3..dc79942 100644
--- a/client/tools/rhncfg/config_management/rhncfg-manager.conf
+++ b/client/tools/rhncfg/config_management/rhncfg-manager.conf
@@ -39,4 +39,5 @@ server_url = %(proto)s://%(server_name)s%(server_handler)s
# httpProxy = some.proxy.example.com:3030
# proxyUser = proxy_user_name
# proxyPassword = proxy_password
-# sslCACert = /usr/share/rhn/RHNS-CA-CERT
\ No newline at end of file
+# sslCACert = /usr/share/rhn/RHNS-CA-CERT
+
13 years, 11 months