From ffc86f7e3a5b4be7dfdee2f201cfa4fc2a30a40e Mon Sep 17 00:00:00 2001 From: Hamish Guthrie Date: Thu, 16 Apr 2009 10:40:15 +0000 Subject: [PATCH] Update default configuration to use profiles SVN-Revision: 15229 --- include/target.mk | 2 +- target/linux/ps3/Makefile | 2 -- target/linux/ps3/config-2.6.28 | 8 ++++++-- .../petitboot/base-files/etc/config/network | 13 +++++++++++++ .../ps3/petitboot/base-files/etc/init.d/boot | 18 +++++++++--------- .../ps3/petitboot/base-files/etc/sysctl.conf | 11 +++++++++++ .../ps3/petitboot/profiles/000-Default.mk | 19 +++++++++++++++++++ target/linux/ps3/petitboot/target.mk | 2 -- 8 files changed, 59 insertions(+), 16 deletions(-) create mode 100644 target/linux/ps3/petitboot/base-files/etc/config/network create mode 100644 target/linux/ps3/petitboot/base-files/etc/sysctl.conf create mode 100644 target/linux/ps3/petitboot/profiles/000-Default.mk diff --git a/include/target.mk b/include/target.mk index baca4b5e79..2f62c2a8cd 100644 --- a/include/target.mk +++ b/include/target.mk @@ -15,7 +15,7 @@ DEVICE_TYPE?=router DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg # For router targets DEFAULT_PACKAGES.router:=dnsmasq iptables ppp ppp-mod-pppoe kmod-ipt-nathelper firewall -DEFAULT_PACKAGES.bootloader:=kexec-tools +DEFAULT_PACKAGES.bootloader:= # Additional packages for Linux 2.6 ifneq ($(KERNEL),2.4) diff --git a/target/linux/ps3/Makefile b/target/linux/ps3/Makefile index b28dba3616..40f8059eaf 100644 --- a/target/linux/ps3/Makefile +++ b/target/linux/ps3/Makefile @@ -12,8 +12,6 @@ BOARDNAME:=Sony PS3 Game Console MAINTAINER:=Geoff Levand SUBTARGETS=petitboot -DEVICE_TYPE=bootloader - LINUX_VERSION:=2.6.28.9 KERNEL_CC:= diff --git a/target/linux/ps3/config-2.6.28 b/target/linux/ps3/config-2.6.28 index 4ad7dadd7f..f61e0df82a 100644 --- a/target/linux/ps3/config-2.6.28 +++ b/target/linux/ps3/config-2.6.28 @@ -169,9 +169,12 @@ CONFIG_INITRAMFS_SOURCE="/home/geoff/projects/cell/bootloader/openwrt-feeds/buil CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_INPUT=y +CONFIG_INPUT_EVBUG=m +CONFIG_INPUT_EVDEV=m +CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_MOUSEDEV=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_IOMMU_HELPER=y @@ -337,7 +340,8 @@ CONFIG_SUNRPC=y CONFIG_SUNRPC_GSS=y # CONFIG_SYN_COOKIES is not set # CONFIG_SYSCTL_SYSCALL_CHECK is not set -# CONFIG_SYSVIPC is not set +CONFIG_SYSVIPC_COMPAT=y +CONFIG_SYSVIPC_SYSCTL=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y CONFIG_TINY_SHMEM=y diff --git a/target/linux/ps3/petitboot/base-files/etc/config/network b/target/linux/ps3/petitboot/base-files/etc/config/network new file mode 100644 index 0000000000..453481e325 --- /dev/null +++ b/target/linux/ps3/petitboot/base-files/etc/config/network @@ -0,0 +1,13 @@ +# Copyright (C) 2006 OpenWrt.org + +config interface loopback + option ifname lo + option proto static + option ipaddr 127.0.0.1 + option netmask 255.0.0.0 + +config interface lan + option ifname eth0 + option proto dhcp + option ipaddr 192.168.1.1 + option netmask 255.255.255.0 diff --git a/target/linux/ps3/petitboot/base-files/etc/init.d/boot b/target/linux/ps3/petitboot/base-files/etc/init.d/boot index 2897f3a7da..c84c6873d3 100755 --- a/target/linux/ps3/petitboot/base-files/etc/init.d/boot +++ b/target/linux/ps3/petitboot/base-files/etc/init.d/boot @@ -19,12 +19,13 @@ system_config() { config_get log_ip "$cfg" log_ip config_get log_size "$cfg" log_size + config_get log_port "$cfg" log_port config_get log_file "$cfg" log_file - # use a shared mem buffer for local default + [ -z $log_file -a -z "$log_size" ] && log_size=16 - syslogd ${log_size:+-C $log_size} ${log_file:+-O $log_file} \ - ${log_ip:+-L -R $log_ip} - klogd + [ -x /sbin/syslogd ] && syslogd ${log_size:+-C $log_size} \ + ${log_file:+-O $log_file} ${log_ip:+-L -R $log_ip} + [ -x /sbin/klogd ] && klogd } apply_uci_config() {( @@ -37,16 +38,15 @@ start() { [ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc [ -f /proc/net/vlan/config ] && vconfig set_name_type DEV_PLUS_VID_NO_PAD + apply_uci_config + config_load system + config_foreach system_config system + mkdir -p /var/run mkdir -p /var/log mkdir -p /var/lock mkdir -p /var/state mkdir -p /tmp/.uci - - apply_uci_config - config_load system - config_foreach system_config system - chown 0700 /tmp/.uci touch /var/log/wtmp touch /var/log/lastlog diff --git a/target/linux/ps3/petitboot/base-files/etc/sysctl.conf b/target/linux/ps3/petitboot/base-files/etc/sysctl.conf new file mode 100644 index 0000000000..1af0079251 --- /dev/null +++ b/target/linux/ps3/petitboot/base-files/etc/sysctl.conf @@ -0,0 +1,11 @@ +kernel.panic=3 +net.ipv4.conf.default.arp_ignore=1 +net.ipv4.conf.all.arp_ignore=1 +net.ipv4.ip_forward=1 +net.ipv4.icmp_echo_ignore_broadcasts=1 +net.ipv4.icmp_ignore_bogus_error_responses=1 +net.ipv4.tcp_ecn=1 +net.ipv4.tcp_fin_timeout=30 +net.ipv4.tcp_keepalive_time=120 +net.ipv4.tcp_timestamps=0 +net.core.netdev_max_backlog=30 diff --git a/target/linux/ps3/petitboot/profiles/000-Default.mk b/target/linux/ps3/petitboot/profiles/000-Default.mk new file mode 100644 index 0000000000..5c433e1339 --- /dev/null +++ b/target/linux/ps3/petitboot/profiles/000-Default.mk @@ -0,0 +1,19 @@ +# +# Copyright (C) 2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/Default + NAME:=Default PS3 Petitboot profile + PACKAGES:=-dnsmasq -iptables -ppp -ppp-mod-pppoe -kmod-ipt-nathelper \ + -firewall \ + kexec-tools petitboot +endef + +define Profile/Default/Description + Default PS3 Petitboot profile +endef +$(eval $(call Profile,Default)) + diff --git a/target/linux/ps3/petitboot/target.mk b/target/linux/ps3/petitboot/target.mk index 4b53f57b6b..04ec11bb3e 100644 --- a/target/linux/ps3/petitboot/target.mk +++ b/target/linux/ps3/petitboot/target.mk @@ -1,8 +1,6 @@ BOARDNAME:=Petitboot FEATURES:=fpu ramdisk -DEFAULT_PACKAGES+= dnsmasq petitboot - define Target/Description Build Petitboot bootloader endef -- 2.25.1