From 4eb933d5a8e2d722128fdef0d9d8a8323bd38a35 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 4 Apr 2011 17:33:42 +0200 Subject: [PATCH 01/13] busybox-initramfs: add applet 'nbd-client' Signed-off-by: Stephan Raue --- .../busybox-initramfs/config/busybox-initramfs.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf b/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf index 0d3038fa5e..05ecea9ce5 100644 --- a/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf +++ b/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.18.0 -# Tue Nov 23 18:27:38 2010 +# Busybox version: 1.18.4 +# Mon Apr 4 17:32:34 2011 # CONFIG_HAVE_DOT_CONFIG=y @@ -700,7 +700,7 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # # Networking Utilities # -# CONFIG_NBDCLIENT is not set +CONFIG_NBDCLIENT=y # CONFIG_NC is not set # CONFIG_NC_SERVER is not set # CONFIG_NC_EXTRA is not set From 37d5f166206155d2b08dae16d1cc47cbd82a916e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 4 Apr 2011 17:35:22 +0200 Subject: [PATCH 02/13] busybox-initramfs: add NFS and CIFS mount support Signed-off-by: Stephan Raue --- .../busybox-initramfs/config/busybox-initramfs.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf b/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf index 05ecea9ce5..b8f0688a40 100644 --- a/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf +++ b/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.18.4 -# Mon Apr 4 17:32:34 2011 +# Mon Apr 4 17:34:53 2011 # CONFIG_HAVE_DOT_CONFIG=y @@ -48,8 +48,8 @@ CONFIG_FEATURE_DEVPTS=y # CONFIG_SELINUX is not set CONFIG_FEATURE_PREFER_APPLETS=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" -# CONFIG_FEATURE_SYSLOG is not set -# CONFIG_FEATURE_HAVE_RPC is not set +CONFIG_FEATURE_SYSLOG=y +CONFIG_FEATURE_HAVE_RPC=y # # Build Options @@ -563,8 +563,8 @@ CONFIG_FEATURE_MOUNT_FAKE=y # CONFIG_FEATURE_MOUNT_VERBOSE is not set # CONFIG_FEATURE_MOUNT_HELPERS is not set CONFIG_FEATURE_MOUNT_LABEL=y -# CONFIG_FEATURE_MOUNT_NFS is not set -# CONFIG_FEATURE_MOUNT_CIFS is not set +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_FEATURE_MOUNT_CIFS=y CONFIG_FEATURE_MOUNT_FLAGS=y # CONFIG_FEATURE_MOUNT_FSTAB is not set CONFIG_PIVOT_ROOT=y From 57ed784d03dab15bd7e5ffb8f0245031cba805a4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 4 Apr 2011 17:39:45 +0200 Subject: [PATCH 03/13] projects/*/linux: add NBD support Signed-off-by: Stephan Raue --- projects/ATV/linux/linux.i386.conf | 2 +- projects/Generic/linux/linux.i386.conf | 2 +- projects/ION/linux/linux.i386.conf | 2 +- projects/ION/linux/linux.x86_64.conf | 2 +- projects/Intel/linux/linux.i386.conf | 2 +- projects/Intel/linux/linux.x86_64.conf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index a4c716ae19..8a524a9d09 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -700,7 +700,7 @@ CONFIG_BLK_DEV_LOOP=y # # DRBD disabled because PROC_FS, INET or CONNECTOR not selected # -# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_NBD=y # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index fcfacb62ae..43c482d995 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -723,7 +723,7 @@ CONFIG_BLK_DEV_LOOP=y # # DRBD disabled because PROC_FS, INET or CONNECTOR not selected # -# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_NBD=y # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 3cdd00abf3..9b56d5026d 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -719,7 +719,7 @@ CONFIG_BLK_DEV_LOOP=y # # DRBD disabled because PROC_FS, INET or CONNECTOR not selected # -# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_NBD=y # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index c3017d67bc..38672c9910 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -668,7 +668,7 @@ CONFIG_BLK_DEV_LOOP=y # # DRBD disabled because PROC_FS, INET or CONNECTOR not selected # -# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_NBD=y # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 12fcdf7e1b..97008e0df1 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -721,7 +721,7 @@ CONFIG_BLK_DEV_LOOP=y # # DRBD disabled because PROC_FS, INET or CONNECTOR not selected # -# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_NBD=y # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 4c382cd2c2..01f6b684dd 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -671,7 +671,7 @@ CONFIG_BLK_DEV_LOOP=y # # DRBD disabled because PROC_FS, INET or CONNECTOR not selected # -# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_NBD=y # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y From 59928805b0cc359263771147d20036eb4b5c03c5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 4 Apr 2011 17:56:52 +0200 Subject: [PATCH 04/13] projects/*/linux: add IP kernel level autoconfiguration, add root FS on NFS support Signed-off-by: Stephan Raue --- projects/ATV/linux/linux.i386.conf | 6 +++++- projects/Generic/linux/linux.i386.conf | 6 +++++- projects/ION/linux/linux.i386.conf | 6 +++++- projects/ION/linux/linux.x86_64.conf | 6 +++++- projects/Intel/linux/linux.i386.conf | 6 +++++- projects/Intel/linux/linux.x86_64.conf | 6 +++++- 6 files changed, 30 insertions(+), 6 deletions(-) diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 8a524a9d09..08c7b5c3f8 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -548,7 +548,10 @@ CONFIG_INET=y CONFIG_IP_MULTICAST=y # CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_FIB_HASH=y -# CONFIG_IP_PNP is not set +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IP_PNP_RARP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE_DEMUX is not set # CONFIG_IP_MROUTE is not set @@ -2200,6 +2203,7 @@ CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set CONFIG_NFS_V4=y # CONFIG_NFS_V4_1 is not set +CONFIG_ROOT_NFS=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFS_USE_NEW_IDMAPPER is not set diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 43c482d995..fa9616dfdd 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -551,7 +551,10 @@ CONFIG_INET=y CONFIG_IP_MULTICAST=y # CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_FIB_HASH=y -# CONFIG_IP_PNP is not set +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IP_PNP_RARP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE_DEMUX is not set # CONFIG_IP_MROUTE is not set @@ -2581,6 +2584,7 @@ CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set CONFIG_NFS_V4=y # CONFIG_NFS_V4_1 is not set +CONFIG_ROOT_NFS=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFS_USE_NEW_IDMAPPER is not set diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 9b56d5026d..800f4bbbcc 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -548,7 +548,10 @@ CONFIG_INET=y CONFIG_IP_MULTICAST=y # CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_FIB_HASH=y -# CONFIG_IP_PNP is not set +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IP_PNP_RARP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE_DEMUX is not set # CONFIG_IP_MROUTE is not set @@ -2446,6 +2449,7 @@ CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set CONFIG_NFS_V4=y # CONFIG_NFS_V4_1 is not set +CONFIG_ROOT_NFS=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFS_USE_NEW_IDMAPPER is not set diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 38672c9910..c47199d5de 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -497,7 +497,10 @@ CONFIG_INET=y CONFIG_IP_MULTICAST=y # CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_FIB_HASH=y -# CONFIG_IP_PNP is not set +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IP_PNP_RARP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE_DEMUX is not set # CONFIG_IP_MROUTE is not set @@ -2389,6 +2392,7 @@ CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set CONFIG_NFS_V4=y # CONFIG_NFS_V4_1 is not set +CONFIG_ROOT_NFS=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFS_USE_NEW_IDMAPPER is not set diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 97008e0df1..e66b7872d4 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -550,7 +550,10 @@ CONFIG_INET=y CONFIG_IP_MULTICAST=y # CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_FIB_HASH=y -# CONFIG_IP_PNP is not set +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IP_PNP_RARP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE_DEMUX is not set # CONFIG_IP_MROUTE is not set @@ -2438,6 +2441,7 @@ CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set CONFIG_NFS_V4=y # CONFIG_NFS_V4_1 is not set +CONFIG_ROOT_NFS=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFS_USE_NEW_IDMAPPER is not set diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 01f6b684dd..df546dba78 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -500,7 +500,10 @@ CONFIG_INET=y CONFIG_IP_MULTICAST=y # CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_FIB_HASH=y -# CONFIG_IP_PNP is not set +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IP_PNP_RARP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE_DEMUX is not set # CONFIG_IP_MROUTE is not set @@ -2376,6 +2379,7 @@ CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set CONFIG_NFS_V4=y # CONFIG_NFS_V4_1 is not set +CONFIG_ROOT_NFS=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFS_USE_NEW_IDMAPPER is not set From e5dd0d1a14a8ed26aa0dadcccfce89027222d61e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 4 Apr 2011 18:06:50 +0200 Subject: [PATCH 05/13] projects/*/linux: buildin all network drivers statically Signed-off-by: Stephan Raue --- projects/Generic/linux/linux.i386.conf | 72 +++++++++++++------------- projects/ION/linux/linux.i386.conf | 8 +-- projects/ION/linux/linux.x86_64.conf | 8 +-- projects/Intel/linux/linux.i386.conf | 4 +- projects/Intel/linux/linux.x86_64.conf | 4 +- 5 files changed, 47 insertions(+), 49 deletions(-) diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index fa9616dfdd..ad9d22b154 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -943,17 +943,17 @@ CONFIG_PHYLIB=y # # MII PHY device drivers # -CONFIG_MARVELL_PHY=m -CONFIG_DAVICOM_PHY=m -CONFIG_QSEMI_PHY=m -CONFIG_LXT_PHY=m +CONFIG_MARVELL_PHY=y +CONFIG_DAVICOM_PHY=y +CONFIG_QSEMI_PHY=y +CONFIG_LXT_PHY=y # CONFIG_CICADA_PHY is not set # CONFIG_VITESSE_PHY is not set # CONFIG_SMSC_PHY is not set -CONFIG_BROADCOM_PHY=m +CONFIG_BROADCOM_PHY=y # CONFIG_BCM63XX_PHY is not set -CONFIG_ICPLUS_PHY=m -CONFIG_REALTEK_PHY=m +CONFIG_ICPLUS_PHY=y +CONFIG_REALTEK_PHY=y # CONFIG_NATIONAL_PHY is not set # CONFIG_STE10XP is not set # CONFIG_LSI_ET1011C_PHY is not set @@ -965,7 +965,7 @@ CONFIG_NET_ETHERNET=y # CONFIG_SUNGEM is not set # CONFIG_CASSINI is not set CONFIG_NET_VENDOR_3COM=y -CONFIG_VORTEX=m +CONFIG_VORTEX=y # CONFIG_TYPHOON is not set # CONFIG_ETHOC is not set # CONFIG_DNET is not set @@ -985,21 +985,21 @@ CONFIG_ULI526X=m # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set CONFIG_NET_PCI=y -CONFIG_PCNET32=m +CONFIG_PCNET32=y # CONFIG_AMD8111_ETH is not set # CONFIG_ADAPTEC_STARFIRE is not set # CONFIG_KSZ884X_PCI is not set -CONFIG_B44=m +CONFIG_B44=y CONFIG_B44_PCI_AUTOSELECT=y CONFIG_B44_PCICORE_AUTOSELECT=y CONFIG_B44_PCI=y -CONFIG_FORCEDETH=m -CONFIG_E100=m +CONFIG_FORCEDETH=y +CONFIG_E100=y # CONFIG_FEALNX is not set # CONFIG_NATSEMI is not set # CONFIG_NE2K_PCI is not set # CONFIG_8139CP is not set -CONFIG_8139TOO=m +CONFIG_8139TOO=y CONFIG_8139TOO_PIO=y # CONFIG_8139TOO_TUNE_TWISTER is not set # CONFIG_8139TOO_8129 is not set @@ -1011,34 +1011,34 @@ CONFIG_8139TOO_PIO=y # CONFIG_SUNDANCE is not set # CONFIG_TLAN is not set # CONFIG_KS8851_MLL is not set -CONFIG_VIA_RHINE=m +CONFIG_VIA_RHINE=y # CONFIG_VIA_RHINE_MMIO is not set # CONFIG_SC92031 is not set -CONFIG_ATL2=m +CONFIG_ATL2=y CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set # CONFIG_DL2K is not set -CONFIG_E1000=m -CONFIG_E1000E=m +CONFIG_E1000=y +CONFIG_E1000E=y # CONFIG_IP1000 is not set -CONFIG_IGB=m +CONFIG_IGB=y # CONFIG_IGBVF is not set # CONFIG_NS83820 is not set # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set -CONFIG_R8169=m -CONFIG_SIS190=m -CONFIG_SKGE=m -CONFIG_SKY2=m -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m -CONFIG_BNX2=m -CONFIG_CNIC=m -CONFIG_QLA3XXX=m -CONFIG_ATL1=m -CONFIG_ATL1E=m -CONFIG_ATL1C=m -CONFIG_JME=m +CONFIG_R8169=y +CONFIG_SIS190=y +CONFIG_SKGE=y +CONFIG_SKY2=y +CONFIG_VIA_VELOCITY=y +CONFIG_TIGON3=y +CONFIG_BNX2=y +CONFIG_CNIC=y +CONFIG_QLA3XXX=y +CONFIG_ATL1=y +CONFIG_ATL1E=y +CONFIG_ATL1C=y +CONFIG_JME=y # CONFIG_STMMAC_ETH is not set # CONFIG_PCH_GBE is not set # CONFIG_NETDEV_10000 is not set @@ -1076,7 +1076,6 @@ CONFIG_AR9170_LEDS=y CONFIG_B43=m CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y -# CONFIG_B43_SDIO is not set CONFIG_B43_PIO=y CONFIG_B43_PHY_N=y CONFIG_B43_PHY_LP=y @@ -1528,14 +1527,12 @@ CONFIG_SSB_POSSIBLE=y # # Sonics Silicon Backplane # -CONFIG_SSB=m +CONFIG_SSB=y CONFIG_SSB_SPROM=y CONFIG_SSB_BLOCKIO=y CONFIG_SSB_PCIHOST_POSSIBLE=y CONFIG_SSB_PCIHOST=y CONFIG_SSB_B43_PCI_BRIDGE=y -CONFIG_SSB_SDIOHOST_POSSIBLE=y -# CONFIG_SSB_SDIOHOST is not set # CONFIG_SSB_SILENT is not set # CONFIG_SSB_DEBUG is not set CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y @@ -2143,6 +2140,7 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y # CONFIG_USB_ISP1760_HCD is not set # CONFIG_USB_ISP1362_HCD is not set CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_OHCI_HCD_SSB is not set # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y @@ -2409,7 +2407,7 @@ CONFIG_RTC_DRV_CMOS=y # # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set -CONFIG_UIO=m +CONFIG_UIO=y # CONFIG_UIO_CIF is not set # CONFIG_UIO_PDRV is not set # CONFIG_UIO_PDRV_GENIRQ is not set @@ -2860,7 +2858,7 @@ CONFIG_BITREVERSE=y CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_FIND_LAST_BIT=y -CONFIG_CRC_CCITT=m +CONFIG_CRC_CCITT=y CONFIG_CRC16=y # CONFIG_CRC_T10DIF is not set CONFIG_CRC_ITU_T=y diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 800f4bbbcc..fa4f887fff 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -957,7 +957,7 @@ CONFIG_NET_PCI=y # CONFIG_ADAPTEC_STARFIRE is not set # CONFIG_KSZ884X_PCI is not set # CONFIG_B44 is not set -CONFIG_FORCEDETH=m +CONFIG_FORCEDETH=y # CONFIG_E100 is not set # CONFIG_FEALNX is not set # CONFIG_NATSEMI is not set @@ -985,7 +985,7 @@ CONFIG_NETDEV_1000=y # CONFIG_NS83820 is not set # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set -CONFIG_R8169=m +CONFIG_R8169=y # CONFIG_SIS190 is not set # CONFIG_SKGE is not set # CONFIG_SKY2 is not set @@ -996,8 +996,8 @@ CONFIG_R8169=m # CONFIG_QLA3XXX is not set # CONFIG_ATL1 is not set # CONFIG_ATL1E is not set -CONFIG_ATL1C=m -CONFIG_JME=m +CONFIG_ATL1C=y +CONFIG_JME=y # CONFIG_STMMAC_ETH is not set # CONFIG_PCH_GBE is not set # CONFIG_NETDEV_10000 is not set diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index c47199d5de..60b6e77e15 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -905,7 +905,7 @@ CONFIG_NET_PCI=y # CONFIG_ADAPTEC_STARFIRE is not set # CONFIG_KSZ884X_PCI is not set # CONFIG_B44 is not set -CONFIG_FORCEDETH=m +CONFIG_FORCEDETH=y # CONFIG_E100 is not set # CONFIG_FEALNX is not set # CONFIG_NATSEMI is not set @@ -933,7 +933,7 @@ CONFIG_NETDEV_1000=y # CONFIG_NS83820 is not set # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set -CONFIG_R8169=m +CONFIG_R8169=y # CONFIG_SIS190 is not set # CONFIG_SKGE is not set # CONFIG_SKY2 is not set @@ -944,8 +944,8 @@ CONFIG_R8169=m # CONFIG_QLA3XXX is not set # CONFIG_ATL1 is not set # CONFIG_ATL1E is not set -CONFIG_ATL1C=m -CONFIG_JME=m +CONFIG_ATL1C=y +CONFIG_JME=y # CONFIG_STMMAC_ETH is not set # CONFIG_PCH_GBE is not set # CONFIG_NETDEV_10000 is not set diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index e66b7872d4..8fcd789c9a 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -942,14 +942,14 @@ CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set # CONFIG_DL2K is not set # CONFIG_E1000 is not set -CONFIG_E1000E=m +CONFIG_E1000E=y # CONFIG_IP1000 is not set # CONFIG_IGB is not set # CONFIG_IGBVF is not set # CONFIG_NS83820 is not set # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set -CONFIG_R8169=m +CONFIG_R8169=y # CONFIG_SIS190 is not set # CONFIG_SKGE is not set # CONFIG_SKY2 is not set diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index df546dba78..3fd4dd359d 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -891,14 +891,14 @@ CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set # CONFIG_DL2K is not set # CONFIG_E1000 is not set -CONFIG_E1000E=m +CONFIG_E1000E=y # CONFIG_IP1000 is not set # CONFIG_IGB is not set # CONFIG_IGBVF is not set # CONFIG_NS83820 is not set # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set -CONFIG_R8169=m +CONFIG_R8169=y # CONFIG_SIS190 is not set # CONFIG_SKGE is not set # CONFIG_SKY2 is not set From 1561aee6f754c02a1b01a1d7b54e04ffd545ad27 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 4 Apr 2011 23:34:42 +0200 Subject: [PATCH 06/13] busybox-initramfs: add applet 'tr' Signed-off-by: Stephan Raue --- .../busybox-initramfs/config/busybox-initramfs.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf b/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf index b8f0688a40..cf648e80b8 100644 --- a/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf +++ b/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.18.4 -# Mon Apr 4 17:34:53 2011 +# Mon Apr 4 23:33:49 2011 # CONFIG_HAVE_DOT_CONFIG=y @@ -171,9 +171,9 @@ CONFIG_CAT=y # CONFIG_FEATURE_DATE_COMPAT is not set CONFIG_TEST=y CONFIG_FEATURE_TEST_64=y -# CONFIG_TR is not set -# CONFIG_FEATURE_TR_CLASSES is not set -# CONFIG_FEATURE_TR_EQUIV is not set +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +CONFIG_FEATURE_TR_EQUIV=y # CONFIG_BASE64 is not set # CONFIG_CAL is not set # CONFIG_CATV is not set From 0cad06d6e5acb36408832608426408ec723fc12f Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Tue, 5 Apr 2011 14:51:08 +0200 Subject: [PATCH 07/13] take mpfr from the gnu.org mirror since the current url no longer works --- packages/toolchain/math/mpfr/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/toolchain/math/mpfr/meta b/packages/toolchain/math/mpfr/meta index f1be4ee08b..4e37333db3 100644 --- a/packages/toolchain/math/mpfr/meta +++ b/packages/toolchain/math/mpfr/meta @@ -24,7 +24,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="LGPL" PKG_SITE="http://www.mpfr.org/" -PKG_URL="http://www.mpfr.org/mpfr-current/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://ftp.gnu.org/gnu/mpfr/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="" PKG_BUILD_DEPENDS="ccache gmp" PKG_PRIORITY="optional" From 1e42a73c7cdab8fa245205400655870a4506a7b4 Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Tue, 5 Apr 2011 01:21:26 +0200 Subject: [PATCH 08/13] implement booting from an nbd root with an nfs overlay. adds 5 new kernel cmdline options: * netboot set this option on cmdline to boot from an nbd root device on the network. * nbdroot=host:portnumber short for nbdserver=host nbdport=portnumber * nbdserver=host the hostname or ip address to mount the root device from. if nbdroot and nbdserver aren't set, 192.168.1.1 will be used. * nbdport=portnumber the port number to mount the root device from. if nbdroot and nbdport aren't set, port number 2000 will be used. * nfsoverlay=host:/path/to/overlay the path to mount the writable overlay directory from. if not set, 192.168.1.1:/var/lib/overlay will be used. --- .../sysutils/busybox-initramfs/scripts/init | 123 ++++++++++++++---- 1 file changed, 96 insertions(+), 27 deletions(-) diff --git a/packages/sysutils/busybox-initramfs/scripts/init b/packages/sysutils/busybox-initramfs/scripts/init index 8953a4eef4..3d31325b3d 100755 --- a/packages/sysutils/busybox-initramfs/scripts/init +++ b/packages/sysutils/busybox-initramfs/scripts/init @@ -27,9 +27,15 @@ IMAGE_SYSTEM="SYSTEM" IMAGE_KERNEL="KERNEL" REBOOT="0" +# defaults for booting from an nbd root +NBD_ROOT_SERVER="192.168.1.1" +NBD_ROOT_PORT="2000" +NFS_OVERLAY="192.168.1.1:/var/lib/overlay" + # mount all needed special filesystems /bin/busybox mount -t devtmpfs none /dev /bin/busybox mount -t proc none /proc + /bin/busybox mount -t sysfs none /sys # hide kernel log messages on console echo '1 4 1 7' > /proc/sys/kernel/printk @@ -49,6 +55,23 @@ REBOOT="0" fastboot) FASTBOOT=yes ;; + netboot) + NETBOOT=yes + ;; + nbdroot=*) + nbdroot="${arg#nbdroot=}" + NBD_ROOT_SERVER=$( echo "${nbdroot}" | /bin/busybox sed 's/:.*//') + NBD_ROOT_PORT=$( echo "${nbdroot}" | /bin/busybox sed 's/.*://') + ;; + nbdserver=*) + NBD_ROOT_SERVER="${arg#nbdserver=}" + ;; + nbdport=*) + NBD_ROOT_PORT="${arg#nbdport=}" + ;; + nfsoverlay=*) + NFS_OVERLAY="${arg#nfsoverlay=}" + ;; esac done @@ -85,7 +108,12 @@ REBOOT="0" progress "trying to mount $1 ..." for i in 1 2 3 4 5 6 7 8 9 10; do ERR_ENV=1 - $IONICE /bin/busybox mount -o $3 $1 $2 > /dev/null 2>&1 + if [ -z "$4" ]; then + mount_opts="-o $3 $1 $2" + else + mount_opts="-t $4 -o $3 $1 $2" + fi + $IONICE /bin/busybox mount $mount_opts > /dev/null 2>&1 [ "$?" -eq "0" ] && ERR_ENV=0 && break /bin/busybox usleep 1000000 done @@ -103,39 +131,80 @@ REBOOT="0" fi } + mount_nbd() { + retry_nr=0 + retry_delay=20 + OVERLAY_DIR=`cat /sys/class/net/eth0/address | /bin/busybox tr -d :` + + while [ ${retry_nr} -lt ${retry_delay} ] && [ ! -e /sysroot/sbin/init ]; do + [ ${retry_nr} -gt 0 ] && \ + $IONICE /bin/busybox nbd-client $NBD_ROOT_SERVER $NBD_ROOT_PORT /dev/nbd0 && \ + mount_part "/dev/nbd0" "/sysroot" "ro" "squashfs" + + retry_nr=$(( ${retry_nr} + 1 )) + + [ ! -e /sysroot/sbin/init ] && /bin/sleep 1 + + [ ${retry_nr} -gt 0 ] + done + + if [ ! -e /sysroot/sbin/init ]; then + error "INIT_2" "Could not mount NBD root from $NBD_ROOT_SERVER port $NBD_ROOT_PORT" + debug_shell + fi + + mount_part "$NFS_OVERLAY" "/sysroot/storage" "rw,nolock,retrans=10" "nfs" + + if [ ! -d /sysroot/storage/$OVERLAY_DIR ]; then + mkdir /sysroot/storage/$OVERLAY_DIR + fi + + /bin/busybox umount /sysroot/storage + mount_part "$NFS_OVERLAY/$OVERLAY_DIR" "/sysroot/storage" "rw,nolock" "nfs" + } + + mount_disk() { + mount_part "$boot" "/flash" "ro,noatime" + + if [ -n "$disk" ]; then + mount_part "$disk" "/storage" "rw,noatime" + update "Kernel" "$IMAGE_KERNEL" "/flash/$IMAGE_KERNEL" + update "System" "$IMAGE_SYSTEM" "/flash/$IMAGE_SYSTEM" + + if test "$REBOOT" -eq "1"; then + echo "System reboots now..." && \ + /bin/busybox reboot + fi + fi + + if [ -f "/flash/$IMAGE_SYSTEM" ]; then + mount_part "/flash/$IMAGE_SYSTEM" "/sysroot" "ro,loop" + [ "$ERR_ENV" -ne "0" ] && debug_shell + else + error "INIT_2" "Could not find system." + debug_shell + fi + + # move /flash and /storage to /sysroot + /bin/busybox mount --move /flash /sysroot/flash + + if [ -n "$disk" ]; then + /bin/busybox mount --move /storage /sysroot/storage + fi + } + show_splash - mount_part "$boot" "/flash" "ro,noatime" - - if [ -n "$disk" ]; then - mount_part "$disk" "/storage" "rw,noatime" - update "Kernel" "$IMAGE_KERNEL" "/flash/$IMAGE_KERNEL" - update "System" "$IMAGE_SYSTEM" "/flash/$IMAGE_SYSTEM" - - if test "$REBOOT" -eq "1"; then - echo "System reboots now..." && \ - /bin/busybox reboot - fi - fi - - if [ -f "/flash/$IMAGE_SYSTEM" ]; then - mount_part "/flash/$IMAGE_SYSTEM" "/sysroot" "ro,loop" - [ "$ERR_ENV" -ne "0" ] && debug_shell + if [ -z "$NETBOOT" ]; then + mount_disk else - error "INIT_2" "Could not find system." - debug_shell + mount_nbd fi -# move /flash and /storage to /sysroot - /bin/busybox mount --move /flash /sysroot/flash - - if [ -n "$disk" ]; then - /bin/busybox mount --move /storage /sysroot/storage - fi - -# unmount all other filesystems + # unmount all other filesystems /bin/busybox umount /dev /bin/busybox umount /proc + /bin/busybox umount /sys # switch to new sysroot and start real init exec /bin/busybox switch_root /sysroot /sbin/init From 326888b02830c502affc6a3ed3addf0a2343880a Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Tue, 5 Apr 2011 19:58:29 +0200 Subject: [PATCH 09/13] replace call to /bin/sleep with /bin/busybox usleep --- packages/sysutils/busybox-initramfs/scripts/init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/busybox-initramfs/scripts/init b/packages/sysutils/busybox-initramfs/scripts/init index 3d31325b3d..f385e1ce1d 100755 --- a/packages/sysutils/busybox-initramfs/scripts/init +++ b/packages/sysutils/busybox-initramfs/scripts/init @@ -143,7 +143,7 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay" retry_nr=$(( ${retry_nr} + 1 )) - [ ! -e /sysroot/sbin/init ] && /bin/sleep 1 + [ ! -e /sysroot/sbin/init ] && /bin/busybox usleep 1000000 [ ${retry_nr} -gt 0 ] done From ebd032f4bb251350475605ea88c3f752a2a416aa Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Tue, 5 Apr 2011 14:51:08 +0200 Subject: [PATCH 10/13] take mpfr from the gnu.org mirror since the current url no longer works --- packages/toolchain/math/mpfr/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/toolchain/math/mpfr/meta b/packages/toolchain/math/mpfr/meta index f1be4ee08b..4e37333db3 100644 --- a/packages/toolchain/math/mpfr/meta +++ b/packages/toolchain/math/mpfr/meta @@ -24,7 +24,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="LGPL" PKG_SITE="http://www.mpfr.org/" -PKG_URL="http://www.mpfr.org/mpfr-current/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://ftp.gnu.org/gnu/mpfr/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="" PKG_BUILD_DEPENDS="ccache gmp" PKG_PRIORITY="optional" From 838c6e7f0aae2ce49e789c5cf8ec78d3682f23ad Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Tue, 5 Apr 2011 01:21:26 +0200 Subject: [PATCH 11/13] implement booting from an nbd root with an nfs overlay. adds 5 new kernel cmdline options: * netboot set this option on cmdline to boot from an nbd root device on the network. * nbdroot=host:portnumber short for nbdserver=host nbdport=portnumber * nbdserver=host the hostname or ip address to mount the root device from. if nbdroot and nbdserver aren't set, 192.168.1.1 will be used. * nbdport=portnumber the port number to mount the root device from. if nbdroot and nbdport aren't set, port number 2000 will be used. * nfsoverlay=host:/path/to/overlay the path to mount the writable overlay directory from. if not set, 192.168.1.1:/var/lib/overlay will be used. --- .../sysutils/busybox-initramfs/scripts/init | 123 ++++++++++++++---- 1 file changed, 96 insertions(+), 27 deletions(-) diff --git a/packages/sysutils/busybox-initramfs/scripts/init b/packages/sysutils/busybox-initramfs/scripts/init index 8953a4eef4..3d31325b3d 100755 --- a/packages/sysutils/busybox-initramfs/scripts/init +++ b/packages/sysutils/busybox-initramfs/scripts/init @@ -27,9 +27,15 @@ IMAGE_SYSTEM="SYSTEM" IMAGE_KERNEL="KERNEL" REBOOT="0" +# defaults for booting from an nbd root +NBD_ROOT_SERVER="192.168.1.1" +NBD_ROOT_PORT="2000" +NFS_OVERLAY="192.168.1.1:/var/lib/overlay" + # mount all needed special filesystems /bin/busybox mount -t devtmpfs none /dev /bin/busybox mount -t proc none /proc + /bin/busybox mount -t sysfs none /sys # hide kernel log messages on console echo '1 4 1 7' > /proc/sys/kernel/printk @@ -49,6 +55,23 @@ REBOOT="0" fastboot) FASTBOOT=yes ;; + netboot) + NETBOOT=yes + ;; + nbdroot=*) + nbdroot="${arg#nbdroot=}" + NBD_ROOT_SERVER=$( echo "${nbdroot}" | /bin/busybox sed 's/:.*//') + NBD_ROOT_PORT=$( echo "${nbdroot}" | /bin/busybox sed 's/.*://') + ;; + nbdserver=*) + NBD_ROOT_SERVER="${arg#nbdserver=}" + ;; + nbdport=*) + NBD_ROOT_PORT="${arg#nbdport=}" + ;; + nfsoverlay=*) + NFS_OVERLAY="${arg#nfsoverlay=}" + ;; esac done @@ -85,7 +108,12 @@ REBOOT="0" progress "trying to mount $1 ..." for i in 1 2 3 4 5 6 7 8 9 10; do ERR_ENV=1 - $IONICE /bin/busybox mount -o $3 $1 $2 > /dev/null 2>&1 + if [ -z "$4" ]; then + mount_opts="-o $3 $1 $2" + else + mount_opts="-t $4 -o $3 $1 $2" + fi + $IONICE /bin/busybox mount $mount_opts > /dev/null 2>&1 [ "$?" -eq "0" ] && ERR_ENV=0 && break /bin/busybox usleep 1000000 done @@ -103,39 +131,80 @@ REBOOT="0" fi } + mount_nbd() { + retry_nr=0 + retry_delay=20 + OVERLAY_DIR=`cat /sys/class/net/eth0/address | /bin/busybox tr -d :` + + while [ ${retry_nr} -lt ${retry_delay} ] && [ ! -e /sysroot/sbin/init ]; do + [ ${retry_nr} -gt 0 ] && \ + $IONICE /bin/busybox nbd-client $NBD_ROOT_SERVER $NBD_ROOT_PORT /dev/nbd0 && \ + mount_part "/dev/nbd0" "/sysroot" "ro" "squashfs" + + retry_nr=$(( ${retry_nr} + 1 )) + + [ ! -e /sysroot/sbin/init ] && /bin/sleep 1 + + [ ${retry_nr} -gt 0 ] + done + + if [ ! -e /sysroot/sbin/init ]; then + error "INIT_2" "Could not mount NBD root from $NBD_ROOT_SERVER port $NBD_ROOT_PORT" + debug_shell + fi + + mount_part "$NFS_OVERLAY" "/sysroot/storage" "rw,nolock,retrans=10" "nfs" + + if [ ! -d /sysroot/storage/$OVERLAY_DIR ]; then + mkdir /sysroot/storage/$OVERLAY_DIR + fi + + /bin/busybox umount /sysroot/storage + mount_part "$NFS_OVERLAY/$OVERLAY_DIR" "/sysroot/storage" "rw,nolock" "nfs" + } + + mount_disk() { + mount_part "$boot" "/flash" "ro,noatime" + + if [ -n "$disk" ]; then + mount_part "$disk" "/storage" "rw,noatime" + update "Kernel" "$IMAGE_KERNEL" "/flash/$IMAGE_KERNEL" + update "System" "$IMAGE_SYSTEM" "/flash/$IMAGE_SYSTEM" + + if test "$REBOOT" -eq "1"; then + echo "System reboots now..." && \ + /bin/busybox reboot + fi + fi + + if [ -f "/flash/$IMAGE_SYSTEM" ]; then + mount_part "/flash/$IMAGE_SYSTEM" "/sysroot" "ro,loop" + [ "$ERR_ENV" -ne "0" ] && debug_shell + else + error "INIT_2" "Could not find system." + debug_shell + fi + + # move /flash and /storage to /sysroot + /bin/busybox mount --move /flash /sysroot/flash + + if [ -n "$disk" ]; then + /bin/busybox mount --move /storage /sysroot/storage + fi + } + show_splash - mount_part "$boot" "/flash" "ro,noatime" - - if [ -n "$disk" ]; then - mount_part "$disk" "/storage" "rw,noatime" - update "Kernel" "$IMAGE_KERNEL" "/flash/$IMAGE_KERNEL" - update "System" "$IMAGE_SYSTEM" "/flash/$IMAGE_SYSTEM" - - if test "$REBOOT" -eq "1"; then - echo "System reboots now..." && \ - /bin/busybox reboot - fi - fi - - if [ -f "/flash/$IMAGE_SYSTEM" ]; then - mount_part "/flash/$IMAGE_SYSTEM" "/sysroot" "ro,loop" - [ "$ERR_ENV" -ne "0" ] && debug_shell + if [ -z "$NETBOOT" ]; then + mount_disk else - error "INIT_2" "Could not find system." - debug_shell + mount_nbd fi -# move /flash and /storage to /sysroot - /bin/busybox mount --move /flash /sysroot/flash - - if [ -n "$disk" ]; then - /bin/busybox mount --move /storage /sysroot/storage - fi - -# unmount all other filesystems + # unmount all other filesystems /bin/busybox umount /dev /bin/busybox umount /proc + /bin/busybox umount /sys # switch to new sysroot and start real init exec /bin/busybox switch_root /sysroot /sbin/init From fbbf3975c6a6444c7e8474fbb3b1c02479ed39cc Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Tue, 5 Apr 2011 19:58:29 +0200 Subject: [PATCH 12/13] replace call to /bin/sleep with /bin/busybox usleep --- packages/sysutils/busybox-initramfs/scripts/init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/busybox-initramfs/scripts/init b/packages/sysutils/busybox-initramfs/scripts/init index 3d31325b3d..f385e1ce1d 100755 --- a/packages/sysutils/busybox-initramfs/scripts/init +++ b/packages/sysutils/busybox-initramfs/scripts/init @@ -143,7 +143,7 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay" retry_nr=$(( ${retry_nr} + 1 )) - [ ! -e /sysroot/sbin/init ] && /bin/sleep 1 + [ ! -e /sysroot/sbin/init ] && /bin/busybox usleep 1000000 [ ${retry_nr} -gt 0 ] done From 3980e36617ea7b64ad58c78c8b0ffb5972f043ae Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 7 Apr 2011 10:10:16 +0200 Subject: [PATCH 13/13] busybox-initramfs: add applet 'sed', thanks to elum Signed-off-by: Stephan Raue --- .../sysutils/busybox-initramfs/config/busybox-initramfs.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf b/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf index cf648e80b8..46a7fbd80f 100644 --- a/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf +++ b/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.18.4 -# Mon Apr 4 23:33:49 2011 +# Thu Apr 7 10:08:24 2011 # CONFIG_HAVE_DOT_CONFIG=y @@ -353,7 +353,7 @@ CONFIG_DEFAULT_SETFONT_DIR="" # CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set # CONFIG_FEATURE_DIFF_DIR is not set # CONFIG_ED is not set -# CONFIG_SED is not set +CONFIG_SED=y CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=4096 # CONFIG_FEATURE_VI_8BIT is not set