changed order of loading AXE modules (exclusive boot time), moved everything related to /lib/modules/axe

This commit is contained in:
Jaroslav Kysela 2015-04-09 20:33:19 +02:00
parent 3c9de865d1
commit edda1fc869
8 changed files with 20 additions and 25 deletions

View File

@ -10,8 +10,7 @@ HOST_ARCH=$(shell uname -m)
EXTRA_AXE_MODULES_DIR=firmware/initramfs/root/modules_idl4k_7108_ST40HOST_LINUX_32BITS EXTRA_AXE_MODULES_DIR=firmware/initramfs/root/modules_idl4k_7108_ST40HOST_LINUX_32BITS
EXTRA_AXE_MODULES=axe_dmx.ko axe_dmxts.ko axe_fe.ko axe_fp.ko axe_i2c.ko \ EXTRA_AXE_MODULES=axe_dmx.ko axe_dmxts.ko axe_fe.ko axe_fp.ko axe_i2c.ko \
stapi_core_stripped.ko stapi_ioctl_stripped.ko stsys_ioctl.ko \ stapi_core_stripped.ko stapi_ioctl_stripped.ko stsys_ioctl.ko \
load_modules_list_32BITS.txt load_modules_list_axe_32BITS.txt \ load_modules_list_32BITS.txt load_modules_list_axe_32BITS.txt
load_modules.sh load_env.sh
ORIG_FILES=main_axe.out mknodes.out ORIG_FILES=main_axe.out mknodes.out
@ -67,8 +66,8 @@ fs.cpio: kernel-modules busybox dropbear minisatip oscam
fakeroot tools/do_min_fs.py \ fakeroot tools/do_min_fs.py \
-r "$(VERSION)" \ -r "$(VERSION)" \
-b "bash strace" \ -b "bash strace" \
$(foreach m,$(EXTRA_AXE_MODULES), -e "$(EXTRA_AXE_MODULES_DIR)/$(m):lib/modules/$(m)") \ $(foreach m,$(EXTRA_AXE_MODULES), -e "$(EXTRA_AXE_MODULES_DIR)/$(m):lib/modules/axe/$(m)") \
$(foreach m,$(ORIG_FILES), -e "$(EXTRA_AXE_MODULES_DIR)/../$(m):root") \ $(foreach m,$(ORIG_FILES), -e "$(EXTRA_AXE_MODULES_DIR)/../$(m):lib/modules/axe/$(m)") \
$(foreach m,$(KMODULES), -e "kernel/$(m):lib/modules/$(m)") \ $(foreach m,$(KMODULES), -e "kernel/$(m):lib/modules/$(m)") \
-e "apps/$(BUSYBOX)/busybox:bin/busybox" \ -e "apps/$(BUSYBOX)/busybox:bin/busybox" \
$(foreach f,$(DROPBEAR_SBIN_FILES), -e "apps/$(DROPBEAR)/$(f):sbin/$(f)") \ $(foreach f,$(DROPBEAR_SBIN_FILES), -e "apps/$(DROPBEAR)/$(f):sbin/$(f)") \

1
firmware/.gitignore vendored
View File

@ -1 +1,2 @@
initramfs initramfs
fw.tgz

View File

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
echo "Starting axe services:" #echo "Starting axe services:"
mknod -m 0777 /tmp/usbdevmon125788 p #mknod -m 0777 /tmp/usbdevmon125788 p
source /lib/modules/load_env.sh source /lib/modules/axe/load_env.sh
cd /root cd /root
export AXE_API_TYPE=linuxdvb export AXE_API_TYPE=linuxdvb
exec ./main_axe.out exec /lib/modules/axe/main_axe.out

View File

@ -6,8 +6,6 @@ if test "$DROPBEAR" != "yes"; then
exit 0 exit 0
fi fi
sleep 5
if ! test -r /etc/dropbear/dropbear_dss_host_key; then if ! test -r /etc/dropbear/dropbear_dss_host_key; then
mkdir -p /etc/dropbear mkdir -p /etc/dropbear
if test -r /etc/sysconfig/dropbear_dss_host_key; then if test -r /etc/sysconfig/dropbear_dss_host_key; then

View File

@ -37,9 +37,14 @@ sysctl -q -p
# start syslogd # start syslogd
syslogd -C256 syslogd -C256
# AXE modules # loopback
ln -s /lib/modules /root/modules ifconfig lo 127.0.0.1 netmask 255.255.255.0
/lib/modules/load_modules.sh
# AXE modules and AXE hw initialization
/lib/modules/axe/load_modules.sh
/etc/init.d/axe &
nc -l 127.0.0.1:1001 -e /bin/true
rm -f /root/main_init.sh
# config/data storage # config/data storage
mkdir -p /mnt/data mkdir -p /mnt/data
@ -66,7 +71,6 @@ if test -n "$KMODULES"; then
fi fi
# basic network # basic network
ifconfig lo 127.0.0.1 netmask 255.255.255.0
ifconfig eth0 up ifconfig eth0 up
route add -net 224.0.0.0 netmask 240.0.0.0 dev eth0 route add -net 224.0.0.0 netmask 240.0.0.0 dev eth0

View File

@ -6,6 +6,4 @@ if test "$TELNETD" != "yes"; then
exit 0 exit 0
fi fi
sleep 5
exec /usr/sbin/telnetd -F -l /bin/login exec /usr/sbin/telnetd -F -l /bin/login

View File

@ -6,14 +6,14 @@ ttyAS0::askfirst:/bin/sh
::once:/etc/init.d/network ::once:/etc/init.d/network
# Time Network Protocol # Time Network Protocol
::once:/etc/init.d/ntpd ::once:/etc/init.d/ntpd
# minisatip
::once:/etc/init.d/satip
# telnetd # telnetd
::once:/etc/init.d/telnetd ::once:/etc/init.d/telnetd
# dropbear # dropbear
::once:/etc/init.d/dropbear ::once:/etc/init.d/dropbear
# oscamd # oscamd
::once:/etc/init.d/oscamd ::once:/etc/init.d/oscamd
# AXE kernel modules and environment
::once:/etc/init.d/axe
# Others # Others
::ctrlaltdel:/sbin/reboot ::ctrlaltdel:/sbin/reboot
::shutdown:/sbin/swapoff -a ::shutdown:/sbin/swapoff -a

View File

@ -4,10 +4,5 @@
# it is respawned immediately on exit # it is respawned immediately on exit
# #
while [ 1 ]; do echo | nc 127.0.0.1 1001
if [ -x /etc/init.d/satip ]; then while test 1; do sleep 999999999; done
. /etc/init.d/satip
else
sleep 33554432
fi
done