From f5e90df8ddeb252d1f127684d16df3aa2446161f Mon Sep 17 00:00:00 2001 From: ashmew2 Date: Mon, 9 Oct 2017 21:14:26 +0000 Subject: [PATCH] Add Netsurf installer to .img git-svn-id: svn://kolibrios.org@7058 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 1 + programs/network/netsurf/Tupfile.lua | 2 ++ programs/network/netsurf/{installer.asm => nsinstall.asm} | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 programs/network/netsurf/Tupfile.lua rename programs/network/netsurf/{installer.asm => nsinstall.asm} (96%) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index a2e4c06da4..1f97302e9a 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -456,6 +456,7 @@ tup.append_table(img_files, { {"NETWORK/PING", PROGS .. "/network/ping/ping"}, {"NETWORK/NETCFG", PROGS .. "/network/netcfg/netcfg"}, {"NETWORK/NETSTAT", PROGS .. "/network/netstat/netstat"}, + {"NETWORK/NSINSTALL", PROGS .. "/network/netsurf/nsinstall"}, {"NETWORK/NSLOOKUP", PROGS .. "/network/nslookup/nslookup"}, {"NETWORK/PASTA", PROGS .. "/network/pasta/pasta"}, {"NETWORK/SYNERGYC", PROGS .. "/network/synergyc/synergyc"}, diff --git a/programs/network/netsurf/Tupfile.lua b/programs/network/netsurf/Tupfile.lua new file mode 100644 index 0000000000..e1e0a533dc --- /dev/null +++ b/programs/network/netsurf/Tupfile.lua @@ -0,0 +1,2 @@ +if tup.getconfig("NO_FASM") ~= "" then return end +tup.rule("nsinstall.asm", "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "nsinstall") diff --git a/programs/network/netsurf/installer.asm b/programs/network/netsurf/nsinstall.asm similarity index 96% rename from programs/network/netsurf/installer.asm rename to programs/network/netsurf/nsinstall.asm index 71cfff76ed..995b4e4692 100644 --- a/programs/network/netsurf/installer.asm +++ b/programs/network/netsurf/nsinstall.asm @@ -262,7 +262,8 @@ dirname_res_icons db '/tmp0/1/res/icons', 0 url db 'www.ashmew2.me/',0 -filelist db 'nskolibrios', 0 +filelist db 'netsurf-kolibrios', 0 + db 'netsurf-kolibrios.map', 0 db 'res/adblock.css', 0 db 'res/quirks.css', 0 db 'res/Messages', 0