[oe-commits] org.oe.dreambox different packages: add support for Dreambox DM500+
tmbinc commit
openembedded-commits at lists.openembedded.org
Thu Jun 14 17:31:58 UTC 2007
different packages: add support for Dreambox DM500+
Author: tmbinc at openembedded.org
Branch: org.openembedded.dreambox
Revision: f1b6671de004b924f6d8e4586b9c37c05d3fb7e4
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f1b6671de004b924f6d8e4586b9c37c05d3fb7e4
Files:
1
packages/base-files/base-files/dm500plus
packages/initscripts/initscripts-1.0/dm500plus
packages/ipkg/ipkg-collateral/dm500plus
packages/netbase/netbase/dm500plus
packages/sysvinit/sysvinit/dm500plus
conf/machine/dm500plus.conf
packages/base-files/base-files/dm500plus/fstab
packages/initscripts/initscripts-1.0/dm500plus/bootup
packages/ipkg/ipkg-collateral/dm500plus/dest
packages/linux/linux-dm500plus.bb
packages/netbase/netbase/dm500plus/interfaces
packages/sysvinit/sysvinit/dm500plus/inittab
packages/dreambox/dreambox-bootlogo.bb
packages/dreambox/dreambox-dvb-modules.bb
packages/dreambox/dreambox-dvbincludes.bb
packages/dreambox/dreambox-secondstage.bb
packages/enigma/enigma_cvs.bb
packages/images/dreambox-image.bb
packages/initscripts/initscripts-opendreambox_1.0.bb
packages/linux/linux-dm600pvr.bb
packages/ppp/ppp_2.4.3.bb
packages/tuxbox/tuxbox-libtuxtxt.bb
packages/tuxbox/tuxbox-plugins.bb
Diffs:
#
# mt diff -rad5421a423b1a0850b194484982fedc5f35703ee -rf1b6671de004b924f6d8e4586b9c37c05d3fb7e4
#
#
#
# add_dir "packages/base-files/base-files/dm500plus"
#
# add_dir "packages/initscripts/initscripts-1.0/dm500plus"
#
# add_dir "packages/ipkg/ipkg-collateral/dm500plus"
#
# add_dir "packages/netbase/netbase/dm500plus"
#
# add_dir "packages/sysvinit/sysvinit/dm500plus"
#
# add_file "conf/machine/dm500plus.conf"
# content [1dedf1e95479e6fb9151b4f4f34172806fe701a3]
#
# add_file "packages/base-files/base-files/dm500plus/fstab"
# content [0ce4faaf484e7ee54f999c2c9ba4f50ec7726dce]
#
# add_file "packages/initscripts/initscripts-1.0/dm500plus/bootup"
# content [35fa6ee4af251568048ed830b1d0c9079ed0b3ad]
#
# add_file "packages/ipkg/ipkg-collateral/dm500plus/dest"
# content [91add4cac98bab229d8815db0a97d317f6bbf2e9]
#
# add_file "packages/linux/linux-dm500plus.bb"
# content [5120f663e7f6e97ec0c0e0dc463dcc31cd5b8052]
#
# add_file "packages/netbase/netbase/dm500plus/interfaces"
# content [aabd462ba3c3c63e37836c3f3b79b7f292f30539]
#
# add_file "packages/sysvinit/sysvinit/dm500plus/inittab"
# content [56d2a8ff459dada22df0c5676f932b1a356cecb3]
#
# patch "packages/dreambox/dreambox-bootlogo.bb"
# from [5ff4631fd6e58cad8e2c43dd08d67d95272d814b]
# to [acf23b51b87a6011fd49668d66704fa7c50dd53c]
#
# patch "packages/dreambox/dreambox-dvb-modules.bb"
# from [3562d68b82051be1a9d58fb9d54b1bd5d440d77d]
# to [0c335434a59ca58d97e4dc7364d0ed5995e2fbcc]
#
# patch "packages/dreambox/dreambox-dvbincludes.bb"
# from [9328ae47be010ecbdc53beed1e03ec3abfe8d76a]
# to [e2ab9d7526faf10359ee4078ea91a64b87a98e20]
#
# patch "packages/dreambox/dreambox-secondstage.bb"
# from [e46d9e420fb9cb877d45e89de213760ee48cc49b]
# to [abef9c79c1566d43a5270c6ca4bae2f32599bee5]
#
# patch "packages/enigma/enigma_cvs.bb"
# from [86b7588a27fa616ecd30a05b5e9ac01fc6e9e978]
# to [cc9bef81cb96c4ee65a9e962de7bb8b1fda3d307]
#
# patch "packages/images/dreambox-image.bb"
# from [bc609062ac087208f01ed1daaaba80240bc3c6c6]
# to [bb78df1572d6d0daa304ff167a04c42e70069208]
#
# patch "packages/initscripts/initscripts-opendreambox_1.0.bb"
# from [76a9bf6029575bae60b4a86dad541a0d1e638bbf]
# to [0cbef9709631f1a676db51ebf3885036aba9c43d]
#
# patch "packages/linux/linux-dm600pvr.bb"
# from [d0bb437bf87a7e069a8d521c13ced243276652ae]
# to [3006cd86b88cdc3b6769eb6a176a5d1a9993a701]
#
# patch "packages/ppp/ppp_2.4.3.bb"
# from [9551730e528355435229dd391aa3f37d270344c9]
# to [dae8dcc2d203b8497bd383920bf8fe29781ae0d4]
#
# patch "packages/tuxbox/tuxbox-libtuxtxt.bb"
# from [8b3feced9bb74f60dd42c38deb6728a6b0b9ef70]
# to [461228fb136f1c9f10b229902e8183911879bbab]
#
# patch "packages/tuxbox/tuxbox-plugins.bb"
# from [684e2a70e262cc28b8a574587b91d737d9d0ac5e]
# to [9b90b791dd576e93f5351ed79e357785c500e2ed]
#
============================================================
--- conf/machine/dm500plus.conf 1dedf1e95479e6fb9151b4f4f34172806fe701a3
+++ conf/machine/dm500plus.conf 1dedf1e95479e6fb9151b4f4f34172806fe701a3
@@ -0,0 +1,46 @@
+TARGET_ARCH = "powerpc"
+IPKG_ARCHS = "all powerpc ${MACHINE}"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-dm500plus"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel dreambox-dvb-modules"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel dreambox-dvb-modules"
+
+TARGET_FPU = "soft"
+TARGET_CPU = "405"
+
+OVERRIDES =. "dvbapiv1:"
+
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
+
+PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
+PREFERRED_VERSION_glibc-initial = "2.3.2+cvs20040726"
+PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
+PREFERRED_VERSION_gcc-cross = "3.4.4"
+PREFERRED_VERSION_gcc-cross-sdk = "3.4.4"
+PREFERRED_VERSION_gcc = "3.4.4"
+PREFERRED_VERSION_gdb = "6.5"
+PREFERRED_VERSION_gdb-cross = "6.5"
+PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
+PREFERRED_VERSION_binutils-cross-sdk = "2.15.94.0.1"
+PREFERRED_VERSION_binutils = "2.15.94.0.1"
+PREFERRED_VERSION_busybox = "1.01"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls --without-fp --with-__thread"
+
+EXTRA_IMAGEDEPENDS += "dreambox-secondstage dreambox-buildimage-native"
+EXTRA_IMAGECMD_jffs2 = " --eraseblock=0x4000 -n -b "
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS}/boot --faketime \
+ --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 \
+ ${EXTRA_IMAGECMD}; rm -rf ${IMAGE_ROOTFS}/boot/*; \
+ mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
+ --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+ ${EXTRA_IMAGECMD}; \
+ buildimage ${STAGING_LIBDIR}/dreambox-secondstage/main.bin.gz \
+ ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 \
+ ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+ ${MACHINE} \
+ > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.nfi"
============================================================
--- packages/base-files/base-files/dm500plus/fstab 0ce4faaf484e7ee54f999c2c9ba4f50ec7726dce
+++ packages/base-files/base-files/dm500plus/fstab 0ce4faaf484e7ee54f999c2c9ba4f50ec7726dce
@@ -0,0 +1,7 @@
+rootfs / auto defaults 1 1
+proc /proc proc defaults 0 0
+devpts /dev/pts devpts mode=0620,gid=5 0 0
+usbdevfs /proc/bus/usb usbdevfs defaults 0 0
+/dev/mtdblock/2 /boot jffs2 ro 0 0
+tmpfs /var tmpfs defaults 0 0
+tmpfs /tmp tmpfs defaults 0 0
============================================================
--- packages/initscripts/initscripts-1.0/dm500plus/bootup 35fa6ee4af251568048ed830b1d0c9079ed0b3ad
+++ packages/initscripts/initscripts-1.0/dm500plus/bootup 35fa6ee4af251568048ed830b1d0c9079ed0b3ad
@@ -0,0 +1,19 @@
+modprobe lcd
+mount -t proc proc /proc
+mount -t sysfs sysfs /sys
+depmod -Ae
+swapon -a
+mount -at nonfs,nosmbfs,noncpfs 2>/dev/null
+tar xzf /etc/var.tar.gz -C /
+modprobe head
+modprobe dreambox_keyboard
+[ -e /etc/dropbear/dropbear_rsa_host_key ] && /usr/bin/showiframe /boot/bootlogo.mvi || /usr/bin/showiframe /boot/bootlogo_wait.mvi
+hostname -F /etc/hostname
+/usr/bin/wdog /usr/bin/dccamd -
+ifup -a
+mount -at nfs,smbfs,cpfs 2>/dev/null
+[ -e "/etc/sysctl.conf" ] && /sbin/sysctl -p "/etc/sysctl.conf"
+ldconfig
+ln -s demux0 /dev/dvb/card0/demux1
+ln -s dvr0 /dev/dvb/card0/dvr1
+ln -s fb/0 /dev/fb0
============================================================
--- packages/ipkg/ipkg-collateral/dm500plus/dest 91add4cac98bab229d8815db0a97d317f6bbf2e9
+++ packages/ipkg/ipkg-collateral/dm500plus/dest 91add4cac98bab229d8815db0a97d317f6bbf2e9
@@ -0,0 +1,3 @@
+dest root /
+dest cf /media/cf/
+dest ram /media/ram/
============================================================
--- packages/linux/linux-dm500plus.bb 5120f663e7f6e97ec0c0e0dc463dcc31cd5b8052
+++ packages/linux/linux-dm500plus.bb 5120f663e7f6e97ec0c0e0dc463dcc31cd5b8052
@@ -0,0 +1,41 @@
+DESCRIPTION = "Linux kernel for Dreambox DM500PLUS"
+LICENSE = "GPL"
+PN = "linux-dm500plus"
+PV = "2.6.12"
+PR = "r0"
+
+# -rX is the patch revision - it's not related to this package's PR
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.bz2 \
+ http://sources.dreamboxupdate.com/download/kernel-patches/linux-2.6.12-dream-ppc-r4.patch.gz;patch=1;pnum=1"
+
+S = "${WORKDIR}/linux-2.6.12"
+
+inherit kernel
+
+FILES_kernel-image = "/boot/zImage.elf /boot/autoexec.bat"
+
+export OS = "Linux"
+ARCH = "ppc"
+KERNEL_IMAGETYPE = "zImage"
+KERNEL_OUTPUT = "arch/ppc/boot/images/zImage.elf"
+
+do_configure_prepend() {
+ oe_machinstall -m 0644 ${S}/arch/ppc/configs/dm500plus_defconfig ${S}/.config || die "no default configuration for ${MACHINE} available."
+ oe_runmake oldconfig
+}
+
+do_install_append () {
+ install -d ${D}/boot
+ install -m 0755 arch/ppc/boot/images/zImage.elf ${D}/boot/zImage.elf
+ echo "/flash/bootlogo.elf" > ${D}/boot/autoexec.bat
+ echo "/flash/zImage.elf" >> ${D}/boot/autoexec.bat
+}
+
+pkg_postinst_kernel () {
+ true
+}
+
+pkg_postrm_kernel () {
+ true
+}
+
============================================================
--- packages/netbase/netbase/dm500plus/interfaces aabd462ba3c3c63e37836c3f3b79b7f292f30539
+++ packages/netbase/netbase/dm500plus/interfaces aabd462ba3c3c63e37836c3f3b79b7f292f30539
@@ -0,0 +1,10 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Ethernet
+auto eth0
+iface eth0 inet dhcp
+
============================================================
--- packages/sysvinit/sysvinit/dm500plus/inittab 56d2a8ff459dada22df0c5676f932b1a356cecb3
+++ packages/sysvinit/sysvinit/dm500plus/inittab 56d2a8ff459dada22df0c5676f932b1a356cecb3
@@ -0,0 +1,32 @@
+# /etc/inittab: init(8) configuration.
+# $Id: inittab,v 1.91 2002/01/25 13:35:21 miquels Exp $
+
+# The default runlevel.
+id:2:initdefault:
+
+# Boot-time system configuration/initialization script.
+# This is run first except when booting in emergency (-b) mode.
+si::sysinit:/etc/init.d/rcS
+
+# What to do in single-user mode.
+~~:S:wait:/sbin/sulogin
+
+# /etc/init.d executes the S and K scripts upon change
+# of runlevel.
+#
+# Runlevel 0 is halt.
+# Runlevel 1 is single-user.
+# Runlevels 2-5 are multi-user.
+# Runlevel 6 is reboot.
+
+l0:0:wait:/etc/init.d/rc 0
+l1:1:wait:/etc/init.d/rc 1
+l2:2:wait:/etc/init.d/rc 2
+l3:3:wait:/etc/init.d/rc 3
+l4:4:wait:/etc/init.d/rc 4
+l5:5:wait:/etc/init.d/rc 5
+l6:6:wait:/etc/init.d/rc 6
+# Normally not reached, but fallthrough in case of emergency.
+z6:6:respawn:/sbin/sulogin
+
+S:5:respawn:/sbin/getty tts/0 115200
============================================================
--- packages/dreambox/dreambox-bootlogo.bb 5ff4631fd6e58cad8e2c43dd08d67d95272d814b
+++ packages/dreambox/dreambox-bootlogo.bb acf23b51b87a6011fd49668d66704fa7c50dd53c
@@ -7,18 +7,10 @@ PR = "r1"
PV = "1.0"
PR = "r1"
-SRC_URI = "http://sources.dreamboxupdate.com/download/7020/bootlogo_dm600pvr.elf \
- http://sources.dreamboxupdate.com/download/7020/bootlogo_dm7020.elf \
- http://sources.dreamboxupdate.com/download/7020/bootlogo_dm7025.elf \
- http://sources.dreamboxupdate.com/download/7020/bootlogo_dm7020.mvi \
- http://sources.dreamboxupdate.com/download/7020/bootlogo_wait_dm7020.mvi \
- http://sources.dreamboxupdate.com/download/7020/backdrop_dm7020.mvi \
- http://sources.dreamboxupdate.com/download/7020/bootlogo_dm7025.mvi \
- http://sources.dreamboxupdate.com/download/7020/bootlogo_wait_dm7025.mvi \
- http://sources.dreamboxupdate.com/download/7020/backdrop_dm7025.mvi \
- http://sources.dreamboxupdate.com/download/7020/bootlogo_dm600pvr.mvi \
- http://sources.dreamboxupdate.com/download/7020/bootlogo_wait_dm600pvr.mvi \
- http://sources.dreamboxupdate.com/download/7020/backdrop_dm600pvr.mvi"
+SRC_URI = "http://sources.dreamboxupdate.com/download/7020/bootlogo_${MACHINE}.elf \
+ http://sources.dreamboxupdate.com/download/7020/bootlogo_${MACHINE}.mvi \
+ http://sources.dreamboxupdate.com/download/7020/bootlogo_wait_${MACHINE}.mvi \
+ http://sources.dreamboxupdate.com/download/7020/backdrop_${MACHINE}.mvi"
S = "${WORKDIR}/"
============================================================
--- packages/dreambox/dreambox-dvb-modules.bb 3562d68b82051be1a9d58fb9d54b1bd5d440d77d
+++ packages/dreambox/dreambox-dvb-modules.bb 0c335434a59ca58d97e4dc7364d0ed5995e2fbcc
@@ -18,6 +18,9 @@ PV_dm600pvr = "${KV}-20070403"
KV_dm600pvr = "2.6.12"
PV_dm600pvr = "${KV}-20070403"
+KV_dm500plus = "2.6.12"
+PV_dm500plus = "${KV}-20070614"
+
RDEPENDS = "kernel (${KV})"
PR = "r0"
@@ -40,6 +43,13 @@ do_install_dm7020() {
done
}
+do_install_dm500plus() {
+ install -d ${D}/lib/modules/${KV}/extra
+ for f in head; do
+ install -m 0644 $f.ko ${D}/lib/modules/${KV}/extra/$f.ko;
+ done
+}
+
do_install_dm7025() {
install -d ${D}/lib/modules/${KV}/extra
for f in alps_bsbe1.ko avs.ko cu1216mk3.ko dreambox_rc2.ko \
============================================================
--- packages/dreambox/dreambox-dvbincludes.bb 9328ae47be010ecbdc53beed1e03ec3abfe8d76a
+++ packages/dreambox/dreambox-dvbincludes.bb e2ab9d7526faf10359ee4078ea91a64b87a98e20
@@ -43,6 +43,17 @@ do_install_dm600pvr() {
done;
}
+do_install_dm500plus() {
+ install -d ${STAGING_INCDIR}/ci
+ install -d ${STAGING_INCDIR}/dbox
+ install -d ${STAGING_INCDIR}/dreambox
+ install -d ${STAGING_INCDIR}/ost
+ install -d ${STAGING_INCDIR}/tuxbox
+ for f in ${INPUT_FILES} ${INPUT_FILES_OST}; do
+ install -m 0644 ${S}/$f ${STAGING_INCDIR}/$f
+ done;
+}
+
do_install_dm7025() {
install -d ${STAGING_INCDIR}/ci
install -d ${STAGING_INCDIR}/dbox
============================================================
--- packages/dreambox/dreambox-secondstage.bb e46d9e420fb9cb877d45e89de213760ee48cc49b
+++ packages/dreambox/dreambox-secondstage.bb abef9c79c1566d43a5270c6ca4bae2f32599bee5
@@ -5,6 +5,7 @@ PV_dm600pvr = "51"
PV_dm7020 = "35"
PV_dm7025 = "51"
PV_dm600pvr = "51"
+PV_dm500plus = "52"
PR = "r0"
SRC_URI = "http://sources.dreamboxupdate.com/download/7020/secondstage-${MACHINE}-${PV}.bin"
============================================================
--- packages/enigma/enigma_cvs.bb 86b7588a27fa616ecd30a05b5e9ac01fc6e9e978
+++ packages/enigma/enigma_cvs.bb cc9bef81cb96c4ee65a9e962de7bb8b1fda3d307
@@ -1,9 +1,9 @@ LICENSE = "GPL"
DEPENDS = "jpeg libungif libid3tag libmad libpng libsigc++-1.2 gettext-native tuxbox-libs tuxbox-plugins dreambox-dvbincludes mtd-utils freetype"
DESCRIPTION = "Enigma is a framebuffer-based frontend for DVB functions"
MAINTAINER = "Felix Domke <tmbinc at elitedvb.net>"
LICENSE = "GPL"
-SRCDATE = "20070327"
+SRCDATE = "20070615"
PV = "cvs-${SRCDATE}"
PN = "enigma"
PR = "r0"
@@ -18,7 +18,9 @@ SRC_URI = "cvs://anoncvs@cvs.tuxbox.org/
file://rotor_fix.diff;patch=1;pnum=1 \
file://disable_boot.diff;patch=1;pnum=1"
+# dm600pvr and dm500plus don't have a FP, so they can't really switch of. Show a shutdown pic instead.
SRC_URI_append_dm600pvr = " http://sources.dreamboxupdate.com/download/opendreambox/enigma/showshutdownpic-${MACHINE}"
+SRC_URI_append_dm500plus = " http://sources.dreamboxupdate.com/download/opendreambox/enigma/showshutdownpic-${MACHINE}"
S = "${WORKDIR}/enigma"
@@ -57,8 +59,8 @@ do_install_append() {
mv ${D}/etc/enigma/* ${D}/usr/share/enigma/default 2> /dev/null || /bin/true
rm -R ${D}/etc/enigma 2> /dev/null || /bin/true
install -m 0644 ${WORKDIR}/config ${D}/usr/share/enigma/default/
- if [ "${MACHINE}" = "dm600pvr" ]; then
- install -m 0755 ${WORKDIR}/showshutdownpic-dm600pvr ${D}/usr/bin/showshutdownpic
+ if [ "${MACHINE}" = "dm600pvr" -o "${MACHINE}" = "dm500plus" ]; then
+ install -m 0755 ${WORKDIR}/showshutdownpic-${MACHINE} ${D}/usr/bin/showshutdownpic
# vulcan-based boxes don't look that well with too much alpha
echo "i:/ezap/osd/alpha=00000000" >> ${D}/usr/share/enigma/default/config
echo "i:/ezap/osd/simpleMainMenu=00000001" >> ${D}/usr/share/enigma/default/config
============================================================
--- packages/images/dreambox-image.bb bc609062ac087208f01ed1daaaba80240bc3c6c6
+++ packages/images/dreambox-image.bb bb78df1572d6d0daa304ff167a04c42e70069208
@@ -50,6 +50,14 @@ OPENDREAMBOX_TUXBOX_R_dm600pvr = " \
tuxbox-plugin-tank tuxbox-plugin-pacman tuxbox-plugin-tetris \
tuxbox-plugin-tuxcom links-dream-plugin"
+OPENDREAMBOX_TUXBOX_R_dm500plus = " \
+ tuxbox-plugin-snake tuxbox-plugin-tuxmail \
+ tuxbox-plugin-soko tuxbox-plugin-tuxtxt \
+ tuxbox-plugin-sol tuxbox-plugin-vierg tuxbox-plugin-master \
+ tuxbox-plugin-solitair tuxbox-plugin-yahtzee tuxbox-plugin-mines \
+ tuxbox-plugin-tank tuxbox-plugin-pacman tuxbox-plugin-tetris \
+ tuxbox-plugin-tuxcom links-dream-plugin"
+
# dvb api specific stuff
OPENDREAMBOX_V2_ONLY = "dreambox-dvb-tools tuxbox-stream"
OPENDREAMBOX_V3_ONLY = "dreambox-dvb-tools-v3 sctzap dvbtraffic"
@@ -66,6 +74,7 @@ OPENDREAMBOX_TUXBOX_R_dm600pvr += " ${EN
OPENDREAMBOX_TUXBOX_R += " ${ENIGMA_LANGUAGE}"
OPENDREAMBOX_TUXBOX_R_dm600pvr += " ${ENIGMA_LANGUAGE}"
+OPENDREAMBOX_TU%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list