Changeset 919


Ignore:
Timestamp:
Jan 21, 2017, 8:21:03 PM (8 months ago)
Author:
amain
Message:

octeon-native: fix boot cmdline configuration, firmware: create header and modules tar.gzs with default owner/group root

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/arch/octeon/erlite/arch-deliver.mk

    r903 r919  
    5050        echo $(TARGET) >$(INSTALL_DIR_OPENWRT_MODULES)/lib/modules/debwrt.target
    5151        echo $(SUB_TARGET) >$(INSTALL_DIR_OPENWRT_MODULES)/lib/modules/debwrt.subtarget
    52         tar czf $(INSTALL_DIR_OPENWRT)/$(MODULES_TAR_GZ) -C $(INSTALL_DIR_OPENWRT_MODULES) .
     52        tar cpzf $(INSTALL_DIR_OPENWRT)/$(MODULES_TAR_GZ) --owner=root --group=root -C $(INSTALL_DIR_OPENWRT_MODULES) .
    5353
    5454openwrt/deliver/kernel-headers:
     
    5858        cp -ra $(SRC_DIR)/install/include $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-$(OPENWRT_LINUX_UNAME_VERSION)
    5959        cp $(SRC_DIR)/kernel/.config $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-$(OPENWRT_LINUX_UNAME_VERSION)
    60         tar czf $(INSTALL_DIR_OPENWRT)/$(HEADERS_TAR_GZ) -C $(INSTALL_DIR_OPENWRT_HEADERS) .
     60        tar cpzf $(INSTALL_DIR_OPENWRT)/$(HEADERS_TAR_GZ) --owner=root --group=root -C $(INSTALL_DIR_OPENWRT_HEADERS) .
    6161
    6262openwrt/deliver/config:
  • trunk/config/cross/config.in

    r902 r919  
    3131menuconfig DEBWRT_CROSS
    3232    bool "Debian cross build environment"
     33    default y if TARGET_octeon-native
    3334    default n
    3435    help
     
    4142            prompt "Debian Release"
    4243            default DEBIAN_BUILDENV_RELEASE_JESSIE
     44            default DEBIAN_BUILDENV_RELEASE_JESSIE if TARGET_octeon-native
    4345            help
    4446              Debian release
  • trunk/config/firmware/arch/mips64/octeon/erlite/config.in

    r904 r919  
    22    bool
    33    default y
    4     select BOOT_METHOD_BOOTLOADER
    5     select DEBWRT_CROSS
    6     # selecting DEBIAN_BUILDENV_RELEASE_JESSIE, a choice does not work somehow
    7     # select DEBIAN_BUILDENV_RELEASE_JESSIE
    84
    95config TARGET_octeon-native_generic
  • trunk/config/firmware/config.in

    r902 r919  
    2929        endif
    3030
    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  
     31        source "config/firmware/shared/kernel/image_name.in"
     32        source "config/firmware/shared/kernel/flash_ip.in"
    3533        source "config/firmware/shared/kernel/config.in"
    3634    endif
  • trunk/config/firmware/shared/kernel/boot.in

    r902 r919  
    2727    prompt "Boot method"
    2828        default BOOT_METHOD_BOOTLOADER if TARGET_octeon
     29        default BOOT_METHOD_BOOTLOADER if TARGET_octeon-native
    2930        default BOOT_METHOD_DEVICE
    3031        help
    3132          Select how DebWrt should boot
     33
     34config BOOT_METHOD_DEVICE
     35        bool "Directly boot from device /dev/sda1"
    3236
    3337config BOOT_METHOD_BOOTLOADER
     
    4549          the the patch-cmdline tool with a no-op script. Which is an ugly hack, but the
    4650          only way to avoid big patches.
    47 
    48 config BOOT_METHOD_DEVICE
    49         bool "Directly boot from device /dev/sda1"
    5051
    5152config BOOT_METHOD_SCRIPT
  • trunk/debian/buildenv

    • Property svn:ignore
      •  

        old new  
        66build
        77qemu
         8build-essential
  • trunk/openwrt

    • Property svn:ignore
      •  

        old new  
        88files-copy
        99unpatch
         10build-essential
         11debian-dependencies
         12download
         13extract
  • trunk/openwrt/openwrt-deliver.mk

    r888 r919  
    9191        echo $(TARGET) >$(INSTALL_DIR_OPENWRT_MODULES)/lib/modules/debwrt.target
    9292        echo $(SUB_TARGET) >$(INSTALL_DIR_OPENWRT_MODULES)/lib/modules/debwrt.subtarget
    93         tar czf $(INSTALL_DIR_OPENWRT)/$(MODULES_TAR_GZ) -C $(INSTALL_DIR_OPENWRT_MODULES) .
     93        tar cpzf $(INSTALL_DIR_OPENWRT)/$(MODULES_TAR_GZ) --owner=root --group=root -C $(INSTALL_DIR_OPENWRT_MODULES) .
    9494
    9595openwrt/deliver/kernel-headers: openwrt/deliver/prepare
     
    101101        #cp $(OPENWRT_LINUX_DIR)/include/linux/switch.h $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-$(OPENWRT_LINUX_UNAME_VERSION)/include/linux/switch.h
    102102        cp $(OPENWRT_LINUX_DIR)/.config $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-$(OPENWRT_LINUX_UNAME_VERSION)
    103         tar czf $(INSTALL_DIR_OPENWRT)/$(HEADERS_TAR_GZ) -C $(INSTALL_DIR_OPENWRT_HEADERS) .
     103        tar cpzf $(INSTALL_DIR_OPENWRT)/$(HEADERS_TAR_GZ) --owner=root --group=root -C $(INSTALL_DIR_OPENWRT_HEADERS) .
    104104
    105105openwrt/deliver/packages: openwrt/deliver/prepare
Note: See TracChangeset for help on using the changeset viewer.