jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into openelec-systemd

Browse Source 
Conflicts:
	packages/network/avahi/package.mk
	packages/sysutils/udisks/init.d/31_mount-disks
This commit is contained in:
Stefan Saraev 2013-08-08 18:23:52 +03:00
commit 3dd82d661d
5 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/initramfs/sysutils/open-iscsi/meta
View File

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="open-iscsi"
PKG_VERSION="ae94266"
PKG_VERSION="bf39941"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

0
packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-ae94266_01_dynamic_linked_iscsistart.patch → packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-01_dynamic_linked_iscsistart.patch
View File

0
packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-ae94266_02-cross_compile.patch → packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-02-cross_compile.patch
View File

26
packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-03_enable-multicast.patch Normal file
View File

@ -0,0 +1,26 @@
From d5b4400d2c50190474a6000d60f05deb95f97e0b Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Thu, 8 Aug 2013 18:08:44 +0300
Subject: [PATCH] enable multicast
source: https://groups.google.com/forum/#!msg/open-iscsi/nuLFqxgsHAA/53-JE3gNNjEJ
---
usr/iscsi_net_util.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr/iscsi_net_util.c b/usr/iscsi_net_util.c
index 6d0ebf9..3801ac7 100644
--- a/usr/iscsi_net_util.c
+++ b/usr/iscsi_net_util.c
@@ -229,7 +229,7 @@ int net_setup_netdev(char *netdev, char *local_ip, char *mask, char *gateway,
/* Bring up interface */
memset(&ifr, 0, sizeof(ifr));
strlcpy(ifr.ifr_name, netdev, IFNAMSIZ);
- ifr.ifr_flags = IFF_UP | IFF_RUNNING;
+ ifr.ifr_flags = IFF_UP | IFF_RUNNING | IFF_MULTICAST;
if (ioctl(sock, SIOCSIFFLAGS, &ifr) < 0) {
log_error("Could not bring up netdev %s (err %d - %s)",
netdev, errno, strerror(errno));
--
1.8.1.2

15
packages/network/avahi/package.mk
View File

@ -85,6 +85,12 @@ post_makeinstall_target() {
sed -e "s,^.*disallow-other-stacks=.*$,disallow-other-stacks=yes,g" -i $INSTALL/etc/avahi/avahi-daemon.conf
# disable wide-area
sed -e "s,^.*enable-wide-area=.*$,enable-wide-area=no,g" -i $INSTALL/etc/avahi/avahi-daemon.conf
# publish-hinfo
sed -e "s,^.*publish-hinfo=.*$,publish-hinfo=no,g" -i $INSTALL/etc/avahi/avahi-daemon.conf
# publish-workstation
sed -e "s,^.*publish-workstation=.*$,publish-workstation=no,g" -i $INSTALL/etc/avahi/avahi-daemon.conf
# browse domains?
sed -e "s,^.*browse-domains=.*$,# browse-domains=,g" -i $INSTALL/etc/avahi/avahi-daemon.conf
rm -rf $INSTALL/etc/avahi/avahi-autoipd.action
rm -rf $INSTALL/etc/avahi/avahi-dnsconfd.action
@ -92,8 +98,13 @@ post_makeinstall_target() {
if [ ! $SFTP_SERVER = "yes" ]; then
rm -rf $INSTALL/etc/avahi/services/sftp-ssh.service
fi
rm -rf $INSTALL/usr/sbin/avahi-dnsconfd
rm -rf $INSTALL/lib/systemd
rm -f $INSTALL/usr/share/dbus-1/system-services/org.freedesktop.Avahi.service
rm -f $INSTALL/usr/sbin/avahi-autoipd
rm -f $INSTALL/usr/sbin/avahi-dnsconfd
rm -f $INSTALL/usr/bin/avahi-bookmarks
rm -f $INSTALL/usr/bin/avahi-publish*
rm -f $INSTALL/usr/bin/avahi-resolve*
}
post_install() {