webif: remove deprecated
PATCH 1/6 webif: remove deprecated
--- package/Config.in | 1 - package/webif/Config.in | 28 -- package/webif/files/etc/httpd.conf | 8 - package/webif/files/usr/lib/webif/apply.sh | 76 ---- package/webif/files/usr/lib/webif/categories.awk | 27 -- package/webif/files/usr/lib/webif/common.awk | 38 -- package/webif/files/usr/lib/webif/form.awk | 100 ----- .../webif/files/usr/lib/webif/lang/ca/common.txt | 226 ---------- .../webif/files/usr/lib/webif/lang/cz/common.txt | 225 ---------- .../webif/files/usr/lib/webif/lang/de/common.txt | 228 ---------- .../webif/files/usr/lib/webif/lang/dk/common.txt | 231 ---------- .../webif/files/usr/lib/webif/lang/ee/common.txt | 230 ---------- .../webif/files/usr/lib/webif/lang/es/common.txt | 227 ---------- .../webif/files/usr/lib/webif/lang/fr/common.txt | 238 ---------- .../webif/files/usr/lib/webif/lang/hr/common.txt | 199 --------- .../webif/files/usr/lib/webif/lang/hu/common.txt | 227 ---------- .../webif/files/usr/lib/webif/lang/it/common.txt | 226 ---------- .../webif/files/usr/lib/webif/lang/nl/common.txt | 224 ---------- .../webif/files/usr/lib/webif/lang/no/common.txt | 230 ---------- .../webif/files/usr/lib/webif/lang/pl/common.txt | 228 ---------- .../webif/files/usr/lib/webif/lang/pt/common.txt | 454 -------------------- .../webif/files/usr/lib/webif/lang/ru/common.txt | 223 ---------- .../webif/files/usr/lib/webif/lang/se/common.txt | 223 ---------- package/webif/files/usr/lib/webif/languages.awk | 12 - .../webif/files/usr/lib/webif/subcategories.awk | 12 - package/webif/files/usr/lib/webif/validate.awk | 151 ------- package/webif/files/usr/lib/webif/webif.sh | 286 ------------ package/webif/files/www/cgi-bin/webif.sh | 2 - package/webif/files/www/cgi-bin/webif/.categories | 2 - package/webif/files/www/cgi-bin/webif/about.sh | 31 -- package/webif/files/www/cgi-bin/webif/config.sh | 46 -- package/webif/files/www/cgi-bin/webif/index.sh | 8 - package/webif/files/www/cgi-bin/webif/info.sh | 44 -- package/webif/files/www/cgi-bin/webif/ipkg.sh | 2 - .../files/www/cgi-bin/webif/status-connection.sh | 29 -- .../webif/files/www/cgi-bin/webif/status-dhcp.sh | 38 -- .../files/www/cgi-bin/webif/status-wireless.sh | 12 - package/webif/files/www/index.html | 16 - package/webif/files/www/webif.css | 296 ------------- package/webif/files/www/webif.js | 33 -- package/webif/src/bstrip.c | 75 ---- package/webif/src/webif-page.c | 289 ------------- package/webif/webif.mk | 71 --- 43 files changed, 0 insertions(+), 5572 deletions(-) delete mode 100644 package/webif/Config.in delete mode 100644 package/webif/files/etc/httpd.conf delete mode 100755 package/webif/files/usr/lib/webif/apply.sh delete mode 100644 package/webif/files/usr/lib/webif/categories.awk delete mode 100644 package/webif/files/usr/lib/webif/common.awk delete mode 100644 package/webif/files/usr/lib/webif/form.awk delete mode 100644 package/webif/files/usr/lib/webif/lang/ca/common.txt delete mode 100644 package/webif/files/usr/lib/webif/lang/cz/common.txt delete mode 100644 package/webif/files/usr/lib/webif/lang/de/common.txt delete mode 100644 package/webif/files/usr/lib/webif/lang/dk/common.txt delete mode 100644 package/webif/files/usr/lib/webif/lang/ee/common.txt delete mode 100644 package/webif/files/usr/lib/webif/lang/es/common.txt delete mode 100644 package/webif/files/usr/lib/webif/lang/fr/common.txt delete mode 100644 package/webif/files/usr/lib/webif/lang/hr/common.txt delete mode 100644 package/webif/files/usr/lib/webif/lang/hu/common.txt delete mode 100644 package/webif/files/usr/lib/webif/lang/it/common.txt delete mode 100644 package/webif/files/usr/lib/webif/lang/nl/common.txt delete mode 100644 package/webif/files/usr/lib/webif/lang/no/common.txt delete mode 100644 package/webif/files/usr/lib/webif/lang/pl/common.txt delete mode 100644 package/webif/files/usr/lib/webif/lang/pt/common.txt delete mode 100644 package/webif/files/usr/lib/webif/lang/ru/common.txt delete mode 100644 package/webif/files/usr/lib/webif/lang/se/common.txt delete mode 100644 package/webif/files/usr/lib/webif/languages.awk delete mode 100644 package/webif/files/usr/lib/webif/subcategories.awk delete mode 100644 package/webif/files/usr/lib/webif/validate.awk delete mode 100755 package/webif/files/usr/lib/webif/webif.sh delete mode 100755 package/webif/files/www/cgi-bin/webif.sh delete mode 100644 package/webif/files/www/cgi-bin/webif/.categories delete mode 100755 package/webif/files/www/cgi-bin/webif/about.sh delete mode 100755 package/webif/files/www/cgi-bin/webif/config.sh delete mode 100755 package/webif/files/www/cgi-bin/webif/index.sh delete mode 100755 package/webif/files/www/cgi-bin/webif/info.sh delete mode 100755 package/webif/files/www/cgi-bin/webif/ipkg.sh delete mode 100755 package/webif/files/www/cgi-bin/webif/status-connection.sh delete mode 100755 package/webif/files/www/cgi-bin/webif/status-dhcp.sh delete mode 100755 package/webif/files/www/cgi-bin/webif/status-wireless.sh delete mode 100644 package/webif/files/www/index.html delete mode 100644 package/webif/files/www/webif.css delete mode 100644 package/webif/files/www/webif.js delete mode 100644 package/webif/src/bstrip.c delete mode 100644 package/webif/src/webif-page.c delete mode 100644 package/webif/webif.mk
package/Config.in +0 -1
@@ -484,7 +484,6 @@ source "package/udpcast/Config.in" source "package/vpnc/Config.in" source "package/vsftpd/Config.in" source "package/vtun/Config.in" -source "package/webif/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/wget/Config.in" endif
package/webif/Config.in deleted +0 -28
@@ -1,28 +0,0 @@ -config BR2_PACKAGE_WEBIF - bool "webif - Status Console" - depends on BR2_PACKAGE_BUSYBOX # httpd - depends on BR2_DEPRECATED - select BR2_PACKAGE_HASERL - help - A web interface for showing different network status. This package - requires awk support on the system, either the one provided by - Busybox or gawk. - - The default login on the status web pages are root/root and - admin/admin. This can be changed in the etc/httpd.conf file. - -config BR2_PACKAGE_WEBIF_INSTALL_INDEX_HTML - bool "instal index.html in /www which redirects to webif" - depends on BR2_PACKAGE_WEBIF - help - Installs a /www/index.html which redirects to the status console cgi - scripts. - -config BR2_PACKAGE_WEBIF_LANGUAGES - bool "install language support" - depends on BR2_PACKAGE_WEBIF - help - This option installs support for other languages than english. - - Supported languages: ca, cz, de, dk, ee, es, fr, hr, hu, it, nl, no, - pl, pt, ru and se.
package/webif/files/etc/httpd.conf deleted +0 -8
@@ -1,8 +0,0 @@ -.asp:text/html -/cgi-bin/webif:root:root -/cgi-bin/webif:admin:admin -.svg:image/svg+xml -.png:image/png -.gif:image/gif -.jpg:image/jpg -
package/webif/files/usr/lib/webif/apply.sh deleted +0 -76
76 lines not on this page · raw message
package/webif/files/usr/lib/webif/categories.awk deleted +0 -27
@@ -1,27 +0,0 @@ -BEGIN { - n = 0 - sel = 0 - FS=":" -} -($3 == "category") && (categories !~ /:$4:/) { - categories = categories ":" $4 ":"; - n++ - if ($4 ~ "^" selected "$") sel = n - c[n] = $4 - if (f[$4] == "") f[$4] = rootdir "/" indexpage "?cat=" $4 -} -($3 == "name") && ((p[$4] == 0) || (p[$4] > int($5))) { - gsub(/^.*\//, "", $1); - p[$4] = int($5) + 1 - f[$4] = rootdir "/" $1 -} -END { - print "<div id=\"mainmenu\"><h3><strong>@TR<<Categories>>:</strong></h3><ul>" - - for (i = 1; i <= n; i++) { - if (sel == i) print "<li class=\"selected-maincat\"><a href=\"" f[c[i]] "\">»@TR<<" c[i] ">>«</a></li>" - else print "<li><a href=\"" f[c[i]] "\"> @TR<<" c[i] ">> </a></li>"; - } - - print "</ul></div>" -}
package/webif/files/usr/lib/webif/common.awk deleted +0 -38
@@ -1,38 +0,0 @@ -function start_form(title, field_opts, field_opts2) { - print "<div class=\"settings\"" field_opts ">" - if (title != "") print "<div class=\"settings-title\"><h3><strong>" title "</strong></h3></div>" - print "<div class=\"settings-content\"" field_opts2 ">" -} - -function end_form(form_help, form_help_link) { - print "</div>" - if (form_help != "") form_help = "<dl>" form_help "</dl>" - print "<div class=\"settings-help\"><blockquote><h3><strong>@TR<<Short help>>:</strong></h3>" form_help form_help_link "</blockquote></div>" - print "<div style=\"clear: both\"> </div></div>" -} - -function textinput(name, value) { - return "<input type=\"text\" name=\"" name "\" value=\"" value "\" />" -} - -function hidden(name, value) { - return "<input type=\"hidden\" name=\"" name "\" value=\"" value "\" />" -} - -function button(name, caption) { - return "<input type=\"submit\" name=\"" name "\" value=\"@TR<<" caption ">>\" />" -} - -function helpitem(name) { - return "<dt>@TR<<" name ">>: </dt>" -} - -function helptext(short, name) { - return "<dd>@TR<<" short "|" name ">>: </dd>" -} - -function sel_option(name, caption, default, sel) { - if (default == name) sel = " selected=\"selected\"" - else sel = "" - return "<option value=\"" name "\"" sel ">@TR<<" caption ">></option>" -}
package/webif/files/usr/lib/webif/form.awk deleted +0 -100
100 lines not on this page · raw message
package/webif/files/usr/lib/webif/lang/ca/common.txt deleted +0 -226
226 lines not on this page · raw message
package/webif/files/usr/lib/webif/lang/cz/common.txt deleted +0 -225
225 lines not on this page · raw message
package/webif/files/usr/lib/webif/lang/de/common.txt deleted +0 -228
228 lines not on this page · raw message
package/webif/files/usr/lib/webif/lang/dk/common.txt deleted +0 -220
220 lines not on this page · raw message
synligt ikke brug for den.
-
-Helptext Encryption Type => 'WPA (RADIUS)' er kun understøttet i AP (Access Point) tilstand. <br /> 'WPA (PSK)' fungerer ikke i 'Ad-Hoc' tilstand. -
-Helptext IP Settings => IP indstilinger er frivillig for DHCP og PPTP. Når de er sat, bliver de brugt som standværdiger, hvis der ikke er en tilgængelig DHCP server. -
-Helptext Idle Time => Ventetid i sekunder før inaktivitet bliver årsagen til at forbindelsen afbrydes.
-
-Helptext Redial Timeout => Ventetid før der prøves at ringe op igen.
-
-# untranslated:
-Available packages => Available packages
package/webif/files/usr/lib/webif/lang/ee/common.txt deleted +0 -230
230 lines not on this page · raw message
package/webif/files/usr/lib/webif/lang/es/common.txt deleted +0 -227
227 lines not on this page · raw message
package/webif/files/usr/lib/webif/lang/fr/common.txt deleted +0 -238
238 lines not on this page · raw message
package/webif/files/usr/lib/webif/lang/hr/common.txt deleted +0 -199
199 lines not on this page · raw message
package/webif/files/usr/lib/webif/lang/hu/common.txt deleted +0 -227
227 lines not on this page · raw message
package/webif/files/usr/lib/webif/lang/it/common.txt deleted +0 -226
226 lines not on this page · raw message
package/webif/files/usr/lib/webif/lang/nl/common.txt deleted +0 -224
224 lines not on this page · raw message
package/webif/files/usr/lib/webif/lang/no/common.txt deleted +0 -230
230 lines not on this page · raw message
package/webif/files/usr/lib/webif/lang/pl/common.txt deleted +0 -228
16 lines not on this page · raw message
package/webif/files/usr/lib/webif/lang/pt/common.txt deleted +0 -454
454 lines not on this page · raw message
package/webif/files/usr/lib/webif/lang/ru/common.txt deleted +0 -48
48 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
#x43B;ьзователя любой более поздней версии.
-Contributions by => Помощники
-Layout based on => Дизайнер
-by => от
-
-
-No config change. => Конфигурация не изменялась.
-Config discarded. => Конфигурация отклонена.
-Config changes: => Изменение конфигурации:
-Updating config... => Обновление конфигурации...
-
-
-# 'Router Info' page
-Firmware Version => Версия прошивки
-Kernel Version => Версия ядра
-Current Date/Time => Время и дата
-MAC Address => MAC-адрес
-
-# 'Connections' page
-Connection Status => Соединение
-Physical Connections => Аппаратные соединения
-Router Connections => Программные соединения маршрутизатора
-
-
-# 'DHCP' page
-DHCP leases => DHCP клиенты
-IP Address => IP адрес
-Name => Имя
-Expires in => Истекает
-
-
-# 'Wireless Status' page
-Wireless Status => Беспроводная сеть
-
-# 'Password' page
-Password Change => Изменить пароль
-New Password => Новый пароль
-Confirm Password => Подтверждение пароля
-
-# 'System Settings' page
-System Settings => Настройки системы
-Host Name => Имя узла
-Language => Язык
-
-# 'Installed Software' page
-Installed Packages => Установленные пакеты
-Update package lists => Обновить список пакетов
-Available packages => Доступные пакеты
-Uninstall => Удалить
-Install => Установить
-
-
-# 'Firmware Upgrade' page
-Firmware format => Формат прошивки
-Error => Ошибка
-done => готово
-Invalid_format => Неизвестный формат прошивки
-Erase_JFFS2 => Очистить раздел jffs2
-Options => Параметры
-Firmware_image => Образ прошивки:
-Upgrade => Обновить
-Upgrading... => Обновление...
-
-# 'LAN Settings' page
-LAN Settings => Настройки сети
-LAN Configuration => Конфигурация сети
-Netmask => Маска подсети
-Default Gateway => Шлюз по умолчанию
-DNS Servers => сервера DNS
-DNS Address => адрес DNS
-
-Note => Заметка
-
-
-# 'WAN Settings' page
-WAN Settings => Настройки внешней сети
-WAN Configuration => Конфигурация внешней сети
-PPTP Server IP => адрес IP сервера PPTP
-Connection Type => Тип соединения
-No WAN => Нет внешней сети
-DHCP => DHCP
-Static IP => Статический IP
-IP Settings => Настройки IP
-PPP Settings => Настройки PPP
-Redial Policy => Разрыв соединения
-Connect on Demand => Соединяться по требованию
-Keep Alive => Поддерживать связь
-Maximum Idle Time => Наибольшее время простоя
-Redial Timeout => Задержка перед повторным соединением
-MTU => MTU
-Username => Имя пользователя
-
-
-# 'Wireless Configuration' page
-Wireless Configuration => Конфигурация беспроводной сети
-Wireless Interface => Беспроводной интерфейс
-WEP Key => Ключ WEP
-Selected WEP Key => Выбранный ключ WEP
-WPA PSK => WPA разделяемый ключ-ESSID => ESSID
-Channel => Канал
-RADIUS IP Address => Адрес IP сервера RADIUS
-RADIUS Server Key => Ключ сервера RADIUS
-Enabled => Включён
-Disabled => Выключен-ESSID Broadcast => Вещание ESSID
-Show => Показать
-Hide => Спрятать
-WLAN Mode => Режим беспроводной сети
-Access Point => Точка доступа
-Client => Клиент
-Bridge => Мост
-Ad-Hoc => По запросу
-Encryption Settings => Настройки безопасности
-Encryption Type => Тип шифрования
-PSK => Пароль
-WPA Mode => Режим WPA
-WPA Algorithms => Алгоритм WPA
-WEP Keys => WEP ключи
-
-
-# 'Advanced Wireless Configuration' page
-Advanced Wireless Configuration => Расширенная конфигурация беспроводной сети
-WDS Connections => Соединение WDS
-MAC Filter List => Фильтр MAC-адресов
-Filter Mode => режим фильтра
-Allow => Пропустить
-Deny => Отклонить
-Set => Установить
-Settings => Настройки
-Automatic WDS => Автоматический WDS
-
-# "Hosts" page
-
-MAC Address => MAC-адрес
-Configured Hosts => Настроенные узлы
-DHCP Static => Статический DHCP
-Host Names => Имена узлов
-
-
-Up => Вверх
-Down => Вниз
-Edit => Правка
-Delete => Удалить
-Save => Сохранить
-Cancel => Отменить
-
-Forward => Перенаправить
-Accept => Принять
-Drop => Отклонить
-
-Firewall => Сетевой экран
-Firewall Rules => Правила сетевого экрана
-Firewall Configuration => Настройки сетевого экрана
-
-New Rule => Новое правило
-Match => Фильтр
-Target => Цель
-Port => Порт
-
-Protocol => Протокол
-Source IP => IP отправителя
-Destination IP => IP получателя
-Source Ports => Порты отправителя
-Destination Ports => Порты получателя
-
-Forward to => Перенаправить на
-Port => Порт
-
-Helptext ESSID => Имя беспроводной сети
-Helptext DNS save => Нужно сохранить настройки на этой странице перед правкой DNS серверов.
-Helptext Operation mode => Эта настройка задаёт режим работы беспроводной сети. Выбор 'Клиент или Мост' неповлияет на настройки сетевого интерфейса. Будут обновлены только некоторые пар!
;аметры драйвера беспроводной сети, который позволят маршрутизацию пакетов с этого интерфейса.
-Helptext Encryption Type => 'WPA (RADIUS)' поддерживается только в режиме точки доступа<br/> 'WPA (PSK)' не работает в режиме по запросу.
-Helptext IP Settings => Настройки IP могут не задаваться в режимах DHCP и PPTP. Если DHCP сервер будет недоступен, будут использоваться заданные настройки.
-Helptext Idle Time => Промежуток времени в секундах по истечению которого соединение будет разорвано, если данные не передовались по внешнему интерфейсу (используется только в реж!
;име соединения по запросу).
-Helptext Redial Timeout => Задержка в секундах перед попыткой установки повторного соединения с провайдером.
package/webif/files/usr/lib/webif/lang/se/common.txt deleted +0 -223
223 lines not on this page · raw message
package/webif/files/usr/lib/webif/languages.awk deleted +0 -12
Lines of this file are not shown. View the raw message.
package/webif/files/usr/lib/webif/subcategories.awk deleted +0 -12
Lines of this file are not shown. View the raw message.
package/webif/files/usr/lib/webif/validate.awk deleted +0 -151
151 lines not on this page · raw message
package/webif/files/usr/lib/webif/webif.sh deleted +0 -286
286 lines not on this page · raw message
package/webif/files/www/cgi-bin/webif.sh deleted +0 -2
Lines of this file are not shown. View the raw message.
package/webif/files/www/cgi-bin/webif/.categories deleted +0 -2
Lines of this file are not shown. View the raw message.
package/webif/files/www/cgi-bin/webif/about.sh deleted +0 -31
Lines of this file are not shown. View the raw message.
package/webif/files/www/cgi-bin/webif/config.sh deleted +0 -46
46 lines not on this page · raw message
package/webif/files/www/cgi-bin/webif/index.sh deleted +0 -8
Lines of this file are not shown. View the raw message.
package/webif/files/www/cgi-bin/webif/info.sh deleted +0 -44
44 lines not on this page · raw message
package/webif/files/www/cgi-bin/webif/ipkg.sh deleted +0 -2
Lines of this file are not shown. View the raw message.
package/webif/files/www/cgi-bin/webif/status-connection.sh deleted +0 -29
Lines of this file are not shown. View the raw message.
package/webif/files/www/cgi-bin/webif/status-dhcp.sh deleted +0 -38
Lines of this file are not shown. View the raw message.
package/webif/files/www/cgi-bin/webif/status-wireless.sh deleted +0 -12
Lines of this file are not shown. View the raw message.
package/webif/files/www/index.html deleted +0 -16
Lines of this file are not shown. View the raw message.
package/webif/files/www/webif.css deleted +0 -296
296 lines not on this page · raw message
package/webif/files/www/webif.js deleted +0 -33
Lines of this file are not shown. View the raw message.
package/webif/src/bstrip.c deleted +0 -75
75 lines not on this page · raw message
package/webif/src/webif-page.c deleted +0 -289
289 lines not on this page · raw message
package/webif/webif.mk deleted +0 -71
71 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.3.4
Part of the diff is not shown here. View the raw message.
PATCH 2/6 devmem2: remove deprecated
--- package/Config.in | 3 --- package/devmem2/Config.in | 7 ------- package/devmem2/devmem2.mk | 42 ------------------------------------------ 3 files changed, 0 insertions(+), 52 deletions(-) delete mode 100644 package/devmem2/Config.in delete mode 100644 package/devmem2/devmem2.mk
package/Config.in +0 -3
@@ -157,9 +157,6 @@ source "package/cramfs/Config.in" source "package/dbus/Config.in" source "package/dbus-glib/Config.in" source "package/dbus-python/Config.in" -if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS -source "package/devmem2/Config.in" -endif source "package/dmraid/Config.in" source "package/dosfstools/Config.in" source "package/e2fsprogs/Config.in"
package/devmem2/Config.in deleted +0 -7
@@ -1,7 +0,0 @@ -config BR2_PACKAGE_DEVMEM2 - bool "devmem2" - depends on BR2_DEPRECATED - help - Simple program to read/write from/to any location in memory. - - http://free-electrons.com/pub/mirror/devmem2.c
package/devmem2/devmem2.mk deleted +0 -42
42 lines not on this page · raw message
Signature · 1 line
1.7.3.4
PATCH 2/6 devmem2: remove deprecated
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>
Last time we wanted to remove it (~6 months ago) people were complaining, so I prefer to keep it for now.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/6 devmem2: remove deprecated
Quoted 2 lines · Peter Korsgaard
Last time we wanted to remove it (~6 months ago) people were complaining, so I prefer to keep it for now.
Undeprecate it then?
Regards.
PATCH 2/6 devmem2: remove deprecated
just my opinion once again,
the devmem2 implementation in busybox is worthless.
if someone really wants devmem2, they are going to want the one that actually works.
Dave
Quoted 20 lines · Gustavo Zacarias
From: Gustavo Zacarias <[email protected]>
Subject: Re: [Buildroot] [PATCH 2/6] devmem2: remove deprecated
To: "Peter Korsgaard" <[email protected]>
Cc: buildroot at busybox.net
Date: Tuesday, November 8, 2011, 6:07 PMQuoted 1 line · Peter Korsgaard
Last time we wanted to remove it (~6 months ago)
people were
Quoted 1 line
complaining, so I prefer to keep it for now.
Undeprecate it then?
Regards._______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH 2/6 devmem2: remove deprecated
Quoted 9 lines · David Anders
just my opinion once again,
the devmem2 implementation in busybox is worthless.
if someone really wants devmem2, they are going to want the one that actually works.
Dave
I've missed all the past discussion about it, just went looking for BR2_DEPRECATED packages that should be gone.
Just sent a patch to remove the deprecated tag and convert the package to modern standards.
Should be enough to keep it around.
Regards.
PATCH 2/6 devmem2: remove deprecated
thanks!
Quoted 29 lines · Gustavo Zacarias
From: Gustavo Zacarias <[email protected]>
Subject: Re: [Buildroot] [PATCH 2/6] devmem2: remove deprecated
To: "David Anders" <[email protected]>
Cc: "Peter Korsgaard" <[email protected]>, buildroot at busybox.net
Date: Tuesday, November 8, 2011, 8:08 PMQuoted 6 lines · David Anders
just my opinion once again,
the devmem2 implementation in busybox is worthless.
if someone really wants devmem2, they are going to
want the one that
Quoted 3 lines
actually works.
Dave
I've missed all the past discussion about it, just went looking for
BR2_DEPRECATEDpackages that should be gone.
Just sent a patch to remove the deprecated tag and convert the package
to modern standards.
Should be enough to keep it around.
Regards.
PATCH 3/6 sfdisk: remove deprecated
In reply to Gustavo Zacarias--- package/Config.in | 4 -- package/sfdisk/Config.in | 5 -- .../sfdisk/sfdisk.001.include_sys_syscalls_h.patch | 12 ----- package/sfdisk/sfdisk.005.no-llseek-fix.patch | 21 -------- package/sfdisk/sfdisk.010.index-rindex-fix-2.patch | 45 ------------------ package/sfdisk/sfdisk.mk | 49 -------------------- 6 files changed, 0 insertions(+), 136 deletions(-) delete mode 100644 package/sfdisk/Config.in delete mode 100644 package/sfdisk/sfdisk.001.include_sys_syscalls_h.patch delete mode 100644 package/sfdisk/sfdisk.005.no-llseek-fix.patch delete mode 100644 package/sfdisk/sfdisk.010.index-rindex-fix-2.patch delete mode 100644 package/sfdisk/sfdisk.mk
package/Config.in +0 -4
@@ -195,10 +195,6 @@ source "package/picocom/Config.in" source "package/rng-tools/Config.in" source "package/sdparm/Config.in" source "package/setserial/Config.in" -if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS -# busybox has fdisk -source "package/sfdisk/Config.in" -endif source "package/smartmontools/Config.in" source "package/squashfs/Config.in" source "package/squashfs3/Config.in"
package/sfdisk/Config.in deleted +0 -5
@@ -1,5 +0,0 @@ -config BR2_PACKAGE_SFDISK - bool "sfdisk" - depends on BR2_DEPRECATED - help - Partition table manipulator for Linux.
package/sfdisk/sfdisk.001.include_sys_syscalls_h.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- sfdisk/sfdisk.c.oorig 2006-10-09 16:24:06.000000000 +0200 -+++ sfdisk/sfdisk.c 2006-10-09 16:24:20.000000000 +0200 -@@ -47,6 +47,9 @@ - #include <sys/stat.h> - #include <sys/utsname.h> - #ifdef __linux__ -+#define _LIBC -+#include <sys/syscall.h> -+#undef _LIBC - #include <linux/unistd.h> /* _syscall */ - #endif - #include "nls.h"
package/sfdisk/sfdisk.005.no-llseek-fix.patch deleted +0 -21
@@ -1,21 +0,0 @@ -diff -ur sfdisk_vanilla/sfdisk.c sfdisk_llseek-fix/sfdisk.c ---- sfdisk_vanilla/sfdisk.c 2004-01-13 13:03:11.000000000 +0000 -+++ sfdisk_llseek-fix/sfdisk.c 2008-04-17 08:42:35.000000000 +0000 -@@ -134,9 +137,17 @@ - * Note: we use 512-byte sectors here, irrespective of the hardware ss. - */ - #if defined(__linux__) && !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) && !defined (__s390x__) -+#if defined(_llseek) - static - _syscall5(int, _llseek, unsigned int, fd, ulong, hi, ulong, lo, - loff_t *, res, unsigned int, wh); -+#else -+static int _llseek (unsigned int fd, unsigned long oh, -+ unsigned long ol, long long *result, -+ unsigned int origin) { -+ return syscall (__NR__llseek, fd, oh, ol, result, origin); -+#endif -+} - #endif - - static int
package/sfdisk/sfdisk.010.index-rindex-fix-2.patch deleted +0 -45
45 lines not on this page · raw message
package/sfdisk/sfdisk.mk deleted +0 -49
49 lines not on this page · raw message
Signature · 1 line
1.7.3.4
PATCH 3/6 sfdisk: remove deprecated
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 4/6 swfdec: remove deprecated
In reply to Gustavo Zacarias--- package/multimedia/Config.in | 1 - package/multimedia/swfdec/Config.in | 36 ---------------------------------- package/multimedia/swfdec/swfdec.mk | 37 ----------------------------------- 3 files changed, 0 insertions(+), 74 deletions(-) delete mode 100644 package/multimedia/swfdec/Config.in delete mode 100644 package/multimedia/swfdec/swfdec.mk
package/multimedia/Config.in +0 -1
@@ -41,7 +41,6 @@ source "package/multimedia/musepack/Config.in" source "package/multimedia/portaudio/Config.in" source "package/multimedia/python-mad/Config.in" source "package/multimedia/speex/Config.in" -source "package/multimedia/swfdec/Config.in" source "package/multimedia/tidsp-binaries/Config.in" source "package/multimedia/taglib/Config.in" source "package/multimedia/tremor/Config.in"
package/multimedia/swfdec/Config.in deleted +0 -36
@@ -1,36 +0,0 @@ -config BR2_PACKAGE_SWFDEC - bool "swfdec" - depends on BR2_DEPRECATED - depends on BR2_USE_WCHAR # glib2 - depends on BR2_INSTALL_LIBSTDCPP # pango - select BR2_PACKAGE_LIBOIL - select BR2_PACKAGE_ALSA_LIB - select BR2_PACKAGE_PANGO - select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PNG - help - Library to play Flash files - - http://swfdec.freedesktop.org/ - -config BR2_PACKAGE_SWFDEC_GTK_SUPPORT - bool "gtk support" - depends on BR2_PACKAGE_SWFDEC - depends on BR2_PACKAGE_LIBGTK2 - select BR2_PACKAGE_LIBSOUP - default y - help - Swfdec-gtk library is used for easy integration - of swfdec in GTK applications - -config BR2_PACKAGE_SWFDEC_GSTREAMER - bool "gstreamer support" - depends on BR2_PACKAGE_SWFDEC - depends on BR2_PACKAGE_GSTREAMER - select BR2_PACKAGE_GST_PLUGINS_BASE - default y - help - Enables GStreamer support - -comment "swfdec requires a toolchain with WCHAR and C++ support" - depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP
package/multimedia/swfdec/swfdec.mk deleted +0 -37
@@ -1,37 +0,0 @@ -############################################################# -# -# Swfdec -# -############################################################# -SWFDEC_VERSION_MAJOR = 0.8 -SWFDEC_VERSION_MINOR = 4 -SWFDEC_VERSION = $(SWFDEC_VERSION_MAJOR).$(SWFDEC_VERSION_MINOR) -SWFDEC_SOURCE = swfdec-$(SWFDEC_VERSION).tar.gz -SWFDEC_SITE = http://swfdec.freedesktop.org/download/swfdec/$(SWFDEC_VERSION_MAJOR) -SWFDEC_MAKE_OPT = \ - GLIB_MKENUMS=$(HOST_DIR)/usr/bin/glib-mkenums \ - GLIB_GENMARSHAL=$(HOST_DIR)/usr/bin/glib-genmarshal - -SWFDEC_INSTALL_STAGING = YES -SWFDEC_INSTALL_TARGET = YES - -SWFDEC_DEPENDENCIES = liboil alsa-lib pango cairo host-pkg-config - -ifeq ($(BR2_PACKAGE_SWFDEC_GSTREAMER),y) -SWFDEC_DEPENDENCIES += gstreamer gst-plugins-base -else -SWFDEC_CONF_OPT += --disable-gstreamer -endif - -ifeq ($(BR2_PACKAGE_SWFDEC_GTK_SUPPORT),y) -SWFDEC_DEPENDENCIES += libgtk2 libsoup -else -SWFDEC_CONF_OPT += --disable-gtk -endif - -$(eval $(call AUTOTARGETS)) - -# swfdec uses glib-* at install time -# Notice: must come after AUTOTARGETS as that's where these variables gets set -SWFDEC_INSTALL_TARGET_OPT += $(SWFDEC_MAKE_OPT) -SWFDEC_INSTALL_STAGING_OPT += $(SWFDEC_MAKE_OPT)
Signature · 1 line
1.7.3.4
PATCH 4/6 swfdec: remove deprecated
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 5/6 liboil: remove deprecated
In reply to Gustavo Zacarias--- package/Config.in | 1 - package/liboil/Config.in | 7 --- package/liboil/liboil-0.3.15-arm-vfp.patch | 16 -------- ...boil-0.3.15-fixes-arm-softfloat-build.patch.arm | 39 ------------------- package/liboil/liboil-0.3.15-no-examples.patch | 34 ---------------- package/liboil/liboil.mk | 41 -------------------- 6 files changed, 0 insertions(+), 138 deletions(-) delete mode 100644 package/liboil/Config.in delete mode 100644 package/liboil/liboil-0.3.15-arm-vfp.patch delete mode 100644 package/liboil/liboil-0.3.15-fixes-arm-softfloat-build.patch.arm delete mode 100644 package/liboil/liboil-0.3.15-no-examples.patch delete mode 100644 package/liboil/liboil.mk
package/Config.in +0 -1
@@ -347,7 +347,6 @@ source "package/libev/Config.in" source "package/libffi/Config.in" source "package/libglib2/Config.in" source "package/libnspr/Config.in" -source "package/liboil/Config.in" source "package/libsigc/Config.in" source "package/orc/Config.in" source "package/poco/Config.in"
package/liboil/Config.in deleted +0 -7
@@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBOIL - bool "liboil" - depends on BR2_DEPRECATED - help - Library of simple functions that are optimized for various CPUs. - - http://liboil.freedesktop.org/
package/liboil/liboil-0.3.15-arm-vfp.patch deleted +0 -16
@@ -1,16 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 06a0ac9..b8d1640 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -158,7 +158,10 @@ if test x$HAVE_GCC_ASM = xyes -a x$HAVE_POWERPC = xyes ; then - true) - fi - --if test x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes ; then -+AC_ARG_ENABLE(vfp, -+ AC_HELP_STRING([--enable-vfp],[compile with Vector Floating-point unit support]), -+ enable_vfp=$enableval,enable_vfp=yes) -+if test "x$enable-vfp" = xyes -a x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes; then - AS_COMPILER_FLAG(["-Wa,-mfpu=vfp"], - [LIBOIL_CFLAGS="$LIBOIL_CFLAGS -mfpu=vfp"], - true)
package/liboil/liboil-0.3.15-fixes-arm-softfloat-build.patch.arm deleted +0 -39
@@ -1,39 +0,0 @@ -Patch generated from: -http://cgit.freedesktop.org/liboil/commit/?id=227782d45d14ca0d68ee73b54eab71c1582dcbfa - -From 227782d45d14ca0d68ee73b54eab71c1582dcbfa Mon Sep 17 00:00:00 2001 -From: Adrian Bunk <[email protected]> -Date: Wed, 09 Sep 2009 13:31:40 +0000 -Subject: fix ARM -mfloat-abi=soft builds - -If __SOFTFP__ is defined, VFP support is not available -even when __VFP_FP__ is defined. ---- -diff --git a/liboil/arm/math_vfp.c b/liboil/arm/math_vfp.c -index ffd3981..0bed96e 100644 ---- a/liboil/arm/math_vfp.c -+++ b/liboil/arm/math_vfp.c -@@ -30,7 +30,7 @@ - #include <liboil/liboilclasses.h> - #include <liboil/liboilfunction.h> - --#if __VFP_FP__ -+#if defined(__VFP_FP__) && !defined(__SOFTFP__) - - extern void vfp_add_f32 (float *d, const float *s1, const float *s2, int n); - extern void vfp_add_f64 (double *d, const double *s1, const double *s2, int n); -diff --git a/liboil/arm/math_vfp_asm.S b/liboil/arm/math_vfp_asm.S -index ea68dba..ae5c803 100644 ---- a/liboil/arm/math_vfp_asm.S -+++ b/liboil/arm/math_vfp_asm.S -@@ -24,7 +24,7 @@ - * SUCH DAMAGE. - */ - --#if __VFP_FP__ -+#if defined(__VFP_FP__) && !defined(__SOFTFP__) - /* - ** compile with -mcpu=arm1136j-s -mfpu=vfp -mfloat-abi=softfp - ** --- -cgit v0.8.3-6-g21f6
package/liboil/liboil-0.3.15-no-examples.patch deleted +0 -34
@@ -1,34 +0,0 @@ -[patch] liboil: don't build examples - -Signed-off-by: Peter Korsgaard <[email protected]> ---- - Makefile.am | 2 +- - Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -Index: liboil-0.3.15/Makefile.am -=================================================================== ---- liboil-0.3.15.orig/Makefile.am -+++ liboil-0.3.15/Makefile.am -@@ -1,7 +1,7 @@ - - AUTOMAKE_OPTIONS = foreign - --SUBDIRS = liboil testsuite examples doc -+SUBDIRS = liboil testsuite doc - - EXTRA_DIST = COPYING autogen.sh gtk-doc.make HACKING BUG-REPORTING - -Index: liboil-0.3.15/Makefile.in -=================================================================== ---- liboil-0.3.15.orig/Makefile.in -+++ liboil-0.3.15/Makefile.in -@@ -259,7 +259,7 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - AUTOMAKE_OPTIONS = foreign --SUBDIRS = liboil testsuite examples doc -+SUBDIRS = liboil testsuite doc - EXTRA_DIST = COPYING autogen.sh gtk-doc.make HACKING BUG-REPORTING - DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc - pkgconfig_DATA = liboil-$(LIBOIL_MAJORMINOR).pc
package/liboil/liboil.mk deleted +0 -41
41 lines not on this page · raw message
Signature · 1 line
1.7.3.4
PATCH 5/6 liboil: remove deprecated
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 6/6 lzma: remove deprecated
In reply to Gustavo Zacarias--- package/Config.in | 1 - package/lzma/Config.in | 12 ------------ package/lzma/lzma.mk | 16 ---------------- package/lzma/lzmacheck.sh | 9 --------- 4 files changed, 0 insertions(+), 38 deletions(-) delete mode 100644 package/lzma/Config.in delete mode 100644 package/lzma/lzma.mk delete mode 100755 package/lzma/lzmacheck.sh
package/Config.in +0 -1
@@ -12,7 +12,6 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/gzip/Config.in" endif source "package/lzop/Config.in" -source "package/lzma/Config.in" source "package/xz/Config.in" endmenu
package/lzma/Config.in deleted +0 -12
@@ -1,12 +0,0 @@ -config BR2_PACKAGE_LZMA - bool "lzma" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_DEPRECATED - help - Lempel Ziv compression method (LZMA) is a compression - algorithm with high compression ratio. - - http://tukaani.org/lzma/ - -comment "lzma requires a toolchain with C++ support" - depends on !BR2_INSTALL_LIBSTDCPP && BR2_DEPRECATED
package/lzma/lzma.mk deleted +0 -16
@@ -1,16 +0,0 @@ -############################################################# -# -# lzma -# -############################################################# -LZMA_VERSION:=4.32.7 -LZMA_SOURCE:=lzma-$(LZMA_VERSION).tar.gz -LZMA_SITE:=http://tukaani.org/lzma/ -LZMA_INSTALL_STAGING = YES -LZMA_INSTALL_TARGET = YES -LZMA_CONF_OPT = $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug) - -$(eval $(call AUTOTARGETS)) -$(eval $(call AUTOTARGETS,host)) - -LZMA=$(HOST_DIR)/usr/bin/lzma
package/lzma/lzmacheck.sh deleted +0 -9
@@ -1,9 +0,0 @@ -#!/bin/sh - -bin=$(toolchain/dependencies/check-host-lzma.sh) -if [ "x$bin" = "x" ] ; then - echo build-lzma-host-binary -else - echo use-lzma-host-binary -fi -
Signature · 1 line
1.7.3.4
PATCH 6/6 lzma: remove deprecated
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>
Gustavo> ---
Gustavo> package/Config.in | 1 - Gustavo> package/lzma/Config.in | 12 ------------ Gustavo> package/lzma/lzma.mk | 16 ---------------- Gustavo> package/lzma/lzmacheck.sh | 9 ---------
It still seems to be used by fs/ and linux/ and dependencies check.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 6/6 lzma: remove deprecated
Quoted 11 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:
?Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>
?Gustavo> ---
?Gustavo> ?package/Config.in ? ? ? ? | ? ?1 - ?Gustavo> ?package/lzma/Config.in ? ?| ? 12 ------------ ?Gustavo> ?package/lzma/lzma.mk ? ? ?| ? 16 ---------------- ?Gustavo> ?package/lzma/lzmacheck.sh | ? ?9 ---------It still seems to be used by
fs/and linux/ and dependencies check.
Which dependencies check do you mean?
It's true that there is a toolchain/dependencies/check-host-lzma.sh file, but it isn't used anywhere, together with package/lzma/lzmacheck.sh. I have a pending patch to remove both files, together with some other dependency stuff, but I'm waiting for 2011.11-rc1 to not pollute the list too much.
~Thomas
PATCH 6/6 lzma: remove deprecated
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas De Schampheleire <[email protected]> writes:
Hi,
Quoted 1 line
Quoted 1 line
It still seems to be used by
fs/and linux/ and dependencies check.
Thomas> Which dependencies check do you mean?
I didn't really check the dependencies stuff, but the fs / linux stuff looks real. I would prefer a lzma removal patch to clean it all up.
Thomas> It's true that there is a toolchain/dependencies/check-host-lzma.sh Thomas> file, but it isn't used anywhere, together with
Thomas> package/lzma/lzmacheck.sh. I have a pending patch to remove both Thomas> files, together with some other dependency stuff, but I'm waiting for Thomas> 2011.11-rc1 to not pollute the list too much.
Ok, sounds good.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/6 webif: remove deprecated
In reply to Gustavo ZacariasQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard