--- a/components/coreutils/Makefile Thu Feb 24 02:24:02 2011 -0800
+++ b/components/coreutils/Makefile Thu Feb 24 10:32:52 2011 -0800
@@ -56,6 +56,10 @@
NEEDMV=if [ -e $(1) ]; then $(RM) $(2); /usr/bin/mv $(1) $(2); fi
RMDIR=/usr/bin/rmdir
+#
+# whoami is in both /usr/bin and /usr/gnu/bin; mistake?
+#
+
install: $(PROTOUSRBINDIR) $(PROTOUSRSHAREMAN1DIR) $(INSTALL_32)
for command in $(CMDS_NONCONFLICTING); do \
$(call NEEDMV,$(PROTOGNUBIN)/$$command,\
@@ -69,9 +73,6 @@
$(call NEEDMV,$(PROTOGNUSHAREMAN1)/$$manpage,\
$(PROTOUSRSHAREMAN1DIR)/$$manpage); \
done
- #
- # whoami is in both /usr/bin and /usr/gnu/bin; mistake?
- #
$(CP) $(PROTOUSRBINDIR)/whoami $(PROTOGNUBIN)/whoami
$(CP) $(PROTOUSRSHAREMAN1DIR)/whoami.1 $(PROTOGNUSHAREMAN1)/whoami.1
$(call NEEDMV,$(PROTOGNUBIN)/install,$(PROTOUSRBINDIR)/ginstall)
--- a/components/coreutils/SUNWgnu-coreutils.p5m Thu Feb 24 02:24:02 2011 -0800
+++ b/components/coreutils/SUNWgnu-coreutils.p5m Thu Feb 24 10:32:52 2011 -0800
@@ -30,4 +30,4 @@
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-depend fmri=shell/[email protected] type=require
+depend fmri=file/[email protected] type=require
--- a/components/coreutils/coreutils.p5m Thu Feb 24 02:24:02 2011 -0800
+++ b/components/coreutils/coreutils.p5m Thu Feb 24 10:32:52 2011 -0800
@@ -20,7 +20,7 @@
#
# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
#
-set name=pkg.fmri value=pkg:/shell/coreutils@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri value=pkg:/file/gnu-coreutils@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GNU Core Utilities"
set name=pkg.description value="GNU Core Utilities are the basic file, shell and text manipulation utilities"
set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"