Changeset 902


Ignore:
Timestamp:
Jan 15, 2017, 2:26:01 PM (4 months ago)
Author:
amain
Message:

native: erlite native kernel compile support

Location:
trunk
Files:
16 added
2 deleted
17 edited
3 copied
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/Config.in

    r694 r902  
    4747mainmenu "DebWrt Configuration"
    4848
    49 source "config/kernel/config.in"
     49source "config/firmware/config.in"
    5050source "config/rootfs/config.in"
    5151source "config/cross/config.in"
  • trunk/Makefile

    r872 r902  
    3636
    3737ifeq ($(CONFIG_DEBWRT_FIRMWARE),y)
     38ifeq ($(CONFIG_DEBWRT_FIRMWARE_NATIVE),y)
     39        include arch/octeon/erlite/arch.mk
     40else
    3841        include openwrt/openwrt.mk
    3942        include openwrt/openwrt-deliver.mk
     43endif
    4044endif
    4145
     
    6165               /select/ {next} \
    6266               // { print $0 }' \
    63         >$(TOPDIR)/config/kernel/target/target.in
    64         cat $(OPENWRT_BUILD_DIR)/target/Config.in | grep -v 'source "tmp/.config-target.in"' >$(TOPDIR)/config/kernel/target/archs.in
     67        >$(TOPDIR)/config/firmware/openwrt/target/target.in
     68        cat $(OPENWRT_BUILD_DIR)/target/Config.in | grep -v 'source "tmp/.config-target.in"' >$(TOPDIR)/config/firmware/openwrt/target/archs.in
    6569
    6670board:
  • trunk/config/config.mk

    r724 r902  
    5050          >$(TOPDIR)/config/archs.in
    5151
     52config/check:
     53        @find config/ -name "*.in" \
     54          | while read conf; \
     55            do \
     56                grep "^\W*source" $${conf} \
     57                  | awk '{print $$2}' \
     58                  | tr -d '"' \
     59                  | grep -v plugins-generated.in \
     60                  | while read src; \
     61                    do \
     62                        if ! ls $${src} 1>/dev/null 2>&1; \
     63                        then \
     64                            echo "$${conf}: unable to find source file $${src}"; \
     65                        fi; \
     66                    done; \
     67            done
     68
    5269config/clean:
    5370        $(MAKE) -C $(MCONF_DIR) clean
     
    7390        @echo "Type make help to get a list of available DebWrt make commands"
    7491
    75 menuconfig: plugins/generate-config config/mconf/mconf FORCE
     92menuconfig: plugins/generate-config config/mconf/mconf config/check FORCE
    7693        $(MCONF) Config.in
    7794        @echo "Type make help to get a list of available DebWrt make commands"
  • trunk/config/cross/config.in

    r694 r902  
    1818# Kconfig documentation: http://lxr.linux.no/#linux+v2.6.34.1/Documentation/kbuild/kconfig-language.txt
    1919
     20config DEBIAN_BUILDENV_RELEASE
     21        string
     22        default "sid"     if DEBIAN_BUILDENV_RELEASE_SID
     23        default "stretch" if DEBIAN_BUILDENV_RELEASE_STRETCH
     24        default "jessie"  if DEBIAN_BUILDENV_RELEASE_JESSIE
     25        default "wheezy"  if DEBIAN_BUILDENV_RELEASE_WHEEZY
     26        default "squeeze" if DEBIAN_BUILDENV_RELEASE_SQUEEZE
     27        default "lenny"   if DEBIAN_BUILDENV_RELEASE_LENNY
     28        default "sid"     if DEBIAN_BUILDENV_RELEASE_SID
     29        default "none"
     30
    2031menuconfig DEBWRT_CROSS
    21     bool "Debian cross build environment (optional)"
     32    bool "Debian cross build environment"
    2233    default n
    2334    help
     
    2536      no need anymore to setup the Debian cross build environment and cross build the
    2637      DebWrt debian packages.
     38 
     39    if DEBWRT_CROSS 
     40        choice
     41            prompt "Debian Release"
     42            default DEBIAN_BUILDENV_RELEASE_JESSIE
     43            help
     44              Debian release
     45
     46            config DEBIAN_BUILDENV_RELEASE_SID
     47                bool
     48                prompt "Sid"
     49
     50            config DEBIAN_BUILDENV_RELEASE_STRETCH
     51                bool
     52                prompt "Stretch"
     53
     54            config DEBIAN_BUILDENV_RELEASE_JESSIE
     55                bool
     56                prompt "Jessie"
     57
     58            config DEBIAN_BUILDENV_RELEASE_WHEEZY
     59                bool
     60                prompt "Wheezy"
     61
     62            config DEBIAN_BUILDENV_RELEASE_SQUEEZE
     63                bool
     64                prompt "Squeeze (depricated - may not work)"
     65
     66            config DEBIAN_BUILDENV_RELEASE_LENNY
     67                bool
     68                prompt "Lenny (depricated - may not work)"
     69
     70        endchoice
    2771       
    28     config DEBIAN_BUILDENV_REPOSITORY
    29             string "Debian Repository" if DEBWRT_CROSS
    30             default "http://ftp.debian.org/debian"
    31             help
    32               Specify the Debian Repository used to set up de Debian Cross-Compile chroot
    33               environment and used to install Debian chroot for the target architecture.
     72        config DEBIAN_BUILDENV_REPOSITORY
     73        string "Debian Repository"
     74        default "http://ftp.debian.org/debian"
     75        help
     76          Specify the Debian Repository used to set up de Debian Cross-Compile chroot
     77          environment and used to install Debian chroot for the target architecture.
    3478
    35     config EMDEBIAN_BUILDENV_REPOSITORY
    36             string "Emdebian Repository" if DEBWRT_CROSS
     79        config DEBIAN_BUILDENV_SETUP_EMDEBIAN
     80            bool "Install Emdebian (obsolete)"
     81            default n
     82
     83        config DEBIAN_BUILDENV_SETUP_QEMU
     84            bool "Install Qemu (obsolete)"
     85            default n
     86
     87        config EMDEBIAN_BUILDENV_REPOSITORY
     88            string "Emdebian Repository" if DEBIAN_BUILDENV_SETUP_EMDEBIAN
    3789            default "http://www.emdebian.org/debian"
    3890            help
     
    4092              environment and used to install Debian chroot for the target architecture.
    4193
    42     config DEBIAN_BUILDENV_INCLUDE_PACKAGES
    43             string "Additional packages" if DEBWRT_CROSS
     94        config DEBIAN_BUILDENV_INCLUDE_PACKAGES
     95            string "Additional packages"
    4496            default "file,less,strace,sudo"
    4597            help
     
    48100              debootstrapped chrooted Debian sid installation.
    49101
    50     config DEBIAN_BUILDENV_QEMU_VERSION
    51             string "Qemu version" if DEBWRT_CROSS
     102        config DEBIAN_BUILDENV_QEMU_VERSION
     103            string "Qemu version" if DEBIAN_BUILDENV_SETUP_QEMU
    52104            default "2.4.0.1"
    53105            help
    54106              At least 0.12.2 is needed for mips targets.
     107    endif
    55108
     109
  • trunk/config/firmware/config.in

    r694 r902  
    55
    66    if DEBWRT_FIRMWARE
    7         source "config/kernel/target/config.in"
     7        choice
     8            prompt "Firwmare type"
     9            default DEBWRT_FIRMWARE_OPENWRT
     10            help
     11              Select the type of firmware to be build
    812
    9         source "config/kernel/config/image_name.in"
    10         source "config/kernel/config/flash_ip.in"
     13            config DEBWRT_FIRMWARE_OPENWRT
     14                bool
     15                prompt "OpenWrt/LEDE"
    1116
    12         source "config/kernel/openwrt/config.in"
    13         source "config/kernel/config/config.in"
     17            config DEBWRT_FIRMWARE_NATIVE
     18                bool
     19                prompt "DebWrt native"
     20        endchoice
     21
     22        if DEBWRT_FIRMWARE_OPENWRT
     23            source "config/firmware/openwrt/target/config.in"
     24            source "config/firmware/openwrt/openwrt/config.in"
     25        endif
     26
     27        if DEBWRT_FIRMWARE_NATIVE
     28            source "config/firmware/arch/config.in"
     29        endif
     30
     31        # Shared config settings between OpenWrt and native
     32            source "config/firmware/shared/kernel/image_name.in"
     33            source "config/firmware/shared/kernel/flash_ip.in"
     34 
     35        source "config/firmware/shared/kernel/config.in"
    1436    endif
  • trunk/config/firmware/openwrt/openwrt/config.in

    r724 r902  
    11menu "OpenWrt Version"
    22
    3 source "config/kernel/openwrt/version.in"
     3source "config/firmware/openwrt/openwrt/version.in"
    44
    55endmenu
     
    77menu "OpenWrt Extra Options"
    88
    9 source "config/kernel/openwrt/extra.in"
     9source "config/firmware/openwrt/openwrt/extra.in"
    1010
    1111endmenu
  • trunk/config/firmware/openwrt/target/config.in

    r676 r902  
    11menu "Target"
    22
    3 source "config/kernel/target/plugin.in"
    4 source "config/kernel/target/archs.in"
    5 source "config/kernel/target/target.in"
     3source "config/firmware/openwrt/target/plugin.in"
     4source "config/firmware/openwrt/target/archs.in"
     5source "config/firmware/openwrt/target/target.in"
    66
    77endmenu
  • trunk/config/firmware/openwrt/target/target.in

    r724 r902  
    34163416          Package set optimized for CPVA642-type.
    34173417
    3418 config TARGET_brcm63xx_generic_CPVA502PLUS
    3419         bool "Telsey CPVA502+"
    3420         depends on TARGET_brcm63xx_generic
    3421        
    3422 
    3423         help
    3424           Package set optimized for CPVA502+.
    3425 
    34263418config TARGET_brcm63xx_generic_TDW8900GB
    34273419        bool "TP-Link TD-W8900GB"
     
    40254017        help
    40264018          Package set optimized for GW6200.
    4027 
    4028 config TARGET_brcm63xx_smp_CPVA502PLUS
    4029         bool "Telsey CPVA502+"
    4030         depends on TARGET_brcm63xx_smp
    4031        
    4032 
    4033         help
    4034           Package set optimized for CPVA502+.
    40354019
    40364020config TARGET_brcm63xx_smp_CPVA642
  • trunk/config/firmware/shared/kernel/boot.in

    r865 r902  
    8383          to become ready, before the kernel tries to boot from it.
    8484
    85 source "config/kernel/config/kexec.in"
     85source "config/firmware/shared/kernel/kexec.in"
    8686
    87 source "config/kernel/config/nfs.in"
     87source "config/firmware/shared/kernel/nfs.in"
    8888
    8989endmenu
  • trunk/config/firmware/shared/kernel/config.in

    r676 r902  
    11menu "Kernel Configuration"
    22
    3 source "config/kernel/config/version.in"
    4 source "config/kernel/config/boot.in"
    5 source "config/kernel/config/options.in"
     3source "config/firmware/shared/kernel/version.in"
     4source "config/firmware/shared/kernel/boot.in"
     5source "config/firmware/shared/kernel/options.in"
    66
    77endmenu
  • trunk/config/firmware/shared/kernel/options.in

    r900 r902  
    6363endmenu
    6464
    65 source "config/kernel/config/systemd.in"
     65source "config/firmware/shared/kernel/systemd.in"
    6666
    6767menu "General configuration"
     
    774774endmenu 
    775775
    776 source "config/kernel/config/options_network.in"
     776source "config/firmware/shared/kernel/options_network.in"
    777777 
    778778menu "OpenWrt Kernel Module Packages"
  • trunk/config/firmware/shared/kernel/options_network.in

    r871 r902  
    3232
    3333config PCI
     34        bool
    3435        default n
    3536
  • trunk/debian/buildenv/buildenv.mk

    r675 r902  
    11# DebWrt - Debian on Embedded devices
    22#
    3 # Copyright (C) 2010-2015 Johan van Zoomeren <amain@debwrt.net>
     3# Copyright (C) 2010-2017 Johan van Zoomeren <amain@debwrt.net>
    44#
    55# This program is free software: you can redistribute it and/or modify
     
    1616# along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717
    18 debian/buildenv/create: debian/buildenv/prepare
     18debian/buildenv/create: debian/buildenv/prepare debian/buildenv/build-essential
    1919        touch $@
    2020
    2121debian/buildenv/prepare:
    2222        mkdir -p $(DEBIAN_BUILD_DIR)
    23         # Due to various bugs in debootstrap in combination with fakechroot it is not
    24         # possible to create a fakechroot here - and therefore we need to use chroot
    25         # with sudo
    26         #fakeroot fakechroot debootstrap
    27                                                 #--variant=fakechroot
    28         sudo debootstrap    --include=$(subst $(space),$(empty),$(CONFIG_DEBIAN_BUILDENV_INCLUDE_PACKAGES)) \
    29                                             $(DEBIAN_BUILD_VERSION) \
    30                                                 $(DEBIAN_BUILD_DIR) \
    31                                                 $(CONFIG_DEBIAN_BUILDENV_REPOSITORY)
     23        sudo debootstrap --include=$(subst $(space),$(empty),$(CONFIG_DEBIAN_BUILDENV_INCLUDE_PACKAGES)) \
     24                         $(DEBIAN_BUILD_VERSION) \
     25                         $(DEBIAN_BUILD_DIR) \
     26                         $(CONFIG_DEBIAN_BUILDENV_REPOSITORY)
    3227        sudo bash -c "echo 127.0.0.1 `hostname -s` localhost >$(DEBIAN_BUILD_DIR)/etc/hosts"
    3328        sudo bash -c "echo debwrt-$(TARGET_ARCH)-$(DEBIAN_BUILD_VERSION) > $(DEBIAN_BUILD_DIR)/etc/debian_chroot"
     
    3934        sudo chroot $(DEBIAN_BUILD_DIR) apt-get update
    4035        sudo chroot $(DEBIAN_BUILD_DIR) groupadd -g $(shell id -g) debwrt
    41         sudo chroot $(DEBIAN_BUILD_DIR) useradd -g debwrt -s /bin/bash -m -u $(shell id -u) $$USER
     36        sudo chroot $(DEBIAN_BUILD_DIR) useradd -g debwrt -s /bin/bash -d /usr/src -m -u $(shell id -u) $$USER
    4237        sudo mkdir -p $(DEBIAN_BUILD_DIR)/etc/sudoers.d
    4338        sudo bash -c "echo \"$(USER) ALL=(ALL) NOPASSWD: ALL\" >$(DEBIAN_BUILD_DIR)/etc/sudoers.d/debwrt"
     
    4540        touch $@
    4641
     42debian/buildenv/build-essential:
     43        sudo chroot $(DEBIAN_BUILD_DIR) bash -c "export LC_ALL=C; apt-get -y --force-yes install build-essential dh-make debootstrap fakeroot zlib1g-dev openssh-client vim pkg-config dpatch libncurses5-dev devscripts subversion automake gcc-multilib g++-multilib quilt devscripts"
     44        touch $@
     45
     46
    4747debian/buildenv/clean: debian/buildenv/qemu-clean debian/buildenv/emdebian-clean
    48         # sudo should not be needed if fakechroot would have worked
    4948        sudo rm -rf $(DEBIAN_BUILD_DIR)
    5049        rm -f debian/buildenv/prepare
    5150        rm -f debian/buildenv/create
     51        rm -f debian/buildenv/build-essential
    5252
    5353.PHONY: debian/buildenv/clean
  • trunk/debian/buildenv/debian.mk

    r675 r902  
    2222chu: chroot-user
    2323chroot:
    24         $(CHROOT) bash -c "cd /usr/src; exec bash"
     24        @$(CHROOT) bash -c "cd /usr/src; exec bash"
    2525chroot-user:
    26         $(CHROOT_USER) bash -c "cd /usr/src; exec bash"
     26        @$(CHROOT_USER)
    2727
    2828include $(TOPDIR)/debian/buildenv/buildenv.mk
  • trunk/debian/buildenv/emdebian.mk

    r685 r902  
    6161        #sudo chroot $(DEBIAN_BUILD_DIR) apt-get -y install apt-cross
    6262        #sudo chroot $(DEBIAN_BUILD_DIR) apt-get -y install libmpfr1ldbl
    63         sudo chroot $(DEBIAN_BUILD_DIR) apt-get -y install emdebian-archive-keyring xapt dpkg-cross
     63        sudo chroot $(DEBIAN_BUILD_DIR) apt-get -y install emdebian-archive-keyring #xapt dpkg-cross
    6464        sudo chroot $(DEBIAN_BUILD_DIR) bash -c "export LC_ALL=C; apt-get -y --force-yes install build-essential dh-make debootstrap fakeroot zlib1g-dev openssh-client vim pkg-config dpatch libncurses5-dev devscripts subversion automake gcc-multilib g++-multilib quilt devscripts"
    6565ifeq ($(TARGET_ARCH),arm)
  • trunk/debian/debian.mk

    r695 r902  
    1818ifeq ($(CONFIG_DEBWRT_CROSS),y)
    1919        include $(TOPDIR)/debian/buildenv/debian.mk
    20         include $(TOPDIR)/debian/package/debian.mk
     20        #include $(TOPDIR)/debian/packages/debian.mk
    2121        DEBIAN_CLEAN+=debian/package/clean debian/buildenv/clean
    2222endif
  • trunk/rules/debwrt.mk

    r884 r902  
    131131
    132132# Debian
    133 DEBIAN_BUILD_DIR:=$(BUILD_DIR_BASE)/debian-$(TARGET)-$(SUB_TARGET)-$(DEBIAN_BUILD_VERSION)
     133DEBIAN_BUILD_VERSION=$(call qstrip,$(CONFIG_DEBIAN_BUILDENV_RELEASE))
     134DEBIAN_BUILD_DIR:=$(BUILD_DIR_BASE)/debian-$(DEBIAN_BUILD_VERSION)
    134135
    135136# Debian packages dir
Note: See TracChangeset for help on using the changeset viewer.