diff options
| author | Igor Pashev <igor.pashev@nexenta.com> | 2012-09-28 22:37:16 +0400 |
|---|---|---|
| committer | Igor Pashev <igor.pashev@nexenta.com> | 2012-09-28 22:37:16 +0400 |
| commit | f4140bc5435dffb27064df5a98b33f6d0d1b9595 (patch) | |
| tree | a5837f7e98908daca4c215442bddc9b517cc551e | |
| parent | f9b823394ccfad3c82551f05f9362a461acd0003 (diff) | |
| download | cibs-f4140bc5435dffb27064df5a98b33f6d0d1b9595.tar.gz | |
Setting gnu symlinks blindly is not good
| -rw-r--r-- | examples/findutils/gnu-findutils.p5m | 7 | ||||
| -rw-r--r-- | examples/findutils/locate.p5m | 2 | ||||
| -rw-r--r-- | examples/gm4/gm4.p5m | 7 | ||||
| -rw-r--r-- | examples/grep/gnu-grep.p5m | 8 | ||||
| -rw-r--r-- | rules/ips.mk | 1 | ||||
| -rw-r--r-- | trans/gnu | 7 |
6 files changed, 23 insertions, 9 deletions
diff --git a/examples/findutils/gnu-findutils.p5m b/examples/findutils/gnu-findutils.p5m index 8e6f021..e902e90 100644 --- a/examples/findutils/gnu-findutils.p5m +++ b/examples/findutils/gnu-findutils.p5m @@ -4,6 +4,13 @@ set name=info.upstream-url value="$(home)" set name=info.source_url value="$(download)" license $(license-file) license="$(license)" +<transform file path=usr/gnu/bin/(.+) -> \ +emit link path=usr/bin/g%<1> target=../gnu/bin/%<1> > + +<transform file path=usr/gnu/share/man/man1/(.+) -> \ +emit link path=usr/share/man/man1/g%<1> target=../../../gnu/share/man/man1/%<1> > + + dir path=usr dir path=usr/gnu dir path=usr/gnu/bin diff --git a/examples/findutils/locate.p5m b/examples/findutils/locate.p5m index fe26217..fee8de0 100644 --- a/examples/findutils/locate.p5m +++ b/examples/findutils/locate.p5m @@ -6,6 +6,8 @@ license $(license-file) license="$(license)" depend fmri=pkg:/file/gnu-$(name)@4.4 type=require +# TODO: mediators for /usr/bin/{locate,updatedb} + dir path=usr dir path=usr/gnu dir path=usr/gnu/bin diff --git a/examples/gm4/gm4.p5m b/examples/gm4/gm4.p5m index 638004d..b5843ed 100644 --- a/examples/gm4/gm4.p5m +++ b/examples/gm4/gm4.p5m @@ -5,6 +5,13 @@ set name=info.source_url value="$(download)" license $(license-file) license=$(license) +<transform file path=usr/gnu/bin/(.+) -> \ +emit link path=usr/bin/g%<1> target=../gnu/bin/%<1> > + +<transform file path=usr/gnu/share/man/man1/(.+) -> \ +emit link path=usr/share/man/man1/g%<1> target=../../../gnu/share/man/man1/%<1>> + + dir path=usr dir path=usr/gnu dir path=usr/gnu/bin diff --git a/examples/grep/gnu-grep.p5m b/examples/grep/gnu-grep.p5m index bf811ec..a1e10d5 100644 --- a/examples/grep/gnu-grep.p5m +++ b/examples/grep/gnu-grep.p5m @@ -1,10 +1,16 @@ - set name=pkg.fmri value=pkg:/text/gnu-$(name)@$(ips_version) set name=pkg.summary value="$(summary)" set name=info.upstream-url value="$(home)" set name=info.source_url value="$(download)" license $(license-file) license="$(license)" +<transform file path=usr/gnu/bin/(.+) -> \ +emit link path=usr/bin/g%<1> target=../gnu/bin/%<1> > + +<transform file path=usr/gnu/share/man/man1/(.+) -> \ +emit link path=usr/share/man/man1/g%<1> target=../../../gnu/share/man/man1/%<1> > + + dir path=usr dir path=usr/gnu dir path=usr/gnu/bin diff --git a/rules/ips.mk b/rules/ips.mk index 36d76e2..8d7184e 100644 --- a/rules/ips.mk +++ b/rules/ips.mk @@ -61,7 +61,6 @@ pkg-protos += -d "$(sourcedir)" -d . transformations := \ $(transdir)/defaults \ -$(transdir)/gnu \ $(transdir)/actuators \ $(transdir)/devel \ $(transdir)/docs \ diff --git a/trans/gnu b/trans/gnu deleted file mode 100644 index 83da978..0000000 --- a/trans/gnu +++ /dev/null @@ -1,7 +0,0 @@ -<transform file path=usr/gnu/bin/(.+) -> \ -emit link path=usr/bin/g%<1> target=../gnu/bin/%<1> \ -facet.compat.gnulinks=true > - -<transform file path=usr/gnu/share/man/man1/(.+) -> \ -emit link path=usr/share/man/man1/g%<1> target=../../../gnu/share/man/man1/%<1> \ -facet.compat.gnulinks=true > |