Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

2025-07-24 11:16:51 +00:00 · 2014-02-02 16:23:55 +01:00 · 2014-02-02 16:23:55 +01:00 · 3c8ab09272
commit 3c8ab09272
parent f0123688a3 ce936f8b17
8 changed files with 23 additions and 137 deletions
--- a/packages/compress/xz/package.mk
+++ b/packages/compress/xz/package.mk
@ -32,6 +32,8 @@ PKG_LONGDESC="XZ Utils is free general-purpose data compression software with hi
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"

+# never build shared or k0p happens when building
+# on fedora due to host selinux/liblzma
 PKG_CONFIGURE_OPTS_HOST="--disable-shared --enable-static \
                         --disable-lzmadec \
                         --disable-lzmainfo \
@ -39,4 +41,10 @@ PKG_CONFIGURE_OPTS_HOST="--disable-shared --enable-static \
                         --disable-scripts \
                         --disable-nls"

+# xz is not build for target now but keep this
+# just in case some day we need xz:target. or gdb fails
 PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static"
+
+post_makeinstall_target() {
+  rm -rf $INSTALL/usr/bin
+}
--- a/packages/lang/Python/package.mk
+++ b/packages/lang/Python/package.mk
@ -158,4 +158,11 @@ post_makeinstall_target() {
    echo "the issue in most cases"
    exit 1
  fi
+
+  # k0p
+  rm -rf $INSTALL/usr/bin/2to3
+  rm -rf $INSTALL/usr/bin/idle
+  rm -rf $INSTALL/usr/bin/pydoc
+  rm -rf $INSTALL/usr/bin/smtpd.py
+  rm -rf $INSTALL/usr/bin/python*-config
 }
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@ -32,7 +32,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kernel.org"
 PKG_DEPENDS_HOST="ccache:host"
-PKG_DEPENDS_TARGET="toolchain cpio:host kmod:host pciutils xz wireless-regdb"
+PKG_DEPENDS_TARGET="toolchain cpio:host kmod:host pciutils xz:host wireless-regdb"
 PKG_DEPENDS_INIT="toolchain"
 PKG_NEED_UNPACK="$LINUX_DEPENDS"
 PKG_PRIORITY="optional"
--- a/packages/network/bluez/package.mk
+++ b/packages/network/bluez/package.mk
@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="bluez"
-PKG_VERSION="5.13"
+PKG_VERSION="5.14"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@ -68,6 +68,7 @@ pre_configure_target() {

 post_makeinstall_target() {
  rm -rf $INSTALL/lib/systemd
+  rm -rf $INSTALL/usr/bin/ciptool
 }

 post_install() {
--- a/packages/network/bluez/patches/bluez-dont_use_gi.repository.patch
+++ b/packages/network/bluez/patches/bluez-dont_use_gi.repository.patch
@ -1,122 +0,0 @@
-diff -Naur bluez-5.1/test/simple-agent bluez-5.1.patch/test/simple-agent
--- bluez-5.1/test/simple-agent	2012-12-24 18:46:55.000000000 +0100
-+++ bluez-5.1.patch/test/simple-agent	2013-02-02 05:24:47.752050167 +0100
-@@ -2,7 +2,7 @@
- 
- from __future__ import absolute_import, print_function, unicode_literals
- 
-from gi.repository import GObject
-+import gobject
- 
- import sys
- import dbus
-@@ -151,7 +151,7 @@
- 	path = "/test/agent"
- 	agent = Agent(bus, path)
- 
-	mainloop = GObject.MainLoop()
-+	mainloop = gobject.MainLoop()
- 
- 	obj = bus.get_object(BUS_NAME, "/org/bluez");
- 	manager = dbus.Interface(obj, "org.bluez.AgentManager1")
-diff -Naur bluez-5.1/test/test-device bluez-5.1.patch/test/test-device
--- bluez-5.1/test/test-device	2012-12-24 18:46:55.000000000 +0100
-+++ bluez-5.1.patch/test/test-device	2013-02-02 05:24:47.755050146 +0100
-@@ -2,7 +2,7 @@
- 
- from __future__ import absolute_import, print_function, unicode_literals
- 
-from gi.repository import GObject
-+import gobject
- 
- import sys
- import dbus
-@@ -13,7 +13,7 @@
- 
- dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
- bus = dbus.SystemBus()
-mainloop = GObject.MainLoop()
-+mainloop = gobject.MainLoop()
- 
- option_list = [
- 		make_option("-i", "--device", action="store",
-diff -Naur bluez-5.1/test/test-discovery bluez-5.1.patch/test/test-discovery
--- bluez-5.1/test/test-discovery	2012-12-24 18:46:55.000000000 +0100
-+++ bluez-5.1.patch/test/test-discovery	2013-02-02 05:24:47.755050146 +0100
-@@ -2,7 +2,7 @@
- 
- from __future__ import absolute_import, print_function, unicode_literals
- 
-from gi.repository import GObject
-+import gobject
- 
- import dbus
- import dbus.mainloop.glib
-@@ -152,5 +152,5 @@
- 
- 	adapter.StartDiscovery()
- 
-	mainloop = GObject.MainLoop()
-+	mainloop = gobject.MainLoop()
- 	mainloop.run()
-diff -Naur bluez-5.1/test/test-hfp bluez-5.1.patch/test/test-hfp
--- bluez-5.1/test/test-hfp	2012-12-24 18:46:55.000000000 +0100
-+++ bluez-5.1.patch/test/test-hfp	2013-02-02 05:24:47.756050139 +0100
-@@ -2,7 +2,7 @@
- 
- from __future__ import absolute_import, print_function, unicode_literals
- 
-from gi.repository import GObject
-+import gobject
- 
- import os
- import sys
-@@ -217,7 +217,7 @@
- 
- 	(options, args) = parser.parse_args()
- 
-	mainloop = GObject.MainLoop()
-+	mainloop = gobject.MainLoop()
- 
- 	opts = {
- 			"Version" : dbus.UInt16(0x0106),
-diff -Naur bluez-5.1/test/test-manager bluez-5.1.patch/test/test-manager
--- bluez-5.1/test/test-manager	2012-12-24 18:46:55.000000000 +0100
-+++ bluez-5.1.patch/test/test-manager	2013-02-02 05:24:47.757050132 +0100
-@@ -2,7 +2,7 @@
- 
- from __future__ import absolute_import, print_function, unicode_literals
- 
-from gi.repository import GObject
-+import gobject
- 
- import dbus
- import dbus.mainloop.glib
-@@ -35,5 +35,5 @@
- 	except:
- 		print("No adapter found")
- 
-	mainloop = GObject.MainLoop()
-+	mainloop = gobject.MainLoop()
- 	mainloop.run()
-diff -Naur bluez-5.1/test/test-profile bluez-5.1.patch/test/test-profile
--- bluez-5.1/test/test-profile	2012-12-24 18:46:55.000000000 +0100
-+++ bluez-5.1.patch/test/test-profile	2013-02-02 05:24:47.757050132 +0100
-@@ -2,7 +2,7 @@
- 
- from __future__ import absolute_import, print_function, unicode_literals
- 
-from gi.repository import GObject
-+import gobject
- 
- import os
- import sys
-@@ -93,7 +93,7 @@
- 
- 	profile = Profile(bus, options.path)
- 
-	mainloop = GObject.MainLoop()
-+	mainloop = gobject.MainLoop()
- 
- 	opts = {
- 			"AutoConnect" :	options.auto_connect,
--- a/packages/network/iptables/package.mk
+++ b/packages/network/iptables/package.mk
@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="iptables"
-PKG_VERSION="1.4.20"
+PKG_VERSION="1.4.21"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/network/iptables/patches/iptables-1.4.20-buildfix.patch
+++ b/packages/network/iptables/patches/iptables-1.4.20-buildfix.patch
@ -1,12 +0,0 @@
-diff -Naur iptables-1.4.20/iptables/Makefile.am iptables-1.4.20.patch/iptables/Makefile.am
--- iptables-1.4.20/iptables/Makefile.am	2013-08-06 17:48:43.000000000 +0200
-+++ iptables-1.4.20.patch/iptables/Makefile.am	2013-09-01 05:30:03.118428151 +0200
-@@ -38,7 +38,7 @@
- v6_sbin_links  = ip6tables ip6tables-restore ip6tables-save
- endif
- 
-iptables-extensions.8: ${srcdir}/iptables-extensions.8.tmpl ../extensions/matches.man ../extensions/targets.man
-+iptables-extensions.8: iptables-extensions.8.tmpl ../extensions/matches.man ../extensions/targets.man
- 	${AM_VERBOSE_GEN} sed \
- 		-e '/@MATCH@/ r ../extensions/matches.man' \
- 		-e '/@TARGET@/ r ../extensions/targets.man' $< >$@;
--- a/packages/network/openssh/package.mk
+++ b/packages/network/openssh/package.mk
@ -68,6 +68,10 @@ post_makeinstall_target() {
  if [ ! $SFTP_SERVER = "yes" ]; then
    rm -rf $INSTALL/usr/lib/openssh/sftp-server
  fi
+  # k0p
+  rm -rf $INSTALL/usr/bin/ssh-add
+  rm -rf $INSTALL/usr/bin/ssh-agent
+  rm -rf $INSTALL/usr/bin/ssh-keyscan
 }

 post_install() {