Skip to content
Permalink
Browse files

Unify "Entware specific" comments, add small parts of last upstream sync

  • Loading branch information...
ryzhovau committed Mar 14, 2019
1 parent e456eba commit d98fff993b547eb7d1d1aaaa2e28f1b740a65281
@@ -4,7 +4,7 @@
# See /LICENSE for more information.
#

mainmenu "Entware-ng Configuration"
mainmenu "Entware Configuration"

config MODULES
option modules
37 README
@@ -1,26 +1,31 @@
This is the buildsystem for the OpenWrt Linux distribution.
_______ ________ __
| |.-----.-----.-----.| | | |.----.| |_
| - || _ | -__| || | | || _|| _|
|_______|| __|_____|__|__||________||__| |____|
|__| W I R E L E S S F R E E D O M
-----------------------------------------------------

Please use "make menuconfig" to choose your preferred
configuration for the toolchain and firmware.
This is the buildsystem for the OpenWrt Linux distribution.

You need to have installed gcc, binutils, bzip2, flex, python, perl, make,
find, grep, diff, unzip, gawk, getopt, subversion, libz-dev and libc headers.
To build your own firmware you need a Linux, BSD or MacOSX system (case
sensitive filesystem required). Cygwin is unsupported because of the lack
of a case sensitive file system.

Run "./scripts/feeds update -a" to get all the latest package definitions
defined in feeds.conf / feeds.conf.default respectively
and "./scripts/feeds install -a" to install symlinks of all of them into
package/feeds/.
You need gcc, binutils, bzip2, flex, python, perl, make, find, grep, diff,
unzip, gawk, getopt, subversion, libz-dev and libc headers installed.

Use "make menuconfig" to configure your image.
1. Run "./scripts/feeds update -a" to obtain all the latest package definitions
defined in feeds.conf / feeds.conf.default

Simply running "make" will build your firmware.
It will download all sources, build the cross-compile toolchain,
the kernel and all choosen applications.
2. Run "./scripts/feeds install -a" to install symlinks for all obtained
packages into package/feeds/

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.
3. Run "make menuconfig" to select your preferred configuration for the
toolchain, target system & firmware packages.

4. Run "make" to build your firmware. This will download all sources, build
the cross-compile toolchain and then cross-compile the Linux kernel & all
chosen applications for your target system.

Sunshine!
Your OpenWrt Community

This file was deleted.

Oops, something went wrong.
@@ -197,14 +197,12 @@ menu "Target Images"
config GRUB_CONSOLE
bool "Use Console Terminal (in addition to Serial)"
depends on GRUB_IMAGES
default n if (TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501 || TARGET_x86_geos || TARGET_x86_alix2)
default y

config GRUB_SERIAL
string "Serial port device"
depends on GRUB_IMAGES
default "hvc0" if TARGET_x86_xen_domu
default "ttyS0" if ! TARGET_x86_xen_domu
default "ttyS0"

config GRUB_BAUDRATE
int "Serial port baud rate"
@@ -220,7 +218,6 @@ menu "Target Images"
config GRUB_BOOTOPTS
string "Extra kernel boot options"
depends on GRUB_IMAGES
default "xencons=hvc" if TARGET_x86_xen_domu
help
If you don't know, just leave it blank.

@@ -241,14 +238,14 @@ menu "Target Images"

config VDI_IMAGES
bool "Build VirtualBox image files (VDI)"
depends on TARGET_x86 || TARGET_x86_64
depends on TARGET_x86
select GRUB_IMAGES
select TARGET_IMAGES_PAD
select PACKAGE_kmod-e1000

config VMDK_IMAGES
bool "Build VMware image files (VMDK)"
depends on TARGET_x86 || TARGET_x86_64
depends on TARGET_x86
select GRUB_IMAGES
select TARGET_IMAGES_PAD
select PACKAGE_kmod-e1000
@@ -269,11 +266,13 @@ menu "Target Images"
config TARGET_KERNEL_PARTSIZE
int "Kernel partition size (in MB)"
depends on GRUB_IMAGES || USES_BOOT_PART
default 8 if TARGET_apm821xx_sata
default 20 if TARGET_brcm2708
default 16

config TARGET_ROOTFS_PARTSIZE
int "Root filesystem partition size (in MB)"
depends on GRUB_IMAGES || USES_ROOTFS_PART || TARGET_ROOTFS_EXT4FS || TARGET_mvebu || TARGET_rb532 || TARGET_sunxi || TARGET_uml
depends on GRUB_IMAGES || USES_ROOTFS_PART || TARGET_ROOTFS_EXT4FS || TARGET_mvebu || TARGET_omap || TARGET_rb532 || TARGET_sunxi || TARGET_uml
default 256
help
Select the root filesystem partition size.
@@ -519,6 +519,20 @@ if KERNEL_CGROUPS
CONFIG_CFQ_GROUP_IOSCHED=y; for enabling throttling policy, set
CONFIG_BLK_DEV_THROTTLING=y.

if KERNEL_BLK_CGROUP

config KERNEL_CFQ_GROUP_IOSCHED
bool "Proportional weight of disk bandwidth in CFQ"

config KERNEL_BLK_DEV_THROTTLING
bool "Enable throttling policy"
default y if TARGET_brcm2708

config KERNEL_BLK_DEV_THROTTLING_LOW
bool "Block throttling .low limit interface support (EXPERIMENTAL)"
depends on KERNEL_BLK_DEV_THROTTLING
endif

config KERNEL_DEBUG_BLK_CGROUP
bool "Enable Block IO controller debugging"
default n
@@ -4,6 +4,7 @@
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# Entware specific: default postint/prerm files disabled

ifndef DUMP
include $(INCLUDE_DIR)/feeds.mk
@@ -289,7 +289,7 @@ ifeq ($(SUBTARGETS),)
CUR_SUBTARGET := default
endif

# Entware specific! Target-Arch-Packages contains the board, not cpu
# Entware specific: Target-Arch-Packages contains the board, not cpu
define BuildTargets/DumpCurrent
.PHONY: dumpinfo
dumpinfo : export DESCRIPTION=$$(Target/Description)

This file was deleted.

Oops, something went wrong.
@@ -4,6 +4,7 @@
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# Entware specific: Build/Compile step

include $(TOPDIR)/rules.mk

@@ -66,7 +67,6 @@ TARGET_LDFLAGS+= \
-static-libstdc++ \
-Wl,--gc-sections

# Entware specific:
define Build/Compile
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \
@@ -4,7 +4,7 @@
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# Stripped charset are added back
# Entware specific: Stripped charset are added back

include $(TOPDIR)/rules.mk

@@ -4,6 +4,7 @@
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# Entware specific: -DLZO_CFG_NO_UNALIGNED=1 for x86 targets

include $(TOPDIR)/rules.mk

@@ -4,11 +4,12 @@
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# Entware specific:
# opkg binary segfaults when a real package is replaced by "provided" package.
# we removed PROVIDES libncurses field in libncursesw and added a real libncurses package that
# installes symlinks. We've added more symlinks to make binaries from older packages to be compatible with
# the new libncurses(w) package.
# Our patch set is different from LEDE for historical reason, it will be merged after next uptade in LEDE
# Our patch set is different from LEDE for historical reason, it will be merged after next sync

include $(TOPDIR)/rules.mk

@@ -4,7 +4,6 @@
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# no-ssl3-method excluded to keep compatibility with existing code

include $(TOPDIR)/rules.mk

@@ -4,7 +4,7 @@
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# locales package moved to rtndev
# Entware specific: locales package moved to rtndev, gconv-modules package added

include $(TOPDIR)/rules.mk
PKG_NAME:=toolchain
@@ -12,9 +12,9 @@ PKG_RELEASE:=3

PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcpd.git
PKG_SOURCE_DATE:=2019-02-25
PKG_SOURCE_VERSION:=9e9389c9c6ebd29d61fd35c563c365195d263848
PKG_MIRROR_HASH:=22e5d9b0e3b5f34f7b89067c635c13237de755e1c8a13526b4e70b7febf12e78
PKG_SOURCE_DATE:=2019-02-27
PKG_SOURCE_VERSION:=16c5b6c9bcb71bb67a6ab15bb458bf9ab5a8fe7e
PKG_MIRROR_HASH:=bb42751da2a9d8fa1576db97524711af3fbf3758598f0dc631c075f6413796fd

PKG_MAINTAINER:=Hans Dedecker <dedeckeh@gmail.com>
PKG_LICENSE:=GPL-2.0
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=omcproxy
PKG_RELEASE:=8
PKG_RELEASE:=9

PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/omcproxy.git
@@ -28,6 +28,10 @@ define Package/omcproxy
TITLE:=IGMPv3 and MLDv2 Multicast Proxy
endef

define Package/omcproxy/conffiles
/etc/config/omcproxy
endef

CMAKE_OPTIONS += -DWITH_LIBUBOX=1

define Package/omcproxy/install
@@ -4,7 +4,7 @@
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# more binaries are added to server and client packages (as in Debian)
# Entware specific: more binaries are added to server and client packages (as in Debian)
# replace `$(ICONV_DEPENDS)` => `+libiconv-full` or use `include $(INCLUDE_DIR)/nls.mk`

include $(TOPDIR)/rules.mk
@@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk

PKG_NAME:=wireguard

PKG_VERSION:=0.0.20190123
PKG_VERSION:=0.0.20190227
PKG_RELEASE:=1

PKG_SOURCE:=WireGuard-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://git.zx2c4.com/WireGuard/snapshot/
PKG_HASH:=edd13c7631af169e3838621b1a1bff3ef73cf7bc778eec2bd55f7c1089ffdf9b
PKG_HASH:=fcdb26fd2692d9e1dee54d14418603c38fbb973a06ce89d08fbe45292ff37f79

PKG_LICENSE:=GPL-2.0 Apache-2.0
PKG_LICENSE_FILES:=COPYING
@@ -4,8 +4,7 @@
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# Entware comment
# We will keep this version because arm feed use 3.2 kernel.
# Entware specific: We will keep this version because arm feed use 3.2 kernel.
# We use 3.2 kernels because Synology still use it on arm NASes.
#

@@ -4,8 +4,8 @@
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# Entware specific: keep 1.4.21 version
# Do not split extensions into separate packages, do not install dev headers
# We do not upgrade 1.4.21 to a newer version in Entware

include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
@@ -4,6 +4,8 @@
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# Entware specific: static linkage against libubox, opkg upgrade (all) support

include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
@@ -32,7 +34,7 @@ PKG_BUILD_PARALLEL:=1
HOST_BUILD_PARALLEL:=1
PKG_INSTALL:=1

HOST_BUILD_DEPENDS:=libubox/host
HOST_BUILD_DEPENDS:=libubox libubox/host

include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/host-build.mk
@@ -42,7 +44,7 @@ define Package/opkg
SECTION:=base
CATEGORY:=Base system
TITLE:=opkg package manager
DEPENDS:=+libpthread +libubox
DEPENDS:=+libpthread
URL:=$(PKG_SOURCE_URL)
MENU:=1
endef
@@ -4,6 +4,7 @@
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# Entware specific postinst/prerm

include $(TOPDIR)/rules.mk

@@ -111,9 +112,9 @@ endef

# The postinst & prerm scripts will work only when busybox has readlink applet.
# We cannot use readlink directly, it is not yet installed and use 'busybox readlink' instead.
# We convert /opt/bin/busybox to canonical form because /opt is a simpink in some Entware installs
# We convert /opt/bin/busybox to canonical form because /opt is a symlink in some Entware installs
# We remove all symlinks to /opt/bin/busybox in /opt/bin and /opt/sbin before installation and removal.
# It alows to handle applets list change and busybox reinstall in a correct way.
# It allows to handle applets list change and busybox reinstall in a correct way.
# /opt/share/busybox_applets.lst is not needed any more

define Package/busybox/postinst
@@ -4,7 +4,7 @@
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# column, ionice and fsfreeze packages added, add swapon/swapoff binaries
# Entware specific: column, ionice and fsfreeze packages added, add swapon/swapoff binaries

include $(TOPDIR)/rules.mk

@@ -6,8 +6,9 @@
#
# Main makefile for the host tools
#
# Entware note: some tools (image and kernel related) that we do not need are removed
# other tools go
# Entware specific: some tools (image and kernel related) that we do not need
# are removed, go-src, go-bootstrap tools added

curdir:=tools

# subdirectories to descend into

0 comments on commit d98fff9

Please sign in to comment.
You can’t perform that action at this time.