From: kos Date: Thu, 17 Jan 2013 08:03:44 +0000 (+0900) Subject: Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus;a=commitdiff_plain;h=e0a5e46b1f37c907fc584f9a503aa04c53d79594;hp=c83955412f7f8fa1488c668478dec0376f6820a3 Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus --- diff --git a/meta-openvuplus/conf/distro/vuplus.conf b/meta-openvuplus/conf/distro/vuplus.conf index da0866b..ed8a5e4 100644 --- a/meta-openvuplus/conf/distro/vuplus.conf +++ b/meta-openvuplus/conf/distro/vuplus.conf @@ -1,6 +1,6 @@ #@TYPE: Distribution -#@NAME: OpenDreambox -#@DESCRIPTION: Distribution configuration for OpenDreambox +#@NAME: OpenVuplus +#@DESCRIPTION: Distribution configuration for OpenVuplus QA_LOG = "1" #USER_CLASSES += "image-prelink" diff --git a/meta-openvuplus/recipes-connectivity/samba/samba/smb.conf b/meta-openvuplus/recipes-connectivity/samba/samba/smb.conf index 83ac00d..6ca902d 100644 --- a/meta-openvuplus/recipes-connectivity/samba/samba/smb.conf +++ b/meta-openvuplus/recipes-connectivity/samba/samba/smb.conf @@ -4,8 +4,8 @@ log file = /tmp/smb.log log level = 1 security = share - server string = Dreambox %h network services - workgroup = Dream + server string = Vuplus %h network services + workgroup = Vuplus netbios name = %h case sensitive=yes preserve case=yes diff --git a/meta-openvuplus/recipes-connectivity/samba/samba_3.0.37.bbappend b/meta-openvuplus/recipes-connectivity/samba/samba_3.0.37.bbappend index c6512c2..a8d4d07 100644 --- a/meta-openvuplus/recipes-connectivity/samba/samba_3.0.37.bbappend +++ b/meta-openvuplus/recipes-connectivity/samba/samba_3.0.37.bbappend @@ -1,4 +1,4 @@ -PR .= "-vuplus0" +PR .= "-vuplus1" SRC_URI += " \ file://01samba-kill \ diff --git a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/02-config.patch b/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/02-config.patch index 6d7965d..6c980c5 100644 --- a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/02-config.patch +++ b/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/02-config.patch @@ -68,7 +68,7 @@ diff -Naurp vsftpd.orig/vsftpd.conf vsftpd/vsftpd.conf # You may specify an explicit list of local users to chroot() to their home # directory. If chroot_local_user is YES, then this list becomes a list of # users to NOT chroot(). -@@ -103,12 +125,20 @@ connect_from_port_20=YES +@@ -103,12 +123,22 @@ connect_from_port_20=YES # the presence of the "-R" option, so there is a strong case for enabling it. #ls_recurse_enable=YES # @@ -97,6 +97,8 @@ diff -Naurp vsftpd.orig/vsftpd.conf vsftpd/vsftpd.conf +# This option specifies the location of the RSA certificate to use for SSL +# encrypted connections. +rsa_cert_file=/etc/ssl/private/vsftpd.pem ++# ++local_root=/ diff -Naurp vsftpd.orig/vsftpd.conf.5 vsftpd/vsftpd.conf.5 --- vsftpd.orig/vsftpd.conf.5 2009-11-06 08:41:11.000000000 +0100 +++ vsftpd/vsftpd.conf.5 2009-11-06 13:37:10.000000000 +0100 diff --git a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd.conf b/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd.conf deleted file mode 100644 index 28ad4e0..0000000 --- a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd.conf +++ /dev/null @@ -1,105 +0,0 @@ -# Opendreambox /etc/vsftpd.conf -# -# Please see vsftpd.conf.5 for all compiled in defaults. -# -# READ THIS: This example file is NOT an exhaustive list of vsftpd options. -# Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's -# capabilities. -# -# Allow anonymous FTP? (Beware - allowed by default if you comment this out). -anonymous_enable=NO -# -# Uncomment this to allow local users to log in. -local_enable=YES -# -# Uncomment this to enable any form of FTP write command. -write_enable=YES -# -# Default umask for local users is 077. You may wish to change this to 022, -# if your users expect that (022 is used by most other ftpd's) -#local_umask=022 -# -# Uncomment this to allow the anonymous FTP user to upload files. This only -# has an effect if the above global write enable is activated. Also, you will -# obviously need to create a directory writable by the FTP user. -#anon_upload_enable=YES -# -# Uncomment this if you want the anonymous FTP user to be able to create -# new directories. -#anon_mkdir_write_enable=YES -# -# Activate directory messages - messages given to remote users when they -# go into a certain directory. -dirmessage_enable=YES -# -# Activate logging of uploads/downloads. -#xferlog_enable=YES -# -# Make sure PORT transfer connections originate from port 20 (ftp-data). -connect_from_port_20=YES -# -# If you want, you can arrange for uploaded anonymous files to be owned by -# a different user. Note! Using "root" for uploaded files is not -# recommended! -#chown_uploads=YES -#chown_username=whoever -# -# You may override where the log file goes if you like. The default is shown -# below. -#xferlog_file=/var/log/vsftpd.log -# -# If you want, you can have your log file in standard ftpd xferlog format -#xferlog_std_format=YES -# -# You may change the default value for timing out an idle session. -#idle_session_timeout=600 -# -# You may change the default value for timing out a data connection. -#data_connection_timeout=120 -# -# It is recommended that you define on your system a unique user which the -# ftp server can use as a totally isolated and unprivileged user. -#nopriv_user=ftpsecure -# -# Enable this and the server will recognise asynchronous ABOR requests. Not -# recommended for security (the code is non-trivial). Not enabling it, -# however, may confuse older FTP clients. -async_abor_enable=YES -# -# By default the server will pretend to allow ASCII mode but in fact ignore -# the request. Turn on the below options to have the server actually do ASCII -# mangling on files when in ASCII mode. -# Beware that turning on ascii_download_enable enables malicious remote parties -# to consume your I/O resources, by issuing the command "SIZE /big/file" in -# ASCII mode. -# These ASCII options are split into upload and download because you may wish -# to enable ASCII uploads (to prevent uploaded scripts etc. from breaking), -# without the DoS risk of SIZE and ASCII downloads. ASCII mangling should be -# on the client anyway.. -#ascii_upload_enable=YES -#ascii_download_enable=YES -# -# You may fully customise the login banner string: -ftpd_banner=Welcome to the OpenDreambox FTP service. -# -# You may specify a file of disallowed anonymous e-mail addresses. Apparently -# useful for combatting certain DoS attacks. -#deny_email_enable=YES -# (default follows) -#banned_email_file=/etc/vsftpd.banned_emails -# -# You may specify an explicit list of local users to chroot() to their home -# directory. If chroot_local_user is YES, then this list becomes a list of -# users to NOT chroot(). -#chroot_list_enable=YES -# (default follows) -#chroot_list_file=/etc/vsftpd.chroot_list -# -# You may activate the "-R" option to the builtin ls. This is disabled by -# default to avoid remote users being able to cause excessive I/O on large -# sites. However, some broken FTP clients such as "ncftp" and "mirror" assume -# the presence of the "-R" option, so there is a strong case for enabling it. -ls_recurse_enable=YES -# -secure_chroot_dir=/dev/shm -local_root=/ diff --git a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd.socket b/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd.socket deleted file mode 100644 index 4505235..0000000 --- a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd.socket +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] - -[Socket] -ListenStream=21 -Accept=yes - -[Install] -WantedBy=sockets.target diff --git a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd.xinetd.in b/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd.xinetd.in deleted file mode 100644 index 000f62a..0000000 --- a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd.xinetd.in +++ /dev/null @@ -1,7 +0,0 @@ -service ftp -{ - socket_type = stream - user = root - server = @SBINDIR@/vsftpd - wait = no -} diff --git a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd@.service b/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd@.service deleted file mode 100644 index 68e89d1..0000000 --- a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/vsftpd@.service +++ /dev/null @@ -1,5 +0,0 @@ -[Unit] - -[Service] -ExecStart=-/usr/sbin/vsftpd -StandardInput=socket diff --git a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb b/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb index 22397c4..899b368 100644 --- a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb +++ b/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb @@ -5,7 +5,7 @@ LICENSE = "GPL-2.0-with-OpenSSL-exception" LIC_FILES_CHKSUM = "file://COPYING;md5=a6067ad950b28336613aed9dd47b1271" DEPENDS = "libcap openssl" DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -PR = "r4" +PR = "r5" SRC_URI = " \ https://security.appspot.com/downloads/${BP}.tar.gz \ @@ -69,6 +69,7 @@ do_configure() { set_default ls_recurse_enable YES set_default secure_chroot_dir "${SECURE_CHROOT_DIR}" set_default rsa_cert_file "${RSA_CERT_FILE}" + set_default local_root "/" } do_compile() { oe_runmake 'CFLAGS=${CFLAGS}' 'LIBS=${LIBS}' 'LINK=${LINK}' diff --git a/meta-openvuplus/recipes-core/base-files/base-files/bm750/fstab b/meta-openvuplus/recipes-core/base-files/base-files/bm750/fstab new file mode 100755 index 0000000..5e15a51 --- /dev/null +++ b/meta-openvuplus/recipes-core/base-files/base-files/bm750/fstab @@ -0,0 +1,10 @@ +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 usbfs defaults 0 0 +/dev/mtdblock2 /boot jffs2 ro 0 0 +tmpfs /var tmpfs defaults 0 0 +tmpfs /tmp tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 +/dev/sda1 /media/hdd auto defaults 0 0 + diff --git a/meta-openvuplus/recipes-core/base-files/base-files/bm750/fstab_3.1 b/meta-openvuplus/recipes-core/base-files/base-files/bm750/fstab_3.1 new file mode 100755 index 0000000..13869e9 --- /dev/null +++ b/meta-openvuplus/recipes-core/base-files/base-files/bm750/fstab_3.1 @@ -0,0 +1,9 @@ +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 usbfs defaults 0 0 +tmpfs /var tmpfs defaults 0 0 +tmpfs /tmp tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 +/dev/sda1 /media/hdd auto defaults 0 0 + diff --git a/meta-openvuplus/recipes-core/base-files/base-files/fstab b/meta-openvuplus/recipes-core/base-files/base-files/fstab deleted file mode 100644 index 07099a8..0000000 --- a/meta-openvuplus/recipes-core/base-files/base-files/fstab +++ /dev/null @@ -1,8 +0,0 @@ -/dev/root / rootfs noatime 0 1 -tmpfs /proc proc nodev,noexec,nosuid 0 0 -tmpfs /proc/bus/usb usbfs nodev,noexec,nosuid 0 0 -tmpfs /sys sysfs nodev,noexec,nosuid 0 0 -tmpfs /dev/pts devpts noexec,nosuid,mode=0620,gid=5 0 0 -tmpfs /dev/shm tmpfs nosuid,nodev 0 0 -tmpfs /var/volatile tmpfs mode=0755 0 0 -/dev/sda1 /media/hdd auto defaults 0 0 diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vuduo2/fstab b/meta-openvuplus/recipes-core/base-files/base-files/vuduo2/fstab new file mode 100755 index 0000000..13869e9 --- /dev/null +++ b/meta-openvuplus/recipes-core/base-files/base-files/vuduo2/fstab @@ -0,0 +1,9 @@ +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 usbfs defaults 0 0 +tmpfs /var tmpfs defaults 0 0 +tmpfs /tmp tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 +/dev/sda1 /media/hdd auto defaults 0 0 + diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vuduo2/fstab_3.1 b/meta-openvuplus/recipes-core/base-files/base-files/vuduo2/fstab_3.1 new file mode 100755 index 0000000..13869e9 --- /dev/null +++ b/meta-openvuplus/recipes-core/base-files/base-files/vuduo2/fstab_3.1 @@ -0,0 +1,9 @@ +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 usbfs defaults 0 0 +tmpfs /var tmpfs defaults 0 0 +tmpfs /tmp tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 +/dev/sda1 /media/hdd auto defaults 0 0 + diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vuplus/profile b/meta-openvuplus/recipes-core/base-files/base-files/vuplus/profile new file mode 100644 index 0000000..2046847 --- /dev/null +++ b/meta-openvuplus/recipes-core/base-files/base-files/vuplus/profile @@ -0,0 +1,26 @@ +# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) +# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). + +PATH="/usr/local/bin:/usr/bin:/bin" +EDITOR="/bin/vi" # needed for packages like cron +TERM="xterm" # Basic terminal capab. For screen etc. + +if [ "`id -u`" -eq 0 ]; then + PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin: +fi +if [ "$PS1" ]; then +# works for bash and ash (no other shells known to be in use here) + PS1='\u@\h:\w\$ ' +fi + +if [ -d /etc/profile.d ]; then + for i in `ls /etc/profile.d/`; do + . /etc/profile.d/$i + done + unset i +fi + +export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM + +umask 022 + diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vusolo/fstab b/meta-openvuplus/recipes-core/base-files/base-files/vusolo/fstab new file mode 100755 index 0000000..5e15a51 --- /dev/null +++ b/meta-openvuplus/recipes-core/base-files/base-files/vusolo/fstab @@ -0,0 +1,10 @@ +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 usbfs defaults 0 0 +/dev/mtdblock2 /boot jffs2 ro 0 0 +tmpfs /var tmpfs defaults 0 0 +tmpfs /tmp tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 +/dev/sda1 /media/hdd auto defaults 0 0 + diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vusolo/fstab_3.1 b/meta-openvuplus/recipes-core/base-files/base-files/vusolo/fstab_3.1 new file mode 100755 index 0000000..13869e9 --- /dev/null +++ b/meta-openvuplus/recipes-core/base-files/base-files/vusolo/fstab_3.1 @@ -0,0 +1,9 @@ +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 usbfs defaults 0 0 +tmpfs /var tmpfs defaults 0 0 +tmpfs /tmp tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 +/dev/sda1 /media/hdd auto defaults 0 0 + diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vusolo2/fstab b/meta-openvuplus/recipes-core/base-files/base-files/vusolo2/fstab new file mode 100755 index 0000000..13869e9 --- /dev/null +++ b/meta-openvuplus/recipes-core/base-files/base-files/vusolo2/fstab @@ -0,0 +1,9 @@ +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 usbfs defaults 0 0 +tmpfs /var tmpfs defaults 0 0 +tmpfs /tmp tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 +/dev/sda1 /media/hdd auto defaults 0 0 + diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vusolo2/fstab_3.1 b/meta-openvuplus/recipes-core/base-files/base-files/vusolo2/fstab_3.1 new file mode 100755 index 0000000..13869e9 --- /dev/null +++ b/meta-openvuplus/recipes-core/base-files/base-files/vusolo2/fstab_3.1 @@ -0,0 +1,9 @@ +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 usbfs defaults 0 0 +tmpfs /var tmpfs defaults 0 0 +tmpfs /tmp tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 +/dev/sda1 /media/hdd auto defaults 0 0 + diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vuultimo/fstab b/meta-openvuplus/recipes-core/base-files/base-files/vuultimo/fstab new file mode 100755 index 0000000..5e15a51 --- /dev/null +++ b/meta-openvuplus/recipes-core/base-files/base-files/vuultimo/fstab @@ -0,0 +1,10 @@ +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 usbfs defaults 0 0 +/dev/mtdblock2 /boot jffs2 ro 0 0 +tmpfs /var tmpfs defaults 0 0 +tmpfs /tmp tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 +/dev/sda1 /media/hdd auto defaults 0 0 + diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vuultimo/fstab_3.1 b/meta-openvuplus/recipes-core/base-files/base-files/vuultimo/fstab_3.1 new file mode 100755 index 0000000..13869e9 --- /dev/null +++ b/meta-openvuplus/recipes-core/base-files/base-files/vuultimo/fstab_3.1 @@ -0,0 +1,9 @@ +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 usbfs defaults 0 0 +tmpfs /var tmpfs defaults 0 0 +tmpfs /tmp tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 +/dev/sda1 /media/hdd auto defaults 0 0 + diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vuuno/fstab b/meta-openvuplus/recipes-core/base-files/base-files/vuuno/fstab new file mode 100755 index 0000000..5e15a51 --- /dev/null +++ b/meta-openvuplus/recipes-core/base-files/base-files/vuuno/fstab @@ -0,0 +1,10 @@ +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 usbfs defaults 0 0 +/dev/mtdblock2 /boot jffs2 ro 0 0 +tmpfs /var tmpfs defaults 0 0 +tmpfs /tmp tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 +/dev/sda1 /media/hdd auto defaults 0 0 + diff --git a/meta-openvuplus/recipes-core/base-files/base-files/vuuno/fstab_3.1 b/meta-openvuplus/recipes-core/base-files/base-files/vuuno/fstab_3.1 new file mode 100755 index 0000000..13869e9 --- /dev/null +++ b/meta-openvuplus/recipes-core/base-files/base-files/vuuno/fstab_3.1 @@ -0,0 +1,9 @@ +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 usbfs defaults 0 0 +tmpfs /var tmpfs defaults 0 0 +tmpfs /tmp tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 +/dev/sda1 /media/hdd auto defaults 0 0 + diff --git a/meta-openvuplus/recipes-core/base-files/base-files_3.0.14.bbappend b/meta-openvuplus/recipes-core/base-files/base-files_3.0.14.bbappend index d27b04d..3d5c1d9 100644 --- a/meta-openvuplus/recipes-core/base-files/base-files_3.0.14.bbappend +++ b/meta-openvuplus/recipes-core/base-files/base-files_3.0.14.bbappend @@ -1,4 +1,4 @@ -PR .= "-vuplus1" +PR .= "-vuplus2" do_install_append() { ln -s media/hdd ${D}/hdd @@ -6,9 +6,6 @@ do_install_append() { rm -r ${D}/mnt ln -s media ${D}/mnt - rmdir ${D}/tmp - ln -s var/tmp ${D}/tmp - ln -s var/run ${D}/run } diff --git a/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/busybox-telnetd.socket b/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/busybox-telnetd.socket deleted file mode 100644 index 88b2189..0000000 --- a/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/busybox-telnetd.socket +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] - -[Socket] -ListenStream=23 -Accept=yes - -[Install] -WantedBy=sockets.target diff --git a/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/busybox-telnetd.xinetd.in b/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/busybox-telnetd.xinetd.in deleted file mode 100644 index 86e1e5e..0000000 --- a/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/busybox-telnetd.xinetd.in +++ /dev/null @@ -1,7 +0,0 @@ -service telnet -{ - socket_type = stream - user = root - server = @SBINDIR@/telnetd - wait = no -} diff --git a/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/busybox-telnetd@.service b/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/busybox-telnetd@.service deleted file mode 100644 index a493a9e..0000000 --- a/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/busybox-telnetd@.service +++ /dev/null @@ -1,5 +0,0 @@ -[Unit] - -[Service] -ExecStart=-/usr/sbin/telnetd -StandardInput=socket diff --git a/meta-openvuplus/recipes-core/dropbear/dropbear/dropbear.xinetd.in b/meta-openvuplus/recipes-core/dropbear/dropbear/dropbear.xinetd.in deleted file mode 100644 index 7e3e247..0000000 --- a/meta-openvuplus/recipes-core/dropbear/dropbear/dropbear.xinetd.in +++ /dev/null @@ -1,8 +0,0 @@ -service ssh -{ - socket_type = stream - user = root - server = @SBINDIR@/dropbear - server_args = -i - wait = no -} diff --git a/meta-openvuplus/recipes-core/netbase/netbase_4.47.bbappend b/meta-openvuplus/recipes-core/netbase/netbase_4.47.bbappend index 429c37f..f57cc55 100644 --- a/meta-openvuplus/recipes-core/netbase/netbase_4.47.bbappend +++ b/meta-openvuplus/recipes-core/netbase/netbase_4.47.bbappend @@ -1,3 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PR .= "-vuplus0" +PR .= "-vuplus1" + +do_install_append () { + touch ${D}${sysconfdir}/resolv.conf +} diff --git a/meta-openvuplus/recipes-devtools/mtd/mtd-utils-1.4.9/disable-ubi.patch b/meta-openvuplus/recipes-devtools/mtd/mtd-utils-1.4.9/disable-ubi.patch deleted file mode 100644 index d9384d9..0000000 --- a/meta-openvuplus/recipes-devtools/mtd/mtd-utils-1.4.9/disable-ubi.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- mtd-utils-1.4.9.org/Makefile 2012-04-02 11:41:10.339446661 +0200 -+++ mtd-utils-1.4.9/Makefile 2012-04-02 11:40:33.659447111 +0200 -@@ -30,13 +30,13 @@ - ubidetach ubinize ubiformat ubirename mtdinfo ubirsvol - - BINS = $(MTD_BINS) --BINS += mkfs.ubifs/mkfs.ubifs --BINS += $(addprefix ubi-utils/,$(UBI_BINS)) -+#BINS += mkfs.ubifs/mkfs.ubifs -+#BINS += $(addprefix ubi-utils/,$(UBI_BINS)) - SCRIPTS = flash_eraseall - - TARGETS = $(BINS) - TARGETS += lib/libmtd.a --TARGETS += ubi-utils/libubi.a -+#TARGETS += ubi-utils/libubi.a - - OBJDEPS = $(BUILDDIR)/include/version.h - diff --git a/meta-openvuplus/recipes-devtools/mtd/mtd-utils-1.4.9/mkfs.ubifs-allow-output-file-creation-on-different-device.patch b/meta-openvuplus/recipes-devtools/mtd/mtd-utils-1.4.9/mkfs.ubifs-allow-output-file-creation-on-different-device.patch new file mode 100644 index 0000000..63f7ae2 --- /dev/null +++ b/meta-openvuplus/recipes-devtools/mtd/mtd-utils-1.4.9/mkfs.ubifs-allow-output-file-creation-on-different-device.patch @@ -0,0 +1,36 @@ +diff --git a/mkfs.ubifs/mkfs.ubifs.c b/mkfs.ubifs/mkfs.ubifs.c +index f77e5e6..e002be5 100644 +--- a/mkfs.ubifs/mkfs.ubifs.c ++++ b/mkfs.ubifs/mkfs.ubifs.c +@@ -324,6 +324,22 @@ static int in_path(const char *dir_name, const char *file_name) + return ret; + } + ++/* ++ * same_device - determine if a file is on the same blockdevice as a directory. ++ * @dir_name: directory path name ++ * @file_name: file path name ++ */ ++static int same_device(const char *dir_name, const char *file_name) ++{ ++ struct stat stat1, stat2; ++ ++ if (stat(dir_name, &stat1) == -1) ++ return -1; ++ if (stat(file_name, &stat2) == -1) ++ return -1; ++ return stat1.st_dev == stat2.st_dev; ++} ++ + /** + * calc_min_log_lebs - calculate the minimum number of log LEBs needed. + * @max_bud_bytes: journal size (buds only) +@@ -376,7 +392,7 @@ static int validate_options(void) + + if (!output) + return err_msg("no output file or UBI volume specified"); +- if (root && in_path(root, output)) ++ if (root && same_device(root, output) && in_path(root, output)) + return err_msg("output file cannot be in the UBIFS root " + "directory"); + if (!is_power_of_2(c->min_io_size)) diff --git a/meta-openvuplus/recipes-devtools/mtd/mtd-utils_1.4.9.bbappend b/meta-openvuplus/recipes-devtools/mtd/mtd-utils_1.4.9.bbappend index 6eb3342..6b9198a 100644 --- a/meta-openvuplus/recipes-devtools/mtd/mtd-utils_1.4.9.bbappend +++ b/meta-openvuplus/recipes-devtools/mtd/mtd-utils_1.4.9.bbappend @@ -1,7 +1,5 @@ -PR .= "-vuplus0" +PR .= "-vuplus1" -FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:" - -DREAMBOX_KERNEL_VERSION = "3.2" +SRC_URI += "file://mkfs.ubifs-allow-output-file-creation-on-different-device.patch" -SRC_URI += "${@base_version_less_or_equal('DREAMBOX_KERNEL_VERSION', '2.6.18', 'file://disable-ubi.patch', '', d)}" +FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:" diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-streamproxy/streamproxy.socket b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-streamproxy/streamproxy.socket deleted file mode 100644 index 020201e..0000000 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-streamproxy/streamproxy.socket +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] - -[Socket] -ListenStream=8001 -Accept=yes - -[Install] -WantedBy=sockets.target diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-streamproxy/streamproxy.xinetd.in b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-streamproxy/streamproxy.xinetd.in deleted file mode 100644 index d559929..0000000 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-streamproxy/streamproxy.xinetd.in +++ /dev/null @@ -1,10 +0,0 @@ -service streamproxy -{ - type = UNLISTED - socket_type = stream - protocol = tcp - wait = no - user = root - server = @BINDIR@/streamproxy - port = 8001 -} diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-streamproxy/streamproxy@.service b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-streamproxy/streamproxy@.service deleted file mode 100644 index 9e4c78e..0000000 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-streamproxy/streamproxy@.service +++ /dev/null @@ -1,5 +0,0 @@ -[Unit] - -[Service] -ExecStart=-/usr/bin/streamproxy -StandardInput=socket diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy/transtreamproxy.socket b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy/transtreamproxy.socket deleted file mode 100644 index 21258f8..0000000 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy/transtreamproxy.socket +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] - -[Socket] -ListenStream=8002 -Accept=yes - -[Install] -WantedBy=sockets.target diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy/transtreamproxy.xinetd.in b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy/transtreamproxy.xinetd.in deleted file mode 100644 index 9761df2..0000000 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy/transtreamproxy.xinetd.in +++ /dev/null @@ -1,10 +0,0 @@ -service transtreamproxy -{ - type = UNLISTED - socket_type = stream - protocol = tcp - wait = no - user = root - server = @BINDIR@/transtreamproxy - port = 8002 -} diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy/transtreamproxy@.service b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy/transtreamproxy@.service deleted file mode 100644 index b6c83e3..0000000 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy/transtreamproxy@.service +++ /dev/null @@ -1,5 +0,0 @@ -[Unit] - -[Service] -ExecStart=-/usr/bin/transtreamproxy -StandardInput=socket diff --git a/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common.bb b/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common.bb new file mode 100644 index 0000000..eb45d65 --- /dev/null +++ b/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "Tuxbox common files" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +MAINTAINER = "Felix Domke " + +PN = "tuxbox-common" +PR = "r3" +SRCDATE = "20090305" +PV = "0.0+cvs${SRCDATE}" + +SRC_URI = "cvs://anoncvs@cvs.tuxbox.org/cvs/tuxbox/;module=cdk/root/share/tuxbox;method=ext;tag=dreambox;date=${SRCDATE} \ + http://dreamboxupdate.com/download/opendreambox/tuxbox-common-r11.tar.gz \ + file://satellites_20120206.patch;patch=1;pnum=0" + +FILES_${PN} = "/" + +S = "${WORKDIR}/tuxbox-common-r11" + +TRANSPONDER_LISTS = "satellites.xml terrestrial.xml" + +do_install() { + install -d ${D}/etc/tuxbox/ + install -d ${D}/usr/share/tuxbox + install -m 0644 ${S}/scart.conf ${D}/etc/tuxbox/scart.conf + install -m 0644 ${S}/timezone.xml ${D}/etc/tuxbox/timezone.xml + ln -sf /etc/tuxbox/timezone.xml ${D}/etc/ + ln -sf /usr/share ${D}/share + + for i in ${TRANSPONDER_LISTS}; do + install -m 0644 ${WORKDIR}/tuxbox/$i ${D}/etc/tuxbox/$i + ln -sf /etc/tuxbox/$i ${D}/etc/; + ln -sf /etc/tuxbox/$i ${D}/usr/share/; + ln -sf /etc/tuxbox/$i ${D}/usr/share/tuxbox/; + done; +} diff --git a/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common/satellites_20120206.patch b/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common/satellites_20120206.patch new file mode 100644 index 0000000..9adbb1c --- /dev/null +++ b/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common/satellites_20120206.patch @@ -0,0 +1,908 @@ +diff --git ../tuxbox/satellites.xml ../tuxbox/satellites.xml +index 7393703..4c00ec2 100644 +--- ../tuxbox/satellites.xml ++++ ../tuxbox/satellites.xml +@@ -359,6 +359,8 @@ + + + ++ ++ + + + +@@ -732,6 +734,200 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -1347,73 +1543,75 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -1498,158 +1696,75 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -1679,128 +1794,45 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -1899,74 +1931,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +@@ -1984,41 +1948,45 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ + ++ ++ ++ ++ ++ ++ ++ ++ ++ + + diff --git a/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common_0.1.bb b/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common_0.1.bb deleted file mode 100644 index 6b24cc0..0000000 --- a/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common_0.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Tuxbox common files" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRCREV = "77ff3efbac5eb01c2fc914ba8fb99374d0970ff5" -PR = "r1" - -inherit opendreambox-git - -do_install() { - install -d ${D}${sysconfdir} - install -d ${D}${sysconfdir}/tuxbox - install -m 0644 timezone.xml ${D}${sysconfdir} - install -m 0644 satellites.xml ${D}${sysconfdir}/tuxbox - install -m 0644 terrestrial.xml ${D}${sysconfdir}/tuxbox -} - -FILES_${PN} = "${sysconfdir}" - -OPENDREAMBOX_PROJECT = "obi/enigma2-xml-data"