Author: pebender
Date: Tue Apr 7 08:52:42 2009
New Revision: 4567
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/inittab
- copied unchanged from r4563,
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/inittab.perl
Removed:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/inittab.perl
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/inittab.sh
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/meta/minimyth/files/source/Makefile
trunk/gar-minimyth/script/meta/minimyth/files/source/initrd/sbin/init
Log:
- Removed unused sh init scripts.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Tue Apr 7
08:52:42 2009
@@ -1,7 +1,7 @@
MiniMyth Changelog
--------------------------------------------------------------------------------
-Changes since 65 (2009-04-06):
+Changes since 65 (2009-04-07):
Current MythTV versions
MythTV 0.20-softpad: version 0.20.2.softpad, release-0-20-fixes branch
svn 16082,
@@ -44,6 +44,7 @@
imon_vfd.
Modified build system
+ - Removed unused sh init scripts.
- Removed the lirc_cmdir kernel module from the library list since it
has
been removed from lirc.
Modified: trunk/gar-minimyth/script/meta/minimyth/files/source/Makefile
==============================================================================
--- trunk/gar-minimyth/script/meta/minimyth/files/source/Makefile
(original)
+++ trunk/gar-minimyth/script/meta/minimyth/files/source/Makefile Tue Apr
7 08:52:42 2009
@@ -219,7 +219,6 @@
@sed -i 's...@mm_conf_version@%$(mm_CONF_VERSION)%g'
$...@~$(sysconfdir)/conf.d/core
@sed -i 's...@path@%$(call MAKE_PATH,$(bindirs_base))%g'
$...@~$(sysconfdir)/conf.d/core
@sed -i 's...@gar_libdir@%$(libdir)%g'
$...@~$(sysconfdir)/fonts/local.conf
- @sed -i 's...@extras_rootdir@%$(extras_rootdir)%'
$...@~$(sysconfdir)/rc.d.sh/init.d/extras
@sed -i 's...@extras_rootdir@%$(extras_rootdir)%'
$...@~$(sysconfdir)/rc.d/init/extras.pm
@# Create the minimyth build configuration file.
@rm -rf $...@~$(versiondir)/minimyth.conf.mk
@@ -267,16 +266,6 @@
test -e $...@~$(sysconfdir)/rc.d/init/$(file).pm && \
index=$$(($${index}+2)) && \
ln -sf ../init/$(file).pm
$...@~$(sysconfdir)/rc.d/rc/K$${index}$(file) ; )
- @# Make sh init script links.
- @mkdir -m 0775 -p $...@~$(sysconfdir)/rc.d.sh/rc.d
- @index=10 ; $(foreach file, $(MM_INIT_START), \
- test -e $...@~$(sysconfdir)/rc.d.sh/init.d/$(file) && \
- index=$$(($${index}+2)) && \
- ln -sf ../init.d/$(file)
$...@~$(sysconfdir)/rc.d.sh/rc.d/S$${index}$(file) ; )
- @index=10 ; $(foreach file, $(MM_INIT_KILL) , \
- test -e $...@~$(sysconfdir)/rc.d.sh/init.d/$(file) && \
- index=$$(($${index}+2)) && \
- ln -sf ../init.d/$(file)
$...@~$(sysconfdir)/rc.d.sh/rc.d/K$${index}$(file) ; )
@# Make font file links.
@for font in `cd $...@~$(libdir)/X11/fonts/TTF ; ls -1 *.{TTF,ttf} 2>
/dev/null` ; do \
ln -sf $(patsubst /%,%,$(call
DIRSTODOTS,$(datadir)/mythtv))$(libdir)/X11/fonts/TTF/$${font} \
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/initrd/sbin/init
==============================================================================
--- trunk/gar-minimyth/script/meta/minimyth/files/source/initrd/sbin/init
(original)
+++ trunk/gar-minimyth/script/meta/minimyth/files/source/initrd/sbin/init
Tue Apr 7 08:52:42 2009
@@ -8,24 +8,11 @@
/bin/mkdir -p initrd
/sbin/pivot_root . initrd
-if /usr/bin/test -z "${MM_INIT_TYPE}" ; then
- MM_INIT_TYPE='perl'
-fi
-
# Save boot line options that we need later.
/bin/mkdir -p /etc/conf.d/
set | /bin/grep -e '^BOOT_IMAGE=' >> /etc/conf.d/boot
set | /bin/grep -e '^initrd=' >> /etc/conf.d/boot
set | /bin/grep -e '^MM_' >> /etc/conf.d/boot
-
-if /usr/bin/test ${MM_INIT_TYPE} = 'perl' ; then
- /bin/ln -s /etc/inittab.perl /etc/inittab
-elif /usr/bin/test ${MM_INIT_TYPE} = 'sh.obsolete' ; then
- /bin/ln -s /etc/inittab.sh /etc/inittab
-else
- /bin/echo "error: MM_INIT_TYPE=${MM_INIT_TYPE} is invalid."
- exit 1
-fi
# Change root to the read-write root file system and start the real init.
exec /usr/sbin/chroot . ./bin/sh -c 'exec /sbin/init' <dev/console
>dev/console 2>&1
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
