From 1e5ad4fdf1d248ab92f2cf6d9321291934781c38 Mon Sep 17 00:00:00 2001 From: josch Date: Fri, 10 Jan 2014 18:13:00 +0100 Subject: [PATCH 1/4] remove firstbootscript first, then do rest --- default/hooks/firstboot | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/default/hooks/firstboot b/default/hooks/firstboot index 7f1119e..b97d79f 100644 --- a/default/hooks/firstboot +++ b/default/hooks/firstboot @@ -8,6 +8,9 @@ cat > $ROOTDIR/etc/init.d/firstboot << __END__ # Default-Stop: ### END INIT INFO +update-rc.d -f firstboot remove + +# generating ssh host key to be unique for f in rsa dsa ecdsa; do rm -rf /etc/ssh/ssh_host_\${f}_key; done echo "generating ssh rsa key..." ssh-keygen -q -t rsa -f /etc/ssh/ssh_host_rsa_key -C "" -N "" @@ -15,8 +18,6 @@ echo "generating ssh dsa key..." ssh-keygen -q -t dsa -f /etc/ssh/ssh_host_dsa_key -C "" -N "" echo "generating ssh ecdsa key..." ssh-keygen -q -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -C "" -N "" - -update-rc.d -f firstboot remove __END__ chmod +x $ROOTDIR/etc/init.d/firstboot From 37f80e3e92312d3249eeaa016abbd84639c6f6c8 Mon Sep 17 00:00:00 2001 From: josch Date: Fri, 10 Jan 2014 18:13:29 +0100 Subject: [PATCH 2/4] do not set noauth=true --- default/multistrap.conf | 1 - goldel-gta04/multistrap.conf | 1 - kirkwood/multistrap.conf | 1 - notioninkadam/multistrap.conf | 1 - om-gta02/multistrap.conf | 1 - touchbook/multistrap.conf | 1 - 6 files changed, 6 deletions(-) diff --git a/default/multistrap.conf b/default/multistrap.conf index e914a7b..f257743 100644 --- a/default/multistrap.conf +++ b/default/multistrap.conf @@ -3,7 +3,6 @@ arch=$ARCH directory=$ROOTDIR cleanup=true unpack=true -noauth=true bootstrap=Debian_bootstrap aptsources=Debian allowrecommends=false diff --git a/goldel-gta04/multistrap.conf b/goldel-gta04/multistrap.conf index e914a7b..f257743 100644 --- a/goldel-gta04/multistrap.conf +++ b/goldel-gta04/multistrap.conf @@ -3,7 +3,6 @@ arch=$ARCH directory=$ROOTDIR cleanup=true unpack=true -noauth=true bootstrap=Debian_bootstrap aptsources=Debian allowrecommends=false diff --git a/kirkwood/multistrap.conf b/kirkwood/multistrap.conf index e914a7b..f257743 100644 --- a/kirkwood/multistrap.conf +++ b/kirkwood/multistrap.conf @@ -3,7 +3,6 @@ arch=$ARCH directory=$ROOTDIR cleanup=true unpack=true -noauth=true bootstrap=Debian_bootstrap aptsources=Debian allowrecommends=false diff --git a/notioninkadam/multistrap.conf b/notioninkadam/multistrap.conf index fd42c53..c4663cc 100644 --- a/notioninkadam/multistrap.conf +++ b/notioninkadam/multistrap.conf @@ -3,7 +3,6 @@ arch=$ARCH directory=$ROOTDIR cleanup=true unpack=true -noauth=true bootstrap=Debian_bootstrap aptsources=Debian_apt allowrecommends=false diff --git a/om-gta02/multistrap.conf b/om-gta02/multistrap.conf index 015c657..1dc9304 100644 --- a/om-gta02/multistrap.conf +++ b/om-gta02/multistrap.conf @@ -3,7 +3,6 @@ arch=$ARCH directory=$ROOTDIR cleanup=true unpack=true -noauth=true bootstrap=Debian_bootstrap Debian_pkgfso aptsources=Debian allowrecommends=false diff --git a/touchbook/multistrap.conf b/touchbook/multistrap.conf index e914a7b..f257743 100644 --- a/touchbook/multistrap.conf +++ b/touchbook/multistrap.conf @@ -3,7 +3,6 @@ arch=$ARCH directory=$ROOTDIR cleanup=true unpack=true -noauth=true bootstrap=Debian_bootstrap aptsources=Debian allowrecommends=false From cf127bcefd6b45902eff5f56a6b3153194b231e5 Mon Sep 17 00:00:00 2001 From: josch Date: Fri, 10 Jan 2014 18:14:16 +0100 Subject: [PATCH 3/4] update gta04 touchscreen config --- goldel-gta04/root/etc/X11/xorg.conf | 3 +-- goldel-gta04/root/etc/X11/xorg.conf.d/s3c2410.conf | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/goldel-gta04/root/etc/X11/xorg.conf b/goldel-gta04/root/etc/X11/xorg.conf index 6506fca..9e5d69a 100644 --- a/goldel-gta04/root/etc/X11/xorg.conf +++ b/goldel-gta04/root/etc/X11/xorg.conf @@ -1,5 +1,4 @@ Section "Device" Identifier "Builtin Default fbdev Device 0" - Driver "omapfb" - Option "fb" "/dev/fb0" + Driver "fbdev" EndSection diff --git a/goldel-gta04/root/etc/X11/xorg.conf.d/s3c2410.conf b/goldel-gta04/root/etc/X11/xorg.conf.d/s3c2410.conf index e022f5b..8a9d085 100644 --- a/goldel-gta04/root/etc/X11/xorg.conf.d/s3c2410.conf +++ b/goldel-gta04/root/etc/X11/xorg.conf.d/s3c2410.conf @@ -1,6 +1,5 @@ Section "InputClass" - Identifier "S3C24XX TouchScreen" - MatchProduct "S3C24XX TouchScreen" - Option "Calibration" "110 922 924 96" - Option "SwapAxes" "1" + Identifier "calibration" + MatchProduct "TSC2007 Touchscreen" + Option "Calibration" "339 3524 3798 225" EndSection From ba4fcd6219ec3256dfc4474b9a161435775ea8da Mon Sep 17 00:00:00 2001 From: josch Date: Fri, 10 Jan 2014 18:14:44 +0100 Subject: [PATCH 4/4] add TODO item --- TODO | 1 + 1 file changed, 1 insertion(+) diff --git a/TODO b/TODO index ff64638..828d935 100644 --- a/TODO +++ b/TODO @@ -4,3 +4,4 @@ * if gconf2 is to be installed bug #636083 * have libfakeroot-sysv.so not in the libfakeroot subdirectory (no idea why the linker doesnt find it otherwise - it works for fakechroot.so in subdir) + * initrd cannot be created