From 8de24b8cab59e114c415d12c95568b14d028268c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 14 Oct 2013 10:00:37 +0200 Subject: [PATCH 01/15] projects/Fusion/linux: add support for RME Hammerfall DIGI9652, this fixes #2636 Signed-off-by: Stephan Raue Conflicts: projects/Fusion/linux/linux.i386.conf projects/Fusion/linux/linux.x86_64.conf projects/Generic_OSS/linux/linux.i386.conf projects/ION/linux/linux.x86_64.conf projects/Intel/linux/linux.x86_64.conf --- projects/Generic/linux/linux.i386.conf | 2 +- projects/Generic/linux/linux.x86_64.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index b8c2297613..5940ab1f17 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -2845,7 +2845,7 @@ CONFIG_SND_INTEL8X0=m # CONFIG_SND_RIPTIDE is not set # CONFIG_SND_RME32 is not set # CONFIG_SND_RME96 is not set -# CONFIG_SND_RME9652 is not set +CONFIG_SND_RME9652=m # CONFIG_SND_SIS7019 is not set # CONFIG_SND_SONICVIBES is not set # CONFIG_SND_TRIDENT is not set diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 79d3d340fd..d70379afc5 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -2813,7 +2813,7 @@ CONFIG_SND_INTEL8X0=m # CONFIG_SND_RIPTIDE is not set # CONFIG_SND_RME32 is not set # CONFIG_SND_RME96 is not set -# CONFIG_SND_RME9652 is not set +CONFIG_SND_RME9652=m # CONFIG_SND_SONICVIBES is not set # CONFIG_SND_TRIDENT is not set # CONFIG_SND_VIA82XX is not set From 0015659ec197c8f786c46a9195f05019a6289c1b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 14 Oct 2013 08:38:04 +0200 Subject: [PATCH 02/15] pptp: use /sbin/ip Signed-off-by: Stephan Raue --- .../pptp/patches/pptp-1.7.2-use-sbin-ip.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 packages/network/pptp/patches/pptp-1.7.2-use-sbin-ip.patch diff --git a/packages/network/pptp/patches/pptp-1.7.2-use-sbin-ip.patch b/packages/network/pptp/patches/pptp-1.7.2-use-sbin-ip.patch new file mode 100644 index 0000000000..17b09a5439 --- /dev/null +++ b/packages/network/pptp/patches/pptp-1.7.2-use-sbin-ip.patch @@ -0,0 +1,36 @@ +commit aa1536de73a383ca64f2bd325ec2844679a269c2 +Author: Stefan Saraev +Date: Sat Oct 12 18:08:59 2013 +0300 + + use /sbin/ip for routing + +diff --git a/routing.c b/routing.c +index ab20a03..7fb4277 100644 +--- a/routing.c ++++ b/routing.c +@@ -55,7 +55,7 @@ regardless (not yet implemented). + + void routing_init(char *ip) { + char buf[256]; +- snprintf(buf, 255, "/bin/ip route get %s", ip); ++ snprintf(buf, 255, "/sbin/ip route get %s", ip); + FILE *p = popen(buf, "r"); + fgets(buf, 255, p); + /* TODO: check for failure of fgets */ +@@ -66,14 +66,14 @@ void routing_init(char *ip) { + + void routing_start() { + char buf[256]; +- snprintf(buf, 255, "/bin/ip route replace %s", route); ++ snprintf(buf, 255, "/sbin/ip route replace %s", route); + FILE *p = popen(buf, "r"); + pclose(p); + } + + void routing_end() { + char buf[256]; +- snprintf(buf, 255, "/bin/ip route delete %s", route); ++ snprintf(buf, 255, "/sbin/ip route delete %s", route); + FILE *p = popen(buf, "r"); + pclose(p); + } From 03330fed8fad3d7092f0cc1e11d23e6eff06b668 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 14 Oct 2013 13:07:30 +0300 Subject: [PATCH 03/15] linux: dont set cpupower to 'performance' on startup --- packages/linux/install | 3 +-- packages/linux/system.d/cpufreq-threshold.service | 11 +++++++++++ packages/linux/system.d/cpupower-end.service | 12 ------------ packages/linux/system.d/cpupower-end.timer | 8 -------- packages/linux/system.d/cpupower-start.service | 11 ----------- 5 files changed, 12 insertions(+), 33 deletions(-) create mode 100644 packages/linux/system.d/cpufreq-threshold.service delete mode 100644 packages/linux/system.d/cpupower-end.service delete mode 100644 packages/linux/system.d/cpupower-end.timer delete mode 100644 packages/linux/system.d/cpupower-start.service diff --git a/packages/linux/install b/packages/linux/install index 94076019ed..606e08de8a 100755 --- a/packages/linux/install +++ b/packages/linux/install @@ -47,5 +47,4 @@ if [ "$PERF_SUPPORT" = "yes" -a "$DEVTOOLS" = "yes" ]; then cp -rP $PKG_BUILD/tools/perf/scripts/python/* $INSTALL/usr/libexec/perf-core/scripts/python/ fi -enable_service cpupower-start.service -enable_service cpupower-end.timer +enable_service cpufreq-threshold.service diff --git a/packages/linux/system.d/cpufreq-threshold.service b/packages/linux/system.d/cpufreq-threshold.service new file mode 100644 index 0000000000..3bebb4e262 --- /dev/null +++ b/packages/linux/system.d/cpufreq-threshold.service @@ -0,0 +1,11 @@ +[Unit] +Description=Set ondemand threshold +DefaultDependencies=false + +[Service] +Type=oneshot +ExecStart=-/bin/sh -c 'echo 50 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold' +RemainAfterExit=yes + +[Install] +WantedBy=basic.target diff --git a/packages/linux/system.d/cpupower-end.service b/packages/linux/system.d/cpupower-end.service deleted file mode 100644 index 1ea8d71c79..0000000000 --- a/packages/linux/system.d/cpupower-end.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Set cpupower to ondemand -DefaultDependencies=false - -[Service] -Type=oneshot -ExecStart=-/bin/sh -c 'for i in /sys/devices/system/cpu/*/cpufreq/scaling_governor; do printf "ondemand" > $i; done' -ExecStartPost=-/bin/sh -c 'echo 50 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold' -RemainAfterExit=yes - -[Install] -WantedBy=basic.target diff --git a/packages/linux/system.d/cpupower-end.timer b/packages/linux/system.d/cpupower-end.timer deleted file mode 100644 index 7995eeb241..0000000000 --- a/packages/linux/system.d/cpupower-end.timer +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Set cpupower to ondemand - -[Timer] -OnBootSec=40sec - -[Install] -WantedBy=basic.target diff --git a/packages/linux/system.d/cpupower-start.service b/packages/linux/system.d/cpupower-start.service deleted file mode 100644 index b967eb78d5..0000000000 --- a/packages/linux/system.d/cpupower-start.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Set cpupower to performance -DefaultDependencies=false - -[Service] -Type=oneshot -ExecStart=-/bin/sh -c 'for i in /sys/devices/system/cpu/*/cpufreq/scaling_governor; do printf "performance" > $i; done' -RemainAfterExit=yes - -[Install] -WantedBy=basic.target From ea46768560e094769031e8b6080bdf26726f756b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 14 Oct 2013 08:16:27 +0200 Subject: [PATCH 04/15] xf86-video-intel: update to xf86-video-intel-2.99.904 Signed-off-by: Stephan Raue --- .../x11/driver/xf86-video-intel/package.mk | 2 +- ...f86-video-intel-upstream-fix-f0bd716.patch | 68 +++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 packages/x11/driver/xf86-video-intel/patches/xf86-video-intel-upstream-fix-f0bd716.patch diff --git a/packages/x11/driver/xf86-video-intel/package.mk b/packages/x11/driver/xf86-video-intel/package.mk index 7b878c8815..dc8076af68 100644 --- a/packages/x11/driver/xf86-video-intel/package.mk +++ b/packages/x11/driver/xf86-video-intel/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xf86-video-intel" -PKG_VERSION="2.99.903" +PKG_VERSION="2.99.904" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS" diff --git a/packages/x11/driver/xf86-video-intel/patches/xf86-video-intel-upstream-fix-f0bd716.patch b/packages/x11/driver/xf86-video-intel/patches/xf86-video-intel-upstream-fix-f0bd716.patch new file mode 100644 index 0000000000..653edff6b4 --- /dev/null +++ b/packages/x11/driver/xf86-video-intel/patches/xf86-video-intel-upstream-fix-f0bd716.patch @@ -0,0 +1,68 @@ +From f0bd716425d1514b62565f9a65397cd1cb2ffb3a Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Thu, 10 Oct 2013 15:22:45 +0000 +Subject: sna: Sanitize output->crtc before falling back oto xf86InitialConfiguration + +During initialisation, we stash the currently attached CRTC id in +output->crtc. This is fine as ordinarily we would not dereference +output->crtc until after it had been assigned a real CRTC. However, + +commit 6fda305e2f2f991b39d09e67d0b17c8c3d50f9a4 +Author: Chris Wilson +Date: Wed Oct 9 15:59:42 2013 +0100 + + sna: Append the current mode to the output list if not found + +introduces such an early dereference and causes a crash if we fail to +probe the KMS configuration (usually due to a user override). + +Reported-by: Łukasz Maśko +Signed-off-by: Chris Wilson +--- +diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c +index 71c4c60..27a4467 100644 +--- a/src/sna/sna_display.c ++++ b/src/sna/sna_display.c +@@ -3225,8 +3225,10 @@ static bool sna_probe_initial_configuration(struct sna *sna) + xf86OutputPtr output = config->output[i]; + uint32_t crtc_id; + +- if (to_sna_output(output) == NULL) ++ if (to_sna_output(output) == NULL) { ++ assert(output->crtc == NULL); + continue; ++ } + + crtc_id = (uintptr_t)output->crtc; + output->crtc = NULL; +@@ -3321,6 +3323,16 @@ static bool sna_probe_initial_configuration(struct sna *sna) + } + + static void ++sanitize_outputs(struct sna *sna) ++{ ++ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn); ++ int i; ++ ++ for (i = 0; i < config->num_output; i++) ++ config->output[i]->crtc = NULL; ++} ++ ++static void + sna_crtc_config_notify(ScreenPtr screen) + { + DBG(("%s\n", __FUNCTION__)); +@@ -3372,8 +3384,10 @@ bool sna_mode_pre_init(ScrnInfoPtr scrn, struct sna *sna) + if (!sna_mode_fake_init(sna, num_fake)) + return false; + +- if (!sna_probe_initial_configuration(sna)) ++ if (!sna_probe_initial_configuration(sna)) { ++ sanitize_outputs(sna); + xf86InitialConfiguration(scrn, TRUE); ++ } + + sna_setup_provider(scrn); + return scrn->modes != NULL; +-- +cgit v0.9.0.2-2-gbebe From 0a72c6f1f4da31d9875391ac990e1e9fd555a2a4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 14 Oct 2013 08:15:49 +0200 Subject: [PATCH 05/15] xf86-input-evdev: update to xf86-input-evdev-2.8.2 Signed-off-by: Stephan Raue --- packages/x11/driver/xf86-input-evdev/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-input-evdev/meta b/packages/x11/driver/xf86-input-evdev/meta index 57fafb86e4..8fbaff7b8c 100644 --- a/packages/x11/driver/xf86-input-evdev/meta +++ b/packages/x11/driver/xf86-input-evdev/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xf86-input-evdev" -PKG_VERSION="2.8.1" +PKG_VERSION="2.8.2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" From 7643f91fa1e9d6e62e2f1d62568f209c042e86d6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 14 Oct 2013 08:15:20 +0200 Subject: [PATCH 06/15] libdrm: update to libdrm-2.4.47 Signed-off-by: Stephan Raue --- packages/graphics/libdrm/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/graphics/libdrm/meta b/packages/graphics/libdrm/meta index c09fa43a37..1bb55a06f7 100644 --- a/packages/graphics/libdrm/meta +++ b/packages/graphics/libdrm/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libdrm" -PKG_VERSION="2.4.46" +PKG_VERSION="2.4.47" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 76fc352ed5fff256fadab956aa3efbf07a600713 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 14 Oct 2013 07:27:09 +0200 Subject: [PATCH 07/15] bcm2835-bootloader: update to bcm2835-bootloader-5113ce6 Signed-off-by: Stephan Raue --- packages/tools/bcm2835-bootloader/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index ef42fc5d0e..8e33f33ad6 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bcm2835-bootloader" -PKG_VERSION="b4e35f4" +PKG_VERSION="5113ce6" PKG_REV="1" PKG_ARCH="arm" PKG_LICENSE="nonfree" From a1f1ca7953b51d69b4ea3953386fd29d05f6199c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 14 Oct 2013 07:26:48 +0200 Subject: [PATCH 08/15] bcm2835-driver: update to bcm2835-driver-5113ce6 Signed-off-by: Stephan Raue --- packages/graphics/bcm2835-driver/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index 46961e0380..20223348d4 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bcm2835-driver" -PKG_VERSION="b4e35f4" +PKG_VERSION="5113ce6" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="nonfree" From f24008cc0ef4f284791bffce5010787f15edf133 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 14 Oct 2013 13:12:18 +0300 Subject: [PATCH 09/15] linux: forgot to clean up aml* --- packages/linux/meta | 8 -------- 1 file changed, 8 deletions(-) diff --git a/packages/linux/meta b/packages/linux/meta index 0dd8317a34..2291fb4df2 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -21,14 +21,6 @@ PKG_NAME="linux" case "$LINUX" in - AMLm1) - PKG_VERSION="AMLm1-2.6.34-1405682" - PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" - ;; - AMLm3) - PKG_VERSION="AMLm3-2.6.34-7fe1265" - PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" - ;; ti-omap4) PKG_VERSION="2.6.38-ti-omap4" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" From fa627eb578522060f4cbab28f315129139c82f29 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 14 Oct 2013 13:13:14 +0300 Subject: [PATCH 10/15] linux: update to linux-3.11.5 --- packages/linux/meta | 2 +- .../patches/{3.11.4 => 3.11.5}/linux-003-no_dev_console.patch | 0 .../{3.11.4 => 3.11.5}/linux-052-XBOX_remote_support.patch | 0 .../{3.11.4 => 3.11.5}/linux-053-spinelplus-remote-0.2.patch | 0 ...ton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch | 0 .../linux-055-add_Formosa_eHome_Infrared_Receiver.patch | 0 .../linux-056-add_Adaptec_eHome_Infrared_Receiver.patch | 0 ...57-Removed-MCE-customer-code-restriction-in-rc6-decode.patch | 0 .../linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch | 0 .../linux-058.01-HID-Sony-upstream_patches.patch.todo-or-remove | 0 .../linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch | 0 .../{3.11.4 => 3.11.5}/linux-058.06-hid_sony-add_SMK_link.patch | 0 .../linux-059-remove_some_xpad_pids-0.2.patch | 0 .../{3.11.4 => 3.11.5}/linux-060-add_AUGUST_DVB-T205.patch | 0 .../linux-203-stb0899_enable_low_symbol_rate.patch | 0 .../linux/patches/{3.11.4 => 3.11.5}/linux-210-dvbsky.patch | 0 .../{3.11.4 => 3.11.5}/linux-210.01-dvbsky-auto-off.patch | 0 .../linux-212-mantis_stb0899_faster_lock.patch | 0 .../patches/{3.11.4 => 3.11.5}/linux-221-ngene-octopus.patch | 0 .../{3.11.4 => 3.11.5}/linux-222-stb0899_signal_quality.patch | 0 .../linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch | 0 .../linux-700-jmicron_1_0_8_5.patch.todo-or-remove | 0 .../{3.11.4 => 3.11.5}/linux-701-linksys_aes2500_brcmfmac.patch | 0 .../linux-702-Support-for-cheap-Ralink-3070-WiFi-plug.patch | 0 .../{3.11.4 => 3.11.5}/linux-703-macmini2012-ethernet.patch | 0 .../linux-704-Support-for-Ubiquiti-WifiStation.patch | 0 .../linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch | 0 .../patches/{3.11.4 => 3.11.5}/linux-900-hide_tsc_error.patch | 0 .../linux-950-saa716x_PCIe_interface_chipset.patch | 0 ...990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch | 0 .../{3.11.4 => 3.11.5}/linux-990.11-ALSA-AMD-HD-Audio.patch | 0 .../linux-990.12-RADEON-upstream-fix-01.patch | 0 .../linux-990.12-RADEON-upstream-fix-02.patch | 0 .../linux-990.12-RADEON-upstream-fix-03.patch | 0 .../patches/{3.11.4 => 3.11.5}/linux-991.01-ptrace_fix.patch | 0 .../{3.11.4 => 3.11.5}/linux-995-CX24120-13Z_frontend.patch | 0 ...pufreq-revert-9d3ce4af3be0235d4cf41ea9fd774205a32e58a2.patch | 0 ...2-A-split-for-ds3000-ts2020-code-forgot-to-change-the-.patch | 0 38 files changed, 1 insertion(+), 1 deletion(-) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-003-no_dev_console.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-052-XBOX_remote_support.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-053-spinelplus-remote-0.2.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-055-add_Formosa_eHome_Infrared_Receiver.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-058.01-HID-Sony-upstream_patches.patch.todo-or-remove (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-058.06-hid_sony-add_SMK_link.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-059-remove_some_xpad_pids-0.2.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-060-add_AUGUST_DVB-T205.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-203-stb0899_enable_low_symbol_rate.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-210-dvbsky.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-210.01-dvbsky-auto-off.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-212-mantis_stb0899_faster_lock.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-221-ngene-octopus.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-222-stb0899_signal_quality.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-700-jmicron_1_0_8_5.patch.todo-or-remove (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-701-linksys_aes2500_brcmfmac.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-702-Support-for-cheap-Ralink-3070-WiFi-plug.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-703-macmini2012-ethernet.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-704-Support-for-Ubiquiti-WifiStation.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-900-hide_tsc_error.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-950-saa716x_PCIe_interface_chipset.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-990.11-ALSA-AMD-HD-Audio.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-990.12-RADEON-upstream-fix-01.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-990.12-RADEON-upstream-fix-02.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-990.12-RADEON-upstream-fix-03.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-991.01-ptrace_fix.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-995-CX24120-13Z_frontend.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-998.01-cpufreq-revert-9d3ce4af3be0235d4cf41ea9fd774205a32e58a2.patch (100%) rename packages/linux/patches/{3.11.4 => 3.11.5}/linux-999.02-A-split-for-ds3000-ts2020-code-forgot-to-change-the-.patch (100%) diff --git a/packages/linux/meta b/packages/linux/meta index 2291fb4df2..828f5d1520 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -26,7 +26,7 @@ case "$LINUX" in PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" ;; *) - PKG_VERSION="3.11.4" + PKG_VERSION="3.11.5" PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz" ;; esac diff --git a/packages/linux/patches/3.11.4/linux-003-no_dev_console.patch b/packages/linux/patches/3.11.5/linux-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-003-no_dev_console.patch rename to packages/linux/patches/3.11.5/linux-003-no_dev_console.patch diff --git a/packages/linux/patches/3.11.4/linux-052-XBOX_remote_support.patch b/packages/linux/patches/3.11.5/linux-052-XBOX_remote_support.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-052-XBOX_remote_support.patch rename to packages/linux/patches/3.11.5/linux-052-XBOX_remote_support.patch diff --git a/packages/linux/patches/3.11.4/linux-053-spinelplus-remote-0.2.patch b/packages/linux/patches/3.11.5/linux-053-spinelplus-remote-0.2.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-053-spinelplus-remote-0.2.patch rename to packages/linux/patches/3.11.5/linux-053-spinelplus-remote-0.2.patch diff --git a/packages/linux/patches/3.11.4/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch b/packages/linux/patches/3.11.5/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch rename to packages/linux/patches/3.11.5/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch diff --git a/packages/linux/patches/3.11.4/linux-055-add_Formosa_eHome_Infrared_Receiver.patch b/packages/linux/patches/3.11.5/linux-055-add_Formosa_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-055-add_Formosa_eHome_Infrared_Receiver.patch rename to packages/linux/patches/3.11.5/linux-055-add_Formosa_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/3.11.4/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch b/packages/linux/patches/3.11.5/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch rename to packages/linux/patches/3.11.5/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/3.11.4/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch b/packages/linux/patches/3.11.5/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch rename to packages/linux/patches/3.11.5/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch diff --git a/packages/linux/patches/3.11.4/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch b/packages/linux/patches/3.11.5/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch rename to packages/linux/patches/3.11.5/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch diff --git a/packages/linux/patches/3.11.4/linux-058.01-HID-Sony-upstream_patches.patch.todo-or-remove b/packages/linux/patches/3.11.5/linux-058.01-HID-Sony-upstream_patches.patch.todo-or-remove similarity index 100% rename from packages/linux/patches/3.11.4/linux-058.01-HID-Sony-upstream_patches.patch.todo-or-remove rename to packages/linux/patches/3.11.5/linux-058.01-HID-Sony-upstream_patches.patch.todo-or-remove diff --git a/packages/linux/patches/3.11.4/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch b/packages/linux/patches/3.11.5/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch rename to packages/linux/patches/3.11.5/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch diff --git a/packages/linux/patches/3.11.4/linux-058.06-hid_sony-add_SMK_link.patch b/packages/linux/patches/3.11.5/linux-058.06-hid_sony-add_SMK_link.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-058.06-hid_sony-add_SMK_link.patch rename to packages/linux/patches/3.11.5/linux-058.06-hid_sony-add_SMK_link.patch diff --git a/packages/linux/patches/3.11.4/linux-059-remove_some_xpad_pids-0.2.patch b/packages/linux/patches/3.11.5/linux-059-remove_some_xpad_pids-0.2.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-059-remove_some_xpad_pids-0.2.patch rename to packages/linux/patches/3.11.5/linux-059-remove_some_xpad_pids-0.2.patch diff --git a/packages/linux/patches/3.11.4/linux-060-add_AUGUST_DVB-T205.patch b/packages/linux/patches/3.11.5/linux-060-add_AUGUST_DVB-T205.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-060-add_AUGUST_DVB-T205.patch rename to packages/linux/patches/3.11.5/linux-060-add_AUGUST_DVB-T205.patch diff --git a/packages/linux/patches/3.11.4/linux-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/3.11.5/linux-203-stb0899_enable_low_symbol_rate.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-203-stb0899_enable_low_symbol_rate.patch rename to packages/linux/patches/3.11.5/linux-203-stb0899_enable_low_symbol_rate.patch diff --git a/packages/linux/patches/3.11.4/linux-210-dvbsky.patch b/packages/linux/patches/3.11.5/linux-210-dvbsky.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-210-dvbsky.patch rename to packages/linux/patches/3.11.5/linux-210-dvbsky.patch diff --git a/packages/linux/patches/3.11.4/linux-210.01-dvbsky-auto-off.patch b/packages/linux/patches/3.11.5/linux-210.01-dvbsky-auto-off.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-210.01-dvbsky-auto-off.patch rename to packages/linux/patches/3.11.5/linux-210.01-dvbsky-auto-off.patch diff --git a/packages/linux/patches/3.11.4/linux-212-mantis_stb0899_faster_lock.patch b/packages/linux/patches/3.11.5/linux-212-mantis_stb0899_faster_lock.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-212-mantis_stb0899_faster_lock.patch rename to packages/linux/patches/3.11.5/linux-212-mantis_stb0899_faster_lock.patch diff --git a/packages/linux/patches/3.11.4/linux-221-ngene-octopus.patch b/packages/linux/patches/3.11.5/linux-221-ngene-octopus.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-221-ngene-octopus.patch rename to packages/linux/patches/3.11.5/linux-221-ngene-octopus.patch diff --git a/packages/linux/patches/3.11.4/linux-222-stb0899_signal_quality.patch b/packages/linux/patches/3.11.5/linux-222-stb0899_signal_quality.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-222-stb0899_signal_quality.patch rename to packages/linux/patches/3.11.5/linux-222-stb0899_signal_quality.patch diff --git a/packages/linux/patches/3.11.4/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch b/packages/linux/patches/3.11.5/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch rename to packages/linux/patches/3.11.5/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch diff --git a/packages/linux/patches/3.11.4/linux-700-jmicron_1_0_8_5.patch.todo-or-remove b/packages/linux/patches/3.11.5/linux-700-jmicron_1_0_8_5.patch.todo-or-remove similarity index 100% rename from packages/linux/patches/3.11.4/linux-700-jmicron_1_0_8_5.patch.todo-or-remove rename to packages/linux/patches/3.11.5/linux-700-jmicron_1_0_8_5.patch.todo-or-remove diff --git a/packages/linux/patches/3.11.4/linux-701-linksys_aes2500_brcmfmac.patch b/packages/linux/patches/3.11.5/linux-701-linksys_aes2500_brcmfmac.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-701-linksys_aes2500_brcmfmac.patch rename to packages/linux/patches/3.11.5/linux-701-linksys_aes2500_brcmfmac.patch diff --git a/packages/linux/patches/3.11.4/linux-702-Support-for-cheap-Ralink-3070-WiFi-plug.patch b/packages/linux/patches/3.11.5/linux-702-Support-for-cheap-Ralink-3070-WiFi-plug.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-702-Support-for-cheap-Ralink-3070-WiFi-plug.patch rename to packages/linux/patches/3.11.5/linux-702-Support-for-cheap-Ralink-3070-WiFi-plug.patch diff --git a/packages/linux/patches/3.11.4/linux-703-macmini2012-ethernet.patch b/packages/linux/patches/3.11.5/linux-703-macmini2012-ethernet.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-703-macmini2012-ethernet.patch rename to packages/linux/patches/3.11.5/linux-703-macmini2012-ethernet.patch diff --git a/packages/linux/patches/3.11.4/linux-704-Support-for-Ubiquiti-WifiStation.patch b/packages/linux/patches/3.11.5/linux-704-Support-for-Ubiquiti-WifiStation.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-704-Support-for-Ubiquiti-WifiStation.patch rename to packages/linux/patches/3.11.5/linux-704-Support-for-Ubiquiti-WifiStation.patch diff --git a/packages/linux/patches/3.11.4/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch b/packages/linux/patches/3.11.5/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch rename to packages/linux/patches/3.11.5/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch diff --git a/packages/linux/patches/3.11.4/linux-900-hide_tsc_error.patch b/packages/linux/patches/3.11.5/linux-900-hide_tsc_error.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-900-hide_tsc_error.patch rename to packages/linux/patches/3.11.5/linux-900-hide_tsc_error.patch diff --git a/packages/linux/patches/3.11.4/linux-950-saa716x_PCIe_interface_chipset.patch b/packages/linux/patches/3.11.5/linux-950-saa716x_PCIe_interface_chipset.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-950-saa716x_PCIe_interface_chipset.patch rename to packages/linux/patches/3.11.5/linux-950-saa716x_PCIe_interface_chipset.patch diff --git a/packages/linux/patches/3.11.4/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch b/packages/linux/patches/3.11.5/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch rename to packages/linux/patches/3.11.5/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch diff --git a/packages/linux/patches/3.11.4/linux-990.11-ALSA-AMD-HD-Audio.patch b/packages/linux/patches/3.11.5/linux-990.11-ALSA-AMD-HD-Audio.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-990.11-ALSA-AMD-HD-Audio.patch rename to packages/linux/patches/3.11.5/linux-990.11-ALSA-AMD-HD-Audio.patch diff --git a/packages/linux/patches/3.11.4/linux-990.12-RADEON-upstream-fix-01.patch b/packages/linux/patches/3.11.5/linux-990.12-RADEON-upstream-fix-01.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-990.12-RADEON-upstream-fix-01.patch rename to packages/linux/patches/3.11.5/linux-990.12-RADEON-upstream-fix-01.patch diff --git a/packages/linux/patches/3.11.4/linux-990.12-RADEON-upstream-fix-02.patch b/packages/linux/patches/3.11.5/linux-990.12-RADEON-upstream-fix-02.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-990.12-RADEON-upstream-fix-02.patch rename to packages/linux/patches/3.11.5/linux-990.12-RADEON-upstream-fix-02.patch diff --git a/packages/linux/patches/3.11.4/linux-990.12-RADEON-upstream-fix-03.patch b/packages/linux/patches/3.11.5/linux-990.12-RADEON-upstream-fix-03.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-990.12-RADEON-upstream-fix-03.patch rename to packages/linux/patches/3.11.5/linux-990.12-RADEON-upstream-fix-03.patch diff --git a/packages/linux/patches/3.11.4/linux-991.01-ptrace_fix.patch b/packages/linux/patches/3.11.5/linux-991.01-ptrace_fix.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-991.01-ptrace_fix.patch rename to packages/linux/patches/3.11.5/linux-991.01-ptrace_fix.patch diff --git a/packages/linux/patches/3.11.4/linux-995-CX24120-13Z_frontend.patch b/packages/linux/patches/3.11.5/linux-995-CX24120-13Z_frontend.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-995-CX24120-13Z_frontend.patch rename to packages/linux/patches/3.11.5/linux-995-CX24120-13Z_frontend.patch diff --git a/packages/linux/patches/3.11.4/linux-998.01-cpufreq-revert-9d3ce4af3be0235d4cf41ea9fd774205a32e58a2.patch b/packages/linux/patches/3.11.5/linux-998.01-cpufreq-revert-9d3ce4af3be0235d4cf41ea9fd774205a32e58a2.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-998.01-cpufreq-revert-9d3ce4af3be0235d4cf41ea9fd774205a32e58a2.patch rename to packages/linux/patches/3.11.5/linux-998.01-cpufreq-revert-9d3ce4af3be0235d4cf41ea9fd774205a32e58a2.patch diff --git a/packages/linux/patches/3.11.4/linux-999.02-A-split-for-ds3000-ts2020-code-forgot-to-change-the-.patch b/packages/linux/patches/3.11.5/linux-999.02-A-split-for-ds3000-ts2020-code-forgot-to-change-the-.patch similarity index 100% rename from packages/linux/patches/3.11.4/linux-999.02-A-split-for-ds3000-ts2020-code-forgot-to-change-the-.patch rename to packages/linux/patches/3.11.5/linux-999.02-A-split-for-ds3000-ts2020-code-forgot-to-change-the-.patch From e3d831a333a234ffbc98b4b84b0b67dd522a8144 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 14 Oct 2013 13:19:59 +0300 Subject: [PATCH 11/15] linux: clean up ti-omap --- packages/linux/meta | 14 ++------------ projects/ARCTIC_MC/options | 1 - projects/ATV/options | 1 - projects/Generic/options | 1 - projects/RPi/options | 1 - projects/Virtual/options | 1 - 6 files changed, 2 insertions(+), 17 deletions(-) diff --git a/packages/linux/meta b/packages/linux/meta index 828f5d1520..7bf7599101 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -19,18 +19,8 @@ ################################################################################ PKG_NAME="linux" - -case "$LINUX" in - ti-omap4) - PKG_VERSION="2.6.38-ti-omap4" - PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" - ;; - *) - PKG_VERSION="3.11.5" - PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz" - ;; -esac - +PKG_VERSION="3.11.5" +PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/projects/ARCTIC_MC/options b/projects/ARCTIC_MC/options index 47b0907156..43ed41ce4e 100755 --- a/projects/ARCTIC_MC/options +++ b/projects/ARCTIC_MC/options @@ -111,7 +111,6 @@ # Kernel to use. values can be: # default: default mainline kernel -# ti-omap4: Ti's OMAP4 kernel LINUX="default" # use linux-next (latest rc) instead latest released version diff --git a/projects/ATV/options b/projects/ATV/options index 63a493020f..7f5a5d852d 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -111,7 +111,6 @@ # Kernel to use. values can be: # default: default mainline kernel -# ti-omap4: Ti's OMAP4 kernel LINUX="default" # use linux-next (latest rc) instead latest released version diff --git a/projects/Generic/options b/projects/Generic/options index 6613271f4c..bb487a9ce6 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -111,7 +111,6 @@ # Kernel to use. values can be: # default: default mainline kernel -# ti-omap4: Ti's OMAP4 kernel LINUX="default" # use linux-next (latest rc) instead latest released version diff --git a/projects/RPi/options b/projects/RPi/options index 5de8239929..5997f8bb57 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -111,7 +111,6 @@ # Kernel to use. values can be: # default: default mainline kernel -# ti-omap4: Ti's OMAP4 kernel LINUX="default" # use linux-next (latest rc) instead latest released version diff --git a/projects/Virtual/options b/projects/Virtual/options index f3956d3713..370f3e41fe 100755 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -106,7 +106,6 @@ # Kernel to use. values can be: # default: default mainline kernel -# ti-omap4: Ti's OMAP4 kernel LINUX="default" # use linux-next (latest rc) instead latest released version From 604778588ee87799006adca4a3320b88d9bbab06 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 14 Oct 2013 13:23:02 +0300 Subject: [PATCH 12/15] clean up cubox --- packages/devel/libcec/build | 8 +-- packages/devel/marvell-libbmm/build | 33 ---------- packages/devel/marvell-libbmm/install | 29 --------- packages/devel/marvell-libbmm/meta | 36 ----------- .../marvell-libbmm-0.2.0-cldflags.patch | 27 --------- packages/devel/marvell-libvmeta/build | 27 --------- packages/devel/marvell-libvmeta/install | 26 -------- packages/devel/marvell-libvmeta/meta | 36 ----------- .../marvell-libvmeta-3.8.3-cldflags.patch | 21 ------- packages/graphics/marvell-libgfx/build | 36 ----------- packages/graphics/marvell-libgfx/install | 32 ---------- packages/graphics/marvell-libgfx/meta | 36 ----------- packages/mediacenter/xbmc/package.mk | 6 -- packages/multimedia/marvell-ipp/build | 44 -------------- packages/multimedia/marvell-ipp/install | 37 ------------ packages/multimedia/marvell-ipp/meta | 36 ----------- .../patches/marvell-ipp-0.2.1-cross.patch | 41 ------------- packages/x11/driver/xf86-video-dove/build | 60 ------------------- .../xf86-video-dove/config/xorg-dove.conf | 41 ------------- packages/x11/driver/xf86-video-dove/install | 29 --------- packages/x11/driver/xf86-video-dove/meta | 36 ----------- .../xf86-video-dove-0.3.4-automake-1.13.patch | 12 ---- .../xf86-video-dove-0.3.4-crosscompile.patch | 12 ---- 23 files changed, 1 insertion(+), 700 deletions(-) delete mode 100755 packages/devel/marvell-libbmm/build delete mode 100755 packages/devel/marvell-libbmm/install delete mode 100644 packages/devel/marvell-libbmm/meta delete mode 100644 packages/devel/marvell-libbmm/patches/marvell-libbmm-0.2.0-cldflags.patch delete mode 100755 packages/devel/marvell-libvmeta/build delete mode 100755 packages/devel/marvell-libvmeta/install delete mode 100644 packages/devel/marvell-libvmeta/meta delete mode 100644 packages/devel/marvell-libvmeta/patches/marvell-libvmeta-3.8.3-cldflags.patch delete mode 100755 packages/graphics/marvell-libgfx/build delete mode 100755 packages/graphics/marvell-libgfx/install delete mode 100644 packages/graphics/marvell-libgfx/meta delete mode 100755 packages/multimedia/marvell-ipp/build delete mode 100755 packages/multimedia/marvell-ipp/install delete mode 100644 packages/multimedia/marvell-ipp/meta delete mode 100644 packages/multimedia/marvell-ipp/patches/marvell-ipp-0.2.1-cross.patch delete mode 100755 packages/x11/driver/xf86-video-dove/build delete mode 100644 packages/x11/driver/xf86-video-dove/config/xorg-dove.conf delete mode 100755 packages/x11/driver/xf86-video-dove/install delete mode 100644 packages/x11/driver/xf86-video-dove/meta delete mode 100644 packages/x11/driver/xf86-video-dove/patches/xf86-video-dove-0.3.4-automake-1.13.patch delete mode 100644 packages/x11/driver/xf86-video-dove/patches/xf86-video-dove-0.3.4-crosscompile.patch diff --git a/packages/devel/libcec/build b/packages/devel/libcec/build index 2a92018b94..c9d0b9ee8f 100755 --- a/packages/devel/libcec/build +++ b/packages/devel/libcec/build @@ -32,12 +32,6 @@ else LIBCEC_RPI="--disable-rpi" fi -if [ "$XBMCPLAYER_DRIVER" = "marvell-libgfx" ]; then - LIBCEC_TDA995X="--enable-cubox --with-tda995x-toolkit-path=$(kernel_path)/drivers/video/dovefb/nxp_hdmi" -else - LIBCEC_TDA995X="--disable-cubox" -fi - # dont use some optimizations because of build problems LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"` @@ -49,7 +43,7 @@ cd $PKG_BUILD --disable-static \ --enable-shared \ $LIBCEC_RPI \ - $LIBCEC_TDA995X + --disable-cubox make diff --git a/packages/devel/marvell-libbmm/build b/packages/devel/marvell-libbmm/build deleted file mode 100755 index 20a99a0a0c..0000000000 --- a/packages/devel/marvell-libbmm/build +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -cd $PKG_BUILD - -make -f Makefile_general libbmm.so.0u - -mkdir -p $SYSROOT_PREFIX/usr/lib - cp -PR libbmm.so* $SYSROOT_PREFIX/usr/lib - -mkdir -p $SYSROOT_PREFIX/usr/include - cp -PR bmm_lib.h $SYSROOT_PREFIX/usr/include diff --git a/packages/devel/marvell-libbmm/install b/packages/devel/marvell-libbmm/install deleted file mode 100755 index 25c228e1a0..0000000000 --- a/packages/devel/marvell-libbmm/install +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/usr/lib - cp -P $PKG_BUILD/libbmm.so* $INSTALL/usr/lib - -mkdir -p $INSTALL/lib/udev/rules.d - cp -PR $PKG_BUILD/etc/udev/rules.d/*.rules $INSTALL/lib/udev/rules.d \ No newline at end of file diff --git a/packages/devel/marvell-libbmm/meta b/packages/devel/marvell-libbmm/meta deleted file mode 100644 index c017bf97f9..0000000000 --- a/packages/devel/marvell-libbmm/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="marvell-libbmm" -PKG_VERSION="0.2.0" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="free to use" -PKG_SITE="http://www.marvell.com" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="system" -PKG_SHORTDESC="marvell-libbmm: Allocate, manage and share large block of physical continuous memory." -PKG_LONGDESC="marvell-libbmm: Allocate, manage and share large block of physical continuous memory." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/devel/marvell-libbmm/patches/marvell-libbmm-0.2.0-cldflags.patch b/packages/devel/marvell-libbmm/patches/marvell-libbmm-0.2.0-cldflags.patch deleted file mode 100644 index a6ae30f902..0000000000 --- a/packages/devel/marvell-libbmm/patches/marvell-libbmm-0.2.0-cldflags.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur libbmm-0.2.0/Makefile_general libbmm-0.2.0.patch/Makefile_general ---- libbmm-0.2.0/Makefile_general 2011-03-07 18:48:46.000000000 +0100 -+++ libbmm-0.2.0.patch/Makefile_general 2012-12-24 20:19:47.791960702 +0100 -@@ -30,20 +30,20 @@ - uninstall-host uninstall-target - - .c.o: -- ${CC} -fPIC -o $@ -c $< -+ ${CC} -fPIC ${CFLAGS} -o $@ -c $< - - all: compile install-host install-target - - compile: bmm_test libbmm.so libbmm.a - - bmm_test: libbmm.so.$(ABI_VERSION) ${bmm_test_obj} -- ${CC} -o $@ ${bmm_test_obj} -L. -lbmm -+ ${CC} ${LDLAGS} -o $@ ${bmm_test_obj} -L. -lbmm - - libbmm.a: ${bmm_lib_obj} - ${AR} -rcs $@ ${bmm_lib_obj} - - libbmm.so.$(ABI_VERSION): ${bmm_lib_obj} -- ${CC} -g -s -shared -Wl,-soname,$@ -o $@.$(ABI_REVISION) ${bmm_lib_obj} -+ ${CC} -g -s ${LDFLAGS} -shared -Wl,-soname,$@ -o $@.$(ABI_REVISION) ${bmm_lib_obj} - ln -s $@.$(ABI_REVISION) $@ - ln -s $@.$(ABI_REVISION) libbmm.so - diff --git a/packages/devel/marvell-libvmeta/build b/packages/devel/marvell-libvmeta/build deleted file mode 100755 index b8d34531c7..0000000000 --- a/packages/devel/marvell-libvmeta/build +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -cd $PKG_BUILD - -make libvmeta.so diff --git a/packages/devel/marvell-libvmeta/install b/packages/devel/marvell-libvmeta/install deleted file mode 100755 index 0a978d3d03..0000000000 --- a/packages/devel/marvell-libvmeta/install +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/usr/lib - cp -P $PKG_BUILD/libvmeta.so* $INSTALL/usr/lib diff --git a/packages/devel/marvell-libvmeta/meta b/packages/devel/marvell-libvmeta/meta deleted file mode 100644 index 530d49f25f..0000000000 --- a/packages/devel/marvell-libvmeta/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="marvell-libvmeta" -PKG_VERSION="3.8.3" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="free to use" -PKG_SITE="http://www.marvell.com" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="marvell-libbmm" -PKG_BUILD_DEPENDS="toolchain marvell-libbmm" -PKG_PRIORITY="optional" -PKG_SECTION="system" -PKG_SHORTDESC="marvell-libvmeta: vmeta library on marvell dove platform." -PKG_LONGDESC="marvell-libvmeta: vmeta library on marvell dove platform." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/devel/marvell-libvmeta/patches/marvell-libvmeta-3.8.3-cldflags.patch b/packages/devel/marvell-libvmeta/patches/marvell-libvmeta-3.8.3-cldflags.patch deleted file mode 100644 index 579ea6e062..0000000000 --- a/packages/devel/marvell-libvmeta/patches/marvell-libvmeta-3.8.3-cldflags.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur marvell-libvmeta-3.8.3/Makefile marvell-libvmeta-3.8.3.patch/Makefile ---- marvell-libvmeta-3.8.3/Makefile 2011-03-07 18:51:17.000000000 +0100 -+++ marvell-libvmeta-3.8.3.patch/Makefile 2012-12-27 01:14:34.043086675 +0100 -@@ -22,7 +22,7 @@ - uninstall-host uninstall-target - - .c.o: -- ${CC} -fPIC -o $@ -c $< -+ ${CC} ${CFLAGS} -fPIC -o $@ -c $< - - all: compile install-host install-target - -@@ -32,7 +32,7 @@ - ${AR} -rcs $@ ${vmeta_lib_obj} - - libvmeta.so: ${vmeta_lib_obj} -- ${CC} -g -s -shared -Wl,-soname,$@ -o $@ ${vmeta_lib_obj} -lbmm -+ ${CC} -g -s ${LDFLAGS} -shared -Wl,-soname,$@ -o $@ ${vmeta_lib_obj} -lbmm - - clean: clean-local - diff --git a/packages/graphics/marvell-libgfx/build b/packages/graphics/marvell-libgfx/build deleted file mode 100755 index b725d421f6..0000000000 --- a/packages/graphics/marvell-libgfx/build +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -if [ "$TARGET_FLOAT" = "softfp" -o "$TARGET_FLOAT" = "soft" ]; then - LIBGLES_LIBDIR="soft/lib" -elif [ "$TARGET_FLOAT" = "hard" ]; then - LIBGLES_LIBDIR="hard/lib" -fi - -cd $PKG_BUILD -mkdir -p $SYSROOT_PREFIX/usr/include - cp -PR include/* $SYSROOT_PREFIX/usr/include - -mkdir -p $SYSROOT_PREFIX/usr/lib - cp -PR $LIBGLES_LIBDIR/*.so* $SYSROOT_PREFIX/usr/lib diff --git a/packages/graphics/marvell-libgfx/install b/packages/graphics/marvell-libgfx/install deleted file mode 100755 index fc9ff36791..0000000000 --- a/packages/graphics/marvell-libgfx/install +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -if [ "$TARGET_FLOAT" = "softfp" -o "$TARGET_FLOAT" = "soft" ]; then - LIBGLES_LIBDIR="soft/lib" -elif [ "$TARGET_FLOAT" = "hard" ]; then - LIBGLES_LIBDIR="hard/lib" -fi - -mkdir -p $INSTALL/usr/lib - cp -PR $PKG_BUILD/$LIBGLES_LIBDIR/*.so* $INSTALL/usr/lib diff --git a/packages/graphics/marvell-libgfx/meta b/packages/graphics/marvell-libgfx/meta deleted file mode 100644 index 0f3214b8b4..0000000000 --- a/packages/graphics/marvell-libgfx/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="marvell-libgfx" -PKG_VERSION="20121001" -PKG_REV="1" -PKG_ARCH="arm" -PKG_LICENSE="nonfree" -PKG_SITE="http://www.marvell.com" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="libXfixes libXdamage" -PKG_BUILD_DEPENDS="toolchain libXfixes libXdamage" -PKG_PRIORITY="optional" -PKG_SECTION="graphics" -PKG_SHORTDESC="marvell-libgfx: OpenGL-ES and OpenMAX driver for Marvell Dove" -PKG_LONGDESC="marvell-libgfx: OpenGL-ES and OpenMAX driver for Marvell Dove" -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk index e4b7f189ec..6948fb7c76 100644 --- a/packages/mediacenter/xbmc/package.mk +++ b/packages/mediacenter/xbmc/package.mk @@ -275,12 +275,6 @@ if [ ! "$XBMCPLAYER_DRIVER" = default ]; then -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux" XBMC_CFLAGS="$XBMC_CFLAGS $BCM2835_INCLUDES" XBMC_CXXFLAGS="$XBMC_CXXFLAGS $BCM2835_INCLUDES" - elif [ "$XBMCPLAYER_DRIVER" = "marvell-libgfx" ]; then - PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET marvell-ipp" - PKG_DEPENDS="$PKG_DEPENDS marvell-ipp" - XBMC_OPENMAX="--disable-openmax" - XBMC_PLAYER="--with-platform=marvell-dove" - XBMC_CODEC="" else XBMC_OPENMAX="--disable-openmax" fi diff --git a/packages/multimedia/marvell-ipp/build b/packages/multimedia/marvell-ipp/build deleted file mode 100755 index 25b18e2279..0000000000 --- a/packages/multimedia/marvell-ipp/build +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -if [ "$TARGET_FLOAT" = "softfp" -o "$TARGET_FLOAT" = "soft" ]; then - VMETA_LIBDIR="vmeta/soft/lib" -elif [ "$TARGET_FLOAT" = "hard" ]; then - VMETA_LIBDIR="vmeta/hard/lib" -fi - -# dont build parallel - MAKEFLAGS=-j1 - -cd $PKG_BUILD -cd example/misc/build/wmmx2_linux - make -f makefile_miscGen -cd - - -mkdir -p $SYSROOT_PREFIX/usr/include/marvell-ipp - cp -PR include/* $SYSROOT_PREFIX/usr/include/marvell-ipp - -mkdir -p $SYSROOT_PREFIX/usr/lib - cp -P lib/libmiscgen.so $SYSROOT_PREFIX/usr/lib - cp -PR $VMETA_LIBDIR/*.so* $SYSROOT_PREFIX/usr/lib diff --git a/packages/multimedia/marvell-ipp/install b/packages/multimedia/marvell-ipp/install deleted file mode 100755 index 7c5145db27..0000000000 --- a/packages/multimedia/marvell-ipp/install +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - - -if [ "$TARGET_FLOAT" = "softfp" -o "$TARGET_FLOAT" = "soft" ]; then - VMETA_LIBDIR="vmeta/soft/lib" -elif [ "$TARGET_FLOAT" = "hard" ]; then - VMETA_LIBDIR="vmeta/hard/lib" -fi - -mkdir -p $INSTALL/usr/lib - cp -PR $PKG_BUILD/$VMETA_LIBDIR/*.so* $INSTALL/usr/lib - cp -P $PKG_BUILD/lib/libmiscgen.so $INSTALL/usr/lib - -mkdir -p $INSTALL/lib/udev/rules.d - cp -PR $PKG_BUILD/etc/*.rules $INSTALL/lib/udev/rules.d diff --git a/packages/multimedia/marvell-ipp/meta b/packages/multimedia/marvell-ipp/meta deleted file mode 100644 index 8e1ff2e23b..0000000000 --- a/packages/multimedia/marvell-ipp/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="marvell-ipp" -PKG_VERSION="0.2.1" -PKG_REV="1" -PKG_ARCH="arm" -PKG_LICENSE="nonfree" -PKG_SITE="http://www.marvell.com" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="marvell-libvmeta" -PKG_BUILD_DEPENDS="toolchain marvell-libvmeta" -PKG_PRIORITY="optional" -PKG_SECTION="multimedia" -PKG_SHORTDESC="marvell-ipp: Marvell IPP Codecs" -PKG_LONGDESC="marvell-ipp: Marvell IPP Codecs" -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/multimedia/marvell-ipp/patches/marvell-ipp-0.2.1-cross.patch b/packages/multimedia/marvell-ipp/patches/marvell-ipp-0.2.1-cross.patch deleted file mode 100644 index f1757a5775..0000000000 --- a/packages/multimedia/marvell-ipp/patches/marvell-ipp-0.2.1-cross.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -Naur marvell-ipp-0.2.1/example/Rules.make marvell-ipp-0.2.1.patch/example/Rules.make ---- marvell-ipp-0.2.1/example/Rules.make 2011-03-07 18:51:40.000000000 +0100 -+++ marvell-ipp-0.2.1.patch/example/Rules.make 2012-12-26 23:48:51.811467005 +0100 -@@ -28,26 +28,26 @@ - #PATH_GNU_BIN=/usr/local/arm-marvell-linux-gnueabi/bin - PATH_GNU_BIN=/usr/local/arm-marvell-linux-gnueabi-4.4.4/bin - TOOLCHAIN_PREFIX=arm-marvell-linux-gnueabi --CFLAGS= -mcpu=marvell-f -+#CFLAGS= -mcpu=marvell-f - endif - - #============================================================================== - # GNU binaries (server admin update) - #============================================================================== --CC=$(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-gcc --CXX=$(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-gcc --AR=$(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-ar --AS=$(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-as --LN=$(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-gcc -+CC ?= $(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-gcc -+CXX?= $(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-gcc -+AR ?= $(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-ar -+AS ?= $(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-as -+LN ?= $(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-gcc - - #============================================================================== - # GNU build options: (build engineer update) - #============================================================================== --CFLAGS+= -O3 -Wall -mabi=aapcs-linux -fPIC -D_IPP_LINUX --CXXFLAGS= $(CFLAGS) --ASFLAGS= -k -mcpu=iwmmxt2 --ARFLAGS= --LNFLAGS= -lpthread -ldl -lm -lrt $(PGO_FLAGS) -Wl,-R ./ -+CFLAGS += -O3 -Wall -mabi=aapcs-linux -fPIC -D_IPP_LINUX -+CXXFLAGS ?= $(CFLAGS) -+ASFLAGS ?= -k -mcpu=iwmmxt2 -+ARFLAGS = -+LNFLAGS ?= -lpthread -ldl -lm -lrt $(PGO_FLAGS) -Wl,-R ./ - - #============================================================================== - # User root path (user update) diff --git a/packages/x11/driver/xf86-video-dove/build b/packages/x11/driver/xf86-video-dove/build deleted file mode 100755 index d9667f9902..0000000000 --- a/packages/x11/driver/xf86-video-dove/build +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -xorg_drv_configure_prepend - -MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_SUPPORT_RANDR=1" -MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_SUPPORT_EXA=1" -MARVEL_CFLAGS="$MARVEL_CFLAGS -DDUMP_RAW_VIDEO=1" -MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_USE_OFFSCREEN_HEAP=0" -MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_EXA_MODE=2" -MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_EXA_ENABLE_UP_DOWNLOAD=0" -MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_EXA_FORCE_HW_LOAD=0" -MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_EXA_ALLOC_PIXMAP_FROM_SYSTEM=0" -MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_EXA_PERF_PROFILING=0" -MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_EXA_TRACE_FALLBACK=1" -MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_EXA_XBGR_SUPPORT=1" -MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_XV_SUPPORT_RGB_FORMAT=1" -MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_XV_TEX_VIDEO=1" -MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_XV_OVERLAY_VIDEO=2" -MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_XV_DEFERRED_STALL_GPU=1" -MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_XV_USE_FAKE_FENCE_STALL=1" -MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_RANDR_EDID_MODES=1" -MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_CRTC_SUPPORT_ROTATION=1" -MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_PLATFORM_INFO=1" -MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_XV_MIXED_VIDEO=1" -MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_SOURCE_VERSION='\"0.1.0\"'" - -CFLAGS="$CFLAGS $MARVEL_CFLAGS -I$SYSROOT_PREFIX/usr/include/HAL" - -cd $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --enable-shared \ - --disable-static \ - --with-xorg-module-dir=$XORG_PATH_MODULES - -make diff --git a/packages/x11/driver/xf86-video-dove/config/xorg-dove.conf b/packages/x11/driver/xf86-video-dove/config/xorg-dove.conf deleted file mode 100644 index 30ffa1cc1b..0000000000 --- a/packages/x11/driver/xf86-video-dove/config/xorg-dove.conf +++ /dev/null @@ -1,41 +0,0 @@ -Section "Monitor" - Identifier "HDMI" - Option "Position" "0 0" - Option "Enable" "true" - Option "PreferredMode" "1920x1080" -# Option "PreferredMode" "1280x720" -# Option "PreferredMode" "1024x768" -# Option "PreferredMode" "640x480" -# Option "PreferredMode" "800x600" -EndSection - -Section "Device" - Identifier "Driver0" - Screen 0 - Driver "dovefb" - Option "debug" "TRUE" - Option "ExaAccel" "FALSE" - Option "Solid" "TRUE" - Option "Copy" "TRUE" - Option "Composite" "FALSE" - Option "SWSolid" "FALSE" - Option "SWCopy" "FALSE" - Option "Commit" "FALSE" - Option "XvAccel" "TRUE" - Option "HWCursor" "FALSE" - Option "EncFunc" "7" - Option "UseDriverBuiltInMode" "TRUE" - Option "EnableDualDisplay" "FALSE" -EndSection - -Section "Screen" - Device "Driver0" - Monitor "HDMI" - Identifier "Screen" -# DefaultDepth 24 -# DefaultFbBpp 24 - SubSection "Display" - Viewport 0 0 - Virtual 2048 2048 - EndSubSection -EndSection diff --git a/packages/x11/driver/xf86-video-dove/install b/packages/x11/driver/xf86-video-dove/install deleted file mode 100755 index ee3585562b..0000000000 --- a/packages/x11/driver/xf86-video-dove/install +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers - cp -P $PKG_BUILD/src/.libs/dovefb_drv.so $INSTALL/$XORG_PATH_MODULES/drivers - -mkdir -p $INSTALL/etc/X11 - cp $PKG_DIR/config/*.conf $INSTALL/etc/X11 diff --git a/packages/x11/driver/xf86-video-dove/meta b/packages/x11/driver/xf86-video-dove/meta deleted file mode 100644 index 1e39526c3a..0000000000 --- a/packages/x11/driver/xf86-video-dove/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="xf86-video-dove" -PKG_VERSION="0.3.4" -PKG_REV="1" -PKG_ARCH="arm" -PKG_LICENSE="OSS" -PKG_SITE="http://www.solid-run.com" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="marvell-libgfx" -PKG_BUILD_DEPENDS="toolchain randrproto renderproto videoproto xproto fontsproto marvell-libgfx xorg-server" -PKG_PRIORITY="optional" -PKG_SECTION="x11/driver" -PKG_SHORTDESC="xf86-video-dove: The Xorg driver for Marvell Dove video chips" -PKG_LONGDESC="The Xorg driver for Marvell Dove video chips." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="yes" diff --git a/packages/x11/driver/xf86-video-dove/patches/xf86-video-dove-0.3.4-automake-1.13.patch b/packages/x11/driver/xf86-video-dove/patches/xf86-video-dove-0.3.4-automake-1.13.patch deleted file mode 100644 index af0808d59a..0000000000 --- a/packages/x11/driver/xf86-video-dove/patches/xf86-video-dove-0.3.4-automake-1.13.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur xf86-video-dove-0.3.4/configure.ac xf86-video-dove-0.3.4.patch/configure.ac ---- xf86-video-dove-0.3.4/configure.ac 2011-03-07 18:52:09.000000000 +0100 -+++ xf86-video-dove-0.3.4.patch/configure.ac 2013-01-22 13:30:57.420372292 +0100 -@@ -27,7 +27,7 @@ - xf86-video-mrvl) - - AC_CONFIG_SRCDIR([Makefile.am]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_AUX_DIR(.) - - AM_INIT_AUTOMAKE([dist-bzip2]) diff --git a/packages/x11/driver/xf86-video-dove/patches/xf86-video-dove-0.3.4-crosscompile.patch b/packages/x11/driver/xf86-video-dove/patches/xf86-video-dove-0.3.4-crosscompile.patch deleted file mode 100644 index 661d802a37..0000000000 --- a/packages/x11/driver/xf86-video-dove/patches/xf86-video-dove-0.3.4-crosscompile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur xf86-video-dove-0.3.4/src/Makefile.am xf86-video-dove-0.3.4.patch/src/Makefile.am ---- xf86-video-dove-0.3.4/src/Makefile.am 2011-03-07 18:52:09.000000000 +0100 -+++ xf86-video-dove-0.3.4.patch/src/Makefile.am 2013-01-01 03:58:19.411541528 +0100 -@@ -24,7 +24,7 @@ - # _ladir passes a dummy rpath to libtool so the thing will actually link - # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. - --INCLUDES = -I/usr/include/HAL -I$(top_srcdir)/src/video -+INCLUDES = -I$(top_srcdir)/src/video - - AM_CFLAGS = @XORG_CFLAGS@ - dovefb_drv_la_LTLIBRARIES = dovefb_drv.la From d5cda8d424279cdb36360299fc3ccb553d21dd28 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 14 Oct 2013 13:31:10 +0300 Subject: [PATCH 13/15] u-boot: clean up --- packages/tools/u-boot/build | 6 ----- packages/tools/u-boot/install | 6 +---- packages/tools/u-boot/meta | 10 +------- projects/ARCTIC_MC/options | 2 +- projects/ATV/options | 2 +- projects/Generic/options | 2 +- projects/RPi/options | 2 +- projects/Virtual/options | 2 +- tools/mkpkg/mkpkg_u-boot-aml | 43 ----------------------------------- 9 files changed, 7 insertions(+), 68 deletions(-) delete mode 100755 tools/mkpkg/mkpkg_u-boot-aml diff --git a/packages/tools/u-boot/build b/packages/tools/u-boot/build index 041a8847f5..de80e5c88c 100755 --- a/packages/tools/u-boot/build +++ b/packages/tools/u-boot/build @@ -41,12 +41,6 @@ fi cd $PKG_BUILD -if [ "$UBOOT_VERSION" = "aml" ]; then - rm -f tools/ucl/libucl_linux.lib - make -C tools/ucl/ucl_cygwin_prj/ - cp -f tools/ucl/ucl_cygwin_prj/objs/libucl.a tools/ucl/libucl_linux.lib -fi - make CROSS_COMPILE="$TARGET_PREFIX" ARCH="$TARGET_ARCH" $UBOOT_CONFIG make CROSS_COMPILE="$TARGET_PREFIX" ARCH="$TARGET_ARCH" HOSTCC="$HOST_CC" HOSTSTRIP="true" diff --git a/packages/tools/u-boot/install b/packages/tools/u-boot/install index b9d41859f7..cdaf9f4b8f 100755 --- a/packages/tools/u-boot/install +++ b/packages/tools/u-boot/install @@ -27,11 +27,7 @@ if [ -z "$UBOOT_CONFIGFILE" ]; then fi mkdir -p $INSTALL/usr/share/u-boot - if [ "$UBOOT_VERSION" = "aml" ]; then - cp $PKG_BUILD/build/u-boot-aml-ucl.bin $INSTALL/usr/share/u-boot/spi_M3_512.bin - else - cp $PKG_BUILD/u-boot.bin $INSTALL/usr/share/u-boot - fi + cp $PKG_BUILD/u-boot.bin $INSTALL/usr/share/u-boot if [ -f "$PKG_BUILD/MLO" ]; then cp $PKG_BUILD/MLO $INSTALL/usr/share/u-boot diff --git a/packages/tools/u-boot/meta b/packages/tools/u-boot/meta index 9a9b70c132..9e6a3868a1 100644 --- a/packages/tools/u-boot/meta +++ b/packages/tools/u-boot/meta @@ -19,15 +19,7 @@ ################################################################################ PKG_NAME="u-boot" -if [ "$UBOOT_VERSION" = "aml" ]; then - PKG_VERSION="aml-50dba31" - PKG_SITE="https://github.com/Pivosgroup/buildroot-uboot" - PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -elif [ "$UBOOT_VERSION" = "cubox" ]; then - PKG_VERSION="cubox-f826edd" - PKG_SITE="https://github.com/rabeeh/u-boot/tree/" - PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -else +if [ "$UBOOT_VERSION" = "default" ]; then PKG_VERSION="2011.03-rc1" PKG_SITE="http://www.denx.de/wiki/U-Boot/WebHome" PKG_URL="ftp://ftp.denx.de/pub/u-boot/$PKG_NAME-$PKG_VERSION.tar.bz2" diff --git a/projects/ARCTIC_MC/options b/projects/ARCTIC_MC/options index 43ed41ce4e..e54893383a 100755 --- a/projects/ARCTIC_MC/options +++ b/projects/ARCTIC_MC/options @@ -97,7 +97,7 @@ # Bootloader to use (syslinux / u-boot / atv-bootloader) BOOTLOADER="syslinux" -# u-boot version to use (default / aml / cubox) +# u-boot version to use (default) UBOOT_VERSION="default" # Configuration for u-boot diff --git a/projects/ATV/options b/projects/ATV/options index 7f5a5d852d..caeba70cf7 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -97,7 +97,7 @@ # Bootloader to use (syslinux / u-boot / atv-bootloader) BOOTLOADER="atv-bootloader" -# u-boot version to use (default / aml / cubox) +# u-boot version to use (default) UBOOT_VERSION="default" # Configuration for u-boot diff --git a/projects/Generic/options b/projects/Generic/options index bb487a9ce6..e65b11de2d 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -97,7 +97,7 @@ # Bootloader to use (syslinux / u-boot / atv-bootloader) BOOTLOADER="syslinux" -# u-boot version to use (default / aml / cubox) +# u-boot version to use (default) UBOOT_VERSION="default" # Configuration for u-boot diff --git a/projects/RPi/options b/projects/RPi/options index 5997f8bb57..36229bfd0e 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -97,7 +97,7 @@ # Bootloader to use (syslinux / u-boot / atv-bootloader / bcm2835-bootloader) BOOTLOADER="bcm2835-bootloader" -# u-boot version to use (default / aml / cubox) +# u-boot version to use (default) UBOOT_VERSION="default" # Configuration for u-boot diff --git a/projects/Virtual/options b/projects/Virtual/options index 370f3e41fe..f7680e2797 100755 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -92,7 +92,7 @@ # Bootloader to use (syslinux / u-boot / atv-bootloader) BOOTLOADER="syslinux" -# u-boot version to use (default / aml / cubox) +# u-boot version to use (default) UBOOT_VERSION="default" # Configuration for u-boot diff --git a/tools/mkpkg/mkpkg_u-boot-aml b/tools/mkpkg/mkpkg_u-boot-aml deleted file mode 100755 index 561d6e2798..0000000000 --- a/tools/mkpkg/mkpkg_u-boot-aml +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -echo "getting sources..." - if [ ! -d u-boot-aml.git ]; then - git clone git://github.com/Pivosgroup/buildroot-uboot.git u-boot-aml.git - fi - - cd u-boot-aml.git - git pull - GIT_REV=`git log -n1 --format=%h` - cd .. - -echo "copying sources..." - rm -rf u-boot-aml-$GIT_REV - cp -R u-boot-aml.git u-boot-aml-$GIT_REV - -echo "cleaning sources..." - rm -rf u-boot-aml-$GIT_REV/.git - -echo "packing sources..." - tar cvJf u-boot-aml-$GIT_REV.tar.xz u-boot-aml-$GIT_REV - -echo "remove temporary sourcedir..." - rm -rf u-boot-aml-$GIT_REV From 8c346a68e4ec03cfe9eead9537a19ef96942fabc Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 14 Oct 2013 13:51:17 +0300 Subject: [PATCH 14/15] tools/mkpkg: remove old/unused scripts --- tools/mkpkg/mkpkg_bluez | 43 ------------------- tools/mkpkg/mkpkg_dvb-firmware | 43 ------------------- tools/mkpkg/mkpkg_eglibc-2.18 | 66 ----------------------------- tools/mkpkg/mkpkg_fennec | 65 ---------------------------- tools/mkpkg/mkpkg_libcofi | 43 ------------------- tools/mkpkg/mkpkg_misc-firmware | 43 ------------------- tools/mkpkg/mkpkg_prelink-cross | 45 -------------------- tools/mkpkg/mkpkg_rpi-cecd | 43 ------------------- tools/mkpkg/mkpkg_tvheadend | 43 ------------------- tools/mkpkg/mkpkg_wlan-firmware | 43 ------------------- tools/mkpkg/mkpkg_xbmc-addon-njoy | 43 ------------------- tools/mkpkg/mkpkg_xbmc-addon-vuplus | 43 ------------------- tools/mkpkg/mkpkg_xwiimote | 43 ------------------- 13 files changed, 606 deletions(-) delete mode 100755 tools/mkpkg/mkpkg_bluez delete mode 100755 tools/mkpkg/mkpkg_dvb-firmware delete mode 100755 tools/mkpkg/mkpkg_eglibc-2.18 delete mode 100755 tools/mkpkg/mkpkg_fennec delete mode 100755 tools/mkpkg/mkpkg_libcofi delete mode 100755 tools/mkpkg/mkpkg_misc-firmware delete mode 100755 tools/mkpkg/mkpkg_prelink-cross delete mode 100755 tools/mkpkg/mkpkg_rpi-cecd delete mode 100755 tools/mkpkg/mkpkg_tvheadend delete mode 100755 tools/mkpkg/mkpkg_wlan-firmware delete mode 100755 tools/mkpkg/mkpkg_xbmc-addon-njoy delete mode 100755 tools/mkpkg/mkpkg_xbmc-addon-vuplus delete mode 100755 tools/mkpkg/mkpkg_xwiimote diff --git a/tools/mkpkg/mkpkg_bluez b/tools/mkpkg/mkpkg_bluez deleted file mode 100755 index 30ab5e785c..0000000000 --- a/tools/mkpkg/mkpkg_bluez +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -echo "getting sources..." - if [ ! -d bluez.git ]; then - git clone git://git.kernel.org/pub/scm/bluetooth/bluez.git bluez.git - fi - - cd bluez.git - git pull - GIT_REV=`git log -n1 --format=%h` - cd .. - -echo "copying sources..." - rm -rf bluez-$GIT_REV - cp -R bluez.git bluez-$GIT_REV - -echo "cleaning sources..." - rm -rf bluez-$GIT_REV/.git - -echo "packing sources..." - tar cvJf bluez-$GIT_REV.tar.xz bluez-$GIT_REV - -echo "remove temporary sourcedir..." - rm -rf bluez-$GIT_REV diff --git a/tools/mkpkg/mkpkg_dvb-firmware b/tools/mkpkg/mkpkg_dvb-firmware deleted file mode 100755 index 6eb4672af9..0000000000 --- a/tools/mkpkg/mkpkg_dvb-firmware +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -echo "getting sources..." - if [ ! -d dvb-firmware.git ]; then - git clone git://github.com/OpenELEC/dvb-firmware.git dvb-firmware.git - fi - - cd dvb-firmware.git - git pull - GIT_REV=`git log -n1 --format=%h` - cd .. - -echo "copying sources..." - rm -rf dvb-firmware-$GIT_REV - cp -R dvb-firmware.git dvb-firmware-$GIT_REV - -echo "cleaning sources..." - rm -rf dvb-firmware-$GIT_REV/.git - -echo "packing sources..." - tar cvJf dvb-firmware-$GIT_REV.tar.xz dvb-firmware-$GIT_REV - -echo "remove temporary sourcedir..." - rm -rf dvb-firmware-$GIT_REV diff --git a/tools/mkpkg/mkpkg_eglibc-2.18 b/tools/mkpkg/mkpkg_eglibc-2.18 deleted file mode 100755 index bd7a882961..0000000000 --- a/tools/mkpkg/mkpkg_eglibc-2.18 +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -echo "getting sources..." - svn co svn://svn.eglibc.org/branches/eglibc-2_18/libc eglibc-2.18-latest - svn co svn://svn.eglibc.org/branches/eglibc-2_18/linuxthreads/linuxthreads eglibc-2.18-latest/linuxthreads - svn co svn://svn.eglibc.org/branches/eglibc-2_18/linuxthreads/linuxthreads_db eglibc-2.18-latest/linuxthreads_db - -echo "getting version..." - cd eglibc-2.18-latest - SVN_REV=`LANG=C svn info 2>/dev/null | grep Revision: | sed -e 's/.*\: //'` - echo $SVN_REV - cd .. - -echo "copying sources..." - rm -rf eglibc-2.18-$SVN_REV - cp -R eglibc-2.18-latest eglibc-2.18-$SVN_REV - -echo "cleaning sources..." - find eglibc-2.18-$SVN_REV -name .svn -exec rm -rf {} ";" - -echo "packing sources..." - tar cvJf eglibc-2.18-$SVN_REV.tar.xz eglibc-2.18-$SVN_REV - -echo "remove temporary sourcedir..." - rm -rf eglibc-2.18-$SVN_REV - -# now localedef - svn co svn://svn.eglibc.org/branches/eglibc-2_18/localedef eglibc-localedef-2.18-latest - -echo "getting version..." - cd eglibc-localedef-2.18-latest - SVN_REV=`LANG=C svn info 2>/dev/null | grep Revision: | sed -e 's/.*\: //'` - echo $SVN_REV - cd .. - -echo "copying sources..." - rm -rf eglibc-localedef-2.18-$SVN_REV - cp -R eglibc-localedef-2.18-latest eglibc-localedef-2.18-$SVN_REV - -echo "cleaning sources..." - find eglibc-localedef-2.18-$SVN_REV -name .svn -exec rm -rf {} ";" - -echo "packing sources..." - tar cvJf eglibc-localedef-2.18-$SVN_REV.tar.xz eglibc-localedef-2.18-$SVN_REV - -echo "remove temporary sourcedir..." - rm -rf eglibc-localedef-2.18-$SVN_REV diff --git a/tools/mkpkg/mkpkg_fennec b/tools/mkpkg/mkpkg_fennec deleted file mode 100755 index e9a1c3714c..0000000000 --- a/tools/mkpkg/mkpkg_fennec +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -echo "getting Mozilla sources..." - [ ! -d fennec-latest ] && \ - hg clone http://hg.mozilla.org/mozilla-central fennec-latest || \ - cd fennec-latest && \ - hg pull && \ - hg update && \ - cd .. - -echo "getting Fennec sources..." - [ ! -d fennec-latest/mobile ] && \ - hg clone http://hg.mozilla.org/mobile-browser fennec-latest/mobile || \ - cd fennec-latest/mobile && \ - hg pull && \ - hg update && \ - cd ../.. - -echo "getting Mozilla Revision..." - cd fennec-latest - MOZ_REV=`LANG=C hg tip --template={rev}` - cd .. - -echo "getting Fennec Revision..." - cd fennec-latest/mobile - FEN_REV=`LANG=C hg tip --template={rev}` - cd ../.. - -echo "copying sources..." - rm -rf fennec-$MOZ_REV.$FEN_REV - cp -R fennec-latest fennec-$MOZ_REV.$FEN_REV - -echo "creating configfiles..." - cd fennec-$MOZ_REV.$FEN_REV - autoconf-2.13 - rm -rf autom* - cd .. - -echo "cleaning sources..." - find fennec-$MOZ_REV.$FEN_REV -name ".hg*" -exec rm -rf {} ";" - -echo "packing sources..." - tar cvjf fennec-$MOZ_REV.$FEN_REV.tar.bz2 fennec-$MOZ_REV.$FEN_REV - -echo "remove temporary sourcedir..." - rm -rf fennec-$MOZ_REV.$FEN_REV diff --git a/tools/mkpkg/mkpkg_libcofi b/tools/mkpkg/mkpkg_libcofi deleted file mode 100755 index 8d5bb2ef70..0000000000 --- a/tools/mkpkg/mkpkg_libcofi +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -echo "getting sources..." - if [ ! -d libcofi.git ]; then - git clone git://github.com/simonjhall/copies-and-fills.git -b master libcofi.git - fi - - cd libcofi.git - git pull - GIT_REV=`git log -n1 --format=%h` - cd .. - -echo "copying sources..." - rm -rf libcofi-$GIT_REV - cp -R libcofi.git libcofi-$GIT_REV - -echo "cleaning sources..." - rm -rf libcofi-$GIT_REV/.git - -echo "packing sources..." - tar cvJf libcofi-$GIT_REV.tar.xz libcofi-$GIT_REV - -echo "remove temporary sourcedir..." - rm -rf libcofi-$GIT_REV diff --git a/tools/mkpkg/mkpkg_misc-firmware b/tools/mkpkg/mkpkg_misc-firmware deleted file mode 100755 index fea69a2b48..0000000000 --- a/tools/mkpkg/mkpkg_misc-firmware +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -echo "getting sources..." - if [ ! -d misc-firmware.git ]; then - git clone git://github.com/OpenELEC/misc-firmware.git misc-firmware.git - fi - - cd misc-firmware.git - git pull - GIT_REV=`git log -n1 --format=%h` - cd .. - -echo "copying sources..." - rm -rf misc-firmware-$GIT_REV - cp -R misc-firmware.git misc-firmware-$GIT_REV - -echo "cleaning sources..." - rm -rf misc-firmware-$GIT_REV/.git - -echo "packing sources..." - tar cvJf misc-firmware-$GIT_REV.tar.xz misc-firmware-$GIT_REV - -echo "remove temporary sourcedir..." - rm -rf misc-firmware-$GIT_REV diff --git a/tools/mkpkg/mkpkg_prelink-cross b/tools/mkpkg/mkpkg_prelink-cross deleted file mode 100755 index 5ce91e507f..0000000000 --- a/tools/mkpkg/mkpkg_prelink-cross +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -echo "getting sources..." - if [ ! -d prelink-cross.git ]; then - git clone git://git.yoctoproject.org/prelink-cross -b cross_prelink prelink-cross.git - fi - - cd prelink-cross.git - git pull - GIT_REV=`git log -n1 --format=%h` - cd .. - -echo "copying sources..." - rm -rf prelink-cross-$GIT_REV - cp -R prelink-cross.git prelink-cross-$GIT_REV - -echo "cleaning sources..." - rm -rf prelink-cross-$GIT_REV/.git - mv prelink-cross-$GIT_REV/trunk/* prelink-cross-$GIT_REV - rm -rf prelink-cross-$GIT_REV/trunk - -echo "packing sources..." - tar cvJf prelink-cross-$GIT_REV.tar.xz prelink-cross-$GIT_REV - -echo "remove temporary sourcedir..." - rm -rf prelink-cross-$GIT_REV \ No newline at end of file diff --git a/tools/mkpkg/mkpkg_rpi-cecd b/tools/mkpkg/mkpkg_rpi-cecd deleted file mode 100755 index f9d89abd59..0000000000 --- a/tools/mkpkg/mkpkg_rpi-cecd +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -echo "getting sources..." - if [ ! -d rpi-cecd.git ]; then - git clone git://github.com/olajep/rpi-cecd.git -b master rpi-cecd.git - fi - - cd rpi-cecd.git - git pull - GIT_REV=`git log -n1 --format=%h` - cd .. - -echo "copying sources..." - rm -rf rpi-cecd-$GIT_REV - cp -R rpi-cecd.git rpi-cecd-$GIT_REV - -echo "cleaning sources..." - rm -rf rpi-cecd-$GIT_REV/.git - -echo "packing sources..." - tar cvJf rpi-cecd-$GIT_REV.tar.xz rpi-cecd-$GIT_REV - -echo "remove temporary sourcedir..." - rm -rf rpi-cecd-$GIT_REV diff --git a/tools/mkpkg/mkpkg_tvheadend b/tools/mkpkg/mkpkg_tvheadend deleted file mode 100755 index eea517819c..0000000000 --- a/tools/mkpkg/mkpkg_tvheadend +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -echo "getting sources..." - if [ ! -d hts-tvheadend.git ]; then - git clone https://github.com/tvheadend/tvheadend.git hts-tvheadend.git - fi - - cd hts-tvheadend.git - git pull - GIT_REV=`git log -n1 --format=%h` - cd .. - -echo "copying sources..." - rm -rf hts-tvheadend-$GIT_REV - cp -R hts-tvheadend.git hts-tvheadend-$GIT_REV - -#echo "cleaning sources..." -# rm -rf hts-tvheadend-$GIT_REV/.git - -echo "packing sources..." - tar cvJf hts-tvheadend-$GIT_REV.tar.xz hts-tvheadend-$GIT_REV - -echo "remove temporary sourcedir..." - rm -rf hts-tvheadend-$GIT_REV diff --git a/tools/mkpkg/mkpkg_wlan-firmware b/tools/mkpkg/mkpkg_wlan-firmware deleted file mode 100755 index 1297211829..0000000000 --- a/tools/mkpkg/mkpkg_wlan-firmware +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -echo "getting sources..." - if [ ! -d wlan-firmware.git ]; then - git clone git://github.com/OpenELEC/wlan-firmware.git wlan-firmware.git - fi - - cd wlan-firmware.git - git pull - GIT_REV=`git log -n1 --format=%h` - cd .. - -echo "copying sources..." - rm -rf wlan-firmware-$GIT_REV - cp -R wlan-firmware.git wlan-firmware-$GIT_REV - -echo "cleaning sources..." - rm -rf wlan-firmware-$GIT_REV/.git - -echo "packing sources..." - tar cvJf wlan-firmware-$GIT_REV.tar.xz wlan-firmware-$GIT_REV - -echo "remove temporary sourcedir..." - rm -rf wlan-firmware-$GIT_REV diff --git a/tools/mkpkg/mkpkg_xbmc-addon-njoy b/tools/mkpkg/mkpkg_xbmc-addon-njoy deleted file mode 100755 index 318b5cd9a9..0000000000 --- a/tools/mkpkg/mkpkg_xbmc-addon-njoy +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -echo "getting sources..." - if [ ! -d xbmc-addon-njoy.git ]; then - git clone git://github.com/jdembski/pvr.njoy.git xbmc-addon-njoy.git - fi - - cd xbmc-addon-njoy.git - git pull - GIT_REV=`git log -n1 --format=%h` - cd .. - -echo "copying sources..." - rm -rf xbmc-addon-njoy-$GIT_REV - cp -R xbmc-addon-njoy.git xbmc-addon-njoy-$GIT_REV - -echo "cleaning sources..." - rm -rf xbmc-addon-njoy-$GIT_REV/.git - -echo "packing sources..." - tar cvJf xbmc-addon-njoy-$GIT_REV.tar.xz xbmc-addon-njoy-$GIT_REV - -echo "remove temporary sourcedir..." - rm -rf xbmc-addon-njoy-$GIT_REV diff --git a/tools/mkpkg/mkpkg_xbmc-addon-vuplus b/tools/mkpkg/mkpkg_xbmc-addon-vuplus deleted file mode 100755 index 8fb7da9656..0000000000 --- a/tools/mkpkg/mkpkg_xbmc-addon-vuplus +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -echo "getting sources..." - if [ ! -d xbmc-addon-vuplus.git ]; then - git clone git://github.com/jdembski/xbmc-addon-vuplus.git xbmc-addon-vuplus.git - fi - - cd xbmc-addon-vuplus.git - git pull - GIT_REV=`git log -n1 --format=%h` - cd .. - -echo "copying sources..." - rm -rf xbmc-addon-vuplus-$GIT_REV - cp -R xbmc-addon-vuplus.git xbmc-addon-vuplus-$GIT_REV - -echo "cleaning sources..." - rm -rf xbmc-addon-vuplus-$GIT_REV/.git - -echo "packing sources..." - tar cvJf xbmc-addon-vuplus-$GIT_REV.tar.xz xbmc-addon-vuplus-$GIT_REV - -echo "remove temporary sourcedir..." - rm -rf xbmc-addon-vuplus-$GIT_REV diff --git a/tools/mkpkg/mkpkg_xwiimote b/tools/mkpkg/mkpkg_xwiimote deleted file mode 100755 index c202aa546a..0000000000 --- a/tools/mkpkg/mkpkg_xwiimote +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -echo "getting sources..." - if [ ! -d xwiimote.git ]; then - git clone git://github.com/dvdhrm/xwiimote.git xwiimote.git - fi - - cd xwiimote.git - git pull - GIT_REV=`git log -n1 --format=%h` - cd .. - -echo "copying sources..." - rm -rf xwiimote-$GIT_REV - cp -R xwiimote.git xwiimote-$GIT_REV - -echo "cleaning sources..." - rm -rf xwiimote-$GIT_REV/.git - -echo "packing sources..." - tar cvJf xwiimote-$GIT_REV.tar.xz xwiimote-$GIT_REV - -echo "remove temporary sourcedir..." - rm -rf xwiimote-$GIT_REV From 97025adff6a238a3fe42cc13aa1f006858699dbd Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 14 Oct 2013 14:46:05 +0300 Subject: [PATCH 15/15] connman: update to connman-1.19 --- packages/network/connman/package.mk | 2 +- .../patches/connman-02-disable-wispr.patch | 61 ++++++++++--------- 2 files changed, 33 insertions(+), 30 deletions(-) diff --git a/packages/network/connman/package.mk b/packages/network/connman/package.mk index 80b6532a1c..f8dfbda816 100644 --- a/packages/network/connman/package.mk +++ b/packages/network/connman/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="connman" -PKG_VERSION="1.18" +PKG_VERSION="1.19" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/network/connman/patches/connman-02-disable-wispr.patch b/packages/network/connman/patches/connman-02-disable-wispr.patch index f5d6a818e9..0b38ee094a 100644 --- a/packages/network/connman/patches/connman-02-disable-wispr.patch +++ b/packages/network/connman/patches/connman-02-disable-wispr.patch @@ -1,8 +1,8 @@ diff --git a/Makefile.am b/Makefile.am -index 4b1b6c2..d518d5d 100644 +index 5efa811..054d7ee 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -172,6 +172,7 @@ endif +@@ -184,6 +184,7 @@ endif endif AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \ @@ -11,10 +11,10 @@ index 4b1b6c2..d518d5d 100644 -DCONNMAN_PLUGIN_BUILTIN \ -DSTATEDIR=\""$(statedir)"\" \ diff --git a/configure.ac b/configure.ac -index cff8b47..626137a 100644 +index 27add27..808611c 100644 --- a/configure.ac +++ b/configure.ac -@@ -357,13 +357,17 @@ AM_CONDITIONAL(CLIENT, test "${enable_client}" != "no") +@@ -345,12 +345,15 @@ AM_CONDITIONAL(CLIENT, test "${enable_client}" != "no") if (test "${enable_wispr}" != "no"); then PKG_CHECK_MODULES(GNUTLS, gnutls, dummy=yes, AC_MSG_ERROR(GnuTLS library is required)) @@ -26,17 +26,15 @@ index cff8b47..626137a 100644 fi AC_SUBST(GNUTLS_CFLAGS) AC_SUBST(GNUTLS_LIBS) - +AC_SUBST(WISPR_CFLAGS) -+ + if (test "${enable_loopback}" != "no"); then AC_CHECK_HEADERS(sys/inotify.h, dummy=yes, - AC_MSG_ERROR(inotify header files are required)) diff --git a/src/main.c b/src/main.c -index 0d58fc4..9c3b79e 100644 +index 5eeade5..20653d3 100644 --- a/src/main.c +++ b/src/main.c -@@ -689,7 +689,9 @@ int main(int argc, char *argv[]) +@@ -681,7 +681,9 @@ int main(int argc, char *argv[]) __connman_dhcp_init(); __connman_dhcpv6_init(); __connman_wpad_init(); @@ -46,7 +44,7 @@ index 0d58fc4..9c3b79e 100644 __connman_rfkill_init(); g_free(option_config); -@@ -703,7 +705,9 @@ int main(int argc, char *argv[]) +@@ -695,7 +697,9 @@ int main(int argc, char *argv[]) g_source_remove(signal); __connman_rfkill_cleanup(); @@ -57,10 +55,10 @@ index 0d58fc4..9c3b79e 100644 __connman_dhcpv6_cleanup(); __connman_dhcp_cleanup(); diff --git a/src/service.c b/src/service.c -index bba548e..39ffda2 100644 +index 45d817e..94cb197 100644 --- a/src/service.c +++ b/src/service.c -@@ -3155,6 +3155,7 @@ static DBusMessage *set_property(DBusConnection *conn, +@@ -3164,6 +3164,7 @@ static DBusMessage *set_property(DBusConnection *conn, update_nameservers(service); dns_configuration_changed(service); @@ -68,15 +66,15 @@ index bba548e..39ffda2 100644 if (__connman_service_is_connected_state(service, CONNMAN_IPCONFIG_TYPE_IPV4)) __connman_wispr_start(service, -@@ -3164,6 +3165,7 @@ static DBusMessage *set_property(DBusConnection *conn, +@@ -3173,6 +3174,7 @@ static DBusMessage *set_property(DBusConnection *conn, CONNMAN_IPCONFIG_TYPE_IPV6)) __connman_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV6); +#endif service_save(service); - } else if (g_str_equal(name, "Timeservers.Configuration") == TRUE) { -@@ -4272,7 +4274,9 @@ static void service_free(gpointer user_data) + } else if (g_str_equal(name, "Timeservers.Configuration")) { +@@ -4352,7 +4354,9 @@ static void service_free(gpointer user_data) __connman_notifier_service_remove(service); service_schedule_removed(service); @@ -86,18 +84,17 @@ index bba548e..39ffda2 100644 stats_stop(service); service->path = NULL; -@@ -5236,8 +5240,9 @@ static int service_indicate_state(struct connman_service *service) +@@ -5331,7 +5335,9 @@ static int service_indicate_state(struct connman_service *service) default_changed(); +#ifdef ENABLE_WISPR __connman_wispr_stop(service); -- +#endif + __connman_wpad_stop(service); - update_nameservers(service); -@@ -5386,7 +5391,11 @@ static void check_proxy_setup(struct connman_service *service) +@@ -5498,7 +5504,11 @@ static void check_proxy_setup(struct connman_service *service) return; done: @@ -109,28 +106,34 @@ index bba548e..39ffda2 100644 } /* -@@ -5448,7 +5457,9 @@ static gboolean redo_wispr(gpointer user_data) - - DBG(""); +@@ -5554,6 +5564,7 @@ static void service_rp_filter(struct connman_service *service, + connected_networks_count, original_rp_filter); + } +#ifdef ENABLE_WISPR - __connman_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV6); -+#endif + static gboolean redo_wispr(gpointer user_data) + { + struct connman_service *service = user_data; +@@ -5569,6 +5580,7 @@ static gboolean redo_wispr(gpointer user_data) return FALSE; } -@@ -5474,7 +5485,9 @@ int __connman_service_online_check_failed(struct connman_service *service, ++#endif + + int __connman_service_online_check_failed(struct connman_service *service, + enum connman_ipconfig_type type) +@@ -5591,7 +5603,9 @@ int __connman_service_online_check_failed(struct connman_service *service, * necessary IPv6 router advertisement messages that might have * DNS data etc. */ +#ifdef ENABLE_WISPR - g_timeout_add_seconds(1, redo_wispr, service); + g_timeout_add_seconds(1, redo_wispr, connman_service_ref(service)); +#endif return EAGAIN; } -@@ -5529,7 +5542,9 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service, - service_rp_filter(service, TRUE); +@@ -5646,7 +5660,9 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service, + service_rp_filter(service, true); } else { service->online_check_count = 1; +#ifdef ENABLE_WISPR @@ -140,7 +143,7 @@ index bba548e..39ffda2 100644 break; case CONNMAN_SERVICE_STATE_ONLINE: diff --git a/src/wpad.c b/src/wpad.c -index 4e5834e..8be310f 100644 +index d40959b..62faf92 100644 --- a/src/wpad.c +++ b/src/wpad.c @@ -85,8 +85,10 @@ static void wpad_result(GResolvResultStatus status,