From 3dadba355638b8cb8ab36aab5bdd6fb1b78e969d Mon Sep 17 00:00:00 2001 From: hummypkg Date: Sun, 20 Nov 2016 15:27:57 +0000 Subject: [PATCH] add support for beta testing git-svn-id: file:///root/webif/svn/pkg/webif/trunk@3352 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 2 +- webif/html/pkg/pkg.jim | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CONTROL/control b/CONTROL/control index d3b426e1..63a3008f 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 1.3.2-17 +Version: 1.3.2-18 Architecture: mipsel Maintainer: af123@hpkg.tv Depends: tcpfix,webif-channelicons(>=1.1.24),lighttpd(>=1.4.39-1),jim(>=0.76-2),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.3),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.3),hmt(>=2.0.10),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.1.9),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl,nugget(>=0.95) diff --git a/webif/html/pkg/pkg.jim b/webif/html/pkg/pkg.jim index b176a949..af0cca3a 100755 --- a/webif/html/pkg/pkg.jim +++ b/webif/html/pkg/pkg.jim @@ -79,6 +79,9 @@ proc pkgrow {name pkg} { } set pkgdata [pkg getall] +if {[file exists /mod/var/opkg/beta]} { + set pkgdata [dict merge $pkgdata [pkg getall beta]] +} pkg loadmeta set type [cgi_get type "avail"]