Changeset 75


Ignore:
Timestamp:
Aug 31, 2010, 3:09:33 PM (9 years ago)
Author:
amain
Message:

rootfs: several changes, preparing for initial usable release

Location:
debwrt/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • debwrt/trunk/Config.in

    r73 r75  
    908908config DEBIAN_ROOTFS_INCLUDE_PACKAGES
    909909        string "Additional packages"
    910         default "openssh-server,openssh-client,vim-tiny,telnetd,bzip2,bridge-utils,tcpdump,vlan,iproute,udev,dnsmasq,ntpdate,ntp,locales,iperf,screen,less,usbutils,pciutils,ebtables,strace,host,samba,module-init-tools,file,bwm-ng,netcat,ethtool,lsof,sdparm,hdparm,wireless-tools,psmisc"
     910        default "dash,openssh-server,openssh-client,vim-tiny,telnetd,telnet,bzip2,bridge-utils,tcpdump,vlan,iproute,udev,dnsmasq,ntpdate,ntp,iperf,screen,less,usbutils,pciutils,ebtables,strace,host,module-init-tools,file,bwm-ng,netcat,ethtool,lsof,sdparm,hdparm,wireless-tools,psmisc"
    911911        help
    912912          Specify a comma seperated list of additional packages to install in the
  • debwrt/trunk/debian/package/debian.mk

    r46 r75  
    2020include $(TOPDIR)/debian/package/debwrt-kernel-headers/build.mk
    2121
     22debian/package/rootfs: debian/package/iw debian/package/libnl
     23
    2224debian/package/clean:
    2325        rm -rf $(DEBIAN_BUILD_DIR)/usr/src/*   
  • debwrt/trunk/debian/rootfs/debian.mk

    r71 r75  
    2121MODULES_VERSION=$(shell echo `basename $(DEBWRT_MODULES_ARCHIVE) 2>/dev/null` | awk -F '-' '{print $$6}')
    2222
    23 debian/rootfs: debian/rootfs/bootstrap debian/rootfs/debwrt-packages debian/rootfs/unpack debian/rootfs/files-install debian/rootfs/modules-install
     23# removed in favor of supporting multiple targets with one base image: debian/rootfs/modules-install
     24debian/rootfs: debian/rootfs/bootstrap debian/rootfs/debwrt-packages debian/rootfs/unpack debian/rootfs/files-install debian/rootfs/post-setup
    2425        touch $@
    2526
     
    3637        fi
    3738        if [ ! -f $(ROOTFS_BUILD_DIR)/dev/initctl ]; then \
    38                 mkfifo $(ROOTFS_BUILD_DIR)/dev/initctl; \
     39                sudo mkfifo $(ROOTFS_BUILD_DIR)/dev/initctl; \
    3940        fi
    40         sudo bash -c "tar cf - -C $(DEBWRT_EXTRA_ROOTFS_FILES_DIR) . | tar -xovf - -C $(ROOTFS_BUILD_DIR)"
     41        sudo bash -c "tar cf - --exclude=".svn" -C $(DEBWRT_EXTRA_ROOTFS_FILES_DIR) . | tar -xovf - -C $(ROOTFS_BUILD_DIR)"
    4142        touch $@
    4243
     
    6667        touch $@
    6768
    68 debian/rootfs/debwrt-packages: debian/rootfs/bootstrap
     69debian/rootfs/debwrt-packages: debian/rootfs/bootstrap debian/package/rootfs
    6970        ls ${INSTALL_DIR_DEBIAN_PACKAGES}/*.deb | grep -v "debwrt-kernel-headers" | while read package; do \
    7071                pfname=`basename $$package`; \
     
    8182        touch $@
    8283
     84debian/rootfs/post-setup: debian/rootfs/bootstrap
     85        sudo mkdir -p $(ROOTFS_BUILD_DIR)/etc/apt
     86        sudo bash -c "echo \"deb http://ftp.debian.org/debian $(DEBIAN_BUILD_VERSION) main\" >$(ROOTFS_BUILD_DIR)/etc/apt/sources.list"
     87        touch $@
     88
    8389debian/rootfs/clean:
    8490        sudo rm -rf $(ROOTFS_BUILD_DIR)
     
    8793        rm -f debian/rootfs/install
    8894        rm -f debian/rootfs/files-install
    89         rm -g debian/rootfs/modules-install
     95        rm -f debian/rootfs/modules-install
    9096
  • debwrt/trunk/debian/rootfs/files/etc/init.d/rcS.firstboot

    r66 r75  
    2626
    2727# Run bash instead of normal boot procedure
     28/bin/echo
     29/bin/echo "Welcome to the DebWrt post installation!"
     30/bin/echo
    2831/bin/echo "Press ctrl-d for normal boot. Use vim.tiny to edit files."
     32/bin/echo
     33/bin/echo "Note that both telnetd and sshd are running on: 192.168.1.1 and on 192.168.1.20."
     34/bin/echo
     35/bin/echo "Second stage install instructions:"
     36/bin/echo
     37/bin/echo "- /debootstrap/debootstrap --second-stage"
     38/bin/echo "- rm -rf /var/cache/apt/archives"
     39/bin/echo "- mkdir -p /var/cache/apt/archives/partial"
     40/bin/echo "- optional: rm -rf /lib/modules ( note: used when preparing an image for a DebWrt release )"
    2941/bin/echo
    3042/bin/bash
  • debwrt/trunk/openwrt/openwrt.mk

    r72 r75  
    7373        touch $@
    7474
     75openwrt/update: openwrt/checkout
     76ifeq ($(IS_OPENWRT_TRUNK),y)
     77        cd $(OPENWRT_BUILD_DIR) && svn update svn://svn.openwrt.org/openwrt/trunk/ .
     78else ifeq ($(IS_OPENWRT_BACKFIRE),y)
     79        cd $(OPENWRT_BUILD_DIR) && svn update svn://svn.openwrt.org/openwrt/branches/backfire/ .
     80else
     81        cd $(OPENWRT_BUILD_DIR) && svn update -r $(OPENWRT_REVISION) svn://svn.openwrt.org/openwrt/trunk/ .
     82endif
     83
    7584openwrt/menuconfig: openwrt/prepare
    7685        $(SCRIPT_CLEAN_EXEC) $(MAKE) -C $(OPENWRT_BUILD_DIR) menuconfig
Note: See TracChangeset for help on using the changeset viewer.