Changeset 3333

Timestamp:

07/23/07 20:15:34 (1 year ago)

Author:

tg

Message:

contrary to the specs, an initramfs image must be sv4cpio instead
of sv4crc, but I finally managed to coerce it into booting finely
(on rb-2.6, as usual)

Files:

• trunk/freewrt/mk/kernel-build.mk (modified) (1 diff)
• trunk/freewrt/package/base-files/Makefile (modified) (1 diff)
• trunk/freewrt/package/base-files/files/init (added)
• trunk/freewrt/target/Config.in (modified) (1 diff)
• trunk/freewrt/target/image/balls.mk (modified) (1 diff)

trunk/freewrt/mk/kernel-build.mk

@@ -47 +47 @@
-
-$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.config
+ifneq ($(strip ${FWRT_INITRAMFS_SOURCE}),)
+        cd ${TOPDIR} && cp $(strip ${FWRT_INITRAMFS_SOURCE}) \
+            ${LINUX_DIR}/usr/initramfs_data.cpio.gz && \
+            touch ${LINUX_DIR}/usr/initramfs_data.cpio.gz
+endif
-        $(TRACE) target/linux/$(BOARD)-$(KERNEL)-kernel-compile
-        env GCC_HONOUR_COPTS=s $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) CC="$(TARGET_CC)" $(MAKE_TRACE) HOSTCFLAGS='-O2 -idirafter ${TOPDIR}/scripts'

trunk/freewrt/package/base-files/Makefile

@@ -10 +10 @@
-PKG_NAME:=              base-files
-PKG_VERSION:=           1.1
-0
+1
-WRKDIST=                ${WRKDIR}/base-files
-NO_DISTFILES:=          1

trunk/freewrt/target/Config.in

@@ -283 +283 @@
-
-endchoice
+
+config FWRT_TARGET_USE_INITRAMFS
+        bool "use an initramfs image"
+        depends on FWRT_LINUX_2_6
+        depends on FWRT_DEVEL
+        default n
+        help
+          embed a custom initramfs into the kernel
+
+config FWRT_INITRAMFS_SOURCE
+        string "path to initramfs image"
+        depends on FWRT_TARGET_USE_INITRAMFS
+        help
+          path, relative to ${TOPDIR}
+
-endmenu

trunk/freewrt/target/image/balls.mk

@@ -16 +16 @@
-${BIN_DIR}/${INITRAMFS}: ${KDIR}/root
-        cd ${KDIR}/root; find . | sed -n '/^\.\//s///p' | sort | \
-rc
+pio
-
-${BIN_DIR}/${ROOTFSTARBALL}: ${KDIR}/root