Josef Söntgen
Christian Helmuth
parent
8845ca52c9
commit
8ca4f7a794
|
|
@ -1 +1 @@
|
|||
9e6fc7d6fa8d1f620a724c97bbc57c14c8f34af4
|
||||
9babc789cd90ed4d3d2ea1025daec34bb0f29da6
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
LICENSE := GPLv2
|
||||
VERSION := 2.8.8dev.12
|
||||
VERSION := 2.8.8rel.2
|
||||
DOWNLOADS := lynx.archive
|
||||
|
||||
URL(lynx) := ftp://invisible-island.net/lynx/tarballs/lynx$(VERSION).tar.gz
|
||||
SHA(lynx) := d9cb802a7acf480c75059da8d7bfb1f101183125
|
||||
SHA(lynx) := 670587ec5265869604baf10e1d640f748a3d94f2
|
||||
SIG(lynx) := ${URL(lynx)}.asc
|
||||
DIR(lynx) := src/noux-pkg/lynx
|
||||
|
||||
PATCHES := src/noux-pkg/lynx/build.patch
|
||||
|
|
|
|||
|
|
@ -1,197 +0,0 @@
|
|||
if {![have_spec x86]} {
|
||||
puts "\nThis runscript is supported on the x86 architecture only\n"
|
||||
exit 0
|
||||
}
|
||||
|
||||
#
|
||||
# Uncomment the following line when working on the VIM source code. Otherwise,
|
||||
# the package may get recompiled, yet it does not get reinstalled into 'bin/'.
|
||||
#
|
||||
#exec rm -rf noux-pkg/bash bin/bash
|
||||
|
||||
set build_components {
|
||||
core init drivers/timer
|
||||
noux/net lib/libc_noux
|
||||
drivers/framebuffer drivers/input
|
||||
drivers/nic
|
||||
drivers/timer
|
||||
server/terminal server/ram_fs
|
||||
test/libports/ncurses
|
||||
test/libports/readline
|
||||
test/libports/zlib
|
||||
}
|
||||
|
||||
#
|
||||
# Build Noux packages only once
|
||||
#
|
||||
set noux_pkgs "bash coreutils lynx noux-etc"
|
||||
|
||||
foreach pkg $noux_pkgs {
|
||||
lappend_if [expr ![file exists bin/$pkg]] build_components noux-pkg/$pkg }
|
||||
|
||||
source ${genode_dir}/repos/base/run/platform_drv.inc
|
||||
append_platform_drv_build_components
|
||||
|
||||
build $build_components
|
||||
|
||||
# strip all binaries prior archiving
|
||||
set find_args ""
|
||||
foreach pkg $noux_pkgs { append find_args " bin/$pkg/" }
|
||||
exec sh -c "find $find_args -type f | (xargs [cross_dev_prefix]strip || true) 2>/dev/null"
|
||||
|
||||
# add bash as sh
|
||||
exec cp bin/bash/bin/bash bin/bash/bin/sh
|
||||
|
||||
foreach pkg $noux_pkgs {
|
||||
exec tar cfv bin/$pkg.tar -h -C bin/$pkg . }
|
||||
|
||||
create_boot_directory
|
||||
|
||||
append config {
|
||||
<config verbose="yes">
|
||||
<parent-provides>
|
||||
<service name="ROM"/>
|
||||
<service name="LOG"/>
|
||||
<service name="CAP"/>
|
||||
<service name="RAM"/>
|
||||
<service name="RM"/>
|
||||
<service name="CPU"/>
|
||||
<service name="PD"/>
|
||||
<service name="IRQ"/>
|
||||
<service name="IO_PORT"/>
|
||||
<service name="IO_MEM"/>
|
||||
<service name="SIGNAL"/>
|
||||
</parent-provides>
|
||||
<default-route>
|
||||
<any-service> <parent/> <any-child/> </any-service>
|
||||
</default-route>
|
||||
<start name="timer">
|
||||
<resource name="RAM" quantum="1M"/>
|
||||
<provides><service name="Timer"/></provides>
|
||||
</start> }
|
||||
|
||||
append_if [have_spec sdl] config {
|
||||
<start name="fb_sdl">
|
||||
<resource name="RAM" quantum="4M"/>
|
||||
<provides>
|
||||
<service name="Input"/>
|
||||
<service name="Framebuffer"/>
|
||||
</provides>
|
||||
</start>}
|
||||
|
||||
append_platform_drv_config
|
||||
|
||||
append_if [have_spec framebuffer] config {
|
||||
<start name="fb_drv">
|
||||
<resource name="RAM" quantum="4M"/>
|
||||
<provides><service name="Framebuffer"/></provides>
|
||||
</start>}
|
||||
|
||||
append_if [have_spec ps2] config {
|
||||
<start name="ps2_drv">
|
||||
<resource name="RAM" quantum="1M"/>
|
||||
<provides><service name="Input"/></provides>
|
||||
</start> }
|
||||
|
||||
append config {
|
||||
<start name="terminal">
|
||||
<resource name="RAM" quantum="2M"/>
|
||||
<provides><service name="Terminal"/></provides>
|
||||
<config>
|
||||
<keyboard layout="us"/>
|
||||
</config>
|
||||
</start>
|
||||
<start name="nic_drv">
|
||||
<resource name="RAM" quantum="4M"/>
|
||||
<provides> <service name="Nic"/> </provides>
|
||||
</start>
|
||||
<start name="ram_fs">
|
||||
<resource name="RAM" quantum="10M"/>
|
||||
<provides><service name="File_system"/></provides>
|
||||
<config>
|
||||
<content>
|
||||
<dir name="tmp">
|
||||
</dir>
|
||||
<dir name="home">
|
||||
</dir>
|
||||
</content>
|
||||
<policy label="noux -> root" root="/" />
|
||||
<policy label="noux -> home" root="/home" writeable="yes" />
|
||||
<policy label="noux -> tmp" root="/tmp" writeable="yes" />
|
||||
</config>
|
||||
</start>
|
||||
<start name="noux">
|
||||
<binary name="noux_net" />
|
||||
<resource name="RAM" quantum="1G" />
|
||||
<config>
|
||||
<user name="lynx_user" uid="3" gid="3">
|
||||
<shell name="/bin/bash" />
|
||||
<home name="/home" />
|
||||
</user>
|
||||
<fstab>
|
||||
}
|
||||
|
||||
foreach pkg $noux_pkgs {
|
||||
append config " <tar name=\"$pkg.tar\" />" }
|
||||
|
||||
append config {
|
||||
<dir name="home">
|
||||
<fs label="home" />
|
||||
</dir>
|
||||
<dir name="ram"> <fs label="root" /> </dir>
|
||||
<dir name="tmp"> <fs label="tmp" /> </dir>
|
||||
|
||||
<dir name="dev">
|
||||
<null />
|
||||
<zero />
|
||||
</dir>
|
||||
|
||||
</fstab>
|
||||
<start name="/bin/bash">
|
||||
<env name="TERM" value="linux" />
|
||||
</start>
|
||||
</config>
|
||||
</start>
|
||||
</config>
|
||||
}
|
||||
|
||||
install_config $config
|
||||
|
||||
|
||||
#
|
||||
# Boot modules
|
||||
#
|
||||
|
||||
# generic modules
|
||||
set boot_modules {
|
||||
core init timer ld.lib.so noux_net nic_drv terminal ram_fs
|
||||
libc.lib.so libm.lib.so libc_noux.lib.so libc_resolv.lib.so
|
||||
lwip.lib.so ncurses.lib.so
|
||||
readline.lib.so zlib.lib.so libcrypto.lib.so libssl.lib.so
|
||||
}
|
||||
|
||||
foreach pkg $noux_pkgs {
|
||||
lappend boot_modules "$pkg.tar" }
|
||||
|
||||
# platform-specific modules
|
||||
lappend_if [have_spec linux] boot_modules fb_sdl
|
||||
lappend_if [have_spec framebuffer] boot_modules fb_drv
|
||||
lappend_if [have_spec ps2] boot_modules ps2_drv
|
||||
|
||||
append_platform_drv_boot_modules
|
||||
|
||||
build_boot_image $boot_modules
|
||||
|
||||
if {[have_spec x86_64]} {
|
||||
# bash.tar is really huge when built for x86_64
|
||||
append qemu_args " -m 320 "
|
||||
}
|
||||
|
||||
append_if [have_spec x86] qemu_args " -net nic,model=e1000"
|
||||
append_if [have_spec lan9118] qemu_args " -net nic,model=lan9118 "
|
||||
|
||||
append qemu_args " -net user "
|
||||
|
||||
run_genode_until forever
|
||||
|
||||
#exec rm bin/bash.tar
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
+++ src/noux-pkg/lynx/src/makefile.in
|
||||
@@ -102,7 +102,7 @@
|
||||
|
||||
lynx$x: message do_chartrans_stuff $(top_builddir)/LYHelp.h $(OBJS) $(WWWLIB)
|
||||
@echo "Linking and creating Lynx executable"
|
||||
- $(CC) $(CC_OPTS) $(LDFLAGS) -o $@ $(OBJS) $(WWWLIB) $(LDFLAGS) $(LIBS) $(INTLLIB)
|
||||
+ $(CC) $(CC_OPTS) $(LDFLAGS) -o $@ $(OBJS) $(WWWLIB) $(LIBS) $(INTLLIB)
|
||||
@echo "Copying Lynx executable into top-level directory"
|
||||
rm -f $(top_builddir)/$@
|
||||
cp $@ $(top_builddir)/
|
||||
|
|
@ -6,6 +6,12 @@ NOUX_CONFIGURE_ARGS = --with-ssl \
|
|||
--with-cfg-file=/etc/lynx.cfg \
|
||||
--with-lss-file=/etc/lynx.lss
|
||||
|
||||
#
|
||||
# Rather than dealing with autoconf force usage of <openssl/xxx.h>
|
||||
# by defining it explicitly
|
||||
#
|
||||
NOUX_CFLAGS += -DUSE_OPENSSL_INCL
|
||||
|
||||
#
|
||||
# Needed for <sys/types.h>
|
||||
#
|
||||
|
|
@ -16,7 +22,7 @@ LIBS += ncurses zlib libssl libcrypto libc_resolv
|
|||
#
|
||||
# Make the zlib linking test succeed
|
||||
#
|
||||
Makefile: dummy_libs
|
||||
Makefile: dummy_libs
|
||||
|
||||
NOUX_LDFLAGS += -L$(PWD)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue