r2020 - in trunk
dslinux_gpf at dslinux.in-berlin.de
dslinux_gpf at dslinux.in-berlin.de
Mon Oct 22 23:59:44 CEST 2007
Author: gpf
Date: 2007-10-22 23:59:38 +0200 (Mon, 22 Oct 2007)
New Revision: 2020
Log:
hnb for DSLinux, Patch contributed by skibur
Modified: trunk/config/Configure.help
===================================================================
--- trunk/config/Configure.help 2007-10-22 20:27:28 UTC (rev 2019)
+++ trunk/config/Configure.help 2007-10-22 21:59:38 UTC (rev 2020)
@@ -500,6 +500,12 @@
CONFIG_USER_LCALC_LCALC
A simple, 4 function calculator
+CONFIG_USER_HNB
+ A hierarchical notebook(hnb) is a curses program to structure
+ many kinds of data in one place, for example addresses, to-do lists,
+ ideas, book reviews or to store snippets of brainstorming. Writing
+ structured documents and speech outlines.
+
CONFIG_USER_ROUTE_IFCONFIG
Required to configure network interfaces.
Approx. binary size: 28k
Modified: trunk/config/config.in
===================================================================
--- trunk/config/config.in 2007-10-22 20:27:28 UTC (rev 2019)
+++ trunk/config/config.in 2007-10-22 21:59:38 UTC (rev 2020)
@@ -799,6 +799,7 @@
bool 'grep' CONFIG_USER_GREP_GREP
bool 'hd' CONFIG_USER_HD_HD
bool 'hexedit' CONFIG_USER_HEXEDIT_HEXEDIT
+bool 'hnb' CONFIG_USER_HNB
bool 'lcalc' CONFIG_USER_LCALC_LCALC
bool 'lcd' CONFIG_USER_LCD_LCD
bool 'ledcon' CONFIG_USER_LEDCON_LEDCON
Modified: trunk/user/Makefile
===================================================================
--- trunk/user/Makefile 2007-10-22 20:27:28 UTC (rev 2019)
+++ trunk/user/Makefile 2007-10-22 21:59:38 UTC (rev 2020)
@@ -152,6 +152,7 @@
dir_$(CONFIG_USER_HD_HD) += hd
dir_$(CONFIG_USER_HOSTAP_HOSTAP) += hostap
dir_$(CONFIG_USER_HEXEDIT_HEXEDIT) += hexedit
+dir_$(CONFIG_USER_HNB) += hnb
dir_$(CONFIG_USER_HOSTAP_HOSTAP) += hostap/utils
dir_$(CONFIG_USER_HOSTAP_HOSTAPD) += hostap/hostapd
dir_$(CONFIG_USER_HTTPD_HTTPD) += httpd
Copied: trunk/user/hnb (from rev 2019, tags/hnb/hnb-1.9.17)
Modified: trunk/user/hnb/Makefile
===================================================================
--- tags/hnb/hnb-1.9.17/Makefile 2007-10-22 20:27:28 UTC (rev 2019)
+++ trunk/user/hnb/Makefile 2007-10-22 21:59:38 UTC (rev 2020)
@@ -1,9 +1,9 @@
src/hnb: src/*.c src/*.h src/*.inc src/hnbrc.inc
(cd src;make)
-install: src/hnb
- install -D src/hnb /usr/local/bin/hnb
- install -D -m444 doc/hnb.1 /usr/local/man/man1/hnb.1
+#install: src/hnb
+# install -D src/hnb /usr/local/bin/hnb
+# install -D -m444 doc/hnb.1 /usr/local/man/man1/hnb.1
clean:
(cd src;make clean)
(cd util;make clean)
@@ -18,3 +18,6 @@
cat doc/hnbrc | util/asc2c >> src/hnbrc.inc
echo "\"">>src/hnbrc.inc
+
+romfs:
+ $(ROMFSINST) src/hnb /bin/hnb
\ No newline at end of file
Modified: trunk/user/hnb/src/Makefile
===================================================================
--- tags/hnb/hnb-1.9.17/src/Makefile 2007-10-22 20:27:28 UTC (rev 2019)
+++ trunk/user/hnb/src/Makefile 2007-10-22 21:59:38 UTC (rev 2020)
@@ -1,5 +1,5 @@
-LIBS=-lncurses libcli/libcli.a
-CFLAGS=-I.. -Ilibcli -DHAVE_CONFIG_H -Wall -pedantic -g
+LIBS+=-L$(ROOTDIR)/lib/libncurses/lib -lncurses libcli/libcli.a
+CFLAGS+=-I.. -I$(ROOTDIR)/lib/libncurses/include -Ilibcli -DHAVE_CONFIG_H -Wall -pedantic -g
CFILES=$(wildcard *.c)
OBJS=$(patsubst %.c,%.o,$(CFILES))
@@ -8,7 +8,7 @@
$(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
hnb: libcli/libcli.a Makefile $(OBJS) init_subsystems.c *.h *.inc
- $(CC) -o hnb $(OBJS) $(LIBS) $(CFLAGS)
+ $(CC) -o hnb $(LDFLAGS) $(OBJS) $(LIBS) $(CFLAGS)
# strip hnb
libcli/libcli.a: libcli/*.c
(cd libcli;make libcli.a)
Modified: trunk/user/hnb/src/libcli/Makefile
===================================================================
--- tags/hnb/hnb-1.9.17/src/libcli/Makefile 2007-10-22 20:27:28 UTC (rev 2019)
+++ trunk/user/hnb/src/libcli/Makefile 2007-10-22 21:59:38 UTC (rev 2020)
@@ -1,13 +1,13 @@
-CFLAGS = -Wall
+CFLAGS += -Wall
OBJS = cli.o cli_history.o cli_tokenize.o
-all: libcli.a libcli.so test-static test-shared
+all: libcli.a #libcli.so test-static test-shared
clean:
rm -f *.o *.a *.so test-s* *~
libcli.a: $(OBJS)
- ar rc libcli.a cli*.o
+ arm-linux-elf-ar rc libcli.a cli*.o
libcli_p.a:
$(CC) -pg -c cli.c
$(CC) -pg -c cli_history.c
Modified: trunk/user/hnb/src/ui_draw.c
===================================================================
--- tags/hnb/hnb-1.9.17/src/ui_draw.c 2007-10-22 20:27:28 UTC (rev 2019)
+++ trunk/user/hnb/src/ui_draw.c 2007-10-22 21:59:38 UTC (rev 2020)
@@ -39,9 +39,9 @@
#define KEEPLINES 5
-int nodes_above;
-int active_line;
-int nodes_below;
+extern int nodes_above;
+extern int active_line;
+extern int nodes_below;
static Node *up (Node *sel, Node *node)
{
Modified: trunk/vendors/Nintendo/DLDI/config.vendor
===================================================================
--- trunk/vendors/Nintendo/DLDI/config.vendor 2007-10-22 20:27:28 UTC (rev 2019)
+++ trunk/vendors/Nintendo/DLDI/config.vendor 2007-10-22 21:59:38 UTC (rev 2020)
@@ -84,8 +84,8 @@
# CONFIG_LIB_LIBCRYPT_OLD_FORCE is not set
# CONFIG_LIB_ID3TAG_FORCE is not set
# CONFIG_LIB_MAD_FORCE is not set
+# CONFIG_LIB_UCLIBCPP_FORCE is not set
# CONFIG_LIB_LIBWWW_FORCE is not set
-# CONFIG_LIB_UCLIBCPP_FORCE is not set
# CONFIG_LIB_LIBICONV_FORCE is not set
# CONFIG_LIB_LIBGETTEXT_FORCE is not set
# CONFIG_LIB_LIBGLIB_FORCE is not set
@@ -200,7 +200,6 @@
# CONFIG_USER_FNORD_HTTPD is not set
# CONFIG_USER_BOA_SRC_BOA is not set
CONFIG_USER_BITCHX_BITCHX=y
-CONFIG_USER_IRSSI_IRSSI=y
# CONFIG_USER_BPALOGIN_BPALOGIN is not set
# CONFIG_USER_BR2684CTL_BR2684CTL is not set
# CONFIG_USER_BRCFG_BRCFG is not set
@@ -240,6 +239,10 @@
# CONFIG_USER_IPTABLES_IPTABLES is not set
# CONFIG_USER_IPTABLES_IP6TABLES is not set
# CONFIG_USER_IPUTILS_IPUTILS is not set
+CONFIG_USER_IRSSI_IRSSI=y
+CONFIG_LIB_LIBICONV=y
+CONFIG_LIB_LIBGETTEXT=y
+CONFIG_LIB_LIBGLIB=y
# CONFIG_USER_KENDIN_CONFIG is not set
# CONFIG_USER_KLAXON_KLAXON is not set
# CONFIG_USER_L2TPD_L2TPD is not set
@@ -315,7 +318,6 @@
# CONFIG_USER_WGET is not set
CONFIG_USER_WNC_WNC=y
CONFIG_USER_DIALOG_DIALOG=y
-CONFIG_USER_DLDITOOL_DLDITOOL=y
CONFIG_USER_BUSYBOX_EXPR=y
# CONFIG_USER_ZEBRA_ZEBRA_ZEBRA is not set
@@ -373,6 +375,7 @@
# CONFIG_USER_DICTIONARY_AMERICAN is not set
CONFIG_USER_DICTIONARY_BRITISH=y
# CONFIG_USER_DE2TSCAL_DE2TSCAL is not set
+CONFIG_USER_DLDITOOL_DLDITOOL=y
# CONFIG_USER_EXPAT_EXAMPLES is not set
# CONFIG_USER_FROB_LED_FROB_LED is not set
CONFIG_USER_FROTZ_FROTZ=y
@@ -383,6 +386,7 @@
# CONFIG_USER_GREP_GREP is not set
# CONFIG_USER_HD_HD is not set
CONFIG_USER_HEXEDIT_HEXEDIT=y
+CONFIG_USER_HNB=y
CONFIG_USER_LCALC_LCALC=y
# CONFIG_USER_LCD_LCD is not set
# CONFIG_USER_LEDCON_LEDCON is not set
@@ -409,6 +413,8 @@
# CONFIG_USER_SED_SED is not set
# CONFIG_USER_SETSERIAL_SETSERIAL is not set
CONFIG_USER_SNAPSHOT=y
+CONFIG_LIB_LIBPNG=y
+CONFIG_LIB_ZLIB=y
# CONFIG_USER_TRIPWIRE_SIGGEN is not set
CONFIG_USER_SL_SL=y
# CONFIG_USER_STRACE_STRACE is not set
@@ -554,6 +560,8 @@
# PIXIL PDA GUI
#
CONFIG_USER_PIXIL=y
+CONFIG_LIB_UCLIBCPP=y
+CONFIG_LIB_LIBWWW=y
#
#
@@ -906,7 +914,10 @@
CONFIG_USER_MICROWIN_HAVE_PNM_SUPPORT=y
CONFIG_USER_MICROWIN_HAVE_XPM_SUPPORT=y
CONFIG_USER_MICROWIN_HAVE_JPEG_SUPPORT=y
+CONFIG_LIB_LIBJPEG=y
CONFIG_USER_MICROWIN_HAVE_PNG_SUPPORT=y
+CONFIG_LIB_LIBPNG=y
+CONFIG_LIB_ZLIB=y
# CONFIG_USER_MICROWIN_HAVE_T1LIB_SUPPORT is not set
# CONFIG_USER_MICROWIN_HAVE_FREETYPE_SUPPORT is not set
CONFIG_USER_MICROWIN_HAVE_SHAREDMEM_SUPPORT=y
Modified: trunk/vendors/Nintendo/DSGBA/config.vendor
===================================================================
--- trunk/vendors/Nintendo/DSGBA/config.vendor 2007-10-22 20:27:28 UTC (rev 2019)
+++ trunk/vendors/Nintendo/DSGBA/config.vendor 2007-10-22 21:59:38 UTC (rev 2020)
@@ -374,6 +374,7 @@
# CONFIG_USER_GREP_GREP is not set
# CONFIG_USER_HD_HD is not set
CONFIG_USER_HEXEDIT_HEXEDIT=y
+# CONFIG_USER_HNB is not set
CONFIG_USER_LCALC_LCALC=y
# CONFIG_USER_LCD_LCD is not set
# CONFIG_USER_LEDCON_LEDCON is not set
Modified: trunk/vendors/Nintendo/DSMEM/config.vendor
===================================================================
--- trunk/vendors/Nintendo/DSMEM/config.vendor 2007-10-22 20:27:28 UTC (rev 2019)
+++ trunk/vendors/Nintendo/DSMEM/config.vendor 2007-10-22 21:59:38 UTC (rev 2020)
@@ -373,6 +373,7 @@
# CONFIG_USER_GREP_GREP is not set
# CONFIG_USER_HD_HD is not set
CONFIG_USER_HEXEDIT_HEXEDIT=y
+# CONFIG_USER_HNB is not set
# CONFIG_USER_LCALC_LCALC is not set
# CONFIG_USER_LCD_LCD is not set
# CONFIG_USER_LEDCON_LEDCON is not set
Modified: trunk/vendors/Nintendo/GBAMP/config.vendor
===================================================================
--- trunk/vendors/Nintendo/GBAMP/config.vendor 2007-10-22 20:27:28 UTC (rev 2019)
+++ trunk/vendors/Nintendo/GBAMP/config.vendor 2007-10-22 21:59:38 UTC (rev 2020)
@@ -373,6 +373,7 @@
# CONFIG_USER_GREP_GREP is not set
# CONFIG_USER_HD_HD is not set
CONFIG_USER_HEXEDIT_HEXEDIT=y
+# CONFIG_USER_HNB is not set
CONFIG_USER_LCALC_LCALC=y
# CONFIG_USER_LCD_LCD is not set
# CONFIG_USER_LEDCON_LEDCON is not set
Modified: trunk/vendors/Nintendo/GBAMP-EXT2/config.vendor
===================================================================
--- trunk/vendors/Nintendo/GBAMP-EXT2/config.vendor 2007-10-22 20:27:28 UTC (rev 2019)
+++ trunk/vendors/Nintendo/GBAMP-EXT2/config.vendor 2007-10-22 21:59:38 UTC (rev 2020)
@@ -373,6 +373,7 @@
# CONFIG_USER_GREP_GREP is not set
# CONFIG_USER_HD_HD is not set
CONFIG_USER_HEXEDIT_HEXEDIT=y
+# CONFIG_USER_HNB is not set
# CONFIG_USER_LCALC_LCALC is not set
# CONFIG_USER_LCD_LCD is not set
# CONFIG_USER_LEDCON_LEDCON is not set
Modified: trunk/vendors/Nintendo/NDS/config.vendor
===================================================================
--- trunk/vendors/Nintendo/NDS/config.vendor 2007-10-22 20:27:28 UTC (rev 2019)
+++ trunk/vendors/Nintendo/NDS/config.vendor 2007-10-22 21:59:38 UTC (rev 2020)
@@ -371,6 +371,7 @@
# CONFIG_USER_GREP_GREP is not set
# CONFIG_USER_HD_HD is not set
# CONFIG_USER_HEXEDIT_HEXEDIT is not set
+# CONFIG_USER_HNB is not set
CONFIG_USER_LCALC_LCALC=y
# CONFIG_USER_LCD_LCD is not set
# CONFIG_USER_LEDCON_LEDCON is not set
More information about the dslinux-commit
mailing list