From fbd346068465fc5e1e52c54fd5a9bf3638e36071 Mon Sep 17 00:00:00 2001 From: Michael Pozhidaev Date: Fri, 18 Jan 2013 06:07:58 +0700 Subject: [PATCH] Initial Homeros support - added destination homeros-nano.iso yields minimal speaking image; - added "homeros" feature contain scripts appropriate for general Homeros functions but need further development. --- conf.d/homeros.mk | 6 ++++++ features.in/homeros/README | 5 +++++ features.in/homeros/config.mk | 9 +++++++++ features.in/homeros/live/image-scripts.d/10-amixer | 13 +++++++++++++ .../live/image-scripts.d/10-console-keyboard-ru | 8 ++++++++ features.in/homeros/live/image-scripts.d/10-rhvoice | 4 ++++ features.in/homeros/live/image-scripts.d/10-ssh | 3 +++ features.in/homeros/live/image-scripts.d/10-sudo | 6 ++++++ .../homeros/live/image-scripts.d/10-voiceman | 3 +++ .../homeros/live/image-scripts.d/20-altlinux-user | 5 +++++ .../homeros/live/image-scripts.d/30-autologin | 13 +++++++++++++ pkg.in/lists/homeros/tools | 6 ++++++ pkg.in/lists/homeros/tts | 2 ++ pkg.in/lists/homeros/voiceman | 3 +++ pkg.in/lists/homeros/yasr | 1 + 15 files changed, 87 insertions(+) create mode 100644 conf.d/homeros.mk create mode 100644 features.in/homeros/README create mode 100644 features.in/homeros/config.mk create mode 100755 features.in/homeros/live/image-scripts.d/10-amixer create mode 100755 features.in/homeros/live/image-scripts.d/10-console-keyboard-ru create mode 100755 features.in/homeros/live/image-scripts.d/10-rhvoice create mode 100755 features.in/homeros/live/image-scripts.d/10-ssh create mode 100755 features.in/homeros/live/image-scripts.d/10-sudo create mode 100755 features.in/homeros/live/image-scripts.d/10-voiceman create mode 100755 features.in/homeros/live/image-scripts.d/20-altlinux-user create mode 100755 features.in/homeros/live/image-scripts.d/30-autologin create mode 100644 pkg.in/lists/homeros/tools create mode 100644 pkg.in/lists/homeros/tts create mode 100644 pkg.in/lists/homeros/voiceman create mode 100644 pkg.in/lists/homeros/yasr diff --git a/conf.d/homeros.mk b/conf.d/homeros.mk new file mode 100644 index 00000000..802c4537 --- /dev/null +++ b/conf.d/homeros.mk @@ -0,0 +1,6 @@ + +ifeq (distro,$(IMAGE_CLASS)) + +distro/homeros-nano: distro/.live-base use/live/textinstall use/homeros; @: + +endif diff --git a/features.in/homeros/README b/features.in/homeros/README new file mode 100644 index 00000000..e360c8cd --- /dev/null +++ b/features.in/homeros/README @@ -0,0 +1,5 @@ +Каталог содержит основную feature для создания адаптированного +дистрибутива Homeros. Это промежуточный вариант, при помощи которого +можно получить минимальный разговаривающий образ, но, возможно, помимо +его дальнейшего естественного развития требуется ещё осмысление с +точки зрения идей mkimage-profiles. diff --git a/features.in/homeros/config.mk b/features.in/homeros/config.mk new file mode 100644 index 00000000..e44642c1 --- /dev/null +++ b/features.in/homeros/config.mk @@ -0,0 +1,9 @@ +use/homeros: + @$(call add_feature) +# @$(call set,BRANDING,simply-linux) +# @$(call add,THE_BRANDING,menu xfce-settings) + @$(call add,THE_LISTS,homeros/voiceman) + @$(call add,THE_LISTS,homeros/tts) + @$(call add,THE_LISTS,homeros/yasr) + @$(call add,THE_LISTS,homeros/tools) +# @$(call set,META_VOL_SET,Homeros) diff --git a/features.in/homeros/live/image-scripts.d/10-amixer b/features.in/homeros/live/image-scripts.d/10-amixer new file mode 100755 index 00000000..ceadf3d4 --- /dev/null +++ b/features.in/homeros/live/image-scripts.d/10-amixer @@ -0,0 +1,13 @@ +#!/bin/sh + +cat < /etc/rc.d/rc.local +#!/bin/sh + +amixer set Master 100% +amixer set Master toggle +amixer set PCM 100% +amixer set PCM toggle + +EOF + +chmod 755 /etc/rc.d/rc.local diff --git a/features.in/homeros/live/image-scripts.d/10-console-keyboard-ru b/features.in/homeros/live/image-scripts.d/10-console-keyboard-ru new file mode 100755 index 00000000..6333e6bc --- /dev/null +++ b/features.in/homeros/live/image-scripts.d/10-console-keyboard-ru @@ -0,0 +1,8 @@ +#!/bin/sh -e + +echo 'KEYTABLE=ruwin_ct_sh-UTF-8' > /etc/sysconfig/keyboard +cat < /etc/sysconfig/i18n +SYSFONT=UniCyr_8x16 +LANG=ru_RU.UTF-8 +SUPPORTED=ru_RU.UTF-8 +EOF diff --git a/features.in/homeros/live/image-scripts.d/10-rhvoice b/features.in/homeros/live/image-scripts.d/10-rhvoice new file mode 100755 index 00000000..23c2861a --- /dev/null +++ b/features.in/homeros/live/image-scripts.d/10-rhvoice @@ -0,0 +1,4 @@ +#!/bin/sh -e + +/bin/ln -s /etc/tts.d/rhvoice-en.voiceman /etc/voiceman.d/rhvoice-en.output +/bin/ln -s /etc/tts.d/rhvoice.voiceman /etc/voiceman.d/rhvoice.output diff --git a/features.in/homeros/live/image-scripts.d/10-ssh b/features.in/homeros/live/image-scripts.d/10-ssh new file mode 100755 index 00000000..aeae3d18 --- /dev/null +++ b/features.in/homeros/live/image-scripts.d/10-ssh @@ -0,0 +1,3 @@ +#!/bin/sh -e + +chkconfig sshd on diff --git a/features.in/homeros/live/image-scripts.d/10-sudo b/features.in/homeros/live/image-scripts.d/10-sudo new file mode 100755 index 00000000..c9f8b83e --- /dev/null +++ b/features.in/homeros/live/image-scripts.d/10-sudo @@ -0,0 +1,6 @@ +#!/bin/sh -e + +mkdir -p /etc/sudo.d +chmod 700 /etc/sudo.d +control su public +control sudo public diff --git a/features.in/homeros/live/image-scripts.d/10-voiceman b/features.in/homeros/live/image-scripts.d/10-voiceman new file mode 100755 index 00000000..750404c8 --- /dev/null +++ b/features.in/homeros/live/image-scripts.d/10-voiceman @@ -0,0 +1,3 @@ +#!/bin/sh -e + +chkconfig voiceman on diff --git a/features.in/homeros/live/image-scripts.d/20-altlinux-user b/features.in/homeros/live/image-scripts.d/20-altlinux-user new file mode 100755 index 00000000..40bf5761 --- /dev/null +++ b/features.in/homeros/live/image-scripts.d/20-altlinux-user @@ -0,0 +1,5 @@ +#!/bin/sh -e + +useradd altlinux +echo 'altlinux ALL=NOPASSWD:ALL' > /etc/sudo.d/altlinux +chmod 400 /etc/sudo.d/altlinux diff --git a/features.in/homeros/live/image-scripts.d/30-autologin b/features.in/homeros/live/image-scripts.d/30-autologin new file mode 100755 index 00000000..96abf709 --- /dev/null +++ b/features.in/homeros/live/image-scripts.d/30-autologin @@ -0,0 +1,13 @@ +#!/bin/sh + +subst s/'^\(1:2345:respawn.*\)$'/'#\1'/ /etc/inittab +cat <> /etc/inittab +# yasr is always available on 1-st console; +yasr:2345:respawn:/bin/openvt -w -f -c 1 -- su -l altlinux -c /usr/local/bin/yasr-with-linux-term +EOF + cat < /usr/local/bin/yasr-with-linux-term +#!/bin/sh +TERM=linux /usr/bin/yasr +exit \$? +EOF + chmod 755 /usr/local/bin/yasr-with-linux-term diff --git a/pkg.in/lists/homeros/tools b/pkg.in/lists/homeros/tools new file mode 100644 index 00000000..374d0f0c --- /dev/null +++ b/pkg.in/lists/homeros/tools @@ -0,0 +1,6 @@ +su +sudo +net-tools +openssh-server +amixer +alsa-utils diff --git a/pkg.in/lists/homeros/tts b/pkg.in/lists/homeros/tts new file mode 100644 index 00000000..75a170e7 --- /dev/null +++ b/pkg.in/lists/homeros/tts @@ -0,0 +1,2 @@ +RHVoice +espeak diff --git a/pkg.in/lists/homeros/voiceman b/pkg.in/lists/homeros/voiceman new file mode 100644 index 00000000..a9e4b922 --- /dev/null +++ b/pkg.in/lists/homeros/voiceman @@ -0,0 +1,3 @@ +voiceman-server +voiceman +voiceman-tools diff --git a/pkg.in/lists/homeros/yasr b/pkg.in/lists/homeros/yasr new file mode 100644 index 00000000..fe04bb31 --- /dev/null +++ b/pkg.in/lists/homeros/yasr @@ -0,0 +1 @@ +yasr