diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:45:29 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:45:29 +0100 |
| commit | 220a96f9926788ed531717f78e44fdf1e7ab3b34 (patch) | |
| tree | 406f65eea71fabd8cf66c2bd1108ec63f8c349ee /package/base-files | |
| parent | 38af8185ea05a1c5d1abb32a68a025e3b4afa4d6 (diff) | |
rework architecture / embedded systems concept
Make configuration of new targets cheap.
Just add a new file in target/arch/sys-enabled/foo.
See other files for syntax. While doing runtime tests
with the new infrastructure I've updated a lot of other
stuff:
- gcc 4.5.2
- uClibc 0.9.32-rc1 (NPTL)
- strongswan, php, miredo, parted, util-linux-ng, e2fsprogs
I promise, this is the last big fat commit this year ;)
Diffstat (limited to 'package/base-files')
| -rw-r--r-- | package/base-files/Config.in.manual | 2 | ||||
| -rw-r--r-- | package/base-files/Makefile | 12 | ||||
| -rw-r--r-- | package/base-files/files/inittab.serial | 2 | ||||
| -rw-r--r-- | package/base-files/src/etc/ipkg.conf | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/package/base-files/Config.in.manual b/package/base-files/Config.in.manual index a3180f4dc..68d22bbd2 100644 --- a/package/base-files/Config.in.manual +++ b/package/base-files/Config.in.manual @@ -6,9 +6,9 @@ config ADK_COMPILE_BASE_FILES config ADK_PACKAGE_BASE_FILES prompt "base-files............. basic filesystem structure and scripts" tristate - default y if !ADK_TOOLCHAIN_ONLY select ADK_COMPILE_BASE_FILES depends on !ADK_TOOLCHAIN_ONLY + default y if !ADK_TOOLCHAIN_ONLY help basic filesystem structure and scripts diff --git a/package/base-files/Makefile b/package/base-files/Makefile index f0695966e..7091c8541 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -24,13 +24,14 @@ INSTALL_STYLE:= manual do-install: $(CP) ./src/* $(IDIR_BASE_FILES) # allow this to fail, as there might be no target-specific files to copy - -$(CP) $(TOPDIR)/target/$(ADK_TARGET)/files/* $(IDIR_BASE_FILES) + -$(CP) $(TOPDIR)/target/$(ADK_TARGET_ARCH)/files/* $(IDIR_BASE_FILES) ifeq (${ADK_TARGET_ROOTFS_NFSROOT},y) @echo "#" > $(IDIR_BASE_FILES)/etc/network/interfaces endif - $(SED) 's,@TARGET@,$(ADK_TARGET),g' $(IDIR_BASE_FILES)/etc/ipkg.conf + $(SED) 's,@ARCH@,$(ADK_TARGET_ARCH),g' $(IDIR_BASE_FILES)/etc/ipkg.conf + $(SED) 's,@SYSTEM@,$(ADK_TARGET_SYSTEM),g' $(IDIR_BASE_FILES)/etc/ipkg.conf + $(SED) 's,@LIBC@,$(ADK_TARGET_LIBC),g' $(IDIR_BASE_FILES)/etc/ipkg.conf $(SED) 's,@HOST@,$(ADK_HOST),g' $(IDIR_BASE_FILES)/etc/ipkg.conf - $(SED) 's,@LIBC@,$(ADK_LIBC),g' $(IDIR_BASE_FILES)/etc/ipkg.conf $(SED) 's,@VENDOR@,$(ADK_VENDOR),g' $(IDIR_BASE_FILES)/etc/ipkg.conf echo /bin/sh >${IDIR_BASE_FILES}/etc/shells echo /bin/ash >>${IDIR_BASE_FILES}/etc/shells @@ -61,6 +62,7 @@ endif cat ./files/inittab.serial >> $(IDIR_BASE_FILES)/etc/inittab test -z $(ADK_RUNTIME_CONSOLE_BOTH) || \ cat ./files/inittab.vga >> $(IDIR_BASE_FILES)/etc/inittab + $(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab test -z $(ADK_RUNTIME_HOSTNAME) || \ echo $(ADK_RUNTIME_HOSTNAME) > $(IDIR_BASE_FILES)/etc/hostname; \ echo "127.0.0.1 $(ADK_RUNTIME_HOSTNAME)" >> $(IDIR_BASE_FILES)/etc/hosts @@ -69,8 +71,8 @@ endif ${ADK_RUNTIME_PASSWORD}),g" $(IDIR_BASE_FILES)/etc/shadow git log -1|head -1|sed -e 's#commit ##' \ > $(IDIR_BASE_FILES)/etc/adkversion - test -z $(ADK_HW) || \ - echo $(ADK_HW) > $(IDIR_BASE_FILES)/etc/adktarget + test -z $(ADK_TARGET_SYSTEM) || \ + echo $(ADK_TARGET_SYSTEM) > $(IDIR_BASE_FILES)/etc/adktarget ifneq (${ADK_PACKAGE_CONFIG_IN_ETC},) gzip -9c ${TOPDIR}/.config >$(IDIR_BASE_FILES)/etc/adkconfig.gz chmod 600 $(IDIR_BASE_FILES)/etc/adkconfig.gz diff --git a/package/base-files/files/inittab.serial b/package/base-files/files/inittab.serial index b50bddb0c..5de880f2a 100644 --- a/package/base-files/files/inittab.serial +++ b/package/base-files/files/inittab.serial @@ -1 +1 @@ -ttyS0::respawn:/sbin/getty -i -L ttyS0 115200 vt100 +ttyS0::respawn:/sbin/getty -i -L ttyS0 @SPEED@ vt100 diff --git a/package/base-files/src/etc/ipkg.conf b/package/base-files/src/etc/ipkg.conf index edb050116..cef6d2845 100644 --- a/package/base-files/src/etc/ipkg.conf +++ b/package/base-files/src/etc/ipkg.conf @@ -1,3 +1,3 @@ -src @VENDOR@ http://@HOST@/@TARGET@_@LIBC@/packages +src @VENDOR@ http://@HOST@/@SYSTEM@_@ARCH@_@LIBC@/packages dest root / dest ram /tmp |