diff --git a/packages/audio/alsa-driver/build b/packages/audio/alsa-driver/build deleted file mode 100755 index ddb9dd0d46..0000000000 --- a/packages/audio/alsa-driver/build +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh - -. config/options - -$SCRIPTS/build toolchain - -ALSA_CARDS="seq-dummy, hrtimer, rtctimer, hpet, pcsp, dummy, hda-intel, hdsp, hdspm," - -ALSA_OPTIONS="seq-hrtimer-default, seq-rtctimer-default, \ - support-old-api, verbose-procfs, verbose-printk, \ - pcm-xrun-debug, ac97-power-save, hda-hwdep, \ - hda-reconfig, hda-input-beep, hda-codec-realtek, \ - hda-codec-analog, hda-codec-sigmatel, \ - hda-codec-via, hda-codec-atihdmi, \ - hda-codec-nvhdmi, hda-codec-intelhdmi, \ - hda-codec-conexant, hda-codec-cmedia, \ - hda-codec-si3054, hda-generic, hda-power-save," - -#CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=32 -fPIC -DPIC" - -cd $BUILD/$1* - -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --enable-shared \ - --with-kernel=$(kernel_path) \ - --with-isapnp=no \ - --with-sequencer=yes \ - --with-oss=no \ - --with-pcm-oss-plugins=no \ - --with-cards="$ALSA_CARDS" \ - --with-card-options="$ALSA_OPTIONS" \ - - -$MAKE - -#$STRIP src/.libs/libasound.so* - -#$MAKE -C include DESTDIR=$SYSROOT_PREFIX install-data -#$MAKE -C src DESTDIR=$SYSROOT_PREFIX install-exec -#$MAKE -C utils DESTDIR=$SYSROOT_PREFIX install-pkgconfigDATA diff --git a/packages/audio/alsa-driver/install b/packages/audio/alsa-driver/install deleted file mode 100755 index 3ddb073ffc..0000000000 --- a/packages/audio/alsa-driver/install +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -. config/options - -mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/src/.libs/libasound.so* $INSTALL/usr/lib - -#mkdir -p $INSTALL/usr/lib/alsa-lib/smixer -#cp -PR $BUILD/$1*/modules/mixer/simple/.libs/*.so $INSTALL/usr/lib/alsa-lib/smixer - -mkdir -p $INSTALL/usr/share/alsa -sed 's%.*~/\.asoundrc.*%%' $BUILD/$1*/src/conf/alsa.conf > $INSTALL/usr/share/alsa/alsa.conf -#cp -PR $BUILD/$1*/src/conf/smixer.conf $INSTALL/usr/share/alsa -#cp -PR $BUILD/$1*/src/conf/*.alisp $INSTALL/usr/share/alsa - -cp -rf $BUILD/$1*/src/conf/cards $INSTALL/usr/share/alsa/ -cp -rf $BUILD/$1*/src/conf/pcm $INSTALL/usr/share/alsa/ -rm -f $INSTALL/usr/share/alsa/cards/Makefile* -rm -f $INSTALL/usr/share/alsa/pcm/Makefile* diff --git a/packages/audio/alsa-driver/url b/packages/audio/alsa-driver/url deleted file mode 100644 index 990485b6f1..0000000000 --- a/packages/audio/alsa-driver/url +++ /dev/null @@ -1 +0,0 @@ -ftp://ftp.alsa-project.org/pub/driver/alsa-driver-1.0.19.tar.bz2 \ No newline at end of file diff --git a/packages/audio/alsa-lib/install b/packages/audio/alsa-lib/install index 3ddb073ffc..576f20e809 100755 --- a/packages/audio/alsa-lib/install +++ b/packages/audio/alsa-lib/install @@ -5,13 +5,13 @@ mkdir -p $INSTALL/usr/lib cp -PR $BUILD/$1*/src/.libs/libasound.so* $INSTALL/usr/lib -#mkdir -p $INSTALL/usr/lib/alsa-lib/smixer -#cp -PR $BUILD/$1*/modules/mixer/simple/.libs/*.so $INSTALL/usr/lib/alsa-lib/smixer +mkdir -p $INSTALL/usr/lib/alsa-lib/smixer +cp -PR $BUILD/$1*/modules/mixer/simple/.libs/*.so $INSTALL/usr/lib/alsa-lib/smixer mkdir -p $INSTALL/usr/share/alsa sed 's%.*~/\.asoundrc.*%%' $BUILD/$1*/src/conf/alsa.conf > $INSTALL/usr/share/alsa/alsa.conf -#cp -PR $BUILD/$1*/src/conf/smixer.conf $INSTALL/usr/share/alsa -#cp -PR $BUILD/$1*/src/conf/*.alisp $INSTALL/usr/share/alsa +cp -PR $BUILD/$1*/src/conf/smixer.conf $INSTALL/usr/share/alsa +cp -PR $BUILD/$1*/src/conf/*.alisp $INSTALL/usr/share/alsa cp -rf $BUILD/$1*/src/conf/cards $INSTALL/usr/share/alsa/ cp -rf $BUILD/$1*/src/conf/pcm $INSTALL/usr/share/alsa/ diff --git a/packages/audio/alsa-utils/build b/packages/audio/alsa-utils/build index b788ae7c1a..ef0a08b3f2 100755 --- a/packages/audio/alsa-utils/build +++ b/packages/audio/alsa-utils/build @@ -6,15 +6,13 @@ $SCRIPTS/build toolchain $SCRIPTS/build alsa-lib [ "$DEVTOOLS" = yes ] && $SCRIPTS/build ncurses -export CPPFLAGS="$CPPFLAGS -I$LIB_PREFIX/include/ncurses" -export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/usr/lib64 -L$LIB_PREFIX/lib" - ALSAMIXER_CONFIG="--disable-alsamixer" ALSATEST_CONFIG="--disable-alsatest" -ALSACONF_CONFIG="--disable-alsaconf" [ "$DEVTOOLS" = yes ] && ALSAMIXER_CONFIG="--enable-alsamixer" [ "$DEVTOOLS" = yes ] && ALSATEST_CONFIG="--enable-alsatest" -[ "$DEVTOOLS" = yes ] && ALSACONF_CONFIG="--enable-alsaconf" + +export CPPFLAGS="$CPPFLAGS -I$SYSROOT_PREFIX/usr/include/ncurses" +export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/usr/lib64 -L$LIB_PREFIX/lib" cd $BUILD/$1* ./configure --host=$TARGET_NAME \ @@ -23,16 +21,17 @@ cd $BUILD/$1* --sysconfdir=/etc \ --localstatedir=/var \ --disable-dependency-tracking \ - $ALSAMIXER_CONFIG + --disable-xmlto \ + $ALSAMIXER_CONFIG \ + $ALSATEST_CONFIG \ -sed -i -e 's/^\(man_MANS[ \t]*=[ \t]*\).*$/\1/' alsactl/Makefile.* +#sed -i -e 's/^\(man_MANS[ \t]*=[ \t]*\).*$/\1/' alsactl/Makefile.* make -C amixer make -C alsactl if [ "$DEVTOOLS" = yes ]; then make -C alsamixer - make -C alsaconf make -C aplay make -C iecset make -C speaker-test diff --git a/packages/audio/alsa-utils/init.d.old/40_alsa b/packages/audio/alsa-utils/init.d.old/40_alsa deleted file mode 100755 index afe306fad9..0000000000 --- a/packages/audio/alsa-utils/init.d.old/40_alsa +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/sh -# -# setup alsa (especially the mixer config) -# -# runlevels: openelec, debug, configure - -echo "### Setting up sound card ###" - -# include audio configuration file -. /etc/audio - -[ ! -f /etc/asound.conf ] && echo "" > /etc/asound.conf - -mixer() { - parm=${3:-on} - amixer -c $ALSA_CARD sset "$1" "$2" $parm >/dev/null 2>&1 - amixer -c $ALSA_CARD sset "$1" $parm >/dev/null 2>&1 -} - -# set alsa channel mode (6ch, 4ch, 2ch) -mixer 'Channel Mode' "${CHANNELS}ch" - -# set common mixer params -mixer Master 90% -mixer Front 90% -mixer PCM 90% -mixer Synth 90% -# mute CD, since using digital audio instead -mixer CD 0% mute -# Only unmute Line and Aux if they are possibly used. -if [ -e /var/use_dxr3 -o -e /var/tvcard -o -e /var/dvbcard -o -e /var/digimatrix ]; then - mixer Line 90% - mixer Aux 90% -else - mixer Line 0% mute - mixer Aux 0% mute -fi -# mute mic -mixer Mic 0% mute -# ESS 1969 chipset has 2 PCM channels -mixer PCM,1 90% -# Trident/YMFPCI/emu10k1 -mixer Wave 100% -mixer Music 100% -mixer AC97 100% -mixer Surround 90% -mixer 'Surround Digital' 90% -mixer 'Wave Surround' 90% -if [ "$CHANNELS" = 6 ]; then - mixer 'Duplicate Front' 0% off -else - mixer 'Duplicate Front' 90% -fi -mixer 'Sigmatel 4-Speaker Stereo' 90% -# CS4237B chipset: -mixer 'Master Digital' 90% -# DRC -mixer 'Dynamic Range Compression' 90% -# Envy24 chips with analog outs -mixer DAC 90% -mixer DAC,0 90% -mixer DAC,1 90% -# some notebooks use headphone instead of master -mixer Headphone 90% -mixer 'Internal Speaker' 75% -mixer Playback 100% - -mixer Center 90% -mixer LFE 90% -mixer Center/LFE 90% - -# Required for newer Via hardware -mixer 'VIA DXS,0' 80% -mixer 'VIA DXS,1' 80% -mixer 'VIA DXS,2' 80% -mixer 'VIA DXS,3' 80% - -# Intel P4P800-MX (Ubuntu bug #5813) -mixer 'Master Playback Switch' on - -# Required at least for Via 823x hardware on DFI K8M800-MLVF Mobo -mixer 'IEC958 Capture Monitor' 0% off - -# Required on some notebooks with ICH4: -mixer 'Headphone Jack Sense' 0% off -mixer 'Line Jack Sense' 0% off - -# Required on some Vaio notebooks (B3XP): -mixer 'External Amplifier' 0% mute - -# Required for either Analog or Digital output -mixer 'SB Live Analog/Digital Output Jack' $SBL_AUDIGY -mixer 'Audigy Analog/Digital Output Jack' $SBL_AUDIGY - -# set SPDIF mixer params -if [ "$SOUNDCARD_MODE" = SPDIF ]; then - mixer 'IEC958' 90% on - mixer 'IEC958 Output' 90% - mixer 'IEC958 Playback AC97-SPSA' $AC97_SPSA - mixer 'IEC958 Coaxial' 90% - mixer 'IEC958 LiveDrive' 90% - mixer 'IEC958 Optical Raw' 90% - mixer 'SPDIF Out' 90% - mixer 'SPDIF Front' 90% - mixer 'SPDIF Rear' 90% - mixer 'SPDIF Center/LFE' 90% - mixer 'Master Digital' 80% -else - mixer 'SPDIF Out' 0% off - mixer 'Analog Front' 90% - mixer 'Analog Rear' 90% - mixer 'Analog Center/LFE' 90% -fi - -exit 0 diff --git a/packages/audio/alsa/install b/packages/audio/alsa/install index c1a3e478cd..1faad092e7 100755 --- a/packages/audio/alsa/install +++ b/packages/audio/alsa/install @@ -9,4 +9,4 @@ $SCRIPTS/install alsa-utils mkdir -p $INSTALL/etc/modprobe.d cp $PKG_DIR/config/alsa-base $INSTALL/etc/modprobe.d -cp $PKG_DIR/config/audio $INSTALL/etc +#cp $PKG_DIR/config/audio $INSTALL/etc diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf index ade4684baf..72873fc1d3 100644 --- a/packages/sysutils/busybox/config/busybox.conf +++ b/packages/sysutils/busybox/config/busybox.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.13.3 -# Mon Mar 23 03:20:24 2009 +# Mon Mar 23 22:02:54 2009 # CONFIG_HAVE_DOT_CONFIG=y @@ -816,7 +816,7 @@ CONFIG_ASH=y # Ash Shell Options # CONFIG_ASH_BASH_COMPAT=y -CONFIG_ASH_JOB_CONTROL=y +# CONFIG_ASH_JOB_CONTROL is not set CONFIG_ASH_READ_NCHARS=y CONFIG_ASH_READ_TIMEOUT=y CONFIG_ASH_ALIAS=y @@ -848,7 +848,7 @@ CONFIG_MSH=y CONFIG_FEATURE_SH_EXTRA_QUIET=y CONFIG_FEATURE_SH_STANDALONE=y # CONFIG_FEATURE_SH_NOFORK is not set -# CONFIG_CTTYHACK is not set +CONFIG_CTTYHACK=y # # System Logging Utilities diff --git a/packages/sysutils/busybox/config/group b/packages/sysutils/busybox/config/group index 1dbf9013ee..e2a6bb3b27 100644 --- a/packages/sysutils/busybox/config/group +++ b/packages/sysutils/busybox/config/group @@ -1 +1,2 @@ root:x:0: +audio:x:63: \ No newline at end of file diff --git a/packages/sysutils/busybox/init.d/80_debug b/packages/sysutils/busybox/init.d/80_debug index 5dc5e6717b..0ac9b0c8c7 100755 --- a/packages/sysutils/busybox/init.d/80_debug +++ b/packages/sysutils/busybox/init.d/80_debug @@ -8,4 +8,5 @@ echo "#starting debug shell ###" - exec /bin/sh /dev/tty2 2>&1 + exec /bin/sh /dev/tty2 2>&1 & + exec /bin/sh diff --git a/packages/sysutils/busybox/scripts/init.system b/packages/sysutils/busybox/scripts/init.system index 55d8938883..ad77e4e2b0 100755 --- a/packages/sysutils/busybox/scripts/init.system +++ b/packages/sysutils/busybox/scripts/init.system @@ -67,4 +67,4 @@ exit $RET echo "starting emergency shell" - exec /bin/busybox sh /dev/tty1 2>&1 + exec /bin/busybox sh /dev/tty3 2>&1 diff --git a/packages/virtual/Xorg/init.d/65_xorg b/packages/virtual/Xorg/init.d/65_xorg index b64dbe1070..1cbc86a9d3 100755 --- a/packages/virtual/Xorg/init.d/65_xorg +++ b/packages/virtual/Xorg/init.d/65_xorg @@ -2,7 +2,7 @@ # # configure X.Org video settings # -# runlevels: openelec +# runlevels: openelec, debug, configure . /etc/sysconfig