Changeset 23498

Timestamp:

2008-01-28 10:20:19 (9 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5706535> launchd uses distributed notifications, which aren't available
<rdar://problem/5702944> launchd does not get -isysroot

Location:

branches/SULeopard

Files:

• Makefile (modified) (3 diffs)
• launchd/configure (modified) (4 diffs)
• launchd/configure.ac (modified) (1 diff)
• launchd/src/Makefile.am (modified) (7 diffs)
• launchd/src/Makefile.in (modified) (6 diffs)
• launchd/src/launchd_core_logic.c (modified) (1 diff)

branches/SULeopard/Makefile

@@ +1 @@
+ifndef SDKROOT
+export SDKROOT = /
+endif
+
 Project = launchd
 Extra_Configure_Flags = --sbindir=/sbin --bindir=/bin --sysconfdir=/private/etc
@@ -6 +10 @@
 
 ifeq ($(shell tconf --test TARGET_OS_EMBEDDED),YES)
-        Extra_Configure_Flags += --host=none-apple-darwin
+Extra_Configure_Flags += --host=none-apple-darwin
 endif
 
@@ -15 +19 @@
         -find -d $(DSTROOT) -type d | grep -v /usr/local/lib/system | xargs rmdir
 else
+ifeq ($(shell tconf --test TARGET_OS_EMBEDDED),NO)
         mkdir -p $(DSTROOT)/Library/StartupItems
         chmod 755 $(DSTROOT)/Library/StartupItems
         mkdir -p $(DSTROOT)/System/Library/StartupItems
         chmod 755 $(DSTROOT)/System/Library/StartupItems
+endif
         rm -rf $(DSTROOT)/usr/local/lib/system
         cp $(OBJROOT)/src/launchd $(SYMROOT)

branches/SULeopard/launchd/configure

@@ -703 +703 @@
 LIBS_ONLY_TRUE
 LIBS_ONLY_FALSE
+DO_EMBEDDED_MAGIC_TRUE
+DO_EMBEDDED_MAGIC_FALSE
 LTLIBOBJS'
 ac_subst_files=''
@@ -7862 +7864 @@
 fi
 
+ if test $(tconf --test TARGET_OS_EMBEDDED) = YES; then
+  DO_EMBEDDED_MAGIC_TRUE=
+  DO_EMBEDDED_MAGIC_FALSE='#'
+else
+  DO_EMBEDDED_MAGIC_TRUE='#'
+  DO_EMBEDDED_MAGIC_FALSE=
+fi
+
+
 
 cat >confcache <<\_ACEOF
@@ -7977 +7988 @@
 Usually this means the macro was only invoked conditionally." >&5
 echo "$as_me: error: conditional \"LIBS_ONLY\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${DO_EMBEDDED_MAGIC_TRUE}" && test -z "${DO_EMBEDDED_MAGIC_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"DO_EMBEDDED_MAGIC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"DO_EMBEDDED_MAGIC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
@@ -8598 +8616 @@
 LIBS_ONLY_TRUE!$LIBS_ONLY_TRUE$ac_delim
 LIBS_ONLY_FALSE!$LIBS_ONLY_FALSE$ac_delim
+DO_EMBEDDED_MAGIC_TRUE!$DO_EMBEDDED_MAGIC_TRUE$ac_delim
+DO_EMBEDDED_MAGIC_FALSE!$DO_EMBEDDED_MAGIC_FALSE$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then
     break
   elif $ac_last_try; then

branches/SULeopard/launchd/configure.ac

@@ -63 +63 @@
 
 AM_CONDITIONAL(LIBS_ONLY, test "$RC_ProjectName" = launchd_libs)
+AM_CONDITIONAL(DO_EMBEDDED_MAGIC, test $(tconf --test TARGET_OS_EMBEDDED) = YES)
+
 
 AC_OUTPUT

branches/SULeopard/launchd/src/Makefile.am

@@ -1 @@
-AM_CFLAGS = -no-cpp-precomp -F/System/Library/PrivateFrameworks -Wall -Wextra -Waggregate-return -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror -D__MigTypeCheck=1 -fvisibility=hidden -Dmig_external=__private_extern__
+AM_CFLAGS = -no-cpp-precomp -isysroot $(SDKROOT) -F$(SDKROOT)/System/Library/PrivateFrameworks -Wall -Wextra -Waggregate-return -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror -D__MigTypeCheck=1 -fvisibility=hidden -Dmig_external=__private_extern__
+
+AM_LDFLAGS = -Wl,-syslibroot,$(SDKROOT)
 
 CLEANFILES = protocol_vproc.h protocol_vprocServer.c protocol_vprocUser.c protocol_vprocServer.h                \
@@ -35 +37 @@
 
 bin_PROGRAMS = launchctl wait4path
+if DO_EMBEDDED_MAGIC
+sbin_PROGRAMS = launchd
+else
 sbin_PROGRAMS = launchd SystemStarter
+endif
 libexec_PROGRAMS = launchproxy
 
@@ -41 +47 @@
 
 launchctl_CFLAGS = $(AM_CFLAGS) -I$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders
-launchctl_LDFLAGS = -framework CoreFoundation -framework IOKit $(LIBS_SECURITY) -weak_library /usr/lib/libedit.dylib
+launchctl_LDFLAGS = $(AM_LDFLAGS) -framework CoreFoundation -framework IOKit $(LIBS_SECURITY) -weak_library /usr/lib/libedit.dylib
 
+if DO_EMBEDDED_MAGIC
+else
 SystemStarter_CFLAGS = -mdynamic-no-pic $(AM_CFLAGS)
-SystemStarter_LDFLAGS = -framework CoreFoundation -framework IOKit
+SystemStarter_LDFLAGS = $(AM_LDFLAGS) -framework CoreFoundation -framework IOKit
 SystemStarter_SOURCES = StartupItems.c IPC.c SystemStarter.c
+endif
 
 launchd_CFLAGS = -mdynamic-no-pic $(AM_CFLAGS) -Wno-unused-parameter
-launchd_LDFLAGS = -lbsm
+launchd_LDFLAGS = $(AM_LDFLAGS) -lbsm
 launchd_SOURCES = launchd.c launchd_core_logic.c launchd_unix_ipc.c protocol_vprocServer.c notifyServer.c launchd_internalUser.c launchd_internalServer.c job_replyUser.c launchd_runtime.c launchd_runtime_kill.c mach_excServer.c
 
@@ -54 +63 @@
 launchd_core_logic.c:: protocol_vproc.h job_reply.h protocol_vprocServer.h
 
-launchproxy_LDFLAGS = $(WEAKLIBS_SECURITY)
+launchproxy_LDFLAGS = $(AM_LDFLAGS) $(WEAKLIBS_SECURITY)
 
 notifyServer.c notifyServer.h: /usr/include/mach/notify.defs
@@ -73 +82 @@
 man5_MANS = launchd.plist.5 launchd.conf.5
 
+if DO_EMBEDDED_MAGIC
+man8_MANS = launchd.8 launchproxy.8
+else
 man8_MANS = StartupItemContext.8 SystemStarter.8 rc.8 launchd.8 launchproxy.8
+endif
 
 install-data-hook:
@@ -86 +99 @@
         mkdir -p $(DESTDIR)/System/Library/LaunchAgents
         mkdir -p $(DESTDIR)/System/Library/LaunchDaemons
-        cp $(srcdir)/StartupItemContext $(DESTDIR)/usr/libexec
         cp $(srcdir)/liblaunch_public.h $(DESTDIR)/usr/include/launch.h
         cp $(srcdir)/libvproc_public.h $(DESTDIR)/usr/include/vproc.h
@@ -95 +107 @@
         cp $(srcdir)/libvproc_private.h $(DESTDIR)/usr/local/include/vproc_priv.h
         cp $(srcdir)/reboot2.h $(DESTDIR)/usr/local/include/reboot2.h
+if DO_EMBEDDED_MAGIC
+else
+        cp $(srcdir)/StartupItemContext $(DESTDIR)/usr/libexec
         cp $(srcdir)/com.apple.SystemStarter.plist $(DESTDIR)/System/Library/LaunchDaemons
+endif
 
 endif

branches/SULeopard/launchd/src/Makefile.in

@@ -34 +34 @@
 POST_UNINSTALL = :
 @LIBS_ONLY_FALSE@bin_PROGRAMS = launchctl$(EXEEXT) wait4path$(EXEEXT)
-@LIBS_ONLY_FALSE@sbin_PROGRAMS = launchd$(EXEEXT) \
-@LIBS_ONLY_FALSE@       SystemStarter$(EXEEXT)
+@DO_EMBEDDED_MAGIC_FALSE@@LIBS_ONLY_FALSE@sbin_PROGRAMS =  \
+@DO_EMBEDDED_MAGIC_FALSE@@LIBS_ONLY_FALSE@      launchd$(EXEEXT) \
+@DO_EMBEDDED_MAGIC_FALSE@@LIBS_ONLY_FALSE@      SystemStarter$(EXEEXT)
+@DO_EMBEDDED_MAGIC_TRUE@@LIBS_ONLY_FALSE@sbin_PROGRAMS =  \
+@DO_EMBEDDED_MAGIC_TRUE@@LIBS_ONLY_FALSE@       launchd$(EXEEXT)
 @LIBS_ONLY_FALSE@libexec_PROGRAMS = launchproxy$(EXEEXT)
 subdir = src
@@ -81 +84 @@
 PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(sbin_PROGRAMS)
 am__SystemStarter_SOURCES_DIST = StartupItems.c IPC.c SystemStarter.c
-@LIBS_ONLY_FALSE@am_SystemStarter_OBJECTS =  \
-@LIBS_ONLY_FALSE@       SystemStarter-StartupItems.$(OBJEXT) \
-@LIBS_ONLY_FALSE@       SystemStarter-IPC.$(OBJEXT) \
-@LIBS_ONLY_FALSE@       SystemStarter-SystemStarter.$(OBJEXT)
+@DO_EMBEDDED_MAGIC_FALSE@@LIBS_ONLY_FALSE@am_SystemStarter_OBJECTS = SystemStarter-StartupItems.$(OBJEXT) \
+@DO_EMBEDDED_MAGIC_FALSE@@LIBS_ONLY_FALSE@      SystemStarter-IPC.$(OBJEXT) \
+@DO_EMBEDDED_MAGIC_FALSE@@LIBS_ONLY_FALSE@      SystemStarter-SystemStarter.$(OBJEXT)
 SystemStarter_OBJECTS = $(am_SystemStarter_OBJECTS)
 SystemStarter_LDADD = $(LDADD)
@@ -240 +242 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CFLAGS = -no-cpp-precomp -F/System/Library/PrivateFrameworks -Wall -Wextra -Waggregate-return -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror -D__MigTypeCheck=1 -fvisibility=hidden -Dmig_external=__private_extern__
+AM_CFLAGS = -no-cpp-precomp -isysroot $(SDKROOT) -F$(SDKROOT)/System/Library/PrivateFrameworks -Wall -Wextra -Waggregate-return -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror -D__MigTypeCheck=1 -fvisibility=hidden -Dmig_external=__private_extern__
+AM_LDFLAGS = -Wl,-syslibroot,$(SDKROOT)
 CLEANFILES = protocol_vproc.h protocol_vprocServer.c protocol_vprocUser.c protocol_vprocServer.h                \
              launchd_internal.h launchd_internalServer.h launchd_internalServer.c launchd_internalUser.c        \
@@ -252 +255 @@
 @LIBS_ONLY_FALSE@sysconf_DATA = hostconfig rc.common rc.netboot
 @LIBS_ONLY_FALSE@launchctl_CFLAGS = $(AM_CFLAGS) -I$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders
-@LIBS_ONLY_FALSE@launchctl_LDFLAGS = -framework CoreFoundation -framework IOKit $(LIBS_SECURITY) -weak_library /usr/lib/libedit.dylib
-@LIBS_ONLY_FALSE@SystemStarter_CFLAGS = -mdynamic-no-pic $(AM_CFLAGS)
-@LIBS_ONLY_FALSE@SystemStarter_LDFLAGS = -framework CoreFoundation -framework IOKit
-@LIBS_ONLY_FALSE@SystemStarter_SOURCES = StartupItems.c IPC.c SystemStarter.c
+@LIBS_ONLY_FALSE@launchctl_LDFLAGS = $(AM_LDFLAGS) -framework CoreFoundation -framework IOKit $(LIBS_SECURITY) -weak_library /usr/lib/libedit.dylib
+@DO_EMBEDDED_MAGIC_FALSE@@LIBS_ONLY_FALSE@SystemStarter_CFLAGS = -mdynamic-no-pic $(AM_CFLAGS)
+@DO_EMBEDDED_MAGIC_FALSE@@LIBS_ONLY_FALSE@SystemStarter_LDFLAGS = $(AM_LDFLAGS) -framework CoreFoundation -framework IOKit
+@DO_EMBEDDED_MAGIC_FALSE@@LIBS_ONLY_FALSE@SystemStarter_SOURCES = StartupItems.c IPC.c SystemStarter.c
 @LIBS_ONLY_FALSE@launchd_CFLAGS = -mdynamic-no-pic $(AM_CFLAGS) -Wno-unused-parameter
-@LIBS_ONLY_FALSE@launchd_LDFLAGS = -lbsm
+@LIBS_ONLY_FALSE@launchd_LDFLAGS = $(AM_LDFLAGS) -lbsm
 @LIBS_ONLY_FALSE@launchd_SOURCES = launchd.c launchd_core_logic.c launchd_unix_ipc.c protocol_vprocServer.c notifyServer.c launchd_internalUser.c launchd_internalServer.c job_replyUser.c launchd_runtime.c launchd_runtime_kill.c mach_excServer.c
-@LIBS_ONLY_FALSE@launchproxy_LDFLAGS = $(WEAKLIBS_SECURITY)
+@LIBS_ONLY_FALSE@launchproxy_LDFLAGS = $(AM_LDFLAGS) $(WEAKLIBS_SECURITY)
 @LIBS_ONLY_FALSE@man1_MANS = wait4path.1 launchctl.1
 @LIBS_ONLY_FALSE@man5_MANS = launchd.plist.5 launchd.conf.5
-@LIBS_ONLY_FALSE@man8_MANS = StartupItemContext.8 SystemStarter.8 rc.8 launchd.8 launchproxy.8
+@DO_EMBEDDED_MAGIC_FALSE@@LIBS_ONLY_FALSE@man8_MANS = StartupItemContext.8 SystemStarter.8 rc.8 launchd.8 launchproxy.8
+@DO_EMBEDDED_MAGIC_TRUE@@LIBS_ONLY_FALSE@man8_MANS = launchd.8 launchproxy.8
 all: config.h
         $(MAKE) $(AM_MAKEFLAGS) all-am
@@ -1194 +1198 @@
 @LIBS_ONLY_FALSE@       mkdir -p $(DESTDIR)/System/Library/LaunchAgents
 @LIBS_ONLY_FALSE@       mkdir -p $(DESTDIR)/System/Library/LaunchDaemons
-@LIBS_ONLY_FALSE@       cp $(srcdir)/StartupItemContext $(DESTDIR)/usr/libexec
 @LIBS_ONLY_FALSE@       cp $(srcdir)/liblaunch_public.h $(DESTDIR)/usr/include/launch.h
 @LIBS_ONLY_FALSE@       cp $(srcdir)/libvproc_public.h $(DESTDIR)/usr/include/vproc.h
@@ -1203 +1206 @@
 @LIBS_ONLY_FALSE@       cp $(srcdir)/libvproc_private.h $(DESTDIR)/usr/local/include/vproc_priv.h
 @LIBS_ONLY_FALSE@       cp $(srcdir)/reboot2.h $(DESTDIR)/usr/local/include/reboot2.h
-@LIBS_ONLY_FALSE@       cp $(srcdir)/com.apple.SystemStarter.plist $(DESTDIR)/System/Library/LaunchDaemons
+@DO_EMBEDDED_MAGIC_FALSE@@LIBS_ONLY_FALSE@      cp $(srcdir)/StartupItemContext $(DESTDIR)/usr/libexec
+@DO_EMBEDDED_MAGIC_FALSE@@LIBS_ONLY_FALSE@      cp $(srcdir)/com.apple.SystemStarter.plist $(DESTDIR)/System/Library/LaunchDaemons
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

branches/SULeopard/launchd/src/launchd_core_logic.c

@@ -6166 +6166 @@
         job_log(j, LOG_DEBUG, "Move subset attempt: 0x%x", target_subset);
 
-        kr = _vproc_grab_subset(target_subset, &reqport, &rcvright, &out_obj_array, &l2l_ports, &l2l_port_cnt);
+        errno = kr = _vproc_grab_subset(target_subset, &reqport, &rcvright, &out_obj_array, &l2l_ports, &l2l_port_cnt);
 
         if (!job_assumes(j, kr == 0)) {