Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
commit
8852f08eed
@ -707,6 +707,12 @@ config BR2_REPRODUCIBLE
|
||||
this allows to generate exactly identical binaries from one
|
||||
build to the other, including on different machines.
|
||||
|
||||
The current implementation is restricted to builds with the
|
||||
same output directory. Many (absolute) paths are recorded in
|
||||
intermediary files, and it is very likely that some of these
|
||||
paths leak into the target rootfs. If you build with the
|
||||
same O=... path, however, the result is identical.
|
||||
|
||||
This is labeled as an experimental feature, as not all
|
||||
packages behave properly to ensure reproducibility.
|
||||
|
||||
|
@ -142,6 +142,50 @@ comment "build, or run, in unpredictable ways. "
|
||||
comment "----------------------------------------------------"
|
||||
endif
|
||||
|
||||
###############################################################################
|
||||
comment "Legacy options removed in 2017.02"
|
||||
|
||||
config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX
|
||||
bool "Blackfin.uclinux.org 2014R1 toolchain removed"
|
||||
select BR2_LEGACY
|
||||
help
|
||||
The ADI Blackfin toolchain has many bugs which are fixed in
|
||||
more recent gcc and uClibc-ng releases. Use the Buildroot
|
||||
toolchain instead.
|
||||
|
||||
config BR2_PACKAGE_MAKEDEVS
|
||||
bool "makedevs removed"
|
||||
select BR2_LEGACY
|
||||
help
|
||||
The makedevs tool is part of busybox. The Buildroot fork
|
||||
should not be used outside of the Buildroot infrastructure.
|
||||
|
||||
config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A
|
||||
bool "Arago ARMv7 2011.09 removed"
|
||||
select BR2_LEGACY
|
||||
help
|
||||
The Arago toolchains are every old and not updated anymore.
|
||||
|
||||
config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE
|
||||
bool "Arago ARMv5 2011.09 removed"
|
||||
select BR2_LEGACY
|
||||
help
|
||||
The Arago toolchains are every old and not updated anymore.
|
||||
|
||||
config BR2_PACKAGE_SNOWBALL_HDMISERVICE
|
||||
bool "snowball-hdmiservice removed"
|
||||
select BR2_LEGACY
|
||||
help
|
||||
We no longer have support for the Snowball platform in
|
||||
Buildroot, so this package was no longer useful.
|
||||
|
||||
config BR2_PACKAGE_SNOWBALL_INIT
|
||||
bool "snowball-init removed"
|
||||
select BR2_LEGACY
|
||||
help
|
||||
We no longer have support for the Snowball platform in
|
||||
Buildroot, so this package was no longer useful.
|
||||
|
||||
###############################################################################
|
||||
comment "Legacy options removed in 2016.11"
|
||||
|
||||
|
@ -1222,6 +1222,10 @@ F: package/gssdp/
|
||||
F: package/gupnp/
|
||||
F: package/gupnp-av/
|
||||
|
||||
N: Rahul Jain <rahul.jain@imgtec.com>
|
||||
F: package/uhttpd/
|
||||
F: package/ustream-ssl/
|
||||
|
||||
N: Renaud Aubin <root@renaud.io>
|
||||
F: package/libhttpparser/
|
||||
|
||||
|
34
Makefile
34
Makefile
@ -24,6 +24,9 @@
|
||||
# You shouldn't need to mess with anything beyond this point...
|
||||
#--------------------------------------------------------------
|
||||
|
||||
# Delete default rules. We don't use them. This saves a bit of time.
|
||||
.SUFFIXES:
|
||||
|
||||
# we want bash as shell
|
||||
SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
|
||||
else if [ -x /bin/bash ]; then echo /bin/bash; \
|
||||
@ -84,6 +87,8 @@ all:
|
||||
|
||||
# Set and export the version string
|
||||
export BR2_VERSION := 2017.02-git
|
||||
# Actual time the release is cut (for reproducible builds)
|
||||
BR2_VERSION_EPOCH = 1478206447
|
||||
|
||||
# Save running make version since it's clobbered by the make package
|
||||
RUNNING_MAKE_VERSION := $(MAKE_VERSION)
|
||||
@ -123,7 +128,8 @@ export BR2_VERSION_FULL := $(BR2_VERSION)$(shell $(TOPDIR)/support/scripts/setlo
|
||||
noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconfig \
|
||||
defconfig %_defconfig allyesconfig allnoconfig silentoldconfig release \
|
||||
randpackageconfig allyespackageconfig allnopackageconfig \
|
||||
print-version olddefconfig distclean
|
||||
print-version olddefconfig distclean manual manual-html manual-split-html \
|
||||
manual-pdf manual-text manual-epub
|
||||
|
||||
# Some global targets do not trigger a build, but are used to collect
|
||||
# metadata, or do various checks. When such targets are triggered,
|
||||
@ -134,9 +140,12 @@ noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconf
|
||||
# We're building in two situations: when MAKECMDGOALS is empty
|
||||
# (default target is to build), or when MAKECMDGOALS contains
|
||||
# something else than one of the nobuild_targets.
|
||||
nobuild_targets := source source-check \
|
||||
legal-info external-deps _external-deps \
|
||||
clean distclean help
|
||||
nobuild_targets := source %-source source-check \
|
||||
legal-info %-legal-info external-deps _external-deps \
|
||||
clean distclean help show-targets graph-depends \
|
||||
%-graph-depends %-show-depends %-show-version \
|
||||
graph-build graph-size list-defconfigs \
|
||||
savedefconfig printvars
|
||||
ifeq ($(MAKECMDGOALS),)
|
||||
BR_BUILDING = y
|
||||
else ifneq ($(filter-out $(nobuild_targets),$(MAKECMDGOALS)),)
|
||||
@ -165,10 +174,10 @@ endif
|
||||
|
||||
# bash prints the name of the directory on 'cd <dir>' if CDPATH is
|
||||
# set, so unset it here to not cause problems. Notice that the export
|
||||
# line doesn't affect the environment of $(shell ..) calls, so
|
||||
# explictly throw away any output from 'cd' here.
|
||||
# line doesn't affect the environment of $(shell ..) calls.
|
||||
export CDPATH :=
|
||||
BASE_DIR := $(shell mkdir -p $(O) && cd $(O) >/dev/null && pwd)
|
||||
|
||||
BASE_DIR := $(CANONICAL_O)
|
||||
$(if $(BASE_DIR),, $(error output directory "$(O)" does not exist))
|
||||
|
||||
|
||||
@ -239,9 +248,12 @@ endif
|
||||
|
||||
# timezone and locale may affect build output
|
||||
ifeq ($(BR2_REPRODUCIBLE),y)
|
||||
export TZ=UTC
|
||||
export LANG=C
|
||||
export LC_ALL=C
|
||||
export TZ = UTC
|
||||
export LANG = C
|
||||
export LC_ALL = C
|
||||
export GZIP = -n
|
||||
BR2_VERSION_GIT_EPOCH = $(shell GIT_DIR=$(TOPDIR)/.git $(GIT) log -1 --format=%at)
|
||||
export SOURCE_DATE_EPOCH = $(if $(wildcard $(TOPDIR)/.git),$(BR2_VERSION_GIT_EPOCH),$(BR2_VERSION_EPOCH))
|
||||
endif
|
||||
|
||||
# To put more focus on warnings, be less verbose as default
|
||||
@ -656,7 +668,7 @@ endif
|
||||
rm -rf $(TARGET_DIR)/usr/info $(TARGET_DIR)/usr/share/info
|
||||
rm -rf $(TARGET_DIR)/usr/doc $(TARGET_DIR)/usr/share/doc
|
||||
rm -rf $(TARGET_DIR)/usr/share/gtk-doc
|
||||
-rmdir $(TARGET_DIR)/usr/share 2>/dev/null
|
||||
rmdir $(TARGET_DIR)/usr/share 2>/dev/null || true
|
||||
$(STRIP_FIND_CMD) | xargs -0 $(STRIPCMD) 2>/dev/null || true
|
||||
|
||||
# See http://sourceware.org/gdb/wiki/FAQ, "GDB does not see any threads
|
||||
|
@ -35,7 +35,7 @@ main()
|
||||
local GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
|
||||
|
||||
sed -e "s/%FILES%/${FILES}/" \
|
||||
board/freescale/common/genimage.cfg.template > ${GENIMAGE_CFG}
|
||||
board/freescale/common/imx/genimage.cfg.template > ${GENIMAGE_CFG}
|
||||
|
||||
rm -rf "${GENIMAGE_TMP}"
|
||||
|
39
board/freescale/common/mxs/genimage.cfg.template
Normal file
39
board/freescale/common/mxs/genimage.cfg.template
Normal file
@ -0,0 +1,39 @@
|
||||
# Minimal SD card image for the Freescale MX23/MX28 Template
|
||||
#
|
||||
# We mimic the .sdcard Freescale's MX23/MX28 image format:
|
||||
# * u-boot.sb is placed at offset 1M,
|
||||
# * a FAT partition at offset 16 MB is containing zImage/uImage and DTB files
|
||||
# * a single root filesystem partition is required (ext2, ext3 or ext4)
|
||||
#
|
||||
|
||||
image boot.vfat {
|
||||
vfat {
|
||||
files = {
|
||||
%FILES%
|
||||
}
|
||||
}
|
||||
size = 16M
|
||||
}
|
||||
|
||||
image sdcard.img {
|
||||
hdimage {
|
||||
}
|
||||
|
||||
partition u-boot {
|
||||
partition-type = 0x53
|
||||
image = "u-boot.sd"
|
||||
offset = 1M
|
||||
size = 16M
|
||||
}
|
||||
|
||||
partition kernel {
|
||||
partition-type = 0xC
|
||||
bootable = "true"
|
||||
image = "boot.vfat"
|
||||
}
|
||||
|
||||
partition rootfs {
|
||||
partition-type = 0x83
|
||||
image = "rootfs.ext2"
|
||||
}
|
||||
}
|
54
board/freescale/common/mxs/post-image.sh
Executable file
54
board/freescale/common/mxs/post-image.sh
Executable file
@ -0,0 +1,54 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#
|
||||
# dtb_list extracts the list of DTB files from BR2_LINUX_KERNEL_INTREE_DTS_NAME
|
||||
# in ${BR_CONFIG}, then prints the corresponding list of file names for the
|
||||
# genimage configuration file
|
||||
#
|
||||
dtb_list()
|
||||
{
|
||||
local DTB_LIST="$(sed -n 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([a-z0-9 \-]*\)"$/\1/p' ${BR2_CONFIG})"
|
||||
|
||||
for dt in $DTB_LIST; do
|
||||
echo -n "\"$dt.dtb\", "
|
||||
done
|
||||
}
|
||||
|
||||
#
|
||||
# linux_image extracts the Linux image format from BR2_LINUX_KERNEL_UIMAGE in
|
||||
# ${BR_CONFIG}, then prints the corresponding file name for the genimage
|
||||
# configuration file
|
||||
#
|
||||
linux_image()
|
||||
{
|
||||
if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then
|
||||
echo "\"uImage\""
|
||||
else
|
||||
echo "\"zImage\""
|
||||
fi
|
||||
}
|
||||
|
||||
main()
|
||||
{
|
||||
local FILES="$(dtb_list) $(linux_image)"
|
||||
local GENIMAGE_CFG="$(mktemp --suffix genimage.cfg)"
|
||||
local GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
|
||||
|
||||
sed -e "s/%FILES%/${FILES}/" \
|
||||
board/freescale/common/mxs/genimage.cfg.template > ${GENIMAGE_CFG}
|
||||
|
||||
rm -rf "${GENIMAGE_TMP}"
|
||||
|
||||
genimage \
|
||||
--rootpath "${TARGET_DIR}" \
|
||||
--tmppath "${GENIMAGE_TMP}" \
|
||||
--inputpath "${BINARIES_DIR}" \
|
||||
--outputpath "${BINARIES_DIR}" \
|
||||
--config "${GENIMAGE_CFG}"
|
||||
|
||||
rm -f ${GENIMAGE_CFG}
|
||||
|
||||
exit $?
|
||||
}
|
||||
|
||||
main $@
|
48
board/freescale/imx23evk/readme.txt
Normal file
48
board/freescale/imx23evk/readme.txt
Normal file
@ -0,0 +1,48 @@
|
||||
**************************
|
||||
Freescale i.MX23 EVK board
|
||||
**************************
|
||||
|
||||
This file documents the Buildroot support for the Freescale i.MX23 EVK board.
|
||||
|
||||
Build
|
||||
=====
|
||||
|
||||
First, configure Buildroot for your i.MX23 EVK board:
|
||||
|
||||
make imx23evk_defconfig
|
||||
|
||||
Build all components:
|
||||
|
||||
make
|
||||
|
||||
You will find in output/images/ directory the following files:
|
||||
- imx23-evk.dtb
|
||||
- rootfs.tar
|
||||
- u-boot.sd
|
||||
- zImage
|
||||
|
||||
Create a bootable SD card
|
||||
=========================
|
||||
|
||||
To determine the device associated to the SD card have a look in the
|
||||
/proc/partitions file:
|
||||
|
||||
cat /proc/partitions
|
||||
|
||||
Then, run the following command:
|
||||
|
||||
*** WARNING! The command will destroy all the card content. Use with care! ***
|
||||
|
||||
sudo dd if=output/images/sdcard.img of=/dev/<your-microsd-device>
|
||||
|
||||
Boot the i.MX23 EVK board
|
||||
=========================
|
||||
|
||||
- Put the Boot Mode Select jumper as 1 0 0 1 so that it can boot
|
||||
from the SD card
|
||||
- Insert the SD card in the SD Card slot of the board;
|
||||
- Connect an RS232 UART cable to the Debug UART Port and connect using a
|
||||
terminal emulator at 115200 bps, 8n1;
|
||||
- power on the board.
|
||||
|
||||
Enjoy!
|
@ -40,7 +40,7 @@ command as root:
|
||||
*** WARNING! This will destroy all the card content. Use with care! ***
|
||||
|
||||
For details about the medium image layout, see the definition in
|
||||
board/freescale/common/genimage.cfg.template.
|
||||
board/freescale/common/imx/genimage.cfg.template.
|
||||
|
||||
Boot the i.MX25 PDK board
|
||||
=========================
|
||||
|
@ -1,29 +0,0 @@
|
||||
image kernel.vfat {
|
||||
vfat {
|
||||
files = {
|
||||
"zImage", "imx28-evk.dtb"
|
||||
}
|
||||
}
|
||||
size = 16M
|
||||
}
|
||||
|
||||
image sdcard.img {
|
||||
hdimage {
|
||||
}
|
||||
partition boot {
|
||||
partition-type = 0x53
|
||||
image = "u-boot.sd"
|
||||
offset = 1M
|
||||
size = 16M
|
||||
}
|
||||
|
||||
partition kernel {
|
||||
partition-type = 0xC
|
||||
image = "kernel.vfat"
|
||||
}
|
||||
|
||||
partition rootfs {
|
||||
partition-type = 0x83
|
||||
image = "rootfs.ext2"
|
||||
}
|
||||
}
|
@ -1,14 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
BOARD_DIR="$(dirname $0)"
|
||||
GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
|
||||
GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
|
||||
|
||||
rm -rf "${GENIMAGE_TMP}"
|
||||
|
||||
genimage \
|
||||
--rootpath "${TARGET_DIR}" \
|
||||
--tmppath "${GENIMAGE_TMP}" \
|
||||
--inputpath "${BINARIES_DIR}" \
|
||||
--outputpath "${BINARIES_DIR}" \
|
||||
--config "${GENIMAGE_CFG}"
|
@ -40,7 +40,7 @@ command as root:
|
||||
*** WARNING! This will destroy all the card content. Use with care! ***
|
||||
|
||||
For details about the medium image layout, see the definition in
|
||||
board/freescale/common/genimage.cfg.template.
|
||||
board/freescale/common/imx/genimage.cfg.template.
|
||||
|
||||
Boot the i.MX51 EVK board
|
||||
=========================
|
||||
|
@ -71,7 +71,7 @@ command as root:
|
||||
*** WARNING! The script will destroy all the card content. Use with care! ***
|
||||
|
||||
For details about the medium image layout, see the definition in
|
||||
board/freescale/common/genimage.cfg.template.
|
||||
board/freescale/common/imx/genimage.cfg.template.
|
||||
|
||||
Boot the SABRE board
|
||||
====================
|
||||
|
@ -43,7 +43,7 @@ command as root:
|
||||
*** WARNING! This will destroy all the card content. Use with care! ***
|
||||
|
||||
For details about the medium image layout, see the definition in
|
||||
board/freescale/common/genimage.cfg.template.
|
||||
board/freescale/common/imx/genimage.cfg.template.
|
||||
|
||||
Boot the i.MX6UL EVK board
|
||||
=========================
|
||||
|
@ -40,7 +40,7 @@ command as root:
|
||||
*** WARNING! This will destroy all the card content. Use with care! ***
|
||||
|
||||
For details about the medium image layout, see the definition in
|
||||
board/freescale/common/genimage.cfg.template.
|
||||
board/freescale/common/imx/genimage.cfg.template.
|
||||
|
||||
Boot the i.MX7D SDB board
|
||||
=========================
|
||||
|
@ -1,28 +0,0 @@
|
||||
image kernel.vfat {
|
||||
vfat {
|
||||
files = {
|
||||
"uImage"
|
||||
}
|
||||
}
|
||||
size = 5M
|
||||
}
|
||||
|
||||
image sdcard.img {
|
||||
hdimage {
|
||||
}
|
||||
partition boot {
|
||||
partition-type = 0x53
|
||||
image = "u-boot.sd"
|
||||
size = 16M
|
||||
}
|
||||
|
||||
partition kernel {
|
||||
partition-type = 0xC
|
||||
image = "kernel.vfat"
|
||||
}
|
||||
|
||||
partition rootfs {
|
||||
partition-type = 0x83
|
||||
image = "rootfs.ext2"
|
||||
}
|
||||
}
|
@ -1,152 +0,0 @@
|
||||
CONFIG_SYSVIPC=y
|
||||
CONFIG_NO_HZ=y
|
||||
CONFIG_HIGH_RES_TIMERS=y
|
||||
CONFIG_PERF_EVENTS=y
|
||||
# CONFIG_COMPAT_BRK is not set
|
||||
CONFIG_MODULES=y
|
||||
CONFIG_MODULE_FORCE_LOAD=y
|
||||
CONFIG_MODULE_UNLOAD=y
|
||||
CONFIG_MODULE_FORCE_UNLOAD=y
|
||||
CONFIG_MODVERSIONS=y
|
||||
CONFIG_BLK_DEV_INTEGRITY=y
|
||||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_MXS=y
|
||||
# CONFIG_ARM_THUMB is not set
|
||||
CONFIG_PREEMPT_VOLUNTARY=y
|
||||
CONFIG_AEABI=y
|
||||
CONFIG_ARM_APPENDED_DTB=y
|
||||
CONFIG_ARM_ATAG_DTB_COMPAT=y
|
||||
CONFIG_CMDLINE="console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait"
|
||||
CONFIG_NET=y
|
||||
CONFIG_PACKET=y
|
||||
CONFIG_UNIX=y
|
||||
CONFIG_INET=y
|
||||
CONFIG_IP_PNP=y
|
||||
CONFIG_IP_PNP_DHCP=y
|
||||
CONFIG_SYN_COOKIES=y
|
||||
CONFIG_CFG80211=y
|
||||
CONFIG_CFG80211_WEXT=y
|
||||
CONFIG_MAC80211=y
|
||||
CONFIG_DEVTMPFS=y
|
||||
CONFIG_DEVTMPFS_MOUNT=y
|
||||
# CONFIG_FIRMWARE_IN_KERNEL is not set
|
||||
CONFIG_MTD=y
|
||||
CONFIG_MTD_CMDLINE_PARTS=y
|
||||
CONFIG_MTD_BLOCK=y
|
||||
CONFIG_MTD_DATAFLASH=y
|
||||
CONFIG_MTD_SST25L=y
|
||||
CONFIG_MTD_NAND=y
|
||||
CONFIG_MTD_NAND_GPMI_NAND=y
|
||||
CONFIG_MTD_UBI=y
|
||||
# CONFIG_BLK_DEV is not set
|
||||
CONFIG_EEPROM_AT24=y
|
||||
CONFIG_EEPROM_93CX6=y
|
||||
CONFIG_SCSI=y
|
||||
CONFIG_BLK_DEV_SD=y
|
||||
CONFIG_NETDEVICES=y
|
||||
# CONFIG_ETHERNET is not set
|
||||
CONFIG_USB_USBNET=y
|
||||
CONFIG_USB_NET_SMSC95XX=y
|
||||
CONFIG_RTL8187=m
|
||||
CONFIG_ATH_CARDS=m
|
||||
CONFIG_ATH9K_HTC=m
|
||||
CONFIG_RT2X00=m
|
||||
CONFIG_RT73USB=m
|
||||
CONFIG_RT2800USB=m
|
||||
CONFIG_RT2800USB_RT53XX=y
|
||||
CONFIG_RT2800USB_RT55XX=y
|
||||
CONFIG_RT2800USB_UNKNOWN=y
|
||||
CONFIG_RTL_CARDS=m
|
||||
CONFIG_RTL8192CU=m
|
||||
# CONFIG_RTLWIFI_DEBUG is not set
|
||||
CONFIG_ZD1211RW=m
|
||||
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
|
||||
CONFIG_INPUT_EVDEV=y
|
||||
# CONFIG_INPUT_KEYBOARD is not set
|
||||
# CONFIG_INPUT_MOUSE is not set
|
||||
# CONFIG_SERIO is not set
|
||||
CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
|
||||
# CONFIG_LEGACY_PTYS is not set
|
||||
# CONFIG_DEVKMEM is not set
|
||||
CONFIG_SERIAL_AMBA_PL011=y
|
||||
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
|
||||
CONFIG_SERIAL_MXS_AUART=y
|
||||
# CONFIG_HW_RANDOM is not set
|
||||
CONFIG_I2C=y
|
||||
# CONFIG_I2C_COMPAT is not set
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
CONFIG_I2C_MXS=y
|
||||
CONFIG_SPI=y
|
||||
CONFIG_SPI_GPIO=m
|
||||
CONFIG_SPI_MXS=y
|
||||
CONFIG_PTP_1588_CLOCK=y
|
||||
CONFIG_GPIO_SYSFS=y
|
||||
# CONFIG_HWMON is not set
|
||||
CONFIG_WATCHDOG=y
|
||||
CONFIG_STMP3XXX_RTC_WATCHDOG=y
|
||||
CONFIG_REGULATOR=y
|
||||
CONFIG_REGULATOR_FIXED_VOLTAGE=y
|
||||
CONFIG_FB=y
|
||||
CONFIG_FB_MXS=y
|
||||
CONFIG_BACKLIGHT_LCD_SUPPORT=y
|
||||
CONFIG_LCD_CLASS_DEVICE=y
|
||||
CONFIG_BACKLIGHT_CLASS_DEVICE=y
|
||||
CONFIG_BACKLIGHT_PWM=y
|
||||
CONFIG_FRAMEBUFFER_CONSOLE=y
|
||||
CONFIG_LOGO=y
|
||||
CONFIG_SOUND=y
|
||||
CONFIG_SND=y
|
||||
CONFIG_SND_HRTIMER=y
|
||||
# CONFIG_SND_SUPPORT_OLD_API is not set
|
||||
# CONFIG_SND_VERBOSE_PROCFS is not set
|
||||
# CONFIG_SND_DRIVERS is not set
|
||||
# CONFIG_SND_ARM is not set
|
||||
# CONFIG_SND_SPI is not set
|
||||
# CONFIG_SND_USB is not set
|
||||
CONFIG_SND_SOC=y
|
||||
CONFIG_USB=y
|
||||
CONFIG_USB_EHCI_HCD=y
|
||||
CONFIG_USB_STORAGE=y
|
||||
CONFIG_USB_CHIPIDEA=y
|
||||
CONFIG_USB_CHIPIDEA_HOST=y
|
||||
CONFIG_USB_MXS_PHY=y
|
||||
CONFIG_MMC=y
|
||||
CONFIG_MMC_MXS=y
|
||||
CONFIG_LEDS_CLASS=y
|
||||
CONFIG_LEDS_GPIO=y
|
||||
CONFIG_LEDS_TRIGGER_TIMER=y
|
||||
CONFIG_LEDS_TRIGGER_ONESHOT=y
|
||||
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
|
||||
CONFIG_LEDS_TRIGGER_BACKLIGHT=y
|
||||
CONFIG_LEDS_TRIGGER_GPIO=y
|
||||
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
|
||||
CONFIG_RTC_CLASS=y
|
||||
CONFIG_RTC_DRV_STMP=y
|
||||
CONFIG_DMADEVICES=y
|
||||
CONFIG_MXS_DMA=y
|
||||
CONFIG_STAGING=y
|
||||
CONFIG_MXS_LRADC=y
|
||||
CONFIG_IIO=y
|
||||
CONFIG_IIO_SYSFS_TRIGGER=y
|
||||
CONFIG_PWM=y
|
||||
CONFIG_PWM_MXS=y
|
||||
CONFIG_EXT4_FS=y
|
||||
CONFIG_TMPFS=y
|
||||
CONFIG_TMPFS_POSIX_ACL=y
|
||||
# CONFIG_MISC_FILESYSTEMS is not set
|
||||
# CONFIG_NETWORK_FILESYSTEMS is not set
|
||||
CONFIG_PRINTK_TIME=y
|
||||
CONFIG_FRAME_WARN=2048
|
||||
CONFIG_UNUSED_SYMBOLS=y
|
||||
CONFIG_DEBUG_FS=y
|
||||
CONFIG_STRICT_DEVMEM=y
|
||||
CONFIG_DEBUG_USER=y
|
||||
CONFIG_KEYS=y
|
||||
CONFIG_CRYPTO_DEFLATE=y
|
||||
CONFIG_CRYPTO_LZO=y
|
||||
# CONFIG_CRYPTO_ANSI_CPRNG is not set
|
||||
CONFIG_CRYPTO_DEV_MXS_DCP=y
|
||||
CONFIG_CRC_CCITT=y
|
||||
CONFIG_CRC_ITU_T=y
|
||||
CONFIG_CRC7=m
|
||||
CONFIG_FONTS=y
|
18
board/olimex/imx233_olinuxino/linux-wifi.fragment
Normal file
18
board/olimex/imx233_olinuxino/linux-wifi.fragment
Normal file
@ -0,0 +1,18 @@
|
||||
# Network testing
|
||||
CONFIG_WIRELESS=y
|
||||
CONFIG_CFG80211=y
|
||||
CONFIG_CFG80211_WEXT=y
|
||||
CONFIG_MAC80211=y
|
||||
# MII PHY device drivers
|
||||
CONFIG_WLAN=y
|
||||
CONFIG_RTL8187=m
|
||||
CONFIG_ATH9K_HTC=m
|
||||
CONFIG_RT2X00=m
|
||||
CONFIG_RT73USB=m
|
||||
CONFIG_RT2800USB=m
|
||||
CONFIG_RT2800USB_RT53XX=y
|
||||
CONFIG_RT2800USB_RT55XX=y
|
||||
CONFIG_RT2800USB_UNKNOWN=y
|
||||
CONFIG_RTL_CARDS=m
|
||||
CONFIG_RTL8192CU=m
|
||||
CONFIG_ZD1211RW=m
|
@ -1,20 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
BOARD_DIR="$(dirname $0)"
|
||||
BOARD_NAME="$(basename ${BOARD_DIR})"
|
||||
GENIMAGE_CFG="${BOARD_DIR}/genimage-${BOARD_NAME}.cfg"
|
||||
GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
|
||||
|
||||
# Create symlink to "rename" kernel image
|
||||
ln -sf uImage.imx23-olinuxino ${BINARIES_DIR}/uImage
|
||||
|
||||
rm -rf "${GENIMAGE_TMP}"
|
||||
|
||||
genimage \
|
||||
--rootpath "${TARGET_DIR}" \
|
||||
--tmppath "${GENIMAGE_TMP}" \
|
||||
--inputpath "${BINARIES_DIR}" \
|
||||
--outputpath "${BINARIES_DIR}" \
|
||||
--config "${GENIMAGE_CFG}"
|
||||
|
||||
exit $?
|
@ -8,89 +8,22 @@ It also pulls up the console on the serial port, not on TV output.
|
||||
=== Output files after building ==============================================
|
||||
|
||||
output/images
|
||||
+-- kernel.vfat (VFAT kernel partition image generated by genimage)
|
||||
+-- boot.vfat (VFAT kernel partition image generated by genimage)
|
||||
+-- imx23-olinuxino.dtb (device tree blob)
|
||||
+-- rootfs.ext2 (Root file system)
|
||||
+-- sdcard.img (Complete SD card image generated by genimage)
|
||||
+-- u-boot.sd (U-Boot image)
|
||||
+-- uImage -> uImage.imx23-olinuxino (To copy kernel as "uImage" to kernel.vfat)
|
||||
+-- uImage.imx23-olinuxino (Kernel uImage)
|
||||
+-- uImage (Kernel binary)
|
||||
|
||||
=== Use of generated SD card image ===========================================
|
||||
|
||||
Just write sdcard.img directly to the SD card
|
||||
To determine the device associated to the SD card have a look in the
|
||||
/proc/partitions file:
|
||||
|
||||
***** WARNING: Double check that /dev/sdc is your MicroSD card *****
|
||||
***** It might be /dev/sdb or some other device name *****
|
||||
***** Failure to do so may result in you wiping your hard disk *****
|
||||
cat /proc/partitions
|
||||
|
||||
# dd if=output/images/sdcard.img of=/dev/sdc bs=512
|
||||
Then, run the following command as root:
|
||||
|
||||
=== Manual creation of SD card image =========================================
|
||||
*** WARNING! The command will destroy all the card content. Use with care! ***
|
||||
|
||||
You'll need a spare MicroSD card with Freescale's special partition layout.
|
||||
This is basically three partitions:
|
||||
|
||||
1) Type 53, the U-Boot partition, should be 16MB.
|
||||
2) VFAT, place the kernel uImage there
|
||||
3) Anything you like, for this example an ext2 partition, type 83 (linux).
|
||||
|
||||
Assuming you see your MicroSD card as /dev/sdc you'd need to do, as root
|
||||
and from the buildroot project top level directory:
|
||||
(remember to replace /dev/sdc* with the appropiate device name!)
|
||||
|
||||
***** WARNING: Double check that /dev/sdc is your MicroSD card *****
|
||||
***** It might be /dev/sdb or some other device name *****
|
||||
***** Failure to do so may result in you wiping your hard disk *****
|
||||
|
||||
1. Unmount the filesystem(s) if they're already mounted, usually...
|
||||
|
||||
# for fs in `grep /dev/sdc /proc/mounts|cut -d ' ' -f 1`;do umount $fs;done
|
||||
|
||||
...should work
|
||||
|
||||
2. Blank the partition table out
|
||||
|
||||
# dd if=/dev/zero of=/dev/sdc bs=1024 count=1024
|
||||
|
||||
3. Set up the partitions
|
||||
|
||||
# fdisk /dev/sdc
|
||||
n
|
||||
p
|
||||
1
|
||||
<ENTER>
|
||||
+16MB
|
||||
t
|
||||
53
|
||||
n
|
||||
p
|
||||
2
|
||||
<ENTER>
|
||||
+5M
|
||||
t
|
||||
2
|
||||
4
|
||||
n
|
||||
p
|
||||
3
|
||||
<ENTER>
|
||||
<ENTER>
|
||||
w
|
||||
|
||||
4. Fill up the first (U-Boot) partition
|
||||
# dd if=output/images/u-boot.sd bs=512 of=/dev/sdc1
|
||||
|
||||
5. Create VFAT Filesystem
|
||||
# mkfs.vfat /dev/sdc2
|
||||
|
||||
6. Mount and copy output/images/uImage.imx23-olinuxino to the VFAT partition, rename to uImage
|
||||
# mount /dev/sdc2 /mnt
|
||||
# cp output/images/uImages/uImage.imx23-olinuxino /mnt/uImage
|
||||
# umount /mnt
|
||||
|
||||
7. Fill up the third (filesystem) partition
|
||||
# dd if=output/images/rootfs.ext2 of=/dev/sdc3 bs=512
|
||||
|
||||
8. Remove the MicroSD card from your linux PC and put it into your olinuxino.
|
||||
|
||||
9. Boot! You're done!
|
||||
sudo dd if=output/images/sdcard.img of=/dev/<your-microsd-device>
|
||||
|
@ -46,7 +46,7 @@ command as root:
|
||||
*** WARNING! This will destroy all the card content. Use with care! ***
|
||||
|
||||
For details about the medium image layout, see the definition in
|
||||
board/freescale/common/genimage.cfg.template.
|
||||
board/freescale/common/imx/genimage.cfg.template.
|
||||
|
||||
Boot the i.MX6UL Pico board
|
||||
=========================
|
||||
|
@ -38,7 +38,7 @@ choice
|
||||
Select the specific U-Boot version you want to use
|
||||
|
||||
config BR2_TARGET_UBOOT_LATEST_VERSION
|
||||
bool "2016.09.01"
|
||||
bool "2016.11"
|
||||
|
||||
config BR2_TARGET_UBOOT_CUSTOM_VERSION
|
||||
bool "Custom version"
|
||||
@ -86,7 +86,7 @@ endif
|
||||
|
||||
config BR2_TARGET_UBOOT_VERSION
|
||||
string
|
||||
default "2016.09.01" if BR2_TARGET_UBOOT_LATEST_VERSION
|
||||
default "2016.11" if BR2_TARGET_UBOOT_LATEST_VERSION
|
||||
default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \
|
||||
if BR2_TARGET_UBOOT_CUSTOM_VERSION
|
||||
default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL
|
||||
|
@ -1,2 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 95728e89dd476d17428f94080752ab48884be477b6a678941582aeef618b70bb u-boot-2016.09.01.tar.bz2
|
||||
sha256 45813e6565dcc0436abe6752624324cdbf5f3ac106570d76d32b46ec529bcdc8 u-boot-2016.11.tar.bz2
|
||||
|
@ -31,4 +31,4 @@ BR2_TARGET_ROOTFS_EXT4=y
|
||||
BR2_PACKAGE_HOST_DOSFSTOOLS=y
|
||||
BR2_PACKAGE_HOST_GENIMAGE=y
|
||||
BR2_PACKAGE_HOST_MTOOLS=y
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/imx28evk/post-image.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/mxs/post-image.sh"
|
||||
|
@ -21,7 +21,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabreauto"
|
||||
|
||||
# filesystem
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
|
||||
|
@ -21,7 +21,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabresd"
|
||||
|
||||
# filesystem
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
|
||||
# required tools to create the microSD image
|
||||
|
@ -21,7 +21,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabreauto"
|
||||
|
||||
# filesystem
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
|
||||
|
@ -21,7 +21,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd"
|
||||
|
||||
# filesystem
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
|
||||
|
@ -18,7 +18,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sl-evk"
|
||||
|
||||
# filesystem
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
|
||||
# required tools to create the microSD image
|
||||
|
@ -21,7 +21,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-sdb"
|
||||
|
||||
# filesystem
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
|
||||
# required tools to create the microSD image
|
||||
|
@ -31,6 +31,6 @@ BR2_PACKAGE_HOST_GENIMAGE=y
|
||||
BR2_PACKAGE_HOST_MTOOLS=y
|
||||
|
||||
# filesystem / image
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
|
@ -33,4 +33,4 @@ BR2_TARGET_UBOOT_FORMAT_IMX=y
|
||||
BR2_PACKAGE_HOST_DOSFSTOOLS=y
|
||||
BR2_PACKAGE_HOST_GENIMAGE=y
|
||||
BR2_PACKAGE_HOST_MTOOLS=y
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
|
||||
|
34
configs/imx23evk_defconfig
Normal file
34
configs/imx23evk_defconfig
Normal file
@ -0,0 +1,34 @@
|
||||
# architecture
|
||||
BR2_arm=y
|
||||
BR2_arm926t=y
|
||||
|
||||
# Linux headers same as kernel, a 4.8 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y
|
||||
|
||||
# system
|
||||
BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
|
||||
|
||||
# kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="mxs"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx23-evk"
|
||||
|
||||
# bootloader
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BOARDNAME="mx23evk"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01"
|
||||
BR2_TARGET_UBOOT_FORMAT_SD=y
|
||||
|
||||
# Filesystem
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
BR2_TARGET_ROOTFS_EXT4=y
|
||||
|
||||
# To generate SD card image
|
||||
BR2_PACKAGE_HOST_DOSFSTOOLS=y
|
||||
BR2_PACKAGE_HOST_GENIMAGE=y
|
||||
BR2_PACKAGE_HOST_MTOOLS=y
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/mxs/post-image.sh"
|
@ -45,6 +45,6 @@ BR2_PACKAGE_HOST_GENIMAGE=y
|
||||
BR2_PACKAGE_HOST_MTOOLS=y
|
||||
|
||||
# filesystem / image
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
|
@ -14,7 +14,7 @@ BR2_PACKAGE_HOST_GENIMAGE=y
|
||||
BR2_PACKAGE_HOST_MTOOLS=y
|
||||
|
||||
# Filesystem
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
|
||||
|
@ -14,7 +14,7 @@ BR2_PACKAGE_HOST_GENIMAGE=y
|
||||
BR2_PACKAGE_HOST_MTOOLS=y
|
||||
|
||||
# Filesystem
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
|
||||
|
@ -14,7 +14,7 @@ BR2_PACKAGE_HOST_GENIMAGE=y
|
||||
BR2_PACKAGE_HOST_MTOOLS=y
|
||||
|
||||
# Filesystem
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
|
||||
|
@ -2,6 +2,9 @@
|
||||
BR2_arm=y
|
||||
BR2_arm926t=y
|
||||
|
||||
# Linux headers same as kernel, a 4.8 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y
|
||||
|
||||
# System
|
||||
BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
|
||||
|
||||
@ -9,15 +12,15 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
|
||||
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
|
||||
|
||||
# Kernel
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.2"
|
||||
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/olimex/imx233_olinuxino/linux-3.18.config"
|
||||
BR2_LINUX_KERNEL_APPENDED_UIMAGE=y
|
||||
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x42000000"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="mxs"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/imx233_olinuxino/linux-wifi.fragment"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx23-olinuxino"
|
||||
BR2_LINUX_KERNEL_UIMAGE=y
|
||||
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x42000000"
|
||||
|
||||
# Firmware for WiFi
|
||||
BR2_PACKAGE_LINUX_FIRMWARE=y
|
||||
@ -30,13 +33,14 @@ BR2_PACKAGE_ZD1211_FIRMWARE=y
|
||||
|
||||
# Filesystem
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
BR2_TARGET_ROOTFS_EXT4=y
|
||||
# BR2_TARGET_ROOTFS_TAR is not set
|
||||
|
||||
# U-Boot
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.01"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01"
|
||||
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mx23_olinuxino"
|
||||
BR2_TARGET_UBOOT_FORMAT_SD=y
|
||||
|
||||
@ -44,5 +48,5 @@ BR2_TARGET_UBOOT_FORMAT_SD=y
|
||||
BR2_PACKAGE_HOST_DOSFSTOOLS=y
|
||||
BR2_PACKAGE_HOST_GENIMAGE=y
|
||||
BR2_PACKAGE_HOST_MTOOLS=y
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/olimex/imx233_olinuxino/post-image.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/mxs/post-image.sh"
|
||||
|
||||
|
@ -25,7 +25,7 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7s-warp"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BOARDNAME="warp7_secure"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11"
|
||||
BR2_TARGET_UBOOT_FORMAT_IMX=y
|
||||
|
||||
# wifi firmware for brcm43430
|
||||
@ -38,7 +38,7 @@ BR2_PACKAGE_WPA_SUPPLICANT=y
|
||||
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
|
||||
|
||||
# Filesystem
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
|
||||
|
@ -42,7 +42,7 @@ BR2_PACKAGE_HOST_DFU_UTIL=y
|
||||
BR2_PACKAGE_HOST_IMX_USB_LOADER=y
|
||||
|
||||
# Filesystem
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
|
||||
|
@ -95,6 +95,9 @@ endif
|
||||
$$(foreach s,$$(call qstrip,$$(BR2_ROOTFS_POST_FAKEROOT_SCRIPT)),\
|
||||
echo "echo '$$(TERM_BOLD)>>> Executing fakeroot script $$(s)$$(TERM_RESET)'" >> $$(FAKEROOT_SCRIPT); \
|
||||
echo $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep))
|
||||
ifeq ($$(BR2_REPRODUCIBLE),y)
|
||||
echo "find $$(TARGET_DIR) -print0 | xargs -0 -r touch -hd @$$(SOURCE_DATE_EPOCH)" >> $$(FAKEROOT_SCRIPT)
|
||||
endif
|
||||
$$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT)
|
||||
chmod a+x $$(FAKEROOT_SCRIPT)
|
||||
PATH=$$(BR_PATH) $$(HOST_DIR)/usr/bin/fakeroot -- $$(FAKEROOT_SCRIPT)
|
||||
|
@ -7,7 +7,8 @@
|
||||
TAR_OPTS := $(call qstrip,$(BR2_TARGET_ROOTFS_TAR_OPTIONS))
|
||||
|
||||
define ROOTFS_TAR_CMD
|
||||
tar $(TAR_OPTS) -cf $@ --numeric-owner -C $(TARGET_DIR) .
|
||||
(cd $(TARGET_DIR); find -print0 | LC_ALL=C sort -z | \
|
||||
tar $(TAR_OPTS) -cf $@ --null -T - --no-recursion --numeric-owner)
|
||||
endef
|
||||
|
||||
$(eval $(call ROOTFS_TARGET,tar))
|
||||
|
@ -94,6 +94,14 @@ LINUX_MAKE_ENV = \
|
||||
$(TARGET_MAKE_ENV) \
|
||||
BR_BINARIES_DIR=$(BINARIES_DIR)
|
||||
|
||||
ifeq ($(BR2_REPRODUCIBLE),y)
|
||||
LINUX_MAKE_ENV += \
|
||||
KBUILD_BUILD_VERSION=1 \
|
||||
KBUILD_BUILD_USER=buildroot \
|
||||
KBUILD_BUILD_HOST=buildroot \
|
||||
KBUILD_BUILD_TIMESTAMP="$(shell date -d @$(SOURCE_DATE_EPOCH))"
|
||||
endif
|
||||
|
||||
# Get the real Linux version, which tells us where kernel modules are
|
||||
# going to be installed in the target filesystem.
|
||||
LINUX_VERSION_PROBED = `$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease 2>/dev/null`
|
||||
|
@ -114,6 +114,7 @@ menu "Debugging, profiling and benchmark"
|
||||
source "package/tinymembench/Config.in"
|
||||
source "package/trace-cmd/Config.in"
|
||||
source "package/trinity/Config.in"
|
||||
source "package/uclibc-ng-test/Config.in"
|
||||
source "package/valgrind/Config.in"
|
||||
source "package/whetstone/Config.in"
|
||||
endmenu
|
||||
@ -169,7 +170,6 @@ menu "Filesystem and flash utilities"
|
||||
source "package/genext2fs/Config.in"
|
||||
source "package/genpart/Config.in"
|
||||
source "package/genromfs/Config.in"
|
||||
source "package/makedevs/Config.in"
|
||||
source "package/mmc-utils/Config.in"
|
||||
source "package/mtd/Config.in"
|
||||
source "package/mtools/Config.in"
|
||||
@ -453,7 +453,6 @@ endmenu
|
||||
source "package/sispmctl/Config.in"
|
||||
source "package/smartmontools/Config.in"
|
||||
source "package/smstools3/Config.in"
|
||||
source "package/snowball-hdmiservice/Config.in"
|
||||
source "package/spi-tools/Config.in"
|
||||
source "package/sredird/Config.in"
|
||||
source "package/statserial/Config.in"
|
||||
@ -912,6 +911,7 @@ menu "Crypto"
|
||||
source "package/polarssl/Config.in"
|
||||
source "package/tinydtls/Config.in"
|
||||
source "package/trousers/Config.in"
|
||||
source "package/ustream-ssl/Config.in"
|
||||
endmenu
|
||||
|
||||
menu "Database"
|
||||
@ -1418,7 +1418,6 @@ menu "Miscellaneous"
|
||||
source "package/qemu/Config.in"
|
||||
source "package/qpdf/Config.in"
|
||||
source "package/shared-mime-info/Config.in"
|
||||
source "package/snowball-init/Config.in"
|
||||
source "package/taskd/Config.in"
|
||||
source "package/wine/Config.in"
|
||||
source "package/xutil_util-macros/Config.in"
|
||||
@ -1615,6 +1614,7 @@ endif
|
||||
source "package/tunctl/Config.in"
|
||||
source "package/tvheadend/Config.in"
|
||||
source "package/udpcast/Config.in"
|
||||
source "package/uhttpd/Config.in"
|
||||
source "package/ulogd/Config.in"
|
||||
source "package/ushare/Config.in"
|
||||
source "package/ussp-push/Config.in"
|
||||
|
@ -184,7 +184,7 @@ endif
|
||||
ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
|
||||
TARGET_CROSS = $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-
|
||||
else
|
||||
TARGET_CROSS = $(HOST_DIR)/usr/bin/$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))-
|
||||
TARGET_CROSS = $(HOST_DIR)/usr/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)-
|
||||
endif
|
||||
|
||||
# Define TARGET_xx variables for all common binutils/gcc
|
||||
|
@ -10,7 +10,7 @@ config BR2_PACKAGE_AUDIT
|
||||
depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL # strndupa()
|
||||
help
|
||||
The audit package contains the user space utilities for
|
||||
storing and searching the audit records generated by
|
||||
|
@ -1,116 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-031
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-031
|
||||
|
||||
Bug-Reported-by: lolilolicon <lolilolicon@gmail.com>
|
||||
Bug-Reference-ID: <CAMtVo_Nz=32Oq=zWTb6=+8gUNXOo2rRvud1W4oPnA-cgVk_ZqQ@mail.gmail.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-08/msg00139.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
The new nameref assignment functionality introduced in bash-4.3 did not perform
|
||||
enough validation on the variable value and would create variables with
|
||||
invalid names.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.3-patched/subst.h 2014-01-11 21:02:27.000000000 -0500
|
||||
--- b/subst.h 2014-09-01 12:16:56.000000000 -0400
|
||||
***************
|
||||
*** 48,51 ****
|
||||
--- 48,52 ----
|
||||
#define ASS_MKGLOBAL 0x0008 /* force global assignment */
|
||||
#define ASS_NAMEREF 0x0010 /* assigning to nameref variable */
|
||||
+ #define ASS_FROMREF 0x0020 /* assigning from value of nameref variable */
|
||||
|
||||
/* Flags for the string extraction functions. */
|
||||
*** a/bash-4.3-patched/variables.c 2014-05-15 08:26:50.000000000 -0400
|
||||
--- b/variables.c 2014-09-01 14:37:44.000000000 -0400
|
||||
***************
|
||||
*** 2504,2511 ****
|
||||
int hflags, aflags;
|
||||
{
|
||||
! char *newval;
|
||||
SHELL_VAR *entry;
|
||||
|
||||
entry = (hflags & HASH_NOSRCH) ? (SHELL_VAR *)NULL : hash_lookup (name, table);
|
||||
/* Follow the nameref chain here if this is the global variables table */
|
||||
if (entry && nameref_p (entry) && (invisible_p (entry) == 0) && table == global_variables->table)
|
||||
--- 2566,2590 ----
|
||||
int hflags, aflags;
|
||||
{
|
||||
! char *newname, *newval;
|
||||
SHELL_VAR *entry;
|
||||
+ #if defined (ARRAY_VARS)
|
||||
+ arrayind_t ind;
|
||||
+ char *subp;
|
||||
+ int sublen;
|
||||
+ #endif
|
||||
|
||||
+ newname = 0;
|
||||
+ #if defined (ARRAY_VARS)
|
||||
+ if ((aflags & ASS_FROMREF) && (hflags & HASH_NOSRCH) == 0 && valid_array_reference (name))
|
||||
+ {
|
||||
+ newname = array_variable_name (name, &subp, &sublen);
|
||||
+ if (newname == 0)
|
||||
+ return (SHELL_VAR *)NULL; /* XXX */
|
||||
+ entry = hash_lookup (newname, table);
|
||||
+ }
|
||||
+ else
|
||||
+ #endif
|
||||
entry = (hflags & HASH_NOSRCH) ? (SHELL_VAR *)NULL : hash_lookup (name, table);
|
||||
+
|
||||
/* Follow the nameref chain here if this is the global variables table */
|
||||
if (entry && nameref_p (entry) && (invisible_p (entry) == 0) && table == global_variables->table)
|
||||
***************
|
||||
*** 2538,2541 ****
|
||||
--- 2617,2630 ----
|
||||
}
|
||||
}
|
||||
+ #if defined (ARRAY_VARS)
|
||||
+ else if (entry == 0 && newname)
|
||||
+ {
|
||||
+ entry = make_new_array_variable (newname); /* indexed array by default */
|
||||
+ if (entry == 0)
|
||||
+ return entry;
|
||||
+ ind = array_expand_index (name, subp, sublen);
|
||||
+ bind_array_element (entry, ind, value, aflags);
|
||||
+ }
|
||||
+ #endif
|
||||
else if (entry == 0)
|
||||
{
|
||||
***************
|
||||
*** 2658,2662 ****
|
||||
if (nameref_cell (nv) == 0)
|
||||
return (bind_variable_internal (nv->name, value, nvc->table, 0, flags));
|
||||
! return (bind_variable_internal (nameref_cell (nv), value, nvc->table, 0, flags));
|
||||
}
|
||||
else
|
||||
--- 2747,2752 ----
|
||||
if (nameref_cell (nv) == 0)
|
||||
return (bind_variable_internal (nv->name, value, nvc->table, 0, flags));
|
||||
! /* XXX - bug here with ref=array[index] */
|
||||
! return (bind_variable_internal (nameref_cell (nv), value, nvc->table, 0, flags|ASS_FROMREF));
|
||||
}
|
||||
else
|
||||
*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 30
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 31
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,55 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-032
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-032
|
||||
|
||||
Bug-Reported-by: crispusfairbairn@gmail.com
|
||||
Bug-Reference-ID: <b5e499f7-3b98-408d-9f94-c0387580e73a@googlegroups.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-09/msg00013.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
When bash is running in Posix mode, it allows signals -- including SIGCHLD --
|
||||
to interrupt the `wait' builtin, as Posix requires. However, the interrupt
|
||||
causes bash to not run a SIGCHLD trap for all exited children. This patch
|
||||
fixes the issue and restores the documented behavior in Posix mode.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.3-patched/jobs.c 2014-05-14 09:20:15.000000000 -0400
|
||||
--- b/jobs.c 2014-09-09 11:50:38.000000000 -0400
|
||||
***************
|
||||
*** 3340,3344 ****
|
||||
{
|
||||
interrupt_immediately = 0;
|
||||
! trap_handler (SIGCHLD); /* set pending_traps[SIGCHLD] */
|
||||
wait_signal_received = SIGCHLD;
|
||||
/* If we're in a signal handler, let CHECK_WAIT_INTR pick it up;
|
||||
--- 3346,3352 ----
|
||||
{
|
||||
interrupt_immediately = 0;
|
||||
! /* This was trap_handler (SIGCHLD) but that can lose traps if
|
||||
! children_exited > 1 */
|
||||
! queue_sigchld_trap (children_exited);
|
||||
wait_signal_received = SIGCHLD;
|
||||
/* If we're in a signal handler, let CHECK_WAIT_INTR pick it up;
|
||||
*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 31
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 32
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,229 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-033
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-033
|
||||
|
||||
Bug-Reported-by: mickael9@gmail.com, Jan Rome <jan.rome@gmail.com>
|
||||
Bug-Reference-ID: <20140907224046.382ED3610CC@mickael-laptop.localdomain>,
|
||||
<540D661D.50908@gmail.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-09/msg00029.html
|
||||
http://lists.gnu.org/archive/html/bug-bash/2014-09/msg00030.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Bash does not clean up the terminal state in all cases where bash or
|
||||
readline modifies it and bash is subsequently terminated by a fatal signal.
|
||||
This happens when the `read' builtin modifies the terminal settings, both
|
||||
when readline is active and when it is not. It occurs most often when a script
|
||||
installs a trap that exits on a signal without re-sending the signal to itself.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.3-patched/shell.c 2014-01-14 08:04:32.000000000 -0500
|
||||
--- b/shell.c 2014-12-22 10:27:50.000000000 -0500
|
||||
***************
|
||||
*** 74,77 ****
|
||||
--- 74,78 ----
|
||||
|
||||
#if defined (READLINE)
|
||||
+ # include <readline/readline.h>
|
||||
# include "bashline.h"
|
||||
#endif
|
||||
***************
|
||||
*** 910,913 ****
|
||||
--- 912,923 ----
|
||||
fflush (stderr);
|
||||
|
||||
+ /* Clean up the terminal if we are in a state where it's been modified. */
|
||||
+ #if defined (READLINE)
|
||||
+ if (RL_ISSTATE (RL_STATE_TERMPREPPED) && rl_deprep_term_function)
|
||||
+ (*rl_deprep_term_function) ();
|
||||
+ #endif
|
||||
+ if (read_tty_modified ())
|
||||
+ read_tty_cleanup ();
|
||||
+
|
||||
/* Do trap[0] if defined. Allow it to override the exit status
|
||||
passed to us. */
|
||||
*** a/bash-4.3-patched/builtins/read.def 2014-10-01 12:57:38.000000000 -0400
|
||||
--- b/builtins/read.def 2014-12-22 10:48:54.000000000 -0500
|
||||
***************
|
||||
*** 141,148 ****
|
||||
int sigalrm_seen;
|
||||
|
||||
! static int reading;
|
||||
static SigHandler *old_alrm;
|
||||
static unsigned char delim;
|
||||
|
||||
/* In all cases, SIGALRM just sets a flag that we check periodically. This
|
||||
avoids problems with the semi-tricky stuff we do with the xfree of
|
||||
--- 141,150 ----
|
||||
int sigalrm_seen;
|
||||
|
||||
! static int reading, tty_modified;
|
||||
static SigHandler *old_alrm;
|
||||
static unsigned char delim;
|
||||
|
||||
+ static struct ttsave termsave;
|
||||
+
|
||||
/* In all cases, SIGALRM just sets a flag that we check periodically. This
|
||||
avoids problems with the semi-tricky stuff we do with the xfree of
|
||||
***************
|
||||
*** 189,193 ****
|
||||
SHELL_VAR *var;
|
||||
TTYSTRUCT ttattrs, ttset;
|
||||
- struct ttsave termsave;
|
||||
#if defined (ARRAY_VARS)
|
||||
WORD_LIST *alist;
|
||||
--- 191,194 ----
|
||||
***************
|
||||
*** 222,226 ****
|
||||
USE_VAR(lastsig);
|
||||
|
||||
! sigalrm_seen = reading = 0;
|
||||
|
||||
i = 0; /* Index into the string that we are reading. */
|
||||
--- 223,227 ----
|
||||
USE_VAR(lastsig);
|
||||
|
||||
! sigalrm_seen = reading = tty_modified = 0;
|
||||
|
||||
i = 0; /* Index into the string that we are reading. */
|
||||
***************
|
||||
*** 439,442 ****
|
||||
--- 440,445 ----
|
||||
goto assign_vars;
|
||||
}
|
||||
+ if (interactive_shell == 0)
|
||||
+ initialize_terminating_signals ();
|
||||
old_alrm = set_signal_handler (SIGALRM, sigalrm);
|
||||
add_unwind_protect (reset_alarm, (char *)NULL);
|
||||
***************
|
||||
*** 483,487 ****
|
||||
--- 486,493 ----
|
||||
if (i < 0)
|
||||
sh_ttyerror (1);
|
||||
+ tty_modified = 1;
|
||||
add_unwind_protect ((Function *)ttyrestore, (char *)&termsave);
|
||||
+ if (interactive_shell == 0)
|
||||
+ initialize_terminating_signals ();
|
||||
}
|
||||
}
|
||||
***************
|
||||
*** 498,502 ****
|
||||
--- 504,511 ----
|
||||
sh_ttyerror (1);
|
||||
|
||||
+ tty_modified = 1;
|
||||
add_unwind_protect ((Function *)ttyrestore, (char *)&termsave);
|
||||
+ if (interactive_shell == 0)
|
||||
+ initialize_terminating_signals ();
|
||||
}
|
||||
|
||||
***************
|
||||
*** 589,592 ****
|
||||
--- 598,603 ----
|
||||
else
|
||||
lastsig = 0;
|
||||
+ if (terminating_signal && tty_modified)
|
||||
+ ttyrestore (&termsave); /* fix terminal before exiting */
|
||||
CHECK_TERMSIG;
|
||||
eof = 1;
|
||||
***************
|
||||
*** 979,982 ****
|
||||
--- 990,1007 ----
|
||||
{
|
||||
ttsetattr (ttp->fd, ttp->attrs);
|
||||
+ tty_modified = 0;
|
||||
+ }
|
||||
+
|
||||
+ void
|
||||
+ read_tty_cleanup ()
|
||||
+ {
|
||||
+ if (tty_modified)
|
||||
+ ttyrestore (&termsave);
|
||||
+ }
|
||||
+
|
||||
+ int
|
||||
+ read_tty_modified ()
|
||||
+ {
|
||||
+ return (tty_modified);
|
||||
}
|
||||
|
||||
*** ./bash-4.3-patched/builtins/common.h 2014-10-01 12:57:47.000000000 -0400
|
||||
--- b/builtins/common.h 2014-12-22 10:10:14.000000000 -0500
|
||||
***************
|
||||
*** 123,126 ****
|
||||
--- 141,148 ----
|
||||
extern void getopts_reset __P((int));
|
||||
|
||||
+ /* Functions from read.def */
|
||||
+ extern void read_tty_cleanup __P((void));
|
||||
+ extern int read_tty_modified __P((void));
|
||||
+
|
||||
/* Functions from set.def */
|
||||
extern int minus_o_option_value __P((char *));
|
||||
*** a/bash-4.3-patched/bashline.c 2014-05-14 09:22:39.000000000 -0400
|
||||
--- b/bashline.c 2014-09-08 11:28:56.000000000 -0400
|
||||
***************
|
||||
*** 203,206 ****
|
||||
--- 203,207 ----
|
||||
extern int array_needs_making;
|
||||
extern int posixly_correct, no_symbolic_links;
|
||||
+ extern int sigalrm_seen;
|
||||
extern char *current_prompt_string, *ps1_prompt;
|
||||
extern STRING_INT_ALIST word_token_alist[];
|
||||
***************
|
||||
*** 4209,4214 ****
|
||||
/* If we're going to longjmp to top_level, make sure we clean up readline.
|
||||
check_signals will call QUIT, which will eventually longjmp to top_level,
|
||||
! calling run_interrupt_trap along the way. */
|
||||
! if (interrupt_state)
|
||||
rl_cleanup_after_signal ();
|
||||
bashline_reset_event_hook ();
|
||||
--- 4262,4268 ----
|
||||
/* If we're going to longjmp to top_level, make sure we clean up readline.
|
||||
check_signals will call QUIT, which will eventually longjmp to top_level,
|
||||
! calling run_interrupt_trap along the way. The check for sigalrm_seen is
|
||||
! to clean up the read builtin's state. */
|
||||
! if (terminating_signal || interrupt_state || sigalrm_seen)
|
||||
rl_cleanup_after_signal ();
|
||||
bashline_reset_event_hook ();
|
||||
*** a/bash-4.3-patched/sig.c 2014-01-10 15:06:06.000000000 -0500
|
||||
--- b/sig.c 2014-09-08 11:26:33.000000000 -0400
|
||||
***************
|
||||
*** 533,538 ****
|
||||
/* Set the event hook so readline will call it after the signal handlers
|
||||
finish executing, so if this interrupted character input we can get
|
||||
! quick response. */
|
||||
! if (interactive_shell && interactive && no_line_editing == 0)
|
||||
bashline_set_event_hook ();
|
||||
#endif
|
||||
--- 533,540 ----
|
||||
/* Set the event hook so readline will call it after the signal handlers
|
||||
finish executing, so if this interrupted character input we can get
|
||||
! quick response. If readline is active or has modified the terminal we
|
||||
! need to set this no matter what the signal is, though the check for
|
||||
! RL_STATE_TERMPREPPED is possibly redundant. */
|
||||
! if (RL_ISSTATE (RL_STATE_SIGHANDLER) || RL_ISSTATE (RL_STATE_TERMPREPPED))
|
||||
bashline_set_event_hook ();
|
||||
#endif
|
||||
*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 32
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 33
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,94 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-034
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-034
|
||||
|
||||
Bug-Reported-by: Dreamcat4 <dreamcat4@gmail.com>
|
||||
Bug-Reference-ID: <CAN39uTpAEs2GFu4ebC_SfSVMRTh-DJ9YanrY4BZZ3OO+CCHjng@mail.gmail.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-05/msg00001.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
If neither the -f nor -v options is supplied to unset, and a name argument is
|
||||
found to be a function and unset, subsequent name arguments are not treated as
|
||||
variables before attempting to unset a function by that name.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.3-patched/builtins/set.def 2013-04-19 07:20:34.000000000 -0400
|
||||
--- b/builtins/set.def 2015-05-05 13:25:36.000000000 -0400
|
||||
***************
|
||||
*** 752,758 ****
|
||||
--- 797,805 ----
|
||||
{
|
||||
int unset_function, unset_variable, unset_array, opt, nameref, any_failed;
|
||||
+ int global_unset_func, global_unset_var;
|
||||
char *name;
|
||||
|
||||
unset_function = unset_variable = unset_array = nameref = any_failed = 0;
|
||||
+ global_unset_func = global_unset_var = 0;
|
||||
|
||||
reset_internal_getopt ();
|
||||
***************
|
||||
*** 762,769 ****
|
||||
{
|
||||
case 'f':
|
||||
! unset_function = 1;
|
||||
break;
|
||||
case 'v':
|
||||
! unset_variable = 1;
|
||||
break;
|
||||
case 'n':
|
||||
--- 809,816 ----
|
||||
{
|
||||
case 'f':
|
||||
! global_unset_func = 1;
|
||||
break;
|
||||
case 'v':
|
||||
! global_unset_var = 1;
|
||||
break;
|
||||
case 'n':
|
||||
***************
|
||||
*** 778,782 ****
|
||||
list = loptend;
|
||||
|
||||
! if (unset_function && unset_variable)
|
||||
{
|
||||
builtin_error (_("cannot simultaneously unset a function and a variable"));
|
||||
--- 825,829 ----
|
||||
list = loptend;
|
||||
|
||||
! if (global_unset_func && global_unset_var)
|
||||
{
|
||||
builtin_error (_("cannot simultaneously unset a function and a variable"));
|
||||
***************
|
||||
*** 796,799 ****
|
||||
--- 843,849 ----
|
||||
name = list->word->word;
|
||||
|
||||
+ unset_function = global_unset_func;
|
||||
+ unset_variable = global_unset_var;
|
||||
+
|
||||
#if defined (ARRAY_VARS)
|
||||
unset_array = 0;
|
||||
|
||||
*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 33
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 34
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,67 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-035
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-035
|
||||
|
||||
Bug-Reported-by: <romerox.adrian@gmail.com>
|
||||
Bug-Reference-ID: <CABV5r3zhPXmSKUe9uedeGc5YFBM2njJ1iVmY2h5neWdQpDBQug@mail.gmail.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-08/msg00045.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
A locale with a long name can trigger a buffer overflow and core dump. This
|
||||
applies on systems that do not have locale_charset in libc, are not using
|
||||
GNU libiconv, and are not using the libintl that ships with bash in lib/intl.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.3-patched/lib/sh/unicode.c 2014-01-30 16:47:19.000000000 -0500
|
||||
--- b/lib/sh/unicode.c 2015-05-01 08:58:30.000000000 -0400
|
||||
***************
|
||||
*** 79,83 ****
|
||||
if (s)
|
||||
{
|
||||
! strcpy (charsetbuf, s+1);
|
||||
t = strchr (charsetbuf, '@');
|
||||
if (t)
|
||||
--- 79,84 ----
|
||||
if (s)
|
||||
{
|
||||
! strncpy (charsetbuf, s+1, sizeof (charsetbuf) - 1);
|
||||
! charsetbuf[sizeof (charsetbuf) - 1] = '\0';
|
||||
t = strchr (charsetbuf, '@');
|
||||
if (t)
|
||||
***************
|
||||
*** 85,89 ****
|
||||
return charsetbuf;
|
||||
}
|
||||
! strcpy (charsetbuf, locale);
|
||||
return charsetbuf;
|
||||
}
|
||||
--- 86,91 ----
|
||||
return charsetbuf;
|
||||
}
|
||||
! strncpy (charsetbuf, locale, sizeof (charsetbuf) - 1);
|
||||
! charsetbuf[sizeof (charsetbuf) - 1] = '\0';
|
||||
return charsetbuf;
|
||||
}
|
||||
*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 34
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 35
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,61 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-036
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-036
|
||||
|
||||
Bug-Reported-by: emanuelczirai@cryptolab.net
|
||||
Bug-Reference-ID: <f962e4f556da5ebfadaf7afe9c78a8cb@cryptolab.net>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-02/msg00071.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
When evaluating and setting integer variables, and the assignment fails to
|
||||
create a variable (for example, when performing an operation on an array
|
||||
variable with an invalid subscript), bash attempts to dereference a null
|
||||
pointer, causing a segmentation violation.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-20150206/variables.c 2015-01-23 20:39:27.000000000 -0500
|
||||
--- b/variables.c 2015-02-19 13:56:12.000000000 -0500
|
||||
***************
|
||||
*** 2834,2841 ****
|
||||
v = bind_variable (lhs, rhs, 0);
|
||||
|
||||
! if (v && isint)
|
||||
! VSETATTR (v, att_integer);
|
||||
!
|
||||
! VUNSETATTR (v, att_invisible);
|
||||
|
||||
return (v);
|
||||
--- 2834,2843 ----
|
||||
v = bind_variable (lhs, rhs, 0);
|
||||
|
||||
! if (v)
|
||||
! {
|
||||
! if (isint)
|
||||
! VSETATTR (v, att_integer);
|
||||
! VUNSETATTR (v, att_invisible);
|
||||
! }
|
||||
|
||||
return (v);
|
||||
*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 35
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 36
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,47 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-037
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-037
|
||||
|
||||
Bug-Reported-by: Greg Wooledge <wooledg@eeg.ccf.org>
|
||||
Bug-Reference-ID: <20150204144240.GN13956@eeg.ccf.org>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-02/msg00007.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
If an associative array uses `@' or `*' as a subscript, `declare -p' produces
|
||||
output that cannot be reused as input.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.3-patched/assoc.c 2011-11-05 16:39:05.000000000 -0400
|
||||
--- b/assoc.c 2015-02-04 15:28:25.000000000 -0500
|
||||
***************
|
||||
*** 437,440 ****
|
||||
--- 440,445 ----
|
||||
if (sh_contains_shell_metas (tlist->key))
|
||||
istr = sh_double_quote (tlist->key);
|
||||
+ else if (ALL_ELEMENT_SUB (tlist->key[0]) && tlist->key[1] == '\0')
|
||||
+ istr = sh_double_quote (tlist->key);
|
||||
else
|
||||
istr = tlist->key;
|
||||
*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 36
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 37
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,92 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-038
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-038
|
||||
|
||||
Bug-Reported-by: worley@alum.mit.edu (Dale R. Worley)
|
||||
Bug-Reference-ID: <201406100051.s5A0pCeB014978@hobgoblin.ariadne.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00028.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
There are a number of instances where `time' is not recognized as a reserved
|
||||
word when the shell grammar says it should be.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.3-patched/parse.y 2014-04-07 11:56:12.000000000 -0400
|
||||
--- b/parse.y 2014-06-11 10:25:53.000000000 -0400
|
||||
***************
|
||||
*** 2819,2827 ****
|
||||
case OR_OR:
|
||||
case '&':
|
||||
case DO:
|
||||
case THEN:
|
||||
case ELSE:
|
||||
case '{': /* } */
|
||||
! case '(': /* ) */
|
||||
case BANG: /* ! time pipeline */
|
||||
case TIME: /* time time pipeline */
|
||||
--- 2819,2832 ----
|
||||
case OR_OR:
|
||||
case '&':
|
||||
+ case WHILE:
|
||||
case DO:
|
||||
+ case UNTIL:
|
||||
+ case IF:
|
||||
case THEN:
|
||||
+ case ELIF:
|
||||
case ELSE:
|
||||
case '{': /* } */
|
||||
! case '(': /* )( */
|
||||
! case ')': /* only valid in case statement */
|
||||
case BANG: /* ! time pipeline */
|
||||
case TIME: /* time time pipeline */
|
||||
*** a/bash-4.3-patched/y.tab.c 2014-10-05 13:52:50.000000000 -0400
|
||||
--- b/y.tab.c 2015-05-19 15:08:43.000000000 -0400
|
||||
***************
|
||||
*** 5131,5139 ****
|
||||
case OR_OR:
|
||||
case '&':
|
||||
case DO:
|
||||
case THEN:
|
||||
case ELSE:
|
||||
case '{': /* } */
|
||||
! case '(': /* ) */
|
||||
case BANG: /* ! time pipeline */
|
||||
case TIME: /* time time pipeline */
|
||||
--- 5131,5144 ----
|
||||
case OR_OR:
|
||||
case '&':
|
||||
+ case WHILE:
|
||||
case DO:
|
||||
+ case UNTIL:
|
||||
+ case IF:
|
||||
case THEN:
|
||||
+ case ELIF:
|
||||
case ELSE:
|
||||
case '{': /* } */
|
||||
! case '(': /* )( */
|
||||
! case ')': /* only valid in case statement */
|
||||
case BANG: /* ! time pipeline */
|
||||
case TIME: /* time time pipeline */
|
||||
*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 37
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 38
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,61 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-039
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-039
|
||||
|
||||
Bug-Reported-by: SN <poczta-sn@gazeta.pl>
|
||||
Bug-Reference-ID: <54E2554C.205@gazeta.pl>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-02/msg00060.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Using the output of `declare -p' when run in a function can result in variables
|
||||
that are invisible to `declare -p'. This problem occurs when an assignment
|
||||
builtin such as `declare' receives a quoted compound array assignment as one of
|
||||
its arguments.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.3-patched/arrayfunc.c 2014-10-01 13:08:48.000000000 -0400
|
||||
--- b/arrayfunc.c 2015-02-19 14:33:05.000000000 -0500
|
||||
***************
|
||||
*** 405,408 ****
|
||||
--- 405,411 ----
|
||||
else
|
||||
array_insert (a, i, l->word->word);
|
||||
+
|
||||
+ VUNSETATTR (var, att_invisible); /* no longer invisible */
|
||||
+
|
||||
return var;
|
||||
}
|
||||
***************
|
||||
*** 635,638 ****
|
||||
--- 638,645 ----
|
||||
if (nlist)
|
||||
dispose_words (nlist);
|
||||
+
|
||||
+ if (var)
|
||||
+ VUNSETATTR (var, att_invisible); /* no longer invisible */
|
||||
+
|
||||
return (var);
|
||||
}
|
||||
*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 38
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 39
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,51 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-040
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacrias.com.ar>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-040
|
||||
|
||||
Bug-Reported-by: Jean Delvare <jdelvare@suse.de>
|
||||
Bug-Reference-ID: <20150609180231.5f463695@endymion.delvare>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-06/msg00033.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
There is a memory leak that occurs when bash expands an array reference on
|
||||
the rhs of an assignment statement.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.3-patched/subst.c 2014-10-01 12:57:47.000000000 -0400
|
||||
--- b/subst.c 2015-06-22 09:16:53.000000000 -0400
|
||||
***************
|
||||
*** 5783,5787 ****
|
||||
if (pflags & PF_ASSIGNRHS)
|
||||
{
|
||||
! temp = array_variable_name (name, &tt, (int *)0);
|
||||
if (ALL_ELEMENT_SUB (tt[0]) && tt[1] == ']')
|
||||
temp = array_value (name, quoted|Q_DOUBLE_QUOTES, 0, &atype, &ind);
|
||||
--- 5783,5787 ----
|
||||
if (pflags & PF_ASSIGNRHS)
|
||||
{
|
||||
! var = array_variable_part (name, &tt, (int *)0);
|
||||
if (ALL_ELEMENT_SUB (tt[0]) && tt[1] == ']')
|
||||
temp = array_value (name, quoted|Q_DOUBLE_QUOTES, 0, &atype, &ind);
|
||||
*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 39
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 40
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,76 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-041
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-041
|
||||
|
||||
Bug-Reported-by: Hanno Böck <hanno@hboeck.de>
|
||||
Bug-Reference-ID: <20150623131106.6f111da9@pc1>, <20150707004640.0e61d2f9@pc1>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-06/msg00089.html,
|
||||
http://lists.gnu.org/archive/html/bug-bash/2015-07/msg00018.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
There are several out-of-bounds read errors that occur when completing command
|
||||
lines where assignment statements appear before the command name. The first
|
||||
two appear only when programmable completion is enabled; the last one only
|
||||
happens when listing possible completions.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.3.40/bashline.c 2014-12-29 14:39:43.000000000 -0500
|
||||
--- b/bashline.c 2015-08-12 10:21:58.000000000 -0400
|
||||
***************
|
||||
*** 1469,1476 ****
|
||||
--- 1469,1489 ----
|
||||
os = start;
|
||||
n = 0;
|
||||
+ was_assignment = 0;
|
||||
s = find_cmd_start (os);
|
||||
e = find_cmd_end (end);
|
||||
do
|
||||
{
|
||||
+ /* Don't read past the end of rl_line_buffer */
|
||||
+ if (s > rl_end)
|
||||
+ {
|
||||
+ s1 = s = e1;
|
||||
+ break;
|
||||
+ }
|
||||
+ /* Or past point if point is within an assignment statement */
|
||||
+ else if (was_assignment && s > rl_point)
|
||||
+ {
|
||||
+ s1 = s = e1;
|
||||
+ break;
|
||||
+ }
|
||||
/* Skip over assignment statements preceding a command name. If we
|
||||
don't find a command name at all, we can perform command name
|
||||
*** a/bash-4.3.40/lib/readline/complete.c 2013-10-14 09:27:10.000000000 -0400
|
||||
--- b/lib/readline/complete.c 2015-07-31 09:34:39.000000000 -0400
|
||||
***************
|
||||
*** 690,693 ****
|
||||
--- 690,695 ----
|
||||
if (temp == 0 || *temp == '\0')
|
||||
return (pathname);
|
||||
+ else if (temp[1] == 0 && temp == pathname)
|
||||
+ return (pathname);
|
||||
/* If the basename is NULL, we might have a pathname like '/usr/src/'.
|
||||
Look for a previous slash and, if one is found, return the portion
|
||||
*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 40
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 41
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,59 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-042
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-042
|
||||
|
||||
Bug-Reported-by: Nathan Neulinger <nneul@neulinger.org>
|
||||
Bug-Reference-ID: <558EFDF2.7060402@neulinger.org>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-06/msg00096.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
There is a problem when parsing command substitutions containing `case'
|
||||
commands within pipelines that causes the parser to not correctly identify
|
||||
the end of the command substitution.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.3-patched/parse.y 2015-05-18 19:27:05.000000000 -0400
|
||||
--- b/parse.y 2015-06-29 10:59:27.000000000 -0400
|
||||
***************
|
||||
*** 3709,3712 ****
|
||||
--- 3709,3714 ----
|
||||
tflags |= LEX_INWORD;
|
||||
lex_wlen = 0;
|
||||
+ if (tflags & LEX_RESWDOK)
|
||||
+ lex_rwlen = 0;
|
||||
}
|
||||
}
|
||||
*** a/bash-4.3-patched/y.tab.c 2015-05-18 19:27:05.000000000 -0400
|
||||
--- b/y.tab.c 2015-06-29 10:59:27.000000000 -0400
|
||||
***************
|
||||
*** 6021,6024 ****
|
||||
--- 6021,6026 ----
|
||||
tflags |= LEX_INWORD;
|
||||
lex_wlen = 0;
|
||||
+ if (tflags & LEX_RESWDOK)
|
||||
+ lex_rwlen = 0;
|
||||
}
|
||||
}
|
||||
*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 41
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 42
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,63 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-043
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-043
|
||||
|
||||
Bug-Reported-by: lolilolicon <lolilolicon@gmail.com>
|
||||
Bug-Reference-ID: <CAMtVo_MF16KWanCB4C8WxA88Qt26zWsvV6V7+_U2fM0E6tCDxw@mail.gmail.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-08/msg00040.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
When the lastpipe option is enabled, the last component can contain nested
|
||||
pipelines and cause a segmentation fault under certain circumestances.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/execute_cmd.c 2014-07-30 10:26:52.000000000 -0400
|
||||
--- b/execute_cmd.c 2014-08-15 08:55:24.000000000 -0400
|
||||
***************
|
||||
*** 2406,2412 ****
|
||||
{
|
||||
#if defined (JOB_CONTROL)
|
||||
! append_process (savestring (the_printed_command), dollar_dollar_pid, exec_result, lastpipe_jid);
|
||||
! #endif
|
||||
lstdin = wait_for (lastpid);
|
||||
#if defined (JOB_CONTROL)
|
||||
/* If wait_for removes the job from the jobs table, use result of last
|
||||
--- 2433,2447 ----
|
||||
{
|
||||
#if defined (JOB_CONTROL)
|
||||
! if (INVALID_JOB (lastpipe_jid) == 0)
|
||||
! {
|
||||
! append_process (savestring (the_printed_command_except_trap), dollar_dollar_pid, exec_result, lastpipe_jid);
|
||||
! lstdin = wait_for (lastpid);
|
||||
! }
|
||||
! else
|
||||
! lstdin = wait_for_single_pid (lastpid); /* checks bgpids list */
|
||||
! #else
|
||||
lstdin = wait_for (lastpid);
|
||||
+ #endif
|
||||
+
|
||||
#if defined (JOB_CONTROL)
|
||||
/* If wait_for removes the job from the jobs table, use result of last
|
||||
*** a/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 42
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 43
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,52 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-044
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-044
|
||||
|
||||
Bug-Reported-by: Ondrej Oprala <ooprala@redhat.com>
|
||||
Bug-Reference-ID: <539ED55B.2080103@redhat.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00046.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
A typo prevents the `compat42' shopt option from working as intended.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
diff -rC 2 bash-4.3.42/builtins/shopt.def bash-4.3.43/builtins/shopt.def
|
||||
*** a/builtins/shopt.def 2013-02-27 09:43:20.000000000 -0500
|
||||
--- b/builtins/shopt.def 2015-10-16 11:25:28.000000000 -0400
|
||||
***************
|
||||
*** 161,165 ****
|
||||
{ "compat40", &shopt_compat40, set_compatibility_level },
|
||||
{ "compat41", &shopt_compat41, set_compatibility_level },
|
||||
! { "compat42", &shopt_compat41, set_compatibility_level },
|
||||
#if defined (READLINE)
|
||||
{ "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL},
|
||||
--- 161,165 ----
|
||||
{ "compat40", &shopt_compat40, set_compatibility_level },
|
||||
{ "compat41", &shopt_compat41, set_compatibility_level },
|
||||
! { "compat42", &shopt_compat42, set_compatibility_level },
|
||||
#if defined (READLINE)
|
||||
{ "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL},
|
||||
|
||||
*** a/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 43
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 44
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,56 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-045
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-045
|
||||
|
||||
Bug-Reported-by: Basin Ilya <basinilya@gmail.com>
|
||||
Bug-Reference-ID: <5624C0AC.8070802@gmail.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-10/msg00141.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
If a file open attempted as part of a redirection fails because it is interrupted
|
||||
by a signal, the shell needs to process any pending traps to allow the redirection
|
||||
to be canceled.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/redir.c 2014-12-03 10:47:38.000000000 -0500
|
||||
--- b/redir.c 2015-01-16 10:15:47.000000000 -0500
|
||||
***************
|
||||
*** 672,676 ****
|
||||
e = errno;
|
||||
if (fd < 0 && e == EINTR)
|
||||
! QUIT;
|
||||
errno = e;
|
||||
}
|
||||
--- 672,679 ----
|
||||
e = errno;
|
||||
if (fd < 0 && e == EINTR)
|
||||
! {
|
||||
! QUIT;
|
||||
! run_pending_traps ();
|
||||
! }
|
||||
errno = e;
|
||||
}
|
||||
|
||||
*** a/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 44
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 45
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,59 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-046
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-046
|
||||
|
||||
Bug-Reported-by: Sergey Tselikh <stselikh@gmail.com>
|
||||
Bug-Reference-ID: <20150816110235.91f3e12e3f20d20cdaad963e@gmail.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-08/msg00080.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
An incorrect conversion from an indexed to associative array can result in a
|
||||
core dump.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/subst.c 2015-08-13 11:32:54.000000000 -0400
|
||||
--- b/subst.c 2015-08-18 10:13:59.000000000 -0400
|
||||
***************
|
||||
*** 9562,9566 ****
|
||||
opts[opti] = '\0';
|
||||
if (opti > 0)
|
||||
! make_internal_declare (tlist->word->word, opts);
|
||||
|
||||
t = do_word_assignment (tlist->word, 0);
|
||||
--- 9562,9573 ----
|
||||
opts[opti] = '\0';
|
||||
if (opti > 0)
|
||||
! {
|
||||
! t = make_internal_declare (tlist->word->word, opts);
|
||||
! if (t != EXECUTION_SUCCESS)
|
||||
! {
|
||||
! last_command_exit_value = t;
|
||||
! exp_jump_to_top_level (DISCARD);
|
||||
! }
|
||||
! }
|
||||
|
||||
t = do_word_assignment (tlist->word, 0);
|
||||
|
||||
*** a/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 45
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 46
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
@ -1,2 +1,2 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 317881019bbf2262fb814b7dd8e40632d13c3608d2f237800a8828fbb8a640dd bash-4.3.30.tar.gz
|
||||
sha256 d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb bash-4.4.tar.gz
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BASH_VERSION = 4.3.30
|
||||
BASH_VERSION = 4.4
|
||||
BASH_SITE = $(BR2_GNU_MIRROR)/bash
|
||||
# Build after since bash is better than busybox shells
|
||||
BASH_DEPENDENCIES = ncurses readline host-bison \
|
||||
|
@ -1,2 +1,2 @@
|
||||
# From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc:
|
||||
sha256 21d1bc9150d3576296595217efb98a746b592389d25d5637e8bee5da7272593b bluez-5.39.tar.xz
|
||||
sha256 16c9c05d2a1da644ce3570d975ada3643d2e60c007a955bac09c0a0efeb58d15 bluez-5.43.tar.xz
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BLUEZ5_UTILS_VERSION = 5.39
|
||||
BLUEZ5_UTILS_VERSION = 5.43
|
||||
BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz
|
||||
BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
|
||||
BLUEZ5_UTILS_INSTALL_STAGING = YES
|
||||
|
@ -1,140 +0,0 @@
|
||||
From 24e5409190820a14e4d097924b1acaab62bb3b99 Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Sun, 30 Oct 2016 18:12:00 +0200
|
||||
Subject: [PATCH] libbridge: fix headers conflict with musl libc
|
||||
|
||||
Don't including kernel headers directly to avoid headers conflict like:
|
||||
|
||||
In file included from .../sysroot/usr/include/linux/if_bridge.h:18:0,
|
||||
from libbridge.h:26,
|
||||
from libbridge_if.c:26:
|
||||
.../sysroot/usr/include/linux/in6.h:32:8: error: redefinition of ‘struct in6_addr’
|
||||
struct in6_addr {
|
||||
^
|
||||
In file included from libbridge.h:24:0,
|
||||
from libbridge_if.c:26:
|
||||
.../sysroot/usr/include/netinet/in.h:23:8: note: originally defined here
|
||||
struct in6_addr {
|
||||
^
|
||||
|
||||
Instead copy the required linux/if_bridge.h definitions into
|
||||
libbridge_private.h.
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Patch status: Nacked
|
||||
(https://lists.linuxfoundation.org/pipermail/bridge/2016-November/010107.html)
|
||||
---
|
||||
libbridge/libbridge.h | 1 -
|
||||
libbridge/libbridge_private.h | 83 ++++++++++++++++++++++++++++++++++++++++++-
|
||||
2 files changed, 82 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h
|
||||
index ff047f933cd6..18b40cd90413 100644
|
||||
--- a/libbridge/libbridge.h
|
||||
+++ b/libbridge/libbridge.h
|
||||
@@ -23,7 +23,6 @@
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <linux/if.h>
|
||||
-#include <linux/if_bridge.h>
|
||||
|
||||
/* defined in net/if.h but that conflicts with linux/if.h... */
|
||||
extern unsigned int if_nametoindex (const char *__ifname);
|
||||
diff --git a/libbridge/libbridge_private.h b/libbridge/libbridge_private.h
|
||||
index 99a511dae00a..565025b7bccb 100644
|
||||
--- a/libbridge/libbridge_private.h
|
||||
+++ b/libbridge/libbridge_private.h
|
||||
@@ -24,7 +24,88 @@
|
||||
#include <linux/sockios.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/ioctl.h>
|
||||
-#include <linux/if_bridge.h>
|
||||
+
|
||||
+/* From linux/if_ether.h */
|
||||
+#ifndef ETH_ALEN
|
||||
+#define ETH_ALEN 6
|
||||
+#endif
|
||||
+
|
||||
+/* From linux/if_bridge.h */
|
||||
+#ifndef BRCTL_GET_VERSION
|
||||
+#define BRCTL_GET_VERSION 0
|
||||
+#define BRCTL_GET_BRIDGES 1
|
||||
+#define BRCTL_ADD_BRIDGE 2
|
||||
+#define BRCTL_DEL_BRIDGE 3
|
||||
+#define BRCTL_ADD_IF 4
|
||||
+#define BRCTL_DEL_IF 5
|
||||
+#define BRCTL_GET_BRIDGE_INFO 6
|
||||
+#define BRCTL_GET_PORT_LIST 7
|
||||
+#define BRCTL_SET_BRIDGE_FORWARD_DELAY 8
|
||||
+#define BRCTL_SET_BRIDGE_HELLO_TIME 9
|
||||
+#define BRCTL_SET_BRIDGE_MAX_AGE 10
|
||||
+#define BRCTL_SET_AGEING_TIME 11
|
||||
+#define BRCTL_SET_GC_INTERVAL 12
|
||||
+#define BRCTL_GET_PORT_INFO 13
|
||||
+#define BRCTL_SET_BRIDGE_STP_STATE 14
|
||||
+#define BRCTL_SET_BRIDGE_PRIORITY 15
|
||||
+#define BRCTL_SET_PORT_PRIORITY 16
|
||||
+#define BRCTL_SET_PATH_COST 17
|
||||
+#define BRCTL_GET_FDB_ENTRIES 18
|
||||
+
|
||||
+#define BR_STATE_DISABLED 0
|
||||
+#define BR_STATE_LISTENING 1
|
||||
+#define BR_STATE_LEARNING 2
|
||||
+#define BR_STATE_FORWARDING 3
|
||||
+#define BR_STATE_BLOCKING 4
|
||||
+
|
||||
+struct __bridge_info {
|
||||
+ __u64 designated_root;
|
||||
+ __u64 bridge_id;
|
||||
+ __u32 root_path_cost;
|
||||
+ __u32 max_age;
|
||||
+ __u32 hello_time;
|
||||
+ __u32 forward_delay;
|
||||
+ __u32 bridge_max_age;
|
||||
+ __u32 bridge_hello_time;
|
||||
+ __u32 bridge_forward_delay;
|
||||
+ __u8 topology_change;
|
||||
+ __u8 topology_change_detected;
|
||||
+ __u8 root_port;
|
||||
+ __u8 stp_enabled;
|
||||
+ __u32 ageing_time;
|
||||
+ __u32 gc_interval;
|
||||
+ __u32 hello_timer_value;
|
||||
+ __u32 tcn_timer_value;
|
||||
+ __u32 topology_change_timer_value;
|
||||
+ __u32 gc_timer_value;
|
||||
+};
|
||||
+
|
||||
+struct __port_info {
|
||||
+ __u64 designated_root;
|
||||
+ __u64 designated_bridge;
|
||||
+ __u16 port_id;
|
||||
+ __u16 designated_port;
|
||||
+ __u32 path_cost;
|
||||
+ __u32 designated_cost;
|
||||
+ __u8 state;
|
||||
+ __u8 top_change_ack;
|
||||
+ __u8 config_pending;
|
||||
+ __u8 unused0;
|
||||
+ __u32 message_age_timer_value;
|
||||
+ __u32 forward_delay_timer_value;
|
||||
+ __u32 hold_timer_value;
|
||||
+};
|
||||
+
|
||||
+struct __fdb_entry {
|
||||
+ __u8 mac_addr[ETH_ALEN];
|
||||
+ __u8 port_no;
|
||||
+ __u8 is_local;
|
||||
+ __u32 ageing_timer_value;
|
||||
+ __u8 port_hi;
|
||||
+ __u8 pad0;
|
||||
+ __u16 unused;
|
||||
+};
|
||||
+#endif /* BRCTL_GET_VERSION */
|
||||
|
||||
#define MAX_BRIDGES 1024
|
||||
#define MAX_PORTS 1024
|
||||
--
|
||||
2.10.1
|
||||
|
@ -1,2 +1,2 @@
|
||||
# From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc
|
||||
sha256 81c023f519c8565b23eddb90e6d0eec2be63ee52e440708e418539dbaa635c5f btrfs-progs-v4.8.2.tar.xz
|
||||
sha256 bf26ead666c337a62a74bc9ec7f8dd9ee200e60e5fe5289967d53328eff261c5 btrfs-progs-v4.8.4.tar.xz
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BTRFS_PROGS_VERSION = 4.8.2
|
||||
BTRFS_PROGS_VERSION = 4.8.4
|
||||
BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs
|
||||
BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz
|
||||
BTRFS_PROGS_DEPENDENCIES = host-pkgconf e2fsprogs lzo util-linux zlib
|
||||
|
@ -3,10 +3,13 @@
|
||||
# Start telnet....
|
||||
#
|
||||
|
||||
TELNETD_ARGS=-F
|
||||
[ -r /etc/default/telnet ] && . /etc/default/telnet
|
||||
|
||||
start() {
|
||||
printf "Starting telnetd: "
|
||||
start-stop-daemon -S -q -m -b -p /var/run/telnetd.pid \
|
||||
-x /usr/sbin/telnetd -- -F
|
||||
-x /usr/sbin/telnetd -- $TELNETD_ARGS
|
||||
[ $? = 0 ] && echo "OK" || echo "FAIL"
|
||||
}
|
||||
|
||||
|
@ -36,6 +36,12 @@ BUSYBOX_MAKE_ENV = \
|
||||
$(TARGET_MAKE_ENV) \
|
||||
CFLAGS="$(BUSYBOX_CFLAGS)" \
|
||||
CFLAGS_busybox="$(BUSYBOX_CFLAGS_busybox)"
|
||||
|
||||
ifeq ($(BR2_REPRODUCIBLE),y)
|
||||
BUSYBOX_MAKE_ENV += \
|
||||
KCONFIG_NOTIMESTAMP=1
|
||||
endif
|
||||
|
||||
BUSYBOX_MAKE_OPTS = \
|
||||
CC="$(TARGET_CC)" \
|
||||
ARCH=$(KERNEL_ARCH) \
|
||||
|
@ -11,7 +11,7 @@ comment "canfestival needs a glibc or uClibc toolchain w/ threads and dynamic li
|
||||
config BR2_PACKAGE_CANFESTIVAL
|
||||
bool "canfestival"
|
||||
depends on BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL # sigval_t
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_STATIC_LIBS
|
||||
help
|
||||
|
@ -5,19 +5,25 @@ files are removed at build time via the target-finalize rule.
|
||||
This buildroot-specific patch makes sure ctest looks also for
|
||||
"Modules/CMake.cmake.ctest" before complaining
|
||||
|
||||
Signed-off-by: Davide Viti <zinosat@tiscali.it>
|
||||
[Vincent: tweak patch for 3.6.3]
|
||||
|
||||
--- cmake-3.0.2/Source/cmake.cxx~ 2014-09-11 15:24:01.000000000 +0200
|
||||
+++ cmake-3.0.2/Source/cmake.cxx 2014-11-25 15:48:04.461033690 +0100
|
||||
@@ -957,7 +957,10 @@
|
||||
"Path to cpack program executable.", cmCacheManager::INTERNAL);
|
||||
Signed-off-by: Davide Viti <zinosat@tiscali.it>
|
||||
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
||||
|
||||
diff -rup a/Source/cmake.cxx b/Source/cmake.cxx
|
||||
--- a/Source/cmake.cxx 2016-07-07 15:47:27.000000000 +0100
|
||||
+++ b/Source/cmake.cxx 2016-07-14 10:14:59.914265515 +0100
|
||||
@@ -771,7 +771,12 @@ int cmake::AddCMakePaths()
|
||||
"Path to cpack program executable.", cmState::INTERNAL);
|
||||
#endif
|
||||
if(!cmSystemTools::FileExists(
|
||||
- (cmSystemTools::GetCMakeRoot()+"/Modules/CMake.cmake").c_str()))
|
||||
+ (cmSystemTools::GetCMakeRoot()+"/Modules/CMake.cmake").c_str()) &&
|
||||
+ !cmSystemTools::FileExists(
|
||||
+ (cmSystemTools::GetCMakeRoot()+"/Modules/CMake.cmake.ctest").c_str())
|
||||
if (!cmSystemTools::FileExists(
|
||||
- (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake").c_str())) {
|
||||
+ (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake").c_str()) &&
|
||||
+ !cmSystemTools::FileExists(
|
||||
+ (cmSystemTools::GetCMakeRoot()+"/Modules/CMake.cmake.ctest").c_str()
|
||||
+ )
|
||||
+ )
|
||||
{
|
||||
+ {
|
||||
// couldn't find modules
|
||||
cmSystemTools::Error("Could not find CMAKE_ROOT !!!\n"
|
||||
cmSystemTools::Error(
|
||||
"Could not find CMAKE_ROOT !!!\n"
|
||||
|
@ -20,11 +20,14 @@ config BR2_PACKAGE_CMAKE_CTEST
|
||||
select BR2_PACKAGE_EXPAT
|
||||
select BR2_PACKAGE_BZIP2
|
||||
select BR2_PACKAGE_XZ
|
||||
select BR2_PACKAGE_LIBUV
|
||||
depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # from jsoncpp
|
||||
depends on BR2_USE_WCHAR # libarchive
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libuv
|
||||
depends on BR2_USE_MMU # libuv
|
||||
help
|
||||
CTest is a testing tool distributed as a part of CMake. It
|
||||
can be used to automate updating (using CVS for example),
|
||||
@ -34,7 +37,9 @@ config BR2_PACKAGE_CMAKE_CTEST
|
||||
|
||||
http://www.cmake.org/
|
||||
|
||||
comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7"
|
||||
comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7, threads"
|
||||
depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
|
||||
BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
|
||||
BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \
|
||||
!BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
@ -1,2 +1,2 @@
|
||||
# From http://www.cmake.org/files/v3.5/cmake-3.5.2-SHA-256.txt
|
||||
sha256 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a cmake-3.5.2.tar.gz
|
||||
# From http://www.cmake.org/files/v3.7/cmake-3.7.0-SHA-256.txt
|
||||
sha256 ed63e05c41aeb6c036e503114ab15847f29c312f9f21f5f1a7060a4b4ec2fb31 cmake-3.7.0.tar.gz
|
||||
|
@ -4,8 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CMAKE_VERSION_MAJOR = 3.5
|
||||
CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).2
|
||||
CMAKE_VERSION_MAJOR = 3.7
|
||||
CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).0
|
||||
CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR)
|
||||
CMAKE_LICENSE = BSD-3c
|
||||
CMAKE_LICENSE_FILES = Copyright.txt
|
||||
@ -22,7 +22,7 @@ CMAKE_LICENSE_FILES = Copyright.txt
|
||||
# the system-wide libraries instead of rebuilding and statically
|
||||
# linking with the ones bundled into the CMake sources.
|
||||
|
||||
CMAKE_DEPENDENCIES = zlib jsoncpp libcurl libarchive expat bzip2 xz
|
||||
CMAKE_DEPENDENCIES = zlib jsoncpp libcurl libarchive expat bzip2 xz libuv
|
||||
|
||||
CMAKE_CONF_OPTS = \
|
||||
-DKWSYS_LFS_WORKS=TRUE \
|
||||
|
@ -1,2 +1,2 @@
|
||||
# From https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/sha256sums.asc
|
||||
sha256 dbb35dbf5f0c1749168c86c913fe98e872247bfc8425314b494c2423e7e43342 cryptsetup-1.7.2.tar.xz
|
||||
sha256 af2b04e8475cf40b8d9ffd97a1acfa73aa787c890430afd89804fb544d6adc02 cryptsetup-1.7.3.tar.xz
|
||||
|
@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
CRYPTSETUP_VERSION_MAJOR = 1.7
|
||||
CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).2
|
||||
CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).3
|
||||
CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz
|
||||
CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR)
|
||||
CRYPTSETUP_DEPENDENCIES = lvm2 popt util-linux host-pkgconf \
|
||||
|
@ -1,2 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 4b2d59c2bd70e61c486b372059164a688c53b8aa9f1aedb4beb3316ae2a130c5 domoticz-3.5837.tar.gz
|
||||
sha256 fb88edbe428851a7a337a85faa93f6da00713b3ad086ff6957031dc9b3b58bba domoticz-3.5877.tar.gz
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
DOMOTICZ_VERSION = 3.5837
|
||||
DOMOTICZ_VERSION = 3.5877
|
||||
DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION))
|
||||
DOMOTICZ_LICENSE = GPLv3
|
||||
DOMOTICZ_LICENSE_FILES = License.txt
|
||||
|
40
package/efibootmgr/0001-Allow-build-with-uClibc.patch
Normal file
40
package/efibootmgr/0001-Allow-build-with-uClibc.patch
Normal file
@ -0,0 +1,40 @@
|
||||
From bbfcc60497c326576bb23cb01d90115ef3cf6947 Mon Sep 17 00:00:00 2001
|
||||
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
||||
Date: Fri, 25 Nov 2016 20:26:52 +0200
|
||||
Subject: [PATCH] Remove unneeded <uchar.h> include
|
||||
|
||||
This fixes the build with uClibc.
|
||||
|
||||
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
||||
---
|
||||
src/efibootdump.c | 1 -
|
||||
src/eficonman.c | 1 -
|
||||
2 files changed, 2 deletions(-)
|
||||
|
||||
diff --git a/src/efibootdump.c b/src/efibootdump.c
|
||||
index 6ff8360..7c5a1c5 100644
|
||||
--- a/src/efibootdump.c
|
||||
+++ b/src/efibootdump.c
|
||||
@@ -19,7 +19,6 @@
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
-#include <uchar.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "error.h"
|
||||
diff --git a/src/eficonman.c b/src/eficonman.c
|
||||
index 2c2be38..9bfae79 100644
|
||||
--- a/src/eficonman.c
|
||||
+++ b/src/eficonman.c
|
||||
@@ -17,7 +17,6 @@
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
-#include <uchar.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#define _(String) gettext (String)
|
||||
--
|
||||
2.10.2
|
||||
|
@ -1,10 +1,11 @@
|
||||
config BR2_PACKAGE_EFIBOOTMGR
|
||||
bool "efibootmgr"
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # efivar
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC # efivar
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL # efivar
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # efivar
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS && \
|
||||
!BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII # efivar
|
||||
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
|
||||
select BR2_PACKAGE_EFIVAR
|
||||
help
|
||||
A Linux user-space application to modify the Intel Extensible
|
||||
@ -14,9 +15,9 @@ config BR2_PACKAGE_EFIBOOTMGR
|
||||
|
||||
https://github.com/rhinstaller/efibootmgr
|
||||
|
||||
comment "efibootmgr requires a glibc toolchain w/ headers >= 3.12, gcc >= 4.9"
|
||||
comment "efibootmgr requires a glibc or uClibc toolchain w/ headers >= 3.12, gcc >= 4.9"
|
||||
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \
|
||||
!BR2_TOOLCHAIN_USES_GLIBC || \\
|
||||
BR2_TOOLCHAIN_USES_MUSL || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS && \
|
||||
!BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII
|
||||
|
@ -8,7 +8,8 @@ EFIBOOTMGR_VERSION = 14
|
||||
EFIBOOTMGR_SITE = $(call github,rhinstaller,efibootmgr,$(EFIBOOTMGR_VERSION))
|
||||
EFIBOOTMGR_LICENSE = GPLv2+
|
||||
EFIBOOTMGR_LICENSE_FILES = COPYING
|
||||
EFIBOOTMGR_DEPENDENCIES = efivar
|
||||
EFIBOOTMGR_DEPENDENCIES = efivar $(if $(BR2_NEEDS_GETTEXT),gettext)
|
||||
EFIBOOTMGR_LDFLAGS = $(TARGET_LDFLAGS) $(if $(BR2_NEEDS_GETTEXT),-lintl)
|
||||
|
||||
define EFIBOOTMSR_PATCH_HEADER_PATH
|
||||
$(SED) 's,-I/,-I$(STAGING_DIR)/,' $(@D)/Makefile
|
||||
@ -17,11 +18,12 @@ endef
|
||||
EFIBOOTMGR_POST_PATCH_HOOKS += EFIBOOTMSR_PATCH_HEADER_PATH
|
||||
|
||||
define EFIBOOTMGR_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D)
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \
|
||||
LDFLAGS="$(EFIBOOTMGR_LDFLAGS)" $(MAKE1) -C $(@D)
|
||||
endef
|
||||
|
||||
define EFIBOOTMGR_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
|
||||
DESTDIR=$(TARGET_DIR) install
|
||||
endef
|
||||
|
||||
|
@ -0,0 +1,29 @@
|
||||
From 314eb67b239e60c2ed3700e2baf9cd0e590465f3 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Thu, 27 Oct 2016 09:19:18 -0400
|
||||
Subject: [PATCH] Use -z muldefs to avoid the multiple definitions bug
|
||||
without -flto
|
||||
|
||||
This fixes github issue #64
|
||||
|
||||
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
||||
---
|
||||
Make.defaults | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/Make.defaults b/Make.defaults
|
||||
index aa974d9..c9d599f 100644
|
||||
--- a/Make.defaults
|
||||
+++ b/Make.defaults
|
||||
@@ -32,6 +32,7 @@ cflags = $(CFLAGS) -I${TOPDIR}/src/include/efivar/ \
|
||||
clang_ccldflags =
|
||||
gcc_ccldflags =
|
||||
ccldflags = $(cflags) -L. $(CCLDFLAGS) $(LDFLAGS) \
|
||||
+ -Wl,-z,muldefs \
|
||||
$(if $(findstring clang,$(CCLD)),$(clang_ccldflags),) \
|
||||
$(if $(findstring gcc,$(CCLD)),$(gcc_ccldflags),) \
|
||||
$(call pkg-config-ccldflags)
|
||||
--
|
||||
2.10.2
|
||||
|
38
package/efivar/0002-Allow-build-with-uClibc.patch
Normal file
38
package/efivar/0002-Allow-build-with-uClibc.patch
Normal file
@ -0,0 +1,38 @@
|
||||
From 2255601757a8a58baddad2d37d0bcc6b003a3732 Mon Sep 17 00:00:00 2001
|
||||
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
||||
Date: Fri, 25 Nov 2016 19:42:27 +0200
|
||||
Subject: [PATCH] Allow build with uClibc
|
||||
|
||||
Basically this replaces type definitions in <uchar.h>.
|
||||
|
||||
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
||||
---
|
||||
src/export.c | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/export.c b/src/export.c
|
||||
index 7f2d4dd..72c02d1 100644
|
||||
--- a/src/export.c
|
||||
+++ b/src/export.c
|
||||
@@ -21,11 +21,17 @@
|
||||
#include <inttypes.h>
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
-#include <uchar.h>
|
||||
|
||||
#include <efivar.h>
|
||||
#include "lib.h"
|
||||
|
||||
+#ifdef __UCLIBC__
|
||||
+typedef int_least16_t char16_t;
|
||||
+typedef int_least32_t char32_t;
|
||||
+#else
|
||||
+#include <uchar.h>
|
||||
+#endif
|
||||
+
|
||||
#define EFIVAR_MAGIC 0xf3df1597
|
||||
|
||||
#define ATTRS_UNSET 0xa5a5a5a5a5a5a5a5
|
||||
--
|
||||
2.10.2
|
||||
|
@ -9,9 +9,8 @@ config BR2_PACKAGE_EFIVAR
|
||||
# toolchains.
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS && \
|
||||
!BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII
|
||||
# doesn't build with uclibc due to lack of uchar.h
|
||||
# doesn't build with musl due to lack of __bswap_constant_16
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
|
||||
select BR2_PACKAGE_POPT
|
||||
help
|
||||
@ -19,9 +18,9 @@ config BR2_PACKAGE_EFIVAR
|
||||
|
||||
https://github.com/rhinstaller/efivar
|
||||
|
||||
comment "efivar requires a glibc toolchain w/ headers >= 3.12, gcc >= 4.9"
|
||||
comment "efivar requires a glibc or uClibc toolchain w/ headers >= 3.12, gcc >= 4.9"
|
||||
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \
|
||||
!BR2_TOOLCHAIN_USES_GLIBC || \
|
||||
BR2_TOOLCHAIN_USES_MUSL || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS && \
|
||||
!BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII
|
||||
|
@ -1,2 +1,2 @@
|
||||
# locally computed hash
|
||||
sha256 7fed0b31fe796d7dfef40cccb97b8bb0b806f16e568074ad2d456be30e195f5e efivar-28.tar.gz
|
||||
sha256 20709c76311f8eb8be92977b7ac008ce62501fa9f7fe885a784321540fc352f9 efivar-30.tar.gz
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
EFIVAR_VERSION = 28
|
||||
EFIVAR_VERSION = 30
|
||||
EFIVAR_SITE = $(call github,rhinstaller,efivar,$(EFIVAR_VERSION))
|
||||
EFIVAR_LICENSE = LGPLv2.1
|
||||
EFIVAR_LICENSE_FILES = COPYING
|
||||
|
@ -1,2 +1,2 @@
|
||||
# From https://download.enlightenment.org/rel/libs/efl/efl-1.18.2.tar.xz.sha256
|
||||
sha256 292faf76557fe56a6bc15b48b5ea3eb1f0790e2ed7f2ade4ae79ef7973d67bed efl-1.18.2.tar.xz
|
||||
# From https://download.enlightenment.org/rel/libs/efl/efl-1.18.3.tar.xz.sha256
|
||||
sha256 0748ec0847f543d96b149cb3a84e6438724e827a38d530922ecb4bd59d3e64c0 efl-1.18.3.tar.xz
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
EFL_VERSION = 1.18.2
|
||||
EFL_VERSION = 1.18.3
|
||||
EFL_SOURCE = efl-$(EFL_VERSION).tar.xz
|
||||
EFL_SITE = http://download.enlightenment.org/rel/libs/efl
|
||||
EFL_LICENSE = BSD-2c, LGPLv2.1+, GPLv2+
|
||||
|
@ -1,11 +1,14 @@
|
||||
# These are the architectures supported by FDK AAC
|
||||
config BR2_PACKAGE_FDK_AAC_ARCH_SUPPORTS
|
||||
bool
|
||||
default y if BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \
|
||||
BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \
|
||||
BR2_powerpc || BR2_sh
|
||||
|
||||
config BR2_PACKAGE_FDK_AAC
|
||||
bool "fdk-aac"
|
||||
depends on BR2_PACKAGE_FDK_AAC_ARCH_SUPPORTS
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
# These are the architectures supported by FDK AAC
|
||||
depends on BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \
|
||||
BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \
|
||||
BR2_powerpc || BR2_sh
|
||||
|
||||
help
|
||||
The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec")
|
||||
is software that implements the MPEG Advanced Audio Coding ("AAC")
|
||||
@ -14,7 +17,5 @@ config BR2_PACKAGE_FDK_AAC
|
||||
http://sourceforge.net/projects/opencore-amr/files/fdk-aac/
|
||||
|
||||
comment "fdk-aac needs a toolchain w/ C++"
|
||||
depends on BR2_PACKAGE_FDK_AAC_ARCH_SUPPORTS
|
||||
depends on !BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \
|
||||
BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \
|
||||
BR2_powerpc || BR2_sh
|
||||
|
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 88f70c1b8cab108f494ecbab5ba302cdb35d59a84cea88008b5fe49be068d5da ffmpeg-3.2.tar.xz
|
||||
sha256 1ecf93da5d601e6fb3096c65cbe33fdaf042d690a3c50c4efadb0a9b74f2badf ffmpeg-3.2.1.tar.xz
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
FFMPEG_VERSION = 3.2
|
||||
FFMPEG_VERSION = 3.2.1
|
||||
FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
|
||||
FFMPEG_SITE = http://ffmpeg.org/releases
|
||||
FFMPEG_INSTALL_STAGING = YES
|
||||
|
@ -25,19 +25,6 @@ HOST_GCC_INITIAL_SUBDIR = build
|
||||
|
||||
HOST_GCC_INITIAL_PRE_CONFIGURE_HOOKS += HOST_GCC_CONFIGURE_SYMLINK
|
||||
|
||||
# gcc on ARC has a bug: in its libgcc, even when no C library is
|
||||
# available (--with-newlib is passed, and therefore inhibit_libc is
|
||||
# defined), it tries to use the C library for the libgmon
|
||||
# library. Since it's not needed in gcc-initial, we disabled it here.
|
||||
ifeq ($(BR2_GCC_VERSION_ARC),y)
|
||||
define HOST_GCC_INITIAL_DISABLE_LIBGMON
|
||||
$(SED) 's/crtbeginS.o libgmon.a crtg.o/crtbeginS.o crtg.o/' \
|
||||
$(@D)/libgcc/config.host
|
||||
endef
|
||||
HOST_GCC_INITIAL_POST_PATCH_HOOKS += HOST_GCC_INITIAL_DISABLE_LIBGMON
|
||||
HOST_GCC_INITIAL_POST_RSYNC_HOOKS += HOST_GCC_INITIAL_DISABLE_LIBGMON
|
||||
endif
|
||||
|
||||
HOST_GCC_INITIAL_CONF_OPTS = \
|
||||
$(HOST_GCC_COMMON_CONF_OPTS) \
|
||||
--enable-languages=c \
|
||||
|
@ -1,2 +1,2 @@
|
||||
# From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc
|
||||
sha256 94802903dd707d85ca3b9a2be35e936a54ce86375f52c6a789efe7ce7e238671 git-2.10.2.tar.xz
|
||||
sha256 7e7e8d69d494892373b87007674be5820a4bc1ef596a0117d03ea3169119fd0b git-2.11.0.tar.xz
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GIT_VERSION = 2.10.2
|
||||
GIT_VERSION = 2.11.0
|
||||
GIT_SOURCE = git-$(GIT_VERSION).tar.xz
|
||||
GIT_SITE = https://www.kernel.org/pub/software/scm/git
|
||||
GIT_LICENSE = GPLv2 LGPLv2.1+
|
||||
|
@ -3,14 +3,11 @@ config BR2_PACKAGE_GLOG
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_STATIC_LIBS
|
||||
# build issues with this external toolchain
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX
|
||||
help
|
||||
C++ implementation of the Google logging module
|
||||
|
||||
https://github.com/google/glog
|
||||
|
||||
comment "glog needs a toolchain w/ C++, threads, dynamic library"
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
BR2_STATIC_LIBS
|
||||
|
@ -1,2 +1,2 @@
|
||||
# locally computed
|
||||
sha256 0b4874961e6488ad9e5808114bd486ea981c540907262caab1419355fd82d745 gst-omx-1.2.0.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.10.2.tar.xz.sha256sum
|
||||
sha256 c069a9cf775c92f889ca8f3b2fc718e428cd0579b7b805851a960c850a7aa497 gst-omx-1.10.2.tar.xz
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST_OMX_VERSION = 1.2.0
|
||||
GST_OMX_VERSION = 1.10.2
|
||||
GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz
|
||||
GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user