Skip to content
This repository was archived by the owner on Mar 17, 2018. It is now read-only.

Commit

Permalink
LEDE sync, 2017.01
Browse files Browse the repository at this point in the history
  • Loading branch information
ryzhovau committed Jan 31, 2017
1 parent 6b97f88 commit 53516d5
Show file tree
Hide file tree
Showing 53 changed files with 998 additions and 3,247 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
/logs
/feeds
/files
/overlay
/package/feeds
/package/openwrt-packages
key-build*
Expand Down
19 changes: 5 additions & 14 deletions LastSync.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
Sync with LEDE
commit 2711b94932a01ecd00ee9cfba7dcbb1cf4fe2517
Author: Alexander Couzens <[email protected]>
Date: Sat Jan 28 17:23:16 2017 +0100

commit 7c47f43fe650309e6a2383c99273dc1bde367bc1
Author: Hauke Mehrtens <[email protected]>
Date: Sun Dec 4 19:03:48 2016 +0100
lantiq: fix unaligned access in xrx200_poll_rx()

lantiq: falcon: remove bootargs-append
Signed-off-by: Alexander Couzens <[email protected]>

trunk/packages

commit fb237477fd1e7801e4877f9fe1ea7bc1ec16dd99
Author: Felix Fietkau <[email protected]>
Date: Thu Dec 15 13:02:31 2016 +0100

mt76: update to the latest version, fixes a build error on some platforms

Signed-off-by: Felix Fietkau <[email protected]>
15 changes: 11 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,12 @@ else
include tools/Makefile
include toolchain/Makefile

$(toolchain/stamp-install): $(tools/stamp-install)
$(target/stamp-compile): $(toolchain/stamp-install) $(tools/stamp-install) $(BUILD_DIR)/.prepared
$(toolchain/stamp-compile): $(tools/stamp-compile)
$(target/stamp-compile): $(toolchain/stamp-compile) $(tools/stamp-compile) $(BUILD_DIR)/.prepared
$(package/stamp-compile): $(target/stamp-compile) $(package/stamp-cleanup)
$(package/stamp-install): $(package/stamp-compile)
$(target/stamp-install): $(package/stamp-compile) $(package/stamp-install)
check: $(tools/stamp-check) $(toolchain/stamp-check) $(package/stamp-check)

printdb:
@true
Expand All @@ -54,7 +55,7 @@ clean: FORCE
rm -rf $(BUILD_DIR) $(STAGING_DIR) $(BIN_DIR) $(OUTPUT_DIR)/packages/$(ARCH_PACKAGES) $(BUILD_LOG_DIR) $(TOPDIR)/staging_dir/packages

dirclean: clean
rm -rf $(STAGING_DIR_HOST) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST) $(BUILD_DIR_TOOLCHAIN)
rm -rf $(STAGING_DIR_HOST) $(STAGING_DIR_HOSTPKG) $(TOOLCHAIN_DIR) $(BUILD_DIR_BASE)/host $(BUILD_DIR_BASE)/hostpkg $(BUILD_DIR_TOOLCHAIN)
rm -rf $(TMP_DIR)

ifndef DUMP_TARGET_DB
Expand Down Expand Up @@ -86,9 +87,15 @@ prereq: $(target/stamp-prereq) tmp/.prereq_packages
checksum: FORCE
$(call sha256sums,$(BIN_DIR))

prepare: .config $(tools/stamp-install) $(toolchain/stamp-install)
diffconfig: FORCE
mkdir -p $(BIN_DIR)
$(SCRIPT_DIR)/diffconfig.sh > $(BIN_DIR)/config.seed

prepare: .config $(tools/stamp-compile) $(toolchain/stamp-compile)
world: prepare $(target/stamp-compile) $(package/stamp-compile) FORCE
$(_SINGLE)$(SUBMAKE) -r package/index
$(_SINGLE)$(SUBMAKE) -r diffconfig
$(_SINGLE)$(SUBMAKE) -r checksum

.PHONY: clean dirclean prereq prepare world package/symlinks package/symlinks-install package/symlinks-clean

Expand Down
14 changes: 4 additions & 10 deletions README
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This is the buildsystem for the OpenWrt Linux distribution.
This is the buildsystem for the LEDE Linux distribution.

Please use "make menuconfig" to configure your appreciated
Please use "make menuconfig" to choose your preferred
configuration for the toolchain and firmware.

You need to have installed gcc, binutils, bzip2, flex, python, perl, make,
Expand All @@ -17,19 +17,13 @@ Simply running "make" will build your firmware.
It will download all sources, build the cross-compile toolchain,
the kernel and all choosen applications.

You can use "scripts/flashing/flash.sh" for remotely updating your embedded
system via tftp.

The OpenWrt system is documented in docs/. You will need a LaTeX distribution
and the tex4ht package to build the documentation. Type "make -C docs/" to build it.

To build your own firmware you need to have access to a Linux, BSD or MacOSX system
(case-sensitive filesystem required). Cygwin will not be supported because of
the lack of case sensitiveness in the file system.


Sunshine!
Your OpenWrt Project
http://openwrt.org
Your LEDE Community
http://www.lede-project.org


60 changes: 2 additions & 58 deletions config/Config-build.in
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,7 @@ menu "Global build settings"

config SHADOW_PASSWORDS
bool
prompt "Enable shadow password support"
default y
help
Enable shadow password support.

config CLEAN_IPKG
bool
Expand Down Expand Up @@ -90,59 +87,6 @@ menu "Global build settings"
help
Enables IPv6 support in kernel (builtin) and packages.

config PKG_BUILD_PARALLEL
bool
prompt "Compile certain packages parallelized"
default y
help
This adds a -jX option to certain packages that are known to behave well
for parallel build. By default, the package make processes use the main
jobserver, in which case this option only takes effect when you add -jX
to the make command.

If you are unsure, select N.

config PKG_BUILD_USE_JOBSERVER
bool
prompt "Use top-level make jobserver for packages"
depends on PKG_BUILD_PARALLEL
default y
help
This passes the main make process jobserver fds to package builds,
enabling full parallelization across different packages.

Note that disabling this may overcommit CPU resources depending on the
-j level of the main make process, the number of package submake jobs
selected below and the number of actual CPUs present.
Example: If the main make is passed a -j4 and the submake -j
is also set to 4, we may end up with 16 parallel make processes
in the worst case.

config PKG_BUILD_JOBS
int
prompt "Number of package submake jobs (2-512)"
range 2 512
default 2
depends on PKG_BUILD_PARALLEL && !PKG_BUILD_USE_JOBSERVER
help
The number of jobs (-jX) to pass to packages submake.

config PKG_DEFAULT_PARALLEL
bool
prompt "Parallelize the default package build rule (May break build)"
depends on PKG_BUILD_PARALLEL
depends on BROKEN
default n
help
Always set the default package build rules to parallel build.

WARNING: This may break build or kill your cat, as it builds packages
with multiple jobs that are probably not tested in a parallel build
environment.

Only say Y if you don't mind fixing broken packages. Before reporting
build bugs, set this to N and re-run the build.

comment "Stripping options"

choice
Expand Down Expand Up @@ -236,7 +180,7 @@ menu "Global build settings"
config PKG_CC_STACKPROTECTOR_STRONG
bool "Strong"
select SSP_SUPPORT if !USE_MUSL
depends on GCC_VERSION_5
depends on !GCC_VERSION_4_8
depends on KERNEL_CC_STACKPROTECTOR_STRONG
endchoice

Expand All @@ -251,7 +195,7 @@ menu "Global build settings"
config KERNEL_CC_STACKPROTECTOR_REGULAR
bool "Regular"
config KERNEL_CC_STACKPROTECTOR_STRONG
depends on GCC_VERSION_5
depends on !GCC_VERSION_4_8
bool "Strong"
endchoice

Expand Down
8 changes: 8 additions & 0 deletions config/Config-devel.in
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,14 @@ menuconfig DEVEL
help
Automatically rebuild packages when their files change.

config AUTOREMOVE
bool "Automatic removal of build directories" if DEVEL
default n
help
Automatically delete build directories after make target completed.
This allows you to symlink build_dir into a scratch location, e.g. a ramdisk,
which does not have enough space to keep a complete build_dir.

config BUILD_SUFFIX
string "Build suffix to append to the target BUILD_DIR variable" if DEVEL
default ""
Expand Down
59 changes: 6 additions & 53 deletions config/Config-images.in
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ menu "Target Images"
prompt "Compression"
default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ar71xx
default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips
default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_apm821xx
default TARGET_INITRAMFS_COMPRESSION_NONE
depends on TARGET_ROOTFS_INITRAMFS
help
Expand Down Expand Up @@ -72,13 +73,6 @@ menu "Target Images"
help
Build an ext4 root filesystem.

config TARGET_EXT4_MAXINODE
int "Maximum number of inodes in root filesystem"
depends on TARGET_ROOTFS_EXT4FS
default 6000
help
Select the maximum number of inodes in the root filesystem.

config TARGET_EXT4_RESERVED_PCT
int "Percentage of reserved blocks in root filesystem"
depends on TARGET_ROOTFS_EXT4FS
Expand Down Expand Up @@ -126,7 +120,7 @@ menu "Target Images"

config TARGET_ROOTFS_JFFS2
bool "jffs2"
default y if USES_JFFS2
depends on USES_JFFS2
help
Build a JFFS2 root filesystem.

Expand Down Expand Up @@ -186,7 +180,7 @@ menu "Target Images"

config GRUB_IMAGES
bool "Build GRUB images (Linux x86 or x86_64 host only)"
depends on TARGET_x86_64 || (TARGET_x86 && !TARGET_x86_rdc)
depends on TARGET_x86
depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
select PACKAGE_grub2
default y
Expand Down Expand Up @@ -254,12 +248,12 @@ menu "Target Images"
config TARGET_KERNEL_PARTSIZE
int "Kernel partition size (in MB)"
depends on GRUB_IMAGES
default 4
default 16

config TARGET_ROOTFS_PARTSIZE
int "Root filesystem partition size (in MB)"
depends on GRUB_IMAGES || TARGET_ROOTFS_EXT4FS || TARGET_rb532
default 48
depends on GRUB_IMAGES || TARGET_ROOTFS_EXT4FS || TARGET_rb532 || TARGET_mvebu || TARGET_uml
default 256
help
Select the root filesystem partition size.

Expand All @@ -271,45 +265,4 @@ menu "Target Images"
it will be mounted by PARTUUID which makes the kernel find the
appropriate disk automatically.


menuconfig TARGET_ROOTFS_INCLUDE_KERNEL
bool "Include kernel in root filesystem"
depends on TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS
default n
help
Include the kernel image in the rootfs. Typically, the image is placed
below /boot.

config TARGET_ROOTFS_INCLUDE_UIMAGE
bool "include uImage" if TARGET_ROOTFS_INCLUDE_KERNEL
default y
help
This option might not apply to all targets. Make sure
to check target/linux/<your_target>/image/Makefile to
see if this option will have any effect.

config TARGET_ROOTFS_INCLUDE_ZIMAGE
bool "include zImage" if TARGET_ROOTFS_INCLUDE_KERNEL
default y
help
This option might not apply to all targets. Make sure
to check target/linux/<your_target>/image/Makefile to
see if this option will have any effect.

config TARGET_ROOTFS_INCLUDE_FIT
bool "include FIT" if TARGET_ROOTFS_INCLUDE_KERNEL
default y
help
This option might not apply to all targets. Make sure
to check target/linux/<your_target>/image/Makefile to
see if this option will have any effect.

config TARGET_ROOTFS_INCLUDE_DTB
bool "Include DTB in root filesystem"
depends on USES_DEVICETREE && (TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS)
default n
help
Include the device tree blob file(s) in the rootfs. Typically the DTBs
are placed below /boot.

endmenu
Loading

0 comments on commit 53516d5

Please sign in to comment.