OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 29-Mar-2007 09:35:05 Branch: HEAD Handle: 2007032908350102 Modified files: openpkg-src/openpkg HISTORY openpkg.spec release.8 release.pod release.sh Log: add variables to expand uuid(8) information in the "openpkg release" format Summary: Revision Changes Path 1.443 +1 -0 openpkg-src/openpkg/HISTORY 1.578 +1 -1 openpkg-src/openpkg/openpkg.spec 1.3 +7 -2 openpkg-src/openpkg/release.8 1.3 +8 -2 openpkg-src/openpkg/release.pod 1.6 +6 -0 openpkg-src/openpkg/release.sh ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY ============================================================================ $ cvs diff -u -r1.442 -r1.443 HISTORY --- openpkg-src/openpkg/HISTORY 22 Mar 2007 21:52:58 -0000 1.442 +++ openpkg-src/openpkg/HISTORY 29 Mar 2007 07:35:01 -0000 1.443 @@ -2,6 +2,7 @@ 2007 ==== +20070329 add variables to expand uuid(8) information in the "openpkg release" format 20070322 cosmetic: align code variable name with documentation 20070321 upgrade to openpkg-registry 1.1.2 replace HOSTNAME with FQDN when creating OPENPKG_DESC default 20070320 automatic (re-)registration if previous registration, community series or release set to openpkg URLs @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openpkg.spec ============================================================================ $ cvs diff -u -r1.577 -r1.578 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 22 Mar 2007 21:52:58 -0000 1.577 +++ openpkg-src/openpkg/openpkg.spec 29 Mar 2007 07:35:01 -0000 1.578 @@ -39,7 +39,7 @@ # o any cc(1) # the package version/release -%define V_openpkg 20070322 +%define V_openpkg 20070329 # the used software versions %define V_rpm 4.2.1 @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/release.8 ============================================================================ $ cvs diff -u -r1.2 -r1.3 release.8 --- openpkg-src/openpkg/release.8 25 Aug 2006 08:58:49 -0000 1.2 +++ openpkg-src/openpkg/release.8 29 Mar 2007 07:35:02 -0000 1.3 @@ -148,8 +148,10 @@ The output format specification. The argument \fIformat\fR is an arbitrary string which can contain the special expansion constructs "\f(CW%t\fR\*(L" for expanding the release tag, \*(R"\f(CW%u\fR\*(L" for expanding the distribution \s-1URL\s0 -and \*(R"\f(CW\*(C`\en\*(C'\fR" for expanding an embedded newline character. The default -\&\fIformat\fR is "\f(CW\*(C`OpenPKG\-%t %u\*(C'\fR". +and \*(R"\f(CW\*(C`\en\*(C'\fR" for expanding an embedded newline character. +The instance \s-1UUID\s0 information is also availble by expanding +\&\f(CW%r\fR to \s-1UUID_REGISTRY\s0, \f(CW%i\fR to \s-1UUID_INSTANCE\s0, \f(CW%p\fR to \s-1UUID_PLATFORM\s0. +The default \fIformat\fR is "\f(CW\*(C`OpenPKG\-%t %u\*(C'\fR". .IP "\fB\-r\fR, \fB\-\-release\fR \fIrelease\fR" 4 .IX Item "-r, --release release" The package "\f(CW\*(C`Release\*(C'\fR" header value to use for deriving the release @@ -214,6 +216,9 @@ \& TAG=2-STABLE-20060622 \& URL=ftp://ftp.example.com/mirror/openpkg.org/* .Ve +.SH "SEE ALSO" +.IX Header "SEE ALSO" +\&\fIuuid\fR\|(8) .SH "HISTORY" .IX Header "HISTORY" The \fBopenpkg release\fR command first appeared in \fBOpenPKG 2\-STABLE\-20060622\fR. @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/release.pod ============================================================================ $ cvs diff -u -r1.2 -r1.3 release.pod --- openpkg-src/openpkg/release.pod 1 Jan 2007 17:40:19 -0000 1.2 +++ openpkg-src/openpkg/release.pod 29 Mar 2007 07:35:03 -0000 1.3 @@ -48,8 +48,10 @@ The output format specification. The argument I<format> is an arbitrary string which can contain the special expansion constructs "C<%t>" for expanding the release tag, "C<%u>" for expanding the distribution URL -and "C<\n>" for expanding an embedded newline character. The default -I<format> is "C<OpenPKG-%t %u>". +and "C<\n>" for expanding an embedded newline character. +The instance UUID information is also availble by expanding +C<%r> to UUID_REGISTRY, C<%i> to UUID_INSTANCE, C<%p> to UUID_PLATFORM. +The default I<format> is "C<OpenPKG-%t %u>". =item B<-r>, B<--release> I<release> @@ -114,6 +116,10 @@ TAG=2-STABLE-20060622 URL=ftp://ftp.example.com/mirror/openpkg.org/* +=head1 SEE ALSO + +uuid(8) + =head1 HISTORY The B<openpkg release> command first appeared in B<OpenPKG 2-STABLE-20060622>. @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/release.sh ============================================================================ $ cvs diff -u -r1.5 -r1.6 release.sh --- openpkg-src/openpkg/release.sh 1 Jan 2007 17:40:19 -0000 1.5 +++ openpkg-src/openpkg/release.sh 29 Mar 2007 07:35:03 -0000 1.6 @@ -132,10 +132,16 @@ ;; esac +# read uuid +[ -f "$prefix/etc/openpkg/uuid" ] && . "$prefix/etc/openpkg/uuid" + # generate output echo "X$opt_F" |\ sed -e 's/^X//' \ -e "s;%t;${tag};g" \ -e "s;%u;${url};g" \ + -e "s;%r;${UUID_REGISTRY};g" \ + -e "s;%i;${UUID_INSTANCE};g" \ + -e "s;%p;${UUID_PLATFORM};g" \ -e 's/\\n/^/g' | tr '^' '\012' @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org