7056876 move erlang to userland (fix install)
7045614 Move Apache Web server to userland (fix perms)
--- a/components/apache2/apache-22.p5m Tue Jun 28 11:24:16 2011 -0700
+++ b/components/apache2/apache-22.p5m Tue Jun 28 12:42:50 2011 -0700
@@ -143,21 +143,21 @@
file path=usr/apache2/2.2/bin/logresolve
file path=usr/apache2/2.2/bin/rotatelogs
file usr/apache2/2.2/bin/suexec path=usr/apache2/2.2/bin/suexec.disabled mode=0500
-file path=usr/apache2/2.2/build/$(MACH64)/config.nice
+file path=usr/apache2/2.2/build/$(MACH64)/config.nice mode=0555
file path=usr/apache2/2.2/build/$(MACH64)/config_vars.mk
-file path=usr/apache2/2.2/build/$(MACH64)/instdso.sh
+file path=usr/apache2/2.2/build/$(MACH64)/instdso.sh mode=0555
file path=usr/apache2/2.2/build/$(MACH64)/library.mk
file path=usr/apache2/2.2/build/$(MACH64)/ltlib.mk
-file path=usr/apache2/2.2/build/$(MACH64)/mkdir.sh
+file path=usr/apache2/2.2/build/$(MACH64)/mkdir.sh mode=0555
file path=usr/apache2/2.2/build/$(MACH64)/program.mk
file path=usr/apache2/2.2/build/$(MACH64)/rules.mk
file path=usr/apache2/2.2/build/$(MACH64)/special.mk
-file path=usr/apache2/2.2/build/config.nice
+file path=usr/apache2/2.2/build/config.nice mode=0555
file path=usr/apache2/2.2/build/config_vars.mk
-file path=usr/apache2/2.2/build/instdso.sh
+file path=usr/apache2/2.2/build/instdso.sh mode=0555
file path=usr/apache2/2.2/build/library.mk
file path=usr/apache2/2.2/build/ltlib.mk
-file path=usr/apache2/2.2/build/mkdir.sh
+file path=usr/apache2/2.2/build/mkdir.sh mode=0555
file path=usr/apache2/2.2/build/program.mk
file path=usr/apache2/2.2/build/rules.mk
file path=usr/apache2/2.2/build/special.mk
--- a/components/erlang/Makefile Tue Jun 28 11:24:16 2011 -0700
+++ b/components/erlang/Makefile Tue Jun 28 12:42:50 2011 -0700
@@ -75,8 +75,13 @@
CONFIGURE_OPTIONS.64 += LDFLAGS="$(LDFLAGS) -m64"
CONFIGURE_OPTIONS.64 += LIBS="-m64"
+# Use cp(1) instead of cloney because erlang's 'install' target uses 'tar'
+# to copy files and our tar doesn't handle long links by default. Between
+# the use of 'tar' and 'ld', a path adjustment wasn't an option due to the
+# need for /usr/bin/ld and /usr/gnu/bin/tar. Perhaps this can be looked
+# at when we upgrade to a more current version.
COMPONENT_PRE_CONFIGURE_ACTION = \
- ($(CLONEY) $(SOURCE_DIR) $(@D))
+ ($(CP) -rp $(SOURCE_DIR)/. $(@D))
CONFIGURE_SCRIPT = $(@D)/configure
COMPONENT_INSTALL_ARGS += INSTALL_PREFIX=$(PROTO_DIR)