From 9535082e262ae6ee6bcc5d731492d6ae46b5169f Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 23 Aug 2012 23:42:35 +0300 Subject: [PATCH 1/8] busybox: add 'stat' applet. closes #1137 --- packages/sysutils/busybox/config/busybox.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf index 5e710bc056..3490227cb3 100644 --- a/packages/sysutils/busybox/config/busybox.conf +++ b/packages/sysutils/busybox/config/busybox.conf @@ -270,7 +270,7 @@ CONFIG_SORT=y CONFIG_FEATURE_SORT_BIG=y # CONFIG_SPLIT is not set # CONFIG_FEATURE_SPLIT_FANCY is not set -# CONFIG_STAT is not set +CONFIG_STAT=y # CONFIG_FEATURE_STAT_FORMAT is not set # CONFIG_STTY is not set # CONFIG_SUM is not set From 95875b3fa307e8c7978af1ba9b41254572a4941b Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 23 Aug 2012 20:26:06 +0300 Subject: [PATCH 2/8] hts-tvheadend: update to hts-tvheadend-7630970 --- .../service/multimedia/hts-tvheadend/addon | 2 +- .../service/multimedia/hts-tvheadend/build | 2 +- .../multimedia/hts-tvheadend/changelog.txt | 4 + .../service/multimedia/hts-tvheadend/meta | 4 +- ...-0f3c6f7-091-cwc-connection-attempt.patch} | 0 ...090-add_CH-GA-Weissenstein_muxes-0.1.patch | 55 ---- ...-092-deliver_raw_teletext_to_clients.patch | 146 ---------- ...213a0-093-add_support_for_IPTV_radio.patch | 257 ------------------ 8 files changed, 8 insertions(+), 462 deletions(-) rename packages/addons/service/multimedia/hts-tvheadend/patches/{hts-tvheadend-78213a0-091-cwc-connection-attempt.patch => hts-tvheadend-0f3c6f7-091-cwc-connection-attempt.patch} (100%) delete mode 100644 packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-78213a0-090-add_CH-GA-Weissenstein_muxes-0.1.patch delete mode 100644 packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-78213a0-092-deliver_raw_teletext_to_clients.patch delete mode 100644 packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-78213a0-093-add_support_for_IPTV_radio.patch diff --git a/packages/addons/service/multimedia/hts-tvheadend/addon b/packages/addons/service/multimedia/hts-tvheadend/addon index 839093f68d..1275f495fb 100755 --- a/packages/addons/service/multimedia/hts-tvheadend/addon +++ b/packages/addons/service/multimedia/hts-tvheadend/addon @@ -28,4 +28,4 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID cp -PR $PKG_DIR/config/dvr-config $ADDON_BUILD/$PKG_ADDON_ID/dvr-config mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $PKG_BUILD/build.linux/tvheadend.bundle $ADDON_BUILD/$PKG_ADDON_ID/bin/tvheadend + cp -P $PKG_BUILD/build.linux/tvheadend $ADDON_BUILD/$PKG_ADDON_ID/bin/tvheadend diff --git a/packages/addons/service/multimedia/hts-tvheadend/build b/packages/addons/service/multimedia/hts-tvheadend/build index 881643a2e7..17499cc211 100755 --- a/packages/addons/service/multimedia/hts-tvheadend/build +++ b/packages/addons/service/multimedia/hts-tvheadend/build @@ -34,7 +34,7 @@ cd $PKG_BUILD --arch=$TARGET_ARCH \ --cpu=$TARGET_CPU \ --cc=$TARGET_CC \ + --enable-bundle \ --release make -make build.linux/tvheadend.bundle diff --git a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt index 9f5f9dfdc4..3be7fbace0 100644 --- a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt +++ b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt @@ -1,3 +1,7 @@ +2.1.4 +- update to hts-tvheadend-7630970 +- add an option to wait for more than 1 adapters to appear + 2.1.3 - update to hts-tvheadend-78213a0 diff --git a/packages/addons/service/multimedia/hts-tvheadend/meta b/packages/addons/service/multimedia/hts-tvheadend/meta index 43c479c8c7..50305002b1 100644 --- a/packages/addons/service/multimedia/hts-tvheadend/meta +++ b/packages/addons/service/multimedia/hts-tvheadend/meta @@ -19,8 +19,8 @@ ################################################################################ PKG_NAME="hts-tvheadend" -PKG_VERSION="78213a0" -PKG_REV="3" +PKG_VERSION="7630970" +PKG_REV="4" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html" diff --git a/packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-78213a0-091-cwc-connection-attempt.patch b/packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-0f3c6f7-091-cwc-connection-attempt.patch similarity index 100% rename from packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-78213a0-091-cwc-connection-attempt.patch rename to packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-0f3c6f7-091-cwc-connection-attempt.patch diff --git a/packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-78213a0-090-add_CH-GA-Weissenstein_muxes-0.1.patch b/packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-78213a0-090-add_CH-GA-Weissenstein_muxes-0.1.patch deleted file mode 100644 index e8c6050515..0000000000 --- a/packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-78213a0-090-add_CH-GA-Weissenstein_muxes-0.1.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -Naur hts-tvheadend-c88a646/src/linuxtv_muxes.h hts-tvheadend-c88a646.patch/src/linuxtv_muxes.h ---- hts-tvheadend-c88a646/src/linuxtv_muxes.h 2011-09-26 20:18:12.000000000 +0200 -+++ hts-tvheadend-c88a646.patch/src/linuxtv_muxes.h 2011-10-18 13:40:37.768853992 +0200 -@@ -12001,6 +12001,39 @@ - { .freq = 573000000, .symrate = 5217000, .fec = 0, .constellation = 5}, - }; - -+static const struct mux muxes_DVBC_ch_GA_Weissenstein[] = { -+ { .freq = 450000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 506000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 514000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 522000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 530000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 538000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 554000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 562000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 570000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 578000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 586000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 594000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 602000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 610000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 618000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 626000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 634000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 642000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 650000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 658000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 666000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 674000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 682000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 690000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 698000000, .symrate = 6900000, .fec = 0, .constellation = 3}, -+ { .freq = 698000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 706000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 714000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 722000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+ { .freq = 730000000, .symrate = 6900000, .fec = 0, .constellation = 5}, -+}; -+ - static const struct mux muxes_DVBC_ch_Rega_Sense[] = { - { .freq = 434000000, .symrate = 6900000, .fec = 0, .constellation = 3}, - { .freq = 714000000, .symrate = 6900000, .fec = 0, .constellation = 3}, -@@ -12881,6 +12914,11 @@ - - static const struct network networks_DVBC_ch[] = { - { -+ .name = "GA-Weissenstein", -+ .muxes = muxes_DVBC_ch_GA_Weissenstein, -+ .nmuxes = sizeof(muxes_DVBC_ch_GA_Weissenstein) / sizeof(struct mux), -+ }, -+ { - .name = "Rega-Sense", - .muxes = muxes_DVBC_ch_Rega_Sense, - .nmuxes = sizeof(muxes_DVBC_ch_Rega_Sense) / sizeof(struct mux), diff --git a/packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-78213a0-092-deliver_raw_teletext_to_clients.patch b/packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-78213a0-092-deliver_raw_teletext_to_clients.patch deleted file mode 100644 index 17358b08b3..0000000000 --- a/packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-78213a0-092-deliver_raw_teletext_to_clients.patch +++ /dev/null @@ -1,146 +0,0 @@ -From 3b407aa2053b1db3316873acd05c64319676eb34 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jernej=20Fija=C4=8Dko?= -Date: Fri, 30 Sep 2011 12:56:01 +0200 -Subject: [PATCH 1/2] Deliver raw teletext to clients that are able to display - it (e.g. XBMC) - ---- - src/parsers.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/tsdemux.c | 7 +++---- - 2 files changed, 58 insertions(+), 4 deletions(-) - -diff --git a/src/parsers.c b/src/parsers.c -index 9b7337d..68c7996 100644 ---- a/src/parsers.c -+++ b/src/parsers.c -@@ -102,6 +102,9 @@ static void parse_aac(service_t *t, elementary_stream_t *st, const uint8_t *data - static void parse_subtitles(service_t *t, elementary_stream_t *st, - const uint8_t *data, int len, int start); - -+static void parse_teletext(service_t *t, elementary_stream_t *st, -+ const uint8_t *data, int len, int start); -+ - static int parse_mpa(service_t *t, elementary_stream_t *st, size_t len, - uint32_t next_startcode, int sc_offset); - -@@ -158,6 +161,10 @@ static int parse_pes_header(service_t *t, elementary_stream_t *st, - parse_aac(t, st, data, len, start); - break; - -+ case SCT_TELETEXT: -+ parse_teletext(t, st, data, len, start); -+ break; -+ - default: - break; - } -@@ -1232,6 +1239,54 @@ static int parse_pes_header(service_t *t, elementary_stream_t *st, - } - } - -+/** -+ * Teletext parser -+ */ -+static void -+parse_teletext(service_t *t, elementary_stream_t *st, const uint8_t *data, -+ int len, int start) -+{ -+ th_pkt_t *pkt; -+ int psize, hlen; -+ const uint8_t *buf; -+ const uint8_t *d; -+ if(start) { -+ st->es_parser_state = 1; -+ st->es_buf.sb_err = 0; -+ st->es_parser_ptr = 0; -+ sbuf_reset(&st->es_buf); -+ } -+ -+ if(st->es_parser_state == 0) -+ return; -+ -+ sbuf_append(&st->es_buf, data, len); -+ -+ if(st->es_buf.sb_ptr < 6) -+ return; -+ d = st->es_buf.sb_data; -+ -+ psize = d[4] << 8 | d[5]; -+ -+ if(st->es_buf.sb_ptr != psize + 6) -+ return; -+ -+ st->es_parser_state = 0; -+ -+ hlen = parse_pes_header(t, st, d + 6, st->es_buf.sb_ptr - 6); -+ if(hlen < 0) -+ return; -+ -+ psize -= hlen; -+ buf = d + 6 + hlen; -+ -+ if(psize >= 46) { -+ -+ pkt = pkt_alloc(buf, psize, st->es_curpts, st->es_curdts); -+ pkt->pkt_commercial = t->s_tt_commercial_advice; -+ parser_deliver(t, st, pkt); -+ } -+} - - /** - * -diff --git a/src/tsdemux.c b/src/tsdemux.c -index 897fe1d..5fdaf8b 100644 ---- a/src/tsdemux.c -+++ b/src/tsdemux.c -@@ -110,11 +110,10 @@ - got_section, st); - break; - -- case SCT_TELETEXT: -- teletext_input(t, st, tsb); -- break; -- - default: -+ if(st->es_type == SCT_TELETEXT) -+ teletext_input(t, st, tsb); -+ - if(off > 188) - break; - --- -1.7.5.4 - - -From a8026cd5b412c5096b0904f060ad5ffccdb883cf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jernej=20Fija=C4=8Dko?= -Date: Thu, 17 Nov 2011 08:25:31 +0100 -Subject: [PATCH 2/2] Disable teletext recording to prevent issues with other - elementary streams. Temporary until a better solution - is found. - ---- - src/plumbing/globalheaders.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/src/plumbing/globalheaders.c b/src/plumbing/globalheaders.c -index 703591b..7f183d4 100644 ---- a/src/plumbing/globalheaders.c -+++ b/src/plumbing/globalheaders.c -@@ -202,6 +202,12 @@ - pkt->pkt_componentindex); - assert(ssc != NULL); - -+ if(ssc->ssc_type == SCT_TELETEXT) { -+ free(sm); -+ ssc->ssc_disabled = 1; -+ break; -+ } -+ - pkt = convertpkt(ssc, pkt); - - apply_header(ssc, pkt); --- -1.7.5.4 - - diff --git a/packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-78213a0-093-add_support_for_IPTV_radio.patch b/packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-78213a0-093-add_support_for_IPTV_radio.patch deleted file mode 100644 index 67810ef2d8..0000000000 --- a/packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-78213a0-093-add_support_for_IPTV_radio.patch +++ /dev/null @@ -1,257 +0,0 @@ -From bb048589ab4e09e69b2fba3f639e8287ea9cc7c3 Mon Sep 17 00:00:00 2001 -From: Tadej Novak -Date: Thu, 26 Jan 2012 18:39:09 +0100 -Subject: [PATCH 1/2] IPTV Radio support - -Added service type for IPTV and IPTV radio for easier access in -some software (like XBMC). ---- - src/iptv_input.c | 6 ++++++ - src/service.c | 9 +++++++-- - src/service.h | 2 ++ - src/webui/extjs.c | 10 +++++++++- - src/webui/static/app/iptv.js | 11 +++++++++-- - 5 files changed, 33 insertions(+), 5 deletions(-) - -diff --git a/src/iptv_input.c b/src/iptv_input.c -index 0bfc311..361a151 100644 ---- a/src/iptv_input.c -+++ b/src/iptv_input.c -@@ -428,6 +428,7 @@ - inet_ntop(AF_INET6, &t->s_iptv_group6, abuf6, sizeof(abuf6)); - htsmsg_add_str(m, "group", abuf6); - } -+ htsmsg_add_u32(m, "radio", t->s_servicetype == ST_IPTV_RADIO); - if(t->s_ch != NULL) { - htsmsg_add_str(m, "channelname", t->s_ch->ch_name); - htsmsg_add_u32(m, "mapped", 1); -@@ -591,6 +592,11 @@ - if(!htsmsg_get_u32(c, "port", &u32)) - t->s_iptv_port = u32; - -+ if(!htsmsg_get_u32(c, "radio", &u32) && u32) -+ t->s_servicetype = ST_IPTV_RADIO; -+ else -+ t->s_servicetype = ST_IPTV; -+ - pthread_mutex_lock(&t->s_stream_mutex); - service_make_nicename(t); - psi_load_service_settings(c, t); -diff --git a/src/service.c b/src/service.c -index 1a405d1..6899e2e 100644 ---- a/src/service.c -+++ b/src/service.c -@@ -732,6 +732,8 @@ - { "HDTV", ST_HDTV }, - { "SDTV-AC", ST_AC_SDTV }, - { "HDTV-AC", ST_AC_HDTV }, -+ { "IPTV", ST_IPTV }, -+ { "IPTV Radio", ST_IPTV_RADIO }, - }; - - const char * -@@ -750,7 +752,8 @@ - t->s_servicetype == ST_SDTV || - t->s_servicetype == ST_HDTV || - t->s_servicetype == ST_AC_SDTV || -- t->s_servicetype == ST_AC_HDTV; -+ t->s_servicetype == ST_AC_HDTV || -+ t->s_servicetype == ST_IPTV; - } - - /** -@@ -759,7 +762,9 @@ - int - service_is_radio(service_t *t) - { -- return t->s_servicetype == ST_RADIO; -+ return -+ t->s_servicetype == ST_RADIO || -+ t->s_servicetype == ST_IPTV_RADIO; - } - - /** -diff --git a/src/service.h b/src/service.h -index 2185e42..186278d 100644 ---- a/src/service.h -+++ b/src/service.h -@@ -318,6 +318,8 @@ typedef void (pid_section_callback_t)(struct service *t, - ST_HDTV = 0x11, /* HDTV (MPEG2) */ - ST_AC_SDTV = 0x16, /* Advanced codec SDTV */ - ST_AC_HDTV = 0x19, /* Advanced codec HDTV */ -+ ST_IPTV = 0x30, /* IPTV */ -+ ST_IPTV_RADIO = 0x31, /* Radio over IPTV */ - } s_servicetype; - - -diff --git a/src/webui/extjs.c b/src/webui/extjs.c -index 3ed9f8b..4596005 100644 ---- a/src/webui/extjs.c -+++ b/src/webui/extjs.c -@@ -1313,7 +1313,14 @@ - } - save = 1; - } -- -+ if(!htsmsg_get_u32(c, "radio", &u32)) { -+ if(u32) -+ t->s_servicetype = ST_IPTV_RADIO; -+ else -+ t->s_servicetype = ST_IPTV; -+ save = 1; -+ } -+ - - save |= tvh_str_update(&t->s_iptv_iface, htsmsg_get_str(c, "interface")); - if(save) -@@ -1347,6 +1354,7 @@ - } - - htsmsg_add_u32(r, "port", t->s_iptv_port); -+ htsmsg_add_u32(r, "radio", t->s_servicetype == ST_IPTV_RADIO); - htsmsg_add_u32(r, "enabled", t->s_enabled); - return r; - } -diff --git a/src/webui/static/app/iptv.js b/src/webui/static/app/iptv.js -index acdbfc0..b29e0b9 100644 ---- a/src/webui/static/app/iptv.js -+++ b/src/webui/static/app/iptv.js -@@ -11,6 +11,12 @@ tvheadend.iptv = function(adapterId) { - width: 45 - }); - -+ var radioColumn = new Ext.grid.CheckColumn({ -+ header: "Radio", -+ dataIndex: 'radio', -+ width: 45 -+ }); -+ - var actions = new Ext.ux.grid.RowActions({ - header:'', - dataIndex: 'actions', -@@ -82,6 +88,7 @@ tvheadend.iptv = function(adapterId) { - maxValue: 65535 - }) - }, -+ radioColumn, - { - header: "Service ID", - dataIndex: 'sid', -@@ -105,7 +112,7 @@ tvheadend.iptv = function(adapterId) { - cm.defaultSortable = true; - - var rec = Ext.data.Record.create([ -- 'id', 'enabled', 'channelname', 'interface', 'group', 'port', -+ 'id', 'enabled', 'channelname', 'interface', 'group', 'port', 'radio', - 'sid', 'pmt', 'pcr' - ]); - -@@ -246,7 +253,7 @@ tvheadend.iptv = function(adapterId) { - stripeRows: true, - title: 'IPTV', - iconCls: 'iptv', -- plugins: [enabledColumn, actions], -+ plugins: [enabledColumn, radioColumn, actions], - store: store, - clicksToEdit: 2, - cm: cm, --- -1.7.5.4 - - -From 18473dd11d983aecb6db6e49b454a5d6bb1a329f Mon Sep 17 00:00:00 2001 -From: Tadej Novak -Date: Mon, 30 Jan 2012 16:55:25 +0100 -Subject: [PATCH 2/2] Use the same service type for all radio types - -Tvheadend now uses same radio type ST_RADIO for DVB and IPTV radios. -Otherwise IPTV streams have ST_IPTV type. ---- - src/iptv_input.c | 4 ++-- - src/service.c | 5 +---- - src/service.h | 1 - - src/webui/extjs.c | 4 ++-- - 4 files changed, 5 insertions(+), 9 deletions(-) - -diff --git a/src/iptv_input.c b/src/iptv_input.c -index 361a151..aeb0ab2 100644 ---- a/src/iptv_input.c -+++ b/src/iptv_input.c -@@ -428,7 +428,7 @@ - inet_ntop(AF_INET6, &t->s_iptv_group6, abuf6, sizeof(abuf6)); - htsmsg_add_str(m, "group", abuf6); - } -- htsmsg_add_u32(m, "radio", t->s_servicetype == ST_IPTV_RADIO); -+ htsmsg_add_u32(m, "radio", t->s_servicetype == ST_RADIO); - if(t->s_ch != NULL) { - htsmsg_add_str(m, "channelname", t->s_ch->ch_name); - htsmsg_add_u32(m, "mapped", 1); -@@ -593,7 +593,7 @@ - t->s_iptv_port = u32; - - if(!htsmsg_get_u32(c, "radio", &u32) && u32) -- t->s_servicetype = ST_IPTV_RADIO; -+ t->s_servicetype = ST_RADIO; - else - t->s_servicetype = ST_IPTV; - -diff --git a/src/service.c b/src/service.c -index 6899e2e..015cd46 100644 ---- a/src/service.c -+++ b/src/service.c -@@ -733,7 +733,6 @@ - { "SDTV-AC", ST_AC_SDTV }, - { "HDTV-AC", ST_AC_HDTV }, - { "IPTV", ST_IPTV }, -- { "IPTV Radio", ST_IPTV_RADIO }, - }; - - const char * -@@ -762,9 +761,7 @@ - int - service_is_radio(service_t *t) - { -- return -- t->s_servicetype == ST_RADIO || -- t->s_servicetype == ST_IPTV_RADIO; -+ return t->s_servicetype == ST_RADIO; - } - - /** -diff --git a/src/service.h b/src/service.h -index 186278d..40d1174 100644 ---- a/src/service.h -+++ b/src/service.h -@@ -319,7 +319,6 @@ typedef void (pid_section_callback_t)(struct service *t, - ST_AC_SDTV = 0x16, /* Advanced codec SDTV */ - ST_AC_HDTV = 0x19, /* Advanced codec HDTV */ - ST_IPTV = 0x30, /* IPTV */ -- ST_IPTV_RADIO = 0x31, /* Radio over IPTV */ - } s_servicetype; - - -diff --git a/src/webui/extjs.c b/src/webui/extjs.c -index 4596005..4487deb 100644 ---- a/src/webui/extjs.c -+++ b/src/webui/extjs.c -@@ -1315,7 +1315,7 @@ - } - if(!htsmsg_get_u32(c, "radio", &u32)) { - if(u32) -- t->s_servicetype = ST_IPTV_RADIO; -+ t->s_servicetype = ST_RADIO; - else - t->s_servicetype = ST_IPTV; - save = 1; -@@ -1354,7 +1354,7 @@ - } - - htsmsg_add_u32(r, "port", t->s_iptv_port); -- htsmsg_add_u32(r, "radio", t->s_servicetype == ST_IPTV_RADIO); -+ htsmsg_add_u32(r, "radio", t->s_servicetype == ST_RADIO); - htsmsg_add_u32(r, "enabled", t->s_enabled); - return r; - } --- -1.7.5.4 - From 19e9da7d569ba11ee727e8edf342117aad03c5c0 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 24 Aug 2012 19:02:15 +0300 Subject: [PATCH 3/8] makemkv: update to makemkv-1.7.7 --- packages/addons/multimedia/makemkv/changelog.txt | 3 +++ packages/addons/multimedia/makemkv/meta | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/addons/multimedia/makemkv/changelog.txt b/packages/addons/multimedia/makemkv/changelog.txt index 619fadb375..1b470ad736 100644 --- a/packages/addons/multimedia/makemkv/changelog.txt +++ b/packages/addons/multimedia/makemkv/changelog.txt @@ -1,3 +1,6 @@ +2.1.4 +- update to makemkv-1.7.7 + 2.1.3 - update to makemkv-1.7.6 diff --git a/packages/addons/multimedia/makemkv/meta b/packages/addons/multimedia/makemkv/meta index c58ff45c1c..9ce34726b7 100644 --- a/packages/addons/multimedia/makemkv/meta +++ b/packages/addons/multimedia/makemkv/meta @@ -19,8 +19,8 @@ ################################################################################ PKG_NAME="makemkv" -PKG_VERSION="1.7.6" -PKG_REV="3" +PKG_VERSION="1.7.7" +PKG_REV="4" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.makemkv.com/forum2/viewforum.php?f=3" From d9ab89466f570c3d0313d6e11d6710c56223a903 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 25 Aug 2012 02:33:29 +0200 Subject: [PATCH 4/8] projects/*/linux: embed Tigon3 Firmwares Signed-off-by: Stephan Raue --- projects/Fusion/linux/linux.i386.conf | 2 +- projects/Fusion/linux/linux.x86_64.conf | 2 +- projects/Generic/linux/linux.i386.conf | 2 +- projects/Generic_OSS/linux/linux.i386.conf | 2 +- projects/Intel/linux/linux.i386.conf | 2 +- projects/Intel/linux/linux.x86_64.conf | 2 +- projects/Virtual/linux/linux.i386.conf | 2 +- projects/Virtual/linux/linux.x86_64.conf | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index 210ea0c342..6310e33d47 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -770,7 +770,7 @@ CONFIG_STANDALONE=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_EXTRA_FIRMWARE="rtl_nic/rtl8105e-1.fw rtl_nic/rtl8168d-1.fw rtl_nic/rtl8168d-2.fw rtl_nic/rtl8168e-1.fw rtl_nic/rtl8168e-2.fw rtl_nic/rtl8168e-3.fw" +CONFIG_EXTRA_FIRMWARE="tigon/tg3.bin tigon/tg3_tso5.bin tigon/tg3_tso.bin rtl_nic/rtl8105e-1.fw rtl_nic/rtl8168d-1.fw rtl_nic/rtl8168d-2.fw rtl_nic/rtl8168e-1.fw rtl_nic/rtl8168e-2.fw rtl_nic/rtl8168e-3.fw" CONFIG_EXTRA_FIRMWARE_DIR="firmware" # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf index 77c49fcca0..3a8b2909ff 100644 --- a/projects/Fusion/linux/linux.x86_64.conf +++ b/projects/Fusion/linux/linux.x86_64.conf @@ -732,7 +732,7 @@ CONFIG_STANDALONE=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_EXTRA_FIRMWARE="rtl_nic/rtl8105e-1.fw rtl_nic/rtl8168d-1.fw rtl_nic/rtl8168d-2.fw rtl_nic/rtl8168e-1.fw rtl_nic/rtl8168e-2.fw rtl_nic/rtl8168e-3.fw" +CONFIG_EXTRA_FIRMWARE="tigon/tg3.bin tigon/tg3_tso5.bin tigon/tg3_tso.bin rtl_nic/rtl8105e-1.fw rtl_nic/rtl8168d-1.fw rtl_nic/rtl8168d-2.fw rtl_nic/rtl8168e-1.fw rtl_nic/rtl8168e-2.fw rtl_nic/rtl8168e-3.fw" CONFIG_EXTRA_FIRMWARE_DIR="firmware" # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index c99dfc0a18..f4739108a2 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -779,7 +779,7 @@ CONFIG_STANDALONE=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_EXTRA_FIRMWARE="rtl_nic/rtl8105e-1.fw rtl_nic/rtl8168d-1.fw rtl_nic/rtl8168d-2.fw rtl_nic/rtl8168e-1.fw rtl_nic/rtl8168e-2.fw rtl_nic/rtl8168e-3.fw" +CONFIG_EXTRA_FIRMWARE="tigon/tg3.bin tigon/tg3_tso5.bin tigon/tg3_tso.bin rtl_nic/rtl8105e-1.fw rtl_nic/rtl8168d-1.fw rtl_nic/rtl8168d-2.fw rtl_nic/rtl8168e-1.fw rtl_nic/rtl8168e-2.fw rtl_nic/rtl8168e-3.fw" CONFIG_EXTRA_FIRMWARE_DIR="firmware" # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index 71a1b60e93..cc37137d57 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -779,7 +779,7 @@ CONFIG_STANDALONE=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_EXTRA_FIRMWARE="rtl_nic/rtl8105e-1.fw rtl_nic/rtl8168d-1.fw rtl_nic/rtl8168d-2.fw rtl_nic/rtl8168e-1.fw rtl_nic/rtl8168e-2.fw rtl_nic/rtl8168e-3.fw radeon/BARTS_mc.bin radeon/BARTS_me.bin radeon/BARTS_pfp.bin radeon/BTC_rlc.bin radeon/CAICOS_mc.bin radeon/CAICOS_me.bin radeon/CAICOS_pfp.bin radeon/CAYMAN_mc.bin radeon/CAYMAN_me.bin radeon/CAYMAN_pfp.bin radeon/CAYMAN_rlc.bin radeon/CEDAR_me.bin radeon/CEDAR_pfp.bin radeon/CEDAR_rlc.bin radeon/CYPRESS_me.bin radeon/CYPRESS_pfp.bin radeon/CYPRESS_rlc.bin radeon/JUNIPER_me.bin radeon/JUNIPER_pfp.bin radeon/JUNIPER_rlc.bin radeon/PALM_me.bin radeon/PALM_pfp.bin radeon/R600_rlc.bin radeon/R700_rlc.bin radeon/REDWOOD_me.bin radeon/REDWOOD_pfp.bin radeon/REDWOOD_rlc.bin radeon/SUMO_rlc.bin radeon/TURKS_mc.bin radeon/TURKS_me.bin radeon/TURKS_pfp.bin" +CONFIG_EXTRA_FIRMWARE="tigon/tg3.bin tigon/tg3_tso5.bin tigon/tg3_tso.bin rtl_nic/rtl8105e-1.fw rtl_nic/rtl8168d-1.fw rtl_nic/rtl8168d-2.fw rtl_nic/rtl8168e-1.fw rtl_nic/rtl8168e-2.fw rtl_nic/rtl8168e-3.fw radeon/BARTS_mc.bin radeon/BARTS_me.bin radeon/BARTS_pfp.bin radeon/BTC_rlc.bin radeon/CAICOS_mc.bin radeon/CAICOS_me.bin radeon/CAICOS_pfp.bin radeon/CAYMAN_mc.bin radeon/CAYMAN_me.bin radeon/CAYMAN_pfp.bin radeon/CAYMAN_rlc.bin radeon/CEDAR_me.bin radeon/CEDAR_pfp.bin radeon/CEDAR_rlc.bin radeon/CYPRESS_me.bin radeon/CYPRESS_pfp.bin radeon/CYPRESS_rlc.bin radeon/JUNIPER_me.bin radeon/JUNIPER_pfp.bin radeon/JUNIPER_rlc.bin radeon/PALM_me.bin radeon/PALM_pfp.bin radeon/R600_rlc.bin radeon/R700_rlc.bin radeon/REDWOOD_me.bin radeon/REDWOOD_pfp.bin radeon/REDWOOD_rlc.bin radeon/SUMO_rlc.bin radeon/TURKS_mc.bin radeon/TURKS_me.bin radeon/TURKS_pfp.bin" CONFIG_EXTRA_FIRMWARE_DIR="firmware" # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index e06f863f93..da5197362b 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -777,7 +777,7 @@ CONFIG_STANDALONE=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_EXTRA_FIRMWARE="rtl_nic/rtl8105e-1.fw rtl_nic/rtl8168d-1.fw rtl_nic/rtl8168d-2.fw rtl_nic/rtl8168e-1.fw rtl_nic/rtl8168e-2.fw rtl_nic/rtl8168e-3.fw" +CONFIG_EXTRA_FIRMWARE="tigon/tg3.bin tigon/tg3_tso5.bin tigon/tg3_tso.bin rtl_nic/rtl8105e-1.fw rtl_nic/rtl8168d-1.fw rtl_nic/rtl8168d-2.fw rtl_nic/rtl8168e-1.fw rtl_nic/rtl8168e-2.fw rtl_nic/rtl8168e-3.fw" CONFIG_EXTRA_FIRMWARE_DIR="firmware" # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 6b08d50fad..e118cc095e 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -729,7 +729,7 @@ CONFIG_STANDALONE=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_EXTRA_FIRMWARE="rtl_nic/rtl8105e-1.fw rtl_nic/rtl8168d-1.fw rtl_nic/rtl8168d-2.fw rtl_nic/rtl8168e-1.fw rtl_nic/rtl8168e-2.fw rtl_nic/rtl8168e-3.fw" +CONFIG_EXTRA_FIRMWARE="tigon/tg3.bin tigon/tg3_tso5.bin tigon/tg3_tso.bin rtl_nic/rtl8105e-1.fw rtl_nic/rtl8168d-1.fw rtl_nic/rtl8168d-2.fw rtl_nic/rtl8168e-1.fw rtl_nic/rtl8168e-2.fw rtl_nic/rtl8168e-3.fw" CONFIG_EXTRA_FIRMWARE_DIR="firmware" # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf index 371926177a..3abf9f4cdd 100644 --- a/projects/Virtual/linux/linux.i386.conf +++ b/projects/Virtual/linux/linux.i386.conf @@ -775,7 +775,7 @@ CONFIG_STANDALONE=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_EXTRA_FIRMWARE="rtl_nic/rtl8105e-1.fw rtl_nic/rtl8168d-1.fw rtl_nic/rtl8168d-2.fw rtl_nic/rtl8168e-1.fw rtl_nic/rtl8168e-2.fw rtl_nic/rtl8168e-3.fw" +CONFIG_EXTRA_FIRMWARE="tigon/tg3.bin tigon/tg3_tso5.bin tigon/tg3_tso.bin rtl_nic/rtl8105e-1.fw rtl_nic/rtl8168d-1.fw rtl_nic/rtl8168d-2.fw rtl_nic/rtl8168e-1.fw rtl_nic/rtl8168e-2.fw rtl_nic/rtl8168e-3.fw" CONFIG_EXTRA_FIRMWARE_DIR="firmware" # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf index ee0dae2ad4..1a70466798 100644 --- a/projects/Virtual/linux/linux.x86_64.conf +++ b/projects/Virtual/linux/linux.x86_64.conf @@ -726,7 +726,7 @@ CONFIG_STANDALONE=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_EXTRA_FIRMWARE="rtl_nic/rtl8105e-1.fw rtl_nic/rtl8168d-1.fw rtl_nic/rtl8168d-2.fw rtl_nic/rtl8168e-1.fw rtl_nic/rtl8168e-2.fw rtl_nic/rtl8168e-3.fw" +CONFIG_EXTRA_FIRMWARE="tigon/tg3.bin tigon/tg3_tso5.bin tigon/tg3_tso.bin rtl_nic/rtl8105e-1.fw rtl_nic/rtl8168d-1.fw rtl_nic/rtl8168d-2.fw rtl_nic/rtl8168e-1.fw rtl_nic/rtl8168e-2.fw rtl_nic/rtl8168e-3.fw" CONFIG_EXTRA_FIRMWARE_DIR="firmware" # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set From e76c8c850007b3a87ca501ae4310bffe536249e1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 25 Aug 2012 03:03:43 +0200 Subject: [PATCH 5/8] projects/Generic*/linux: embed BNX2 Firmwares Signed-off-by: Stephan Raue --- projects/Generic/linux/linux.i386.conf | 2 +- projects/Generic_OSS/linux/linux.i386.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 f4739108a2..5871796ae0 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -779,7 +779,7 @@ CONFIG_STANDALONE=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_EXTRA_FIRMWARE="tigon/tg3.bin tigon/tg3_tso5.bin tigon/tg3_tso.bin rtl_nic/rtl8105e-1.fw rtl_nic/rtl8168d-1.fw rtl_nic/rtl8168d-2.fw rtl_nic/rtl8168e-1.fw rtl_nic/rtl8168e-2.fw rtl_nic/rtl8168e-3.fw" +CONFIG_EXTRA_FIRMWARE="bnx2/bnx2-mips-06-6.2.1.fw bnx2/bnx2-mips-09-6.2.1a.fw bnx2/bnx2-rv2p-06-6.0.15.fw bnx2/bnx2-rv2p-09-6.0.17.fw bnx2/bnx2-rv2p-09ax-6.0.17.fw tigon/tg3.bin tigon/tg3_tso5.bin tigon/tg3_tso.bin rtl_nic/rtl8105e-1.fw rtl_nic/rtl8168d-1.fw rtl_nic/rtl8168d-2.fw rtl_nic/rtl8168e-1.fw rtl_nic/rtl8168e-2.fw rtl_nic/rtl8168e-3.fw" CONFIG_EXTRA_FIRMWARE_DIR="firmware" # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index cc37137d57..a6a72c4dad 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -779,7 +779,7 @@ CONFIG_STANDALONE=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_EXTRA_FIRMWARE="tigon/tg3.bin tigon/tg3_tso5.bin tigon/tg3_tso.bin rtl_nic/rtl8105e-1.fw rtl_nic/rtl8168d-1.fw rtl_nic/rtl8168d-2.fw rtl_nic/rtl8168e-1.fw rtl_nic/rtl8168e-2.fw rtl_nic/rtl8168e-3.fw radeon/BARTS_mc.bin radeon/BARTS_me.bin radeon/BARTS_pfp.bin radeon/BTC_rlc.bin radeon/CAICOS_mc.bin radeon/CAICOS_me.bin radeon/CAICOS_pfp.bin radeon/CAYMAN_mc.bin radeon/CAYMAN_me.bin radeon/CAYMAN_pfp.bin radeon/CAYMAN_rlc.bin radeon/CEDAR_me.bin radeon/CEDAR_pfp.bin radeon/CEDAR_rlc.bin radeon/CYPRESS_me.bin radeon/CYPRESS_pfp.bin radeon/CYPRESS_rlc.bin radeon/JUNIPER_me.bin radeon/JUNIPER_pfp.bin radeon/JUNIPER_rlc.bin radeon/PALM_me.bin radeon/PALM_pfp.bin radeon/R600_rlc.bin radeon/R700_rlc.bin radeon/REDWOOD_me.bin radeon/REDWOOD_pfp.bin radeon/REDWOOD_rlc.bin radeon/SUMO_rlc.bin radeon/TURKS_mc.bin radeon/TURKS_me.bin radeon/TURKS_pfp.bin" +CONFIG_EXTRA_FIRMWARE="bnx2/bnx2-mips-06-6.2.1.fw bnx2/bnx2-mips-09-6.2.1a.fw bnx2/bnx2-rv2p-06-6.0.15.fw bnx2/bnx2-rv2p-09-6.0.17.fw bnx2/bnx2-rv2p-09ax-6.0.17.fw tigon/tg3.bin tigon/tg3_tso5.bin tigon/tg3_tso.bin rtl_nic/rtl8105e-1.fw rtl_nic/rtl8168d-1.fw rtl_nic/rtl8168d-2.fw rtl_nic/rtl8168e-1.fw rtl_nic/rtl8168e-2.fw rtl_nic/rtl8168e-3.fw radeon/BARTS_mc.bin radeon/BARTS_me.bin radeon/BARTS_pfp.bin radeon/BTC_rlc.bin radeon/CAICOS_mc.bin radeon/CAICOS_me.bin radeon/CAICOS_pfp.bin radeon/CAYMAN_mc.bin radeon/CAYMAN_me.bin radeon/CAYMAN_pfp.bin radeon/CAYMAN_rlc.bin radeon/CEDAR_me.bin radeon/CEDAR_pfp.bin radeon/CEDAR_rlc.bin radeon/CYPRESS_me.bin radeon/CYPRESS_pfp.bin radeon/CYPRESS_rlc.bin radeon/JUNIPER_me.bin radeon/JUNIPER_pfp.bin radeon/JUNIPER_rlc.bin radeon/PALM_me.bin radeon/PALM_pfp.bin radeon/R600_rlc.bin radeon/R700_rlc.bin radeon/REDWOOD_me.bin radeon/REDWOOD_pfp.bin radeon/REDWOOD_rlc.bin radeon/SUMO_rlc.bin radeon/TURKS_mc.bin radeon/TURKS_me.bin radeon/TURKS_pfp.bin" CONFIG_EXTRA_FIRMWARE_DIR="firmware" # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set From e952403cd2c99f5658b296a053402a4a102716e8 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 25 Aug 2012 14:05:26 +0400 Subject: [PATCH 6/8] add logic to start connman in debug mode allow a simple and persistent way to start connman in debug mode to assist with networking diagnostics --- packages/network/connman/init.d/21_network | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/network/connman/init.d/21_network b/packages/network/connman/init.d/21_network index 683135989d..b3daccd5be 100644 --- a/packages/network/connman/init.d/21_network +++ b/packages/network/connman/init.d/21_network @@ -270,7 +270,11 @@ set_interface() { set_interface set_hwclock - /usr/sbin/connmand -n > /dev/null 2>&1 + if [ -f $HOME/.config/debug.connman ]; then + /usr/sbin/connmand -nd > /dev/null 2>&1 + else + /usr/sbin/connmand -n > /dev/null 2>&1 + fi usleep 250000 done )& From 176e5bfd4688ae6c615c107225ce2aeb163d2179 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 25 Aug 2012 14:36:40 +0200 Subject: [PATCH 7/8] connman: update to connman-1.6 Signed-off-by: Stephan Raue --- packages/network/connman/meta | 2 +- ...nup-routes.patch => connman-1.6-do-not-cleanup-routes.patch} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/network/connman/patches/{connman-1.5-do-not-cleanup-routes.patch => connman-1.6-do-not-cleanup-routes.patch} (100%) diff --git a/packages/network/connman/meta b/packages/network/connman/meta index 5b0edac8b1..7c8452005d 100644 --- a/packages/network/connman/meta +++ b/packages/network/connman/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="connman" -PKG_VERSION="1.5" +PKG_VERSION="1.6" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/network/connman/patches/connman-1.5-do-not-cleanup-routes.patch b/packages/network/connman/patches/connman-1.6-do-not-cleanup-routes.patch similarity index 100% rename from packages/network/connman/patches/connman-1.5-do-not-cleanup-routes.patch rename to packages/network/connman/patches/connman-1.6-do-not-cleanup-routes.patch From f877afe18d7b9eb80ee7fd3b5e8eac128aea67bf Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 25 Aug 2012 14:37:24 +0200 Subject: [PATCH 8/8] systemd: update to systemd-189 Signed-off-by: Stephan Raue --- packages/sysutils/systemd/build | 2 + packages/sysutils/systemd/meta | 11 ++- .../patches/systemd-189-broken-HAVE_XZ.patch | 33 ++++++++ .../systemd-189-missing_includes.patch | 78 +++++++++++++++++++ 4 files changed, 121 insertions(+), 3 deletions(-) create mode 100644 packages/sysutils/systemd/patches/systemd-189-broken-HAVE_XZ.patch create mode 100644 packages/sysutils/systemd/patches/systemd-189-missing_includes.patch diff --git a/packages/sysutils/systemd/build b/packages/sysutils/systemd/build index d67451f705..cf307e7952 100755 --- a/packages/sysutils/systemd/build +++ b/packages/sysutils/systemd/build @@ -50,8 +50,10 @@ cd $PKG_BUILD --disable-tcpwrap \ --disable-pam \ --disable-acl \ + --disable-gcrypt \ --disable-audit \ --disable-libcryptsetup \ + --disable-qrencode \ --disable-binfmt \ --disable-vconsole \ --disable-readahead \ diff --git a/packages/sysutils/systemd/meta b/packages/sysutils/systemd/meta index 260985f711..9dbb17edf9 100644 --- a/packages/sysutils/systemd/meta +++ b/packages/sysutils/systemd/meta @@ -19,14 +19,14 @@ ################################################################################ PKG_NAME="systemd" -PKG_VERSION="188" +PKG_VERSION="189" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd" PKG_URL="http://www.freedesktop.org/software/systemd/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS=" libcap dbus kmod util-linux usbutils pciutils glib" -PKG_BUILD_DEPENDS="toolchain libcap dbus kmod util-linux usbutils pciutils glib" +PKG_DEPENDS=" libcap dbus kmod util-linux usbutils pciutils glib libgcrypt" +PKG_BUILD_DEPENDS="toolchain libcap dbus kmod util-linux usbutils pciutils glib libgcrypt" PKG_PRIORITY="required" PKG_SECTION="system" PKG_SHORTDESC="systemd: a system and session manager" @@ -34,3 +34,8 @@ PKG_LONGDESC="systemd is a system and session manager for Linux, compatible with PKG_IS_ADDON="no" PKG_AUTORECONF="yes" + +# libgcrypt is needed actually only for autoreconf + PKG_DEPENDS="$PKG_DEPENDS libgcrypt" + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libgcrypt" + diff --git a/packages/sysutils/systemd/patches/systemd-189-broken-HAVE_XZ.patch b/packages/sysutils/systemd/patches/systemd-189-broken-HAVE_XZ.patch new file mode 100644 index 0000000000..717a2aafc6 --- /dev/null +++ b/packages/sysutils/systemd/patches/systemd-189-broken-HAVE_XZ.patch @@ -0,0 +1,33 @@ +Without this, build fail if we --disable-xz or does not have xz installed in +system. + +Signed-off-by: Yin Kangkai +--- + src/journal/journal-verify.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c +index 2401293..5d134bd 100644 +--- a/src/journal/journal-verify.c ++++ b/src/journal/journal-verify.c +@@ -63,6 +63,7 @@ static int journal_file_object_verify(JournalFile *f, Object *o) { + h1 = le64toh(o->data.hash); + + if (o->object.flags & OBJECT_COMPRESSED) { ++#ifdef HAVE_XZ + void *b = NULL; + uint64_t alloc = 0, b_size; + +@@ -73,6 +74,9 @@ static int journal_file_object_verify(JournalFile *f, Object *o) { + + h2 = hash64(b, b_size); + free(b); ++#else ++ return -EPROTONOSUPPORT; ++#endif + } else + h2 = hash64(o->data.payload, le64toh(o->object.size) - offsetof(Object, data.payload)); + +-- +1.7.3.4 + diff --git a/packages/sysutils/systemd/patches/systemd-189-missing_includes.patch b/packages/sysutils/systemd/patches/systemd-189-missing_includes.patch new file mode 100644 index 0000000000..19ff579cc5 --- /dev/null +++ b/packages/sysutils/systemd/patches/systemd-189-missing_includes.patch @@ -0,0 +1,78 @@ +From: Allin Cottrell +Date: Thu, 23 Aug 2012 23:46:38 +0000 +Subject: journald: add missing includes + +--- +diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c +index 6cd2397..2596d44 100644 +--- a/src/journal/journald-console.c ++++ b/src/journal/journald-console.c +@@ -21,6 +21,7 @@ + + #include + #include ++#include + + #include "journald.h" + #include "journald-console.h" +diff --git a/src/journal/journald-gperf.gperf b/src/journal/journald-gperf.gperf +index 2f83cbd..32474df 100644 +--- a/src/journal/journald-gperf.gperf ++++ b/src/journal/journald-gperf.gperf +@@ -1,5 +1,6 @@ + %{ + #include ++#include + #include "conf-parser.h" + #include "journald.h" + %} +diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c +index aebca5d..b259480 100644 +--- a/src/journal/journald-kmsg.c ++++ b/src/journal/journald-kmsg.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + #include + #include +diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c +index 7aa99a3..4e44c3a 100644 +--- a/src/journal/journald-native.c ++++ b/src/journal/journald-native.c +@@ -20,6 +20,7 @@ + ***/ + + #include ++#include + #include + + #include "socket-util.h" +diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c +index 3e4022a..113c421 100644 +--- a/src/journal/journald-stream.c ++++ b/src/journal/journald-stream.c +@@ -21,6 +21,7 @@ + + #include + #include ++#include + #include + + #ifdef HAVE_SELINUX +diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c +index daed095..9db9198 100644 +--- a/src/journal/journald-syslog.c ++++ b/src/journal/journald-syslog.c +@@ -20,6 +20,7 @@ + ***/ + + #include ++#include + #include + + #include "socket-util.h" +-- +cgit v0.9.0.2-2-gbebe