mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-04-19 12:57:16 +00:00
initial work on merging with buildroot201702
This commit is contained in:
parent
646631c920
commit
c8ed482c5a
10
.br-external.mk
Normal file
10
.br-external.mk
Normal file
@ -0,0 +1,10 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
#
|
||||
|
||||
BR2_EXTERNAL ?=
|
||||
BR2_EXTERNAL_NAMES =
|
||||
BR2_EXTERNAL_DIRS =
|
||||
BR2_EXTERNAL_MKS =
|
||||
|
||||
# No br2-external tree defined.
|
@ -159,6 +159,13 @@ config BR2_nios2
|
||||
http://www.altera.com/
|
||||
http://en.wikipedia.org/wiki/Nios_II
|
||||
|
||||
config BR2_or1k
|
||||
bool "OpenRISC"
|
||||
select BR2_ARCH_HAS_MMU_MANDATORY
|
||||
help
|
||||
OpenRISC is a free and open processor for embedded system.
|
||||
http://openrisc.io
|
||||
|
||||
config BR2_powerpc
|
||||
bool "PowerPC"
|
||||
select BR2_ARCH_HAS_MMU_MANDATORY
|
||||
@ -197,16 +204,6 @@ config BR2_sh
|
||||
http://www.hitachi.com/
|
||||
http://en.wikipedia.org/wiki/SuperH
|
||||
|
||||
config BR2_sh64
|
||||
bool "SuperH64"
|
||||
depends on BR2_DEPRECATED_SINCE_2015_05
|
||||
select BR2_ARCH_HAS_MMU_MANDATORY
|
||||
help
|
||||
SuperH64 (or SH) is a 64-bit reduced instruction set computer (RISC)
|
||||
instruction set architecture (ISA) developed by Hitachi.
|
||||
http://www.hitachi.com/
|
||||
http://en.wikipedia.org/wiki/SuperH
|
||||
|
||||
config BR2_sparc
|
||||
bool "SPARC"
|
||||
select BR2_ARCH_HAS_MMU_MANDATORY
|
||||
@ -336,12 +333,19 @@ config BR2_BINFMT_FLAT_ONE
|
||||
|
||||
config BR2_BINFMT_FLAT_SEP_DATA
|
||||
bool "Separate data and code region"
|
||||
# this FLAT binary type technically exists on m68k, but fails
|
||||
# to build numerous packages: due to architecture limitation,
|
||||
# big functions cannot be built in this mode. They cause build
|
||||
# failures such as "Tried to convert PC relative branch to
|
||||
# absolute jump" or "error: value -yyyyy out of range".
|
||||
depends on BR2_bfin
|
||||
help
|
||||
Allow for the data and text segments to be separated and placed in
|
||||
different regions of memory.
|
||||
|
||||
config BR2_BINFMT_FLAT_SHARED
|
||||
bool "Shared binary"
|
||||
depends on BR2_m68k || BR2_bfin
|
||||
# Even though this really generates shared binaries, there is no libdl
|
||||
# and dlopen() cannot be used. So packages that require shared
|
||||
# libraries cannot be built. Therefore, we don't select
|
||||
@ -357,14 +361,10 @@ if BR2_arcle || BR2_arceb
|
||||
source "arch/Config.in.arc"
|
||||
endif
|
||||
|
||||
if BR2_arm || BR2_armeb
|
||||
if BR2_arm || BR2_armeb || BR2_aarch64 || BR2_aarch64_be
|
||||
source "arch/Config.in.arm"
|
||||
endif
|
||||
|
||||
if BR2_aarch64 || BR2_aarch64_be
|
||||
source "arch/Config.in.aarch64"
|
||||
endif
|
||||
|
||||
if BR2_bfin
|
||||
source "arch/Config.in.bfin"
|
||||
endif
|
||||
@ -385,11 +385,15 @@ if BR2_nios2
|
||||
source "arch/Config.in.nios2"
|
||||
endif
|
||||
|
||||
if BR2_or1k
|
||||
source "arch/Config.in.or1k"
|
||||
endif
|
||||
|
||||
if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
|
||||
source "arch/Config.in.powerpc"
|
||||
endif
|
||||
|
||||
if BR2_sh || BR2_sh64
|
||||
if BR2_sh
|
||||
source "arch/Config.in.sh"
|
||||
endif
|
||||
|
||||
|
@ -1,7 +0,0 @@
|
||||
config BR2_ARCH
|
||||
default "aarch64" if BR2_aarch64
|
||||
default "aarch64_be" if BR2_aarch64_be
|
||||
|
||||
config BR2_ENDIAN
|
||||
default "LITTLE" if BR2_aarch64
|
||||
default "BIG" if BR2_aarch64_be
|
@ -31,6 +31,10 @@ config BR2_ARM_CPU_HAS_VFPV4
|
||||
bool
|
||||
select BR2_ARM_CPU_HAS_VFPV3
|
||||
|
||||
config BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
bool
|
||||
select BR2_ARM_CPU_HAS_VFPV4
|
||||
|
||||
config BR2_ARM_CPU_HAS_ARM
|
||||
bool
|
||||
|
||||
@ -55,9 +59,11 @@ config BR2_ARM_CPU_ARMV7A
|
||||
config BR2_ARM_CPU_ARMV7M
|
||||
bool
|
||||
|
||||
config BR2_ARM_CPU_ARMV8
|
||||
bool
|
||||
|
||||
choice
|
||||
prompt "Target Architecture Variant"
|
||||
depends on BR2_arm || BR2_armeb
|
||||
default BR2_arm926t
|
||||
help
|
||||
Specific CPU variant to use
|
||||
@ -68,12 +74,14 @@ config BR2_arm920t
|
||||
select BR2_ARM_CPU_HAS_THUMB
|
||||
select BR2_ARM_CPU_ARMV4
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_arm922t
|
||||
bool "arm922t"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
select BR2_ARM_CPU_HAS_THUMB
|
||||
select BR2_ARM_CPU_ARMV4
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_arm926t
|
||||
bool "arm926t"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
@ -81,12 +89,14 @@ config BR2_arm926t
|
||||
select BR2_ARM_CPU_HAS_THUMB
|
||||
select BR2_ARM_CPU_ARMV5
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_arm1136j_s
|
||||
bool "arm1136j-s"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
select BR2_ARM_CPU_HAS_THUMB
|
||||
select BR2_ARM_CPU_ARMV6
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_arm1136jf_s
|
||||
bool "arm1136jf-s"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
@ -94,12 +104,14 @@ config BR2_arm1136jf_s
|
||||
select BR2_ARM_CPU_HAS_THUMB
|
||||
select BR2_ARM_CPU_ARMV6
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_arm1176jz_s
|
||||
bool "arm1176jz-s"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
select BR2_ARM_CPU_HAS_THUMB
|
||||
select BR2_ARM_CPU_ARMV6
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_arm1176jzf_s
|
||||
bool "arm1176jzf-s"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
@ -107,6 +119,7 @@ config BR2_arm1176jzf_s
|
||||
select BR2_ARM_CPU_HAS_THUMB
|
||||
select BR2_ARM_CPU_ARMV6
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_arm11mpcore
|
||||
bool "mpcore"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
@ -114,6 +127,7 @@ config BR2_arm11mpcore
|
||||
select BR2_ARM_CPU_HAS_THUMB
|
||||
select BR2_ARM_CPU_ARMV6
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_cortex_a5
|
||||
bool "cortex-A5"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
@ -122,6 +136,7 @@ config BR2_cortex_a5
|
||||
select BR2_ARM_CPU_HAS_THUMB2
|
||||
select BR2_ARM_CPU_ARMV7A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_cortex_a7
|
||||
bool "cortex-A7"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
@ -130,6 +145,7 @@ config BR2_cortex_a7
|
||||
select BR2_ARM_CPU_HAS_THUMB2
|
||||
select BR2_ARM_CPU_ARMV7A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_cortex_a8
|
||||
bool "cortex-A8"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
@ -138,6 +154,7 @@ config BR2_cortex_a8
|
||||
select BR2_ARM_CPU_HAS_THUMB2
|
||||
select BR2_ARM_CPU_ARMV7A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_cortex_a9
|
||||
bool "cortex-A9"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
@ -146,6 +163,7 @@ config BR2_cortex_a9
|
||||
select BR2_ARM_CPU_HAS_THUMB2
|
||||
select BR2_ARM_CPU_ARMV7A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_cortex_a12
|
||||
bool "cortex-A12"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
@ -154,6 +172,7 @@ config BR2_cortex_a12
|
||||
select BR2_ARM_CPU_HAS_THUMB2
|
||||
select BR2_ARM_CPU_ARMV7A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_cortex_a15
|
||||
bool "cortex-A15"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
@ -162,6 +181,7 @@ config BR2_cortex_a15
|
||||
select BR2_ARM_CPU_HAS_THUMB2
|
||||
select BR2_ARM_CPU_ARMV7A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_cortex_a17
|
||||
bool "cortex-A17"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
@ -170,41 +190,73 @@ config BR2_cortex_a17
|
||||
select BR2_ARM_CPU_HAS_THUMB2
|
||||
select BR2_ARM_CPU_ARMV7A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_cortex_a53
|
||||
bool "cortex-A53"
|
||||
select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
config BR2_cortex_a57
|
||||
bool "cortex-A57"
|
||||
select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
config BR2_cortex_a72
|
||||
bool "cortex-A72"
|
||||
select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
|
||||
select BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
select BR2_ARM_CPU_ARMV8
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
config BR2_cortex_m3
|
||||
bool "cortex-M3"
|
||||
select BR2_ARM_CPU_HAS_THUMB2
|
||||
select BR2_ARM_CPU_ARMV7M
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_cortex_m4
|
||||
bool "cortex-M4"
|
||||
select BR2_ARM_CPU_HAS_THUMB2
|
||||
select BR2_ARM_CPU_ARMV7M
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_fa526
|
||||
bool "fa526/626"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
select BR2_ARM_CPU_ARMV4
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_pj4
|
||||
bool "pj4"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
select BR2_ARM_CPU_HAS_VFPV3
|
||||
select BR2_ARM_CPU_ARMV7A
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_strongarm
|
||||
bool "strongarm sa110/sa1100"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
select BR2_ARM_CPU_ARMV4
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_xscale
|
||||
bool "xscale"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
select BR2_ARM_CPU_HAS_THUMB
|
||||
select BR2_ARM_CPU_ARMV5
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
config BR2_iwmmxt
|
||||
bool "iwmmxt"
|
||||
select BR2_ARM_CPU_HAS_ARM
|
||||
select BR2_ARM_CPU_ARMV5
|
||||
select BR2_ARCH_HAS_MMU_OPTIONAL
|
||||
depends on !BR2_ARCH_IS_64
|
||||
endchoice
|
||||
|
||||
config BR2_ARM_ENABLE_NEON
|
||||
@ -284,7 +336,7 @@ endchoice
|
||||
|
||||
choice
|
||||
prompt "Floating point strategy"
|
||||
depends on BR2_ARM_EABI || BR2_ARM_EABIHF
|
||||
default BR2_ARM_FPU_FP_ARMV8 if BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
default BR2_ARM_FPU_VFPV4D16 if BR2_ARM_CPU_HAS_VFPV4
|
||||
default BR2_ARM_FPU_VFPV3D16 if BR2_ARM_CPU_HAS_VFPV3
|
||||
default BR2_ARM_FPU_VFPV2 if BR2_ARM_CPU_HAS_VFPV2
|
||||
@ -395,10 +447,25 @@ config BR2_ARM_FPU_NEON_VFPV4
|
||||
example on Cortex-A5 and Cortex-A7, support for VFPv4 and
|
||||
NEON is optional.
|
||||
|
||||
config BR2_ARM_FPU_FP_ARMV8
|
||||
bool "FP-ARMv8"
|
||||
depends on BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
help
|
||||
This option allows to use the ARMv8 floating point unit.
|
||||
|
||||
config BR2_ARM_FPU_NEON_FP_ARMV8
|
||||
bool "NEON/FP-ARMv8"
|
||||
depends on BR2_ARM_CPU_HAS_FP_ARMV8
|
||||
depends on BR2_ARM_CPU_HAS_NEON
|
||||
help
|
||||
This option allows to use both the ARMv8 floating point unit
|
||||
and the NEON SIMD unit for floating point operations.
|
||||
|
||||
endchoice
|
||||
|
||||
choice
|
||||
prompt "ARM instruction set"
|
||||
depends on BR2_arm || BR2_armeb
|
||||
|
||||
config BR2_ARM_INSTRUCTIONS_ARM
|
||||
bool "ARM"
|
||||
@ -434,12 +501,14 @@ config BR2_ARM_INSTRUCTIONS_THUMB2
|
||||
endchoice
|
||||
|
||||
config BR2_ARCH
|
||||
default "arm" if BR2_arm
|
||||
default "armeb" if BR2_armeb
|
||||
default "arm" if BR2_arm
|
||||
default "armeb" if BR2_armeb
|
||||
default "aarch64" if BR2_aarch64
|
||||
default "aarch64_be" if BR2_aarch64_be
|
||||
|
||||
config BR2_ENDIAN
|
||||
default "LITTLE" if BR2_arm
|
||||
default "BIG" if BR2_armeb
|
||||
default "LITTLE" if (BR2_arm || BR2_aarch64)
|
||||
default "BIG" if (BR2_armeb || BR2_aarch64_be)
|
||||
|
||||
config BR2_GCC_TARGET_CPU
|
||||
default "arm920t" if BR2_arm920t
|
||||
@ -465,11 +534,22 @@ config BR2_GCC_TARGET_CPU
|
||||
default "strongarm" if BR2_strongarm
|
||||
default "xscale" if BR2_xscale
|
||||
default "iwmmxt" if BR2_iwmmxt
|
||||
default "cortex-a53" if (BR2_cortex_a53 && !BR2_ARCH_IS_64)
|
||||
default "cortex-a53+fp" if (BR2_cortex_a53 && BR2_ARCH_IS_64 && BR2_ARM_FPU_FP_ARMV8)
|
||||
default "cortex-a53+fp+simd" if (BR2_cortex_a53 && BR2_ARCH_IS_64 && BR2_ARM_FPU_NEON_FP_ARMV8)
|
||||
default "cortex-a57" if (BR2_cortex_a57 && !BR2_ARCH_IS_64)
|
||||
default "cortex-a57+fp" if (BR2_cortex_a57 && BR2_ARCH_IS_64 && BR2_ARM_FPU_FP_ARMV8)
|
||||
default "cortex-a57+fp+simd" if (BR2_cortex_a57 && BR2_ARCH_IS_64 && BR2_ARM_FPU_NEON_FP_ARMV8)
|
||||
default "cortex-a72" if (BR2_cortex_a72 && !BR2_ARCH_IS_64)
|
||||
default "cortex-a72+fp" if (BR2_cortex_a72 && BR2_ARCH_IS_64 && BR2_ARM_FPU_FP_ARMV8)
|
||||
default "cortex-a72+fp+simd" if (BR2_cortex_a72 && BR2_ARCH_IS_64 && BR2_ARM_FPU_NEON_FP_ARMV8)
|
||||
|
||||
config BR2_GCC_TARGET_ABI
|
||||
default "aapcs-linux"
|
||||
default "aapcs-linux" if BR2_arm || BR2_armeb
|
||||
default "lp64" if BR2_aarch64 || BR2_aarch64_be
|
||||
|
||||
config BR2_GCC_TARGET_FPU
|
||||
depends on BR2_arm || BR2_armeb
|
||||
default "vfp" if BR2_ARM_FPU_VFPV2
|
||||
default "vfpv3" if BR2_ARM_FPU_VFPV3
|
||||
default "vfpv3-d16" if BR2_ARM_FPU_VFPV3D16
|
||||
@ -477,6 +557,8 @@ config BR2_GCC_TARGET_FPU
|
||||
default "vfpv4-d16" if BR2_ARM_FPU_VFPV4D16
|
||||
default "neon" if BR2_ARM_FPU_NEON
|
||||
default "neon-vfpv4" if BR2_ARM_FPU_NEON_VFPV4
|
||||
default "fp-armv8" if BR2_ARM_FPU_FP_ARMV8
|
||||
default "neon-fp-armv8" if BR2_ARM_FPU_NEON_FP_ARMV8
|
||||
|
||||
config BR2_GCC_TARGET_FLOAT_ABI
|
||||
default "soft" if BR2_ARM_SOFT_FLOAT
|
||||
|
@ -1,7 +1,7 @@
|
||||
choice
|
||||
prompt "Target CPU"
|
||||
depends on BR2_bfin
|
||||
default BR2_bf609
|
||||
default BR2_bf532
|
||||
help
|
||||
Specify target CPU
|
||||
config BR2_bf606
|
||||
|
@ -35,7 +35,3 @@ endchoice
|
||||
config BR2_GCC_TARGET_CPU
|
||||
default "68040" if BR2_m68k_68040
|
||||
default "5208" if BR2_m68k_cf5208
|
||||
|
||||
config BR2_GCC_TARGET_ARCH
|
||||
default "m68k" if BR2_m68k_m68k
|
||||
default "cf" if BR2_m68k_cf
|
||||
|
@ -1,3 +1,21 @@
|
||||
# mips default CPU ISAs
|
||||
config BR2_MIPS_CPU_MIPS32
|
||||
bool
|
||||
config BR2_MIPS_CPU_MIPS32R2
|
||||
bool
|
||||
config BR2_MIPS_CPU_MIPS32R5
|
||||
bool
|
||||
config BR2_MIPS_CPU_MIPS32R6
|
||||
bool
|
||||
config BR2_MIPS_CPU_MIPS64
|
||||
bool
|
||||
config BR2_MIPS_CPU_MIPS64R2
|
||||
bool
|
||||
config BR2_MIPS_CPU_MIPS64R5
|
||||
bool
|
||||
config BR2_MIPS_CPU_MIPS64R6
|
||||
bool
|
||||
|
||||
choice
|
||||
prompt "Target Architecture Variant"
|
||||
depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
|
||||
@ -6,27 +24,78 @@ choice
|
||||
help
|
||||
Specific CPU variant to use
|
||||
|
||||
64bit cabable: 64, 64r2, 64r6
|
||||
non-64bit capable: 32, 32r2, 32r6
|
||||
64bit cabable: 64, 64r2, 64r5, 64r6
|
||||
non-64bit capable: 32, 32r2, 32r5, 32r6
|
||||
|
||||
config BR2_mips_32
|
||||
bool "mips 32"
|
||||
bool "Generic MIPS32"
|
||||
depends on !BR2_ARCH_IS_64
|
||||
select BR2_MIPS_CPU_MIPS32
|
||||
config BR2_mips_32r2
|
||||
bool "mips 32r2"
|
||||
bool "Generic MIPS32R2"
|
||||
depends on !BR2_ARCH_IS_64
|
||||
select BR2_MIPS_CPU_MIPS32R2
|
||||
config BR2_mips_32r5
|
||||
bool "Generic MIPS32R5"
|
||||
depends on !BR2_ARCH_IS_64
|
||||
select BR2_MIPS_CPU_MIPS32R5
|
||||
config BR2_mips_32r6
|
||||
bool "mips 32r6"
|
||||
bool "Generic MIPS32R6"
|
||||
depends on !BR2_ARCH_IS_64
|
||||
select BR2_MIPS_CPU_MIPS32R6
|
||||
config BR2_mips_interaptiv
|
||||
bool "interAptiv"
|
||||
depends on !BR2_ARCH_IS_64
|
||||
select BR2_MIPS_CPU_MIPS32R2
|
||||
config BR2_mips_m5150
|
||||
bool "M5150"
|
||||
depends on !BR2_ARCH_IS_64
|
||||
select BR2_MIPS_CPU_MIPS32R5
|
||||
config BR2_mips_m6250
|
||||
bool "M6250"
|
||||
depends on !BR2_ARCH_IS_64
|
||||
select BR2_MIPS_CPU_MIPS32R6
|
||||
config BR2_mips_p5600
|
||||
bool "P5600"
|
||||
depends on !BR2_ARCH_IS_64
|
||||
select BR2_MIPS_CPU_MIPS32R5
|
||||
config BR2_mips_xburst
|
||||
bool "XBurst"
|
||||
depends on !BR2_ARCH_IS_64
|
||||
select BR2_MIPS_CPU_MIPS32R2
|
||||
help
|
||||
The Ingenic XBurst is a MIPS32R2 microprocessor. It has a
|
||||
bug in the FPU that can generate incorrect results in
|
||||
certain cases. The problem shows up when you have several
|
||||
fused madd instructions in sequence with dependant
|
||||
operands. This requires the -mno-fused-madd compiler option
|
||||
to be used in order to prevent emitting these instructions.
|
||||
|
||||
See http://www.ingenic.com/en/?xburst.html
|
||||
config BR2_mips_64
|
||||
bool "mips 64"
|
||||
bool "Generic MIPS64"
|
||||
depends on BR2_ARCH_IS_64
|
||||
select BR2_MIPS_CPU_MIPS64
|
||||
config BR2_mips_64r2
|
||||
bool "mips 64r2"
|
||||
bool "Generic MIPS64R2"
|
||||
depends on BR2_ARCH_IS_64
|
||||
select BR2_MIPS_CPU_MIPS64R2
|
||||
config BR2_mips_64r5
|
||||
bool "Generic MIPS64R5"
|
||||
depends on BR2_ARCH_IS_64
|
||||
select BR2_MIPS_CPU_MIPS64R5
|
||||
config BR2_mips_64r6
|
||||
bool "mips 64r6"
|
||||
bool "Generic MIPS64R6"
|
||||
depends on BR2_ARCH_IS_64
|
||||
select BR2_MIPS_CPU_MIPS64R6
|
||||
config BR2_mips_i6400
|
||||
bool "I6400"
|
||||
depends on BR2_ARCH_IS_64
|
||||
select BR2_MIPS_CPU_MIPS64R6
|
||||
config BR2_mips_p6600
|
||||
bool "P6600"
|
||||
depends on BR2_ARCH_IS_64
|
||||
select BR2_MIPS_CPU_MIPS64R6
|
||||
endchoice
|
||||
|
||||
|
||||
@ -70,10 +139,19 @@ config BR2_ENDIAN
|
||||
config BR2_GCC_TARGET_ARCH
|
||||
default "mips32" if BR2_mips_32
|
||||
default "mips32r2" if BR2_mips_32r2
|
||||
default "mips32r5" if BR2_mips_32r5
|
||||
default "mips32r6" if BR2_mips_32r6
|
||||
default "interaptiv" if BR2_mips_interaptiv
|
||||
default "m5101" if BR2_mips_m5150
|
||||
default "m6201" if BR2_mips_m6250
|
||||
default "p5600" if BR2_mips_p5600
|
||||
default "mips32r2" if BR2_mips_xburst
|
||||
default "mips64" if BR2_mips_64
|
||||
default "mips64r2" if BR2_mips_64r2
|
||||
default "mips64r5" if BR2_mips_64r5
|
||||
default "mips64r6" if BR2_mips_64r6
|
||||
default "i6400" if BR2_mips_i6400
|
||||
default "p6600" if BR2_mips_p6600
|
||||
|
||||
config BR2_MIPS_OABI32
|
||||
bool
|
||||
|
5
arch/Config.in.or1k
Normal file
5
arch/Config.in.or1k
Normal file
@ -0,0 +1,5 @@
|
||||
config BR2_ARCH
|
||||
default "or1k"
|
||||
|
||||
config BR2_ENDIAN
|
||||
default "BIG"
|
@ -23,8 +23,7 @@ config BR2_ARCH
|
||||
default "sh4eb" if BR2_sh4eb
|
||||
default "sh4a" if BR2_sh4a
|
||||
default "sh4aeb" if BR2_sh4aeb
|
||||
default "sh64" if BR2_sh64
|
||||
|
||||
config BR2_ENDIAN
|
||||
default "LITTLE" if BR2_sh4 || BR2_sh4a || BR2_sh64
|
||||
default "LITTLE" if BR2_sh4 || BR2_sh4a
|
||||
default "BIG" if BR2_sh2a || BR2_sh4eb || BR2_sh4aeb
|
||||
|
@ -187,6 +187,7 @@ rm -f $TARGET/etc/init.d/S20urandom
|
||||
rm -f $TARGET/etc/init.d/S80dhcp-relay
|
||||
rm -f $TARGET/etc/init.d/S80dhcp-server
|
||||
rm -f $TARGET/etc/init.d/S91smb
|
||||
rm -f $TARGET/etc/init.d/S99motion
|
||||
|
||||
# other unwanted dirs
|
||||
rm -rf $TARGET/data/*
|
||||
|
@ -0,0 +1,39 @@
|
||||
From f30c692c1f9ef0e93bee2b408a24baa017f1ca9d Mon Sep 17 00:00:00 2001
|
||||
From: Vladimir Serbinenko <phcoder@gmail.com>
|
||||
Date: Thu, 7 Nov 2013 01:01:47 +0100
|
||||
Subject: [PATCH] * grub-core/gettext/gettext.c (main_context),
|
||||
(secondary_context): Define after defining type and not before.
|
||||
|
||||
[Thomas: backport from upstream commit
|
||||
f30c692c1f9ef0e93bee2b408a24baa017f1ca9d, and remove ChangeLog
|
||||
modifications to avoid conflicts.]
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
grub-core/gettext/gettext.c | 4 ++--
|
||||
2 files changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
|
||||
index df73570..4880cef 100644
|
||||
--- a/grub-core/gettext/gettext.c
|
||||
+++ b/grub-core/gettext/gettext.c
|
||||
@@ -34,8 +34,6 @@ GRUB_MOD_LICENSE ("GPLv3+");
|
||||
http://www.gnu.org/software/autoconf/manual/gettext/MO-Files.html .
|
||||
*/
|
||||
|
||||
-static struct grub_gettext_context main_context, secondary_context;
|
||||
-
|
||||
static const char *(*grub_gettext_original) (const char *s);
|
||||
|
||||
struct grub_gettext_msg
|
||||
@@ -69,6 +67,8 @@ struct grub_gettext_context
|
||||
struct grub_gettext_msg *grub_gettext_msg_list;
|
||||
};
|
||||
|
||||
+static struct grub_gettext_context main_context, secondary_context;
|
||||
+
|
||||
#define MO_MAGIC_NUMBER 0x950412de
|
||||
|
||||
static grub_err_t
|
||||
--
|
||||
2.7.4
|
||||
|
@ -45,6 +45,9 @@ endif
|
||||
# the confusion, it also uses NM, OBJCOPY and STRIP to build the
|
||||
# bootloader itself; none of these are used to build the native
|
||||
# tools.
|
||||
#
|
||||
# NOTE: TARGET_STRIP is overridden by BR2_STRIP_none, so always
|
||||
# use the cross compile variant to ensure grub2 builds
|
||||
|
||||
GRUB2_CONF_ENV = \
|
||||
$(HOST_CONFIGURE_OPTS) \
|
||||
@ -55,14 +58,14 @@ GRUB2_CONF_ENV = \
|
||||
TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
|
||||
NM="$(TARGET_NM)" \
|
||||
OBJCOPY="$(TARGET_OBJCOPY)" \
|
||||
STRIP="$(TARGET_STRIP)"
|
||||
STRIP="$(TARGET_CROSS)strip"
|
||||
|
||||
GRUB2_CONF_OPTS = \
|
||||
--target=$(GRUB2_TARGET) \
|
||||
--with-platform=$(GRUB2_PLATFORM) \
|
||||
--disable-grub-mkfont \
|
||||
--enable-efiemu=no \
|
||||
--enable-liblzma=no \
|
||||
ac_cv_lib_lzma_lzma_code=no \
|
||||
--enable-device-mapper=no \
|
||||
--enable-libzfs=no \
|
||||
--disable-werror
|
||||
|
22
boot/syslinux/0002-disable-pie.patch
Normal file
22
boot/syslinux/0002-disable-pie.patch
Normal file
@ -0,0 +1,22 @@
|
||||
Description: Disable PIE to avoid FTBFS on amd64
|
||||
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1579023
|
||||
Author: Graham Inggs <ginggs@ubuntu.com>
|
||||
Last-Update: 2016-05-06
|
||||
|
||||
gcc 6.x has PIE support enabled by default, which causes a build issue
|
||||
with syslinux. This patch disables PIE support in the relevant
|
||||
syslinux Makefile.
|
||||
|
||||
Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
|
||||
|
||||
--- a/gpxe/src/Makefile
|
||||
+++ b/gpxe/src/Makefile
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
|
||||
CLEANUP :=
|
||||
-CFLAGS :=
|
||||
+CFLAGS := -fno-PIE
|
||||
ASFLAGS :=
|
||||
LDFLAGS :=
|
||||
MAKEDEPS := Makefile
|
@ -0,0 +1,39 @@
|
||||
From 7c8d81605302e7d7fdd3e7d8eb69302bddc64a2c Mon Sep 17 00:00:00 2001
|
||||
From: Alexey Brodkin <abrodkin@synopsys.com>
|
||||
Date: Fri, 16 Sep 2016 12:12:26 +0300
|
||||
Subject: [PATCH] arc: Use -mcpu=XXX instead of obsolete -marcXXX
|
||||
|
||||
With newer ARC tools old way of CPU specification gets obsolete,
|
||||
so we're switching to newer and more common way of setting "-mcpu".
|
||||
|
||||
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
|
||||
---
|
||||
arch/arc/config.mk | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/arch/arc/config.mk b/arch/arc/config.mk
|
||||
index 7c974f0..13676bd 100644
|
||||
--- a/arch/arc/config.mk
|
||||
+++ b/arch/arc/config.mk
|
||||
@@ -31,15 +31,15 @@ CONFIG_MMU = 1
|
||||
endif
|
||||
|
||||
ifdef CONFIG_CPU_ARC750D
|
||||
-PLATFORM_CPPFLAGS += -marc700
|
||||
+PLATFORM_CPPFLAGS += -mcpu=arc700
|
||||
endif
|
||||
|
||||
ifdef CONFIG_CPU_ARC770D
|
||||
-PLATFORM_CPPFLAGS += -marc700 -mlock -mswape
|
||||
+PLATFORM_CPPFLAGS += -mcpu=arc700 -mlock -mswape
|
||||
endif
|
||||
|
||||
ifdef CONFIG_CPU_ARCEM6
|
||||
-PLATFORM_CPPFLAGS += -marcem
|
||||
+PLATFORM_CPPFLAGS += -mcpu=arcem
|
||||
endif
|
||||
|
||||
ifdef CONFIG_CPU_ARCHS34
|
||||
--
|
||||
2.7.4
|
||||
|
@ -0,0 +1,39 @@
|
||||
From 7c8d81605302e7d7fdd3e7d8eb69302bddc64a2c Mon Sep 17 00:00:00 2001
|
||||
From: Alexey Brodkin <abrodkin@synopsys.com>
|
||||
Date: Fri, 16 Sep 2016 12:12:26 +0300
|
||||
Subject: [PATCH] arc: Use -mcpu=XXX instead of obsolete -marcXXX
|
||||
|
||||
With newer ARC tools old way of CPU specification gets obsolete,
|
||||
so we're switching to newer and more common way of setting "-mcpu".
|
||||
|
||||
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
|
||||
---
|
||||
arch/arc/config.mk | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/arch/arc/config.mk b/arch/arc/config.mk
|
||||
index 7c974f0..13676bd 100644
|
||||
--- a/arch/arc/config.mk
|
||||
+++ b/arch/arc/config.mk
|
||||
@@ -31,15 +31,15 @@ CONFIG_MMU = 1
|
||||
endif
|
||||
|
||||
ifdef CONFIG_CPU_ARC750D
|
||||
-PLATFORM_CPPFLAGS += -marc700
|
||||
+PLATFORM_CPPFLAGS += -mcpu=arc700
|
||||
endif
|
||||
|
||||
ifdef CONFIG_CPU_ARC770D
|
||||
-PLATFORM_CPPFLAGS += -marc700 -mlock -mswape
|
||||
+PLATFORM_CPPFLAGS += -mcpu=arc700 -mlock -mswape
|
||||
endif
|
||||
|
||||
ifdef CONFIG_CPU_ARCEM6
|
||||
-PLATFORM_CPPFLAGS += -marcem
|
||||
+PLATFORM_CPPFLAGS += -mcpu=arcem
|
||||
endif
|
||||
|
||||
ifdef CONFIG_CPU_ARCHS34
|
||||
--
|
||||
2.7.4
|
||||
|
@ -38,7 +38,7 @@ choice
|
||||
Select the specific U-Boot version you want to use
|
||||
|
||||
config BR2_TARGET_UBOOT_LATEST_VERSION
|
||||
bool "2016.03"
|
||||
bool "2017.01"
|
||||
|
||||
config BR2_TARGET_UBOOT_CUSTOM_VERSION
|
||||
bool "Custom version"
|
||||
@ -86,7 +86,7 @@ endif
|
||||
|
||||
config BR2_TARGET_UBOOT_VERSION
|
||||
string
|
||||
default "2016.03" if BR2_TARGET_UBOOT_LATEST_VERSION
|
||||
default "2017.01" 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
|
||||
@ -95,6 +95,7 @@ config BR2_TARGET_UBOOT_VERSION
|
||||
|
||||
config BR2_TARGET_UBOOT_PATCH
|
||||
string "Custom U-Boot patches"
|
||||
default BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR if BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR != "" # legacy
|
||||
help
|
||||
A space-separated list of patches to apply to U-Boot.
|
||||
Each patch can be described as an URL, a local file path,
|
||||
@ -137,9 +138,15 @@ config BR2_TARGET_UBOOT_NEEDS_DTC
|
||||
Select this option if your U-Boot board configuration
|
||||
requires the Device Tree compiler to be available.
|
||||
|
||||
choice
|
||||
prompt "U-Boot binary format"
|
||||
default BR2_TARGET_UBOOT_FORMAT_BIN
|
||||
config BR2_TARGET_UBOOT_NEEDS_OPENSSL
|
||||
bool "U-Boot needs OpenSSL"
|
||||
help
|
||||
Select this option if your U-Boot board configuration
|
||||
requires OpenSSL to be available on the host. This is
|
||||
typically the case when the board configuration has
|
||||
CONFIG_FIT_SIGNATURE enabled.
|
||||
|
||||
menu "U-Boot binary format"
|
||||
|
||||
config BR2_TARGET_UBOOT_FORMAT_AIS
|
||||
bool "u-boot.ais"
|
||||
@ -150,6 +157,7 @@ config BR2_TARGET_UBOOT_FORMAT_AIS
|
||||
|
||||
config BR2_TARGET_UBOOT_FORMAT_BIN
|
||||
bool "u-boot.bin"
|
||||
default y
|
||||
|
||||
config BR2_TARGET_UBOOT_FORMAT_DTB_IMG
|
||||
bool "u-boot-dtb.img"
|
||||
@ -252,19 +260,21 @@ config BR2_TARGET_UBOOT_FORMAT_CUSTOM
|
||||
help
|
||||
On some platforms, the standard U-Boot binary is not called
|
||||
u-boot.bin, but u-boot<something>.bin. If this is your case,
|
||||
you should select this option and specify the correct name
|
||||
you should select this option and specify the correct name(s)
|
||||
in BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME.
|
||||
|
||||
endchoice
|
||||
|
||||
config BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME
|
||||
string "U-Boot binary format: custom name"
|
||||
string "U-Boot binary format: custom names"
|
||||
depends on BR2_TARGET_UBOOT_FORMAT_CUSTOM
|
||||
help
|
||||
Specify the correct name of the output binary created by
|
||||
U-Boot, if it is not one of the default names. For example:
|
||||
In case the U-Boot binary for the target platform is not among
|
||||
the default names, one or more custom names can be listed here.
|
||||
Use space to separate multiple names.
|
||||
Example:
|
||||
u-boot_magic.bin
|
||||
|
||||
endmenu
|
||||
|
||||
config BR2_TARGET_UBOOT_OMAP_IFT
|
||||
depends on BR2_TARGET_UBOOT_FORMAT_BIN
|
||||
depends on BR2_arm || BR2_armeb
|
||||
@ -313,7 +323,7 @@ config BR2_TARGET_UBOOT_SPL_NAME
|
||||
default "spl/u-boot-spl.bin"
|
||||
depends on BR2_TARGET_UBOOT_SPL
|
||||
help
|
||||
This is the name of the SPL binary, generated during
|
||||
A space-separated list of SPL binaries, generated during
|
||||
u-boot build. For most platform it is spl/u-boot-spl.bin
|
||||
but not always. It is MLO on OMAP for example.
|
||||
|
||||
@ -348,9 +358,13 @@ menuconfig BR2_TARGET_UBOOT_ENVIMAGE
|
||||
if BR2_TARGET_UBOOT_ENVIMAGE
|
||||
|
||||
config BR2_TARGET_UBOOT_ENVIMAGE_SOURCE
|
||||
string "Source file for environment"
|
||||
string "Source files for environment"
|
||||
help
|
||||
Text file describing the environment.
|
||||
Text files describing the environment. Files should have
|
||||
lines of the form var=value, one per line. Blank lines and
|
||||
lines starting with a # are ignored.
|
||||
|
||||
Multiple source files are concatenated in the order listed.
|
||||
|
||||
config BR2_TARGET_UBOOT_ENVIMAGE_SIZE
|
||||
string "Size of environment"
|
||||
|
@ -1,2 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 e49337262ecac44dbdeac140f2c6ebd1eba345e0162b0464172e7f05583ed7bb u-boot-2016.03.tar.bz2
|
||||
sha256 6c425175f93a4bcf2ec9faf5658ef279633dbd7856a293d95bd1ff516528ecf2 u-boot-2017.01.tar.bz2
|
||||
|
@ -36,44 +36,81 @@ BR_NO_CHECK_HASH_FOR += $(UBOOT_SOURCE)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_BIN),y)
|
||||
UBOOT_BINS += u-boot.bin
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_ELF),y)
|
||||
UBOOT_BIN = u-boot
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_KWB),y)
|
||||
UBOOT_BIN = u-boot.kwb
|
||||
UBOOT_MAKE_TARGET = $(UBOOT_BIN)
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_AIS),y)
|
||||
UBOOT_BIN = u-boot.ais
|
||||
UBOOT_MAKE_TARGET = $(UBOOT_BIN)
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y)
|
||||
UBOOT_BIN = u-boot.ldr
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND_BIN),y)
|
||||
UBOOT_BIN = u-boot-nand.bin
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_DTB_IMG),y)
|
||||
UBOOT_BIN = u-boot-dtb.img
|
||||
UBOOT_MAKE_TARGET = all $(UBOOT_BIN)
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y)
|
||||
UBOOT_BIN = u-boot.img
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMX),y)
|
||||
UBOOT_BIN = u-boot.imx
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_SB),y)
|
||||
UBOOT_BIN = u-boot.sb
|
||||
UBOOT_MAKE_TARGET = $(UBOOT_BIN)
|
||||
UBOOT_BINS += u-boot
|
||||
# To make elf usable for debuging on ARC use special target
|
||||
ifeq ($(BR2_arc),y)
|
||||
UBOOT_MAKE_TARGET += mdbtrick
|
||||
endif
|
||||
endif
|
||||
|
||||
# Call 'make all' unconditionally
|
||||
UBOOT_MAKE_TARGET += all
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_KWB),y)
|
||||
UBOOT_BINS += u-boot.kwb
|
||||
UBOOT_MAKE_TARGET += u-boot.kwb
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_AIS),y)
|
||||
UBOOT_BINS += u-boot.ais
|
||||
UBOOT_MAKE_TARGET += u-boot.ais
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y)
|
||||
UBOOT_BINS += u-boot.ldr
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND_BIN),y)
|
||||
UBOOT_BINS += u-boot-nand.bin
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_DTB_IMG),y)
|
||||
UBOOT_BINS += u-boot-dtb.img
|
||||
UBOOT_MAKE_TARGET += u-boot-dtb.img
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y)
|
||||
UBOOT_BINS += u-boot.img
|
||||
UBOOT_MAKE_TARGET += u-boot.img
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMX),y)
|
||||
UBOOT_BINS += u-boot.imx
|
||||
UBOOT_MAKE_TARGET += u-boot.imx
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_SB),y)
|
||||
UBOOT_BINS += u-boot.sb
|
||||
UBOOT_MAKE_TARGET += u-boot.sb
|
||||
# mxsimage needs OpenSSL
|
||||
UBOOT_DEPENDENCIES += host-elftosb host-openssl
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_SD),y)
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_SD),y)
|
||||
# BootStream (.sb) is generated by U-Boot, we convert it to SD format
|
||||
UBOOT_BIN = u-boot.sd
|
||||
UBOOT_MAKE_TARGET = u-boot.sb
|
||||
UBOOT_BINS += u-boot.sd
|
||||
UBOOT_MAKE_TARGET += u-boot.sb
|
||||
UBOOT_DEPENDENCIES += host-elftosb host-openssl
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND),y)
|
||||
UBOOT_BIN = u-boot.nand
|
||||
UBOOT_MAKE_TARGET = u-boot.sb
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND),y)
|
||||
UBOOT_BINS += u-boot.nand
|
||||
UBOOT_MAKE_TARGET += u-boot.sb
|
||||
UBOOT_DEPENDENCIES += host-elftosb host-openssl
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y)
|
||||
UBOOT_BIN = $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME))
|
||||
else
|
||||
UBOOT_BIN = u-boot.bin
|
||||
UBOOT_BIN_IFT = $(UBOOT_BIN).ift
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y)
|
||||
UBOOT_BINS += $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME))
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_OMAP_IFT),y)
|
||||
UBOOT_BINS += u-boot.bin
|
||||
UBOOT_BIN_IFT = u-boot.bin.ift
|
||||
endif
|
||||
|
||||
# The kernel calls AArch64 'arm64', but U-Boot calls it just 'arm', so
|
||||
@ -89,13 +126,17 @@ endif
|
||||
UBOOT_MAKE_OPTS += \
|
||||
CROSS_COMPILE="$(TARGET_CROSS)" \
|
||||
ARCH=$(UBOOT_ARCH) \
|
||||
HOSTCFLAGS="$(HOST_CFLAGS)" \
|
||||
HOSTCC="$(HOSTCC) $(HOST_CFLAGS)" \
|
||||
HOSTLDFLAGS="$(HOST_LDFLAGS)"
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y)
|
||||
UBOOT_DEPENDENCIES += host-dtc
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSSL),y)
|
||||
UBOOT_DEPENDENCIES += host-openssl
|
||||
endif
|
||||
|
||||
# prior to u-boot 2013.10 the license info was in COPYING. Copy it so
|
||||
# legal-info finds it
|
||||
define UBOOT_COPY_OLD_LICENSE_FILE
|
||||
@ -140,6 +181,12 @@ endif # BR2_TARGET_UBOOT_USE_DEFCONFIG
|
||||
|
||||
UBOOT_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig
|
||||
UBOOT_KCONFIG_OPTS = $(UBOOT_MAKE_OPTS)
|
||||
define UBOOT_HELP_CMDS
|
||||
@echo ' uboot-menuconfig - Run U-Boot menuconfig'
|
||||
@echo ' uboot-savedefconfig - Run U-Boot savedefconfig'
|
||||
@echo ' uboot-update-defconfig - Save the U-Boot configuration to the path specified'
|
||||
@echo ' by BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE'
|
||||
endef
|
||||
endif # BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY
|
||||
|
||||
define UBOOT_BUILD_CMDS
|
||||
@ -162,15 +209,22 @@ define UBOOT_BUILD_OMAP_IFT
|
||||
endef
|
||||
|
||||
define UBOOT_INSTALL_IMAGES_CMDS
|
||||
cp -dpf $(@D)/$(UBOOT_BIN) $(BINARIES_DIR)/
|
||||
$(foreach f,$(UBOOT_BINS), \
|
||||
cp -dpf $(@D)/$(f) $(BINARIES_DIR)/
|
||||
)
|
||||
$(if $(BR2_TARGET_UBOOT_FORMAT_NAND),
|
||||
cp -dpf $(@D)/$(UBOOT_MAKE_TARGET) $(BINARIES_DIR))
|
||||
cp -dpf $(@D)/u-boot.sb $(BINARIES_DIR))
|
||||
$(if $(BR2_TARGET_UBOOT_SPL),
|
||||
cp -dpf $(@D)/$(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME)) $(BINARIES_DIR)/)
|
||||
$(foreach f,$(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME)), \
|
||||
cp -dpf $(@D)/$(f) $(BINARIES_DIR)/
|
||||
)
|
||||
)
|
||||
$(if $(BR2_TARGET_UBOOT_ENVIMAGE),
|
||||
$(HOST_DIR)/usr/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \
|
||||
$(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \
|
||||
-o $(BINARIES_DIR)/uboot-env.bin $(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE))
|
||||
cat $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)) | \
|
||||
$(HOST_DIR)/usr/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \
|
||||
$(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \
|
||||
$(if $(filter BIG,$(BR2_ENDIAN)),-b) \
|
||||
-o $(BINARIES_DIR)/uboot-env.bin -)
|
||||
endef
|
||||
|
||||
define UBOOT_INSTALL_OMAP_IFT_IMAGE
|
||||
@ -193,8 +247,9 @@ endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_ZYNQ_IMAGE),y)
|
||||
define UBOOT_GENERATE_ZYNQ_IMAGE
|
||||
$(HOST_DIR)/usr/bin/python2 $(HOST_DIR)/usr/bin/zynq-boot-bin.py \
|
||||
-u $(@D)/$(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME)) \
|
||||
$(HOST_DIR)/usr/bin/python2 \
|
||||
$(HOST_DIR)/usr/bin/zynq-boot-bin.py \
|
||||
-u $(@D)/$(firstword $(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME))) \
|
||||
-o $(BINARIES_DIR)/BOOT.BIN
|
||||
endef
|
||||
UBOOT_DEPENDENCIES += host-zynq-boot-bin
|
||||
@ -203,8 +258,11 @@ endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_ALTERA_SOCFPGA_IMAGE_CRC),y)
|
||||
define UBOOT_CRC_ALTERA_SOCFPGA_IMAGE
|
||||
$(HOST_DIR)/usr/bin/mkpimage -o $(BINARIES_DIR)/$(notdir $(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME))).crc \
|
||||
$(@D)/$(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME))
|
||||
$(foreach f,$(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME)), \
|
||||
$(HOST_DIR)/usr/bin/mkpimage \
|
||||
-o $(BINARIES_DIR)/$(notdir $(call qstrip,$(f))).crc \
|
||||
$(@D)/$(call qstrip,$(f))
|
||||
)
|
||||
endef
|
||||
UBOOT_DEPENDENCIES += host-mkpimage
|
||||
UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_CRC_ALTERA_SOCFPGA_IMAGE
|
||||
|
@ -7,7 +7,8 @@
|
||||
ROOTFS_CLOOP_DEPENDENCIES = host-cloop host-cdrkit
|
||||
|
||||
define ROOTFS_CLOOP_CMD
|
||||
$(HOST_DIR)/usr/bin/genisoimage -r $(TARGET_DIR) | $(HOST_DIR)/usr/bin/create_compressed_fs - 65536 > $@
|
||||
$(HOST_DIR)/usr/bin/genisoimage -r $(TARGET_DIR) | \
|
||||
$(HOST_DIR)/usr/bin/create_compressed_fs - 65536 > $@
|
||||
endef
|
||||
|
||||
$(eval $(call ROOTFS_TARGET,cloop))
|
||||
$(eval $(call ROOTFS_TARGET,cloop))
|
||||
|
15
fs/common.mk
15
fs/common.mk
@ -76,22 +76,29 @@ $$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(ROOTFS_$(2)_DEPENDENCIES)
|
||||
rm -f $$(FAKEROOT_SCRIPT)
|
||||
rm -f $$(TARGET_DIR_WARNING_FILE)
|
||||
rm -f $$(USERS_TABLE)
|
||||
echo '#!/bin/sh' > $$(FAKEROOT_SCRIPT)
|
||||
echo "set -e" >> $$(FAKEROOT_SCRIPT)
|
||||
echo "chown -h -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)
|
||||
ifneq ($$(ROOTFS_USERS_TABLES),)
|
||||
cat $$(ROOTFS_USERS_TABLES) >> $$(USERS_TABLE)
|
||||
endif
|
||||
printf '$$(subst $$(sep),\n,$$(PACKAGES_USERS))' >> $$(USERS_TABLE)
|
||||
$$(call PRINTF,$$(PACKAGES_USERS)) >> $$(USERS_TABLE)
|
||||
#PATH=$$(BR_PATH) $$(TOPDIR)/support/scripts/mkusers $$(USERS_TABLE) $$(TARGET_DIR) >> $$(FAKEROOT_SCRIPT)
|
||||
ifneq ($$(ROOTFS_DEVICE_TABLES),)
|
||||
cat $$(ROOTFS_DEVICE_TABLES) > $$(FULL_DEVICE_TABLE)
|
||||
ifeq ($$(BR2_ROOTFS_DEVICE_CREATION_STATIC),y)
|
||||
printf '$$(subst $$(sep),\n,$$(PACKAGES_DEVICES_TABLE))' >> $$(FULL_DEVICE_TABLE)
|
||||
$$(call PRINTF,$$(PACKAGES_DEVICES_TABLE)) >> $$(FULL_DEVICE_TABLE)
|
||||
endif
|
||||
printf '$$(subst $$(sep),\n,$$(PACKAGES_PERMISSIONS_TABLE))' >> $$(FULL_DEVICE_TABLE)
|
||||
endif
|
||||
$$(call PRINTF,$$(PACKAGES_PERMISSIONS_TABLE)) >> $$(FULL_DEVICE_TABLE)
|
||||
#echo "$$(HOST_DIR)/usr/bin/makedevs -d $$(FULL_DEVICE_TABLE) $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)
|
||||
$$(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
|
||||
echo "$$(ROOTFS_$(2)_CMD)" >> $$(FAKEROOT_SCRIPT)
|
||||
$$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT)
|
||||
chmod a+x $$(FAKEROOT_SCRIPT)
|
||||
PATH=$$(BR_PATH) $$(HOST_DIR)/usr/bin/fakeroot -- $$(FAKEROOT_SCRIPT)
|
||||
$$(INSTALL) -m 0644 support/misc/target-dir-warning.txt $$(TARGET_DIR_WARNING_FILE)
|
||||
|
@ -11,7 +11,7 @@ config BR2_TARGET_ROOTFS_EXT2_2
|
||||
|
||||
choice
|
||||
bool "ext2/3/4 variant"
|
||||
default BR2_TARGET_ROOTFS_EXT2_2r0
|
||||
default BR2_TARGET_ROOTFS_EXT2_2r1
|
||||
|
||||
config BR2_TARGET_ROOTFS_EXT2_2r0
|
||||
bool "ext2 (rev0)"
|
||||
|
@ -20,12 +20,11 @@ ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)),0)
|
||||
EXT2_OPTS += -r $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)
|
||||
endif
|
||||
|
||||
# Not qstrip-ing the variable, because it may contain spaces, but we must
|
||||
# qstrip it when checking. Furthermore, we need to further quote it, so
|
||||
# that the quotes do not get eaten by the echo statement when creating the
|
||||
# fakeroot script
|
||||
ifneq ($(call qstrip,$(BR2_TARGET_ROOTFS_EXT2_LABEL)),)
|
||||
EXT2_OPTS += -l '$(BR2_TARGET_ROOTFS_EXT2_LABEL)'
|
||||
# qstrip results in stripping consecutive spaces into a single one. So the
|
||||
# variable is not qstrip-ed to preserve the integrity of the string value.
|
||||
EXT2_LABEL := $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_LABEL))
|
||||
ifneq ($(EXT2_LABEL),)
|
||||
EXT2_OPTS += -l "$(EXT2_LABEL)"
|
||||
endif
|
||||
|
||||
ROOTFS_EXT2_DEPENDENCIES = host-mke2img
|
||||
|
@ -24,7 +24,7 @@
|
||||
|
||||
ROOTFS_ISO9660_BOOT_MENU = $(call qstrip,$(BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU))
|
||||
|
||||
ROOTFS_ISO9660_DEPENDENCIES = host-cdrkit host-fakeroot linux
|
||||
ROOTFS_ISO9660_DEPENDENCIES = host-cdrkit linux
|
||||
|
||||
ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
|
||||
ROOTFS_ISO9660_USE_INITRD = YES
|
||||
|
@ -39,8 +39,8 @@ ROOTFS_JFFS2_DEPENDENCIES = host-mtd
|
||||
|
||||
ifneq ($(BR2_TARGET_ROOTFS_JFFS2_SUMMARY),)
|
||||
define ROOTFS_JFFS2_CMD
|
||||
$(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $@.nosummary && \
|
||||
$(SUMTOOL) $(SUMTOOL_OPTS) -i $@.nosummary -o $@ && \
|
||||
$(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $@.nosummary
|
||||
$(SUMTOOL) $(SUMTOOL_OPTS) -i $@.nosummary -o $@
|
||||
rm $@.nosummary
|
||||
endef
|
||||
else
|
||||
|
@ -26,8 +26,7 @@ endif
|
||||
|
||||
define ROOTFS_SQUASHFS_CMD
|
||||
$(HOST_DIR)/usr/bin/mksquashfs $(TARGET_DIR) $@ -noappend \
|
||||
$(ROOTFS_SQUASHFS_ARGS) && \
|
||||
chmod 0644 $@
|
||||
$(ROOTFS_SQUASHFS_ARGS)
|
||||
endef
|
||||
|
||||
$(eval $(call ROOTFS_TARGET,squashfs))
|
||||
|
@ -7,7 +7,8 @@
|
||||
TAR_OPTS := $(call qstrip,$(BR2_TARGET_ROOTFS_TAR_OPTIONS))
|
||||
|
||||
define ROOTFS_TAR_CMD
|
||||
tar -c$(TAR_OPTS)f $@ --numeric-owner -C $(TARGET_DIR) .
|
||||
(cd $(TARGET_DIR); find -print0 | LC_ALL=C sort -z | \
|
||||
tar $(TAR_OPTS) -cf $@ --null --no-recursion -T - --numeric-owner)
|
||||
endef
|
||||
|
||||
$(eval $(call ROOTFS_TARGET,tar))
|
||||
|
@ -20,10 +20,12 @@ else
|
||||
UBINIZE_CONFIG_FILE_PATH = fs/ubifs/ubinize.cfg
|
||||
endif
|
||||
|
||||
# don't use sed -i as it misbehaves on systems with SELinux enabled when this is
|
||||
# executed through fakeroot (see #9386)
|
||||
define ROOTFS_UBI_CMD
|
||||
$(INSTALL) -m 0644 $(UBINIZE_CONFIG_FILE_PATH) $(BUILD_DIR)/ubinize.cfg ;\
|
||||
$(SED) 's;BR2_ROOTFS_UBIFS_PATH;$@fs;' $(BUILD_DIR)/ubinize.cfg ;\
|
||||
$(HOST_DIR)/usr/sbin/ubinize -o $@ $(UBI_UBINIZE_OPTS) $(BUILD_DIR)/ubinize.cfg ;\
|
||||
sed 's;BR2_ROOTFS_UBIFS_PATH;$@fs;' \
|
||||
$(UBINIZE_CONFIG_FILE_PATH) > $(BUILD_DIR)/ubinize.cfg
|
||||
$(HOST_DIR)/usr/sbin/ubinize -o $@ $(UBI_UBINIZE_OPTS) $(BUILD_DIR)/ubinize.cfg
|
||||
rm $(BUILD_DIR)/ubinize.cfg
|
||||
endef
|
||||
|
||||
|
17
package/4th/0001-avoid-regen-during-install.patch
Normal file
17
package/4th/0001-avoid-regen-during-install.patch
Normal file
@ -0,0 +1,17 @@
|
||||
avoid regen during install
|
||||
|
||||
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
||||
|
||||
--- a/sources/Makefile
|
||||
+++ b/sources/Makefile
|
||||
@@ -120,7 +120,7 @@
|
||||
ln -sf $(SHARED_LIB) $(LIBRARIES)/lib4th.so
|
||||
endif
|
||||
|
||||
-mostlyinstall: libinstall all
|
||||
+mostlyinstall: libinstall
|
||||
cp 4th 4tsh pp4th $(BINARIES)
|
||||
|
||||
install: mostlyinstall
|
||||
--
|
||||
|
2
package/4th/4th.hash
Normal file
2
package/4th/4th.hash
Normal file
@ -0,0 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 1c7adbb1a56dad4c4c781e6e023d77ac862842560c05246b691d07e9a4460ab2 4th-3.62.4-unix.tar.gz
|
70
package/4th/4th.mk
Normal file
70
package/4th/4th.mk
Normal file
@ -0,0 +1,70 @@
|
||||
################################################################################
|
||||
#
|
||||
# 4th
|
||||
#
|
||||
################################################################################
|
||||
|
||||
4TH_VERSION = 3.62.4
|
||||
4TH_SOURCE = 4th-$(4TH_VERSION)-unix.tar.gz
|
||||
4TH_SITE = http://downloads.sourceforge.net/project/forth-4th/4th-$(4TH_VERSION)
|
||||
4TH_LICENSE = GPLv3+, LGPLv3+
|
||||
# The COPYING file only contains the text of the LGPLv3, but the
|
||||
# source code really contains parts under GPLv3+.
|
||||
4TH_LICENSE_FILES = COPYING
|
||||
4TH_DEPENDENCIES = host-4th
|
||||
4TH_INSTALL_STAGING = YES
|
||||
|
||||
4TH_CFLAGS = $(TARGET_CFLAGS) -DUNIX -fsigned-char
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
4TH_MAKE_ENV = $(TARGET_MAKE_ENV) STATIC=1
|
||||
else
|
||||
4TH_MAKE_ENV = $(TARGET_MAKE_ENV) SHARED=1
|
||||
4TH_CFLAGS += -fPIC
|
||||
endif
|
||||
|
||||
define 4TH_BUILD_CMDS
|
||||
$(4TH_MAKE_ENV) $(MAKE) -C $(@D)/sources all \
|
||||
CROSS="$(TARGET_CROSS)" \
|
||||
CFLAGS="$(4TH_CFLAGS)" \
|
||||
FOURTH=$(HOST_DIR)/usr/bin/4th
|
||||
endef
|
||||
|
||||
define 4TH_INSTALL_STAGING_CMDS
|
||||
$(4TH_MAKE_ENV) $(MAKE) -C $(@D)/sources libinstall \
|
||||
LIBRARIES=$(STAGING_DIR)/usr/lib
|
||||
$(INSTALL) -D -m 0644 $(@D)/sources/4th.h \
|
||||
$(STAGING_DIR)/usr/include/4th.h
|
||||
endef
|
||||
|
||||
define 4TH_INSTALL_TARGET_CMDS
|
||||
mkdir -p $(TARGET_DIR)/usr/bin
|
||||
mkdir -p $(TARGET_DIR)/usr/lib
|
||||
$(4TH_MAKE_ENV) $(MAKE) -C $(@D)/sources mostlyinstall \
|
||||
BINARIES=$(TARGET_DIR)/usr/bin \
|
||||
LIBRARIES=$(TARGET_DIR)/usr/lib
|
||||
mkdir -p $(TARGET_DIR)/usr/share/4th/lib
|
||||
cp -dpf $(@D)/4th/*.4th $(TARGET_DIR)/usr/share/4th
|
||||
cp -dpf $(@D)/4th/lib/*.4th $(TARGET_DIR)/usr/share/4th/lib
|
||||
mkdir -p $(TARGET_DIR)/usr/share/4th/demo
|
||||
cp -dpf $(@D)/4th/demo/*.4th $(TARGET_DIR)/usr/share/4th/demo
|
||||
mkdir -p $(TARGET_DIR)/usr/share/4th/4pp/lib
|
||||
cp -dpf $(@D)/4th/4pp/*.4pp $(TARGET_DIR)/usr/share/4th/4pp
|
||||
cp -dpf $(@D)/4th/4pp/lib/*.4pp $(TARGET_DIR)/usr/share/4th/4pp/lib
|
||||
endef
|
||||
|
||||
define HOST_4TH_BUILD_CMDS
|
||||
$(HOST_MAKE_ENV) $(MAKE) -C $(@D)/sources all \
|
||||
CFLAGS="$(HOST_CFLAGS) -DUNIX -fsigned-char"
|
||||
endef
|
||||
|
||||
define HOST_4TH_INSTALL_CMDS
|
||||
mkdir -p $(HOST_DIR)/usr/bin
|
||||
mkdir -p $(HOST_DIR)/usr/lib
|
||||
$(HOST_MAKE_ENV) $(MAKE) -C $(@D)/sources mostlyinstall \
|
||||
BINARIES=$(HOST_DIR)/usr/bin \
|
||||
LIBRARIES=$(HOST_DIR)/usr/lib
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
$(eval $(host-generic-package))
|
8
package/4th/Config.in
Normal file
8
package/4th/Config.in
Normal file
@ -0,0 +1,8 @@
|
||||
config BR2_PACKAGE_4TH
|
||||
bool "4th"
|
||||
help
|
||||
4tH is a Forth compiler that can create bytecode,
|
||||
C-embeddable bytecode, standalone executables, but also
|
||||
works fine as a scripting language
|
||||
|
||||
http://thebeez.home.xs4all.nl/4tH/
|
File diff suppressed because it is too large
Load Diff
@ -12,6 +12,7 @@ menu "Host utilities"
|
||||
source "package/e2fsprogs/Config.in.host"
|
||||
source "package/e2tools/Config.in.host"
|
||||
source "package/faketime/Config.in.host"
|
||||
source "package/fwup/Config.in.host"
|
||||
source "package/genext2fs/Config.in.host"
|
||||
source "package/genimage/Config.in.host"
|
||||
source "package/genpart/Config.in.host"
|
||||
@ -19,20 +20,29 @@ menu "Host utilities"
|
||||
source "package/gptfdisk/Config.in.host"
|
||||
source "package/imx-usb-loader/Config.in.host"
|
||||
source "package/jq/Config.in.host"
|
||||
source "package/jsmin/Config.in.host"
|
||||
source "package/lpc3250loader/Config.in.host"
|
||||
source "package/lttng-babeltrace/Config.in.host"
|
||||
source "package/mfgtools/Config.in.host"
|
||||
source "package/mke2img/Config.in.host"
|
||||
source "package/mkpasswd/Config.in.host"
|
||||
source "package/mtd/Config.in.host"
|
||||
source "package/mtools/Config.in.host"
|
||||
source "package/mxsldr/Config.in.host"
|
||||
source "package/omap-u-boot-utils/Config.in.host"
|
||||
source "package/openocd/Config.in.host"
|
||||
source "package/opkg-utils/Config.in.host"
|
||||
source "package/parted/Config.in.host"
|
||||
source "package/patchelf/Config.in.host"
|
||||
source "package/pru-software-support/Config.in.host"
|
||||
source "package/pwgen/Config.in.host"
|
||||
source "package/qemu/Config.in.host"
|
||||
source "package/raspberrypi-usbboot/Config.in.host"
|
||||
source "package/sam-ba/Config.in.host"
|
||||
source "package/squashfs/Config.in.host"
|
||||
source "package/sunxi-tools/Config.in.host"
|
||||
source "package/tegrarcm/Config.in.host"
|
||||
source "package/ti-cgt-pru/Config.in.host"
|
||||
source "package/uboot-tools/Config.in.host"
|
||||
source "package/util-linux/Config.in.host"
|
||||
source "package/vboot-utils/Config.in.host"
|
||||
|
@ -122,6 +122,9 @@ endif
|
||||
ifeq ($(BR2_OPTIMIZE_3),y)
|
||||
TARGET_OPTIMIZATION = -O3
|
||||
endif
|
||||
ifeq ($(BR2_OPTIMIZE_G),y)
|
||||
TARGET_OPTIMIZATION = -Og
|
||||
endif
|
||||
ifeq ($(BR2_OPTIMIZE_S),y)
|
||||
TARGET_OPTIMIZATION = -Os
|
||||
endif
|
||||
@ -138,6 +141,7 @@ endif
|
||||
TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
|
||||
TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING)
|
||||
TARGET_CXXFLAGS = $(TARGET_CFLAGS)
|
||||
TARGET_FCFLAGS = $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING)
|
||||
TARGET_LDFLAGS = $(call qstrip,$(BR2_TARGET_LDFLAGS))
|
||||
|
||||
ifeq ($(BR2_BINFMT_FLAT),y)
|
||||
@ -145,35 +149,42 @@ TARGET_CFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FL
|
||||
-Wl$(comma)-elf2flt)
|
||||
TARGET_CXXFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),\
|
||||
-Wl$(comma)-elf2flt)
|
||||
TARGET_FCFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),\
|
||||
-Wl$(comma)-elf2flt)
|
||||
TARGET_LDFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt)
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_BINFMT_FLAT_SHARED),y)
|
||||
TARGET_LDFLAGS += -mid-shared-library -mshared-library-id=0
|
||||
TARGET_CFLAGS += -mid-shared-library -mshared-library-id=0
|
||||
TARGET_FCFLAGS += -mid-shared-library -mshared-library-id=0
|
||||
TARGET_CXXFLAGS += -mid-shared-library -mshared-library-id=0
|
||||
endif
|
||||
ifeq ($(BR2_BINFMT_FLAT_SEP_DATA),y)
|
||||
TARGET_LDFLAGS += -msep-data
|
||||
TARGET_CFLAGS += -msep-data
|
||||
TARGET_FCFLAGS += -msep-data
|
||||
TARGET_CXXFLAGS += -msep-data
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_SSP_REGULAR),y)
|
||||
TARGET_CFLAGS += -fstack-protector
|
||||
TARGET_CXXFLAGS += -fstack-protector
|
||||
TARGET_FCFLAGS += -fstack-protector
|
||||
else ifeq ($(BR2_SSP_STRONG),y)
|
||||
TARGET_CFLAGS += -fstack-protector-strong
|
||||
TARGET_CXXFLAGS += -fstack-protector-strong
|
||||
TARGET_FCFLAGS += -fstack-protector-strong
|
||||
else ifeq ($(BR2_SSP_ALL),y)
|
||||
TARGET_CFLAGS += -fstack-protector-all
|
||||
TARGET_CXXFLAGS += -fstack-protector-all
|
||||
TARGET_FCFLAGS += -fstack-protector-all
|
||||
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
|
||||
@ -192,32 +203,19 @@ TARGET_OBJDUMP = $(TARGET_CROSS)objdump
|
||||
|
||||
ifeq ($(BR2_STRIP_strip),y)
|
||||
STRIP_STRIP_DEBUG := --strip-debug
|
||||
STRIP_STRIP_UNNEEDED := --strip-unneeded
|
||||
STRIP_STRIP_ALL := --strip-all
|
||||
TARGET_STRIP = $(TARGET_CROSS)strip
|
||||
STRIPCMD = $(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
|
||||
KSTRIPCMD = $(STRIPCMD) $(STRIP_STRIP_UNNEEDED)
|
||||
endif
|
||||
ifeq ($(BR2_STRIP_sstrip),y)
|
||||
STRIP_STRIP_DEBUG :=
|
||||
STRIP_STRIP_UNNEEDED :=
|
||||
STRIP_STRIP_ALL :=
|
||||
TARGET_STRIP = $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-sstrip
|
||||
STRIPCMD = $(TARGET_STRIP)
|
||||
KSTRIPCMD = $(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note --strip-unneeded
|
||||
endif
|
||||
ifeq ($(BR2_STRIP_none),y)
|
||||
TARGET_STRIP = true
|
||||
STRIPCMD = $(TARGET_STRIP)
|
||||
KSTRIPCMD = $(TARGET_STRIP)
|
||||
endif
|
||||
INSTALL := $(shell which install || type -p install)
|
||||
FLEX := $(shell which flex || type -p flex)
|
||||
BISON := $(shell which bison || type -p bison)
|
||||
SED := $(shell which sed || type -p sed) -i -e
|
||||
UNZIP := $(shell which unzip || type -p unzip) -q
|
||||
|
||||
APPLY_PATCHES = support/scripts/apply-patches.sh $(if $(QUIET),-s)
|
||||
APPLY_PATCHES = PATH=$(HOST_DIR)/usr/bin:$$PATH support/scripts/apply-patches.sh $(if $(QUIET),-s)
|
||||
|
||||
HOST_CPPFLAGS = -I$(HOST_DIR)/usr/include
|
||||
HOST_CFLAGS ?= -O2
|
||||
@ -236,8 +234,10 @@ export PERL=$(shell which perl)
|
||||
# finds this perl module by exporting the proper value for PERL5LIB.
|
||||
export PERL5LIB=$(HOST_DIR)/usr/lib/perl
|
||||
|
||||
TARGET_MAKE_ENV = PATH=$(BR_PATH)
|
||||
|
||||
TARGET_CONFIGURE_OPTS = \
|
||||
PATH=$(BR_PATH) \
|
||||
$(TARGET_MAKE_ENV) \
|
||||
AR="$(TARGET_AR)" \
|
||||
AS="$(TARGET_AS)" \
|
||||
LD="$(TARGET_LD)" \
|
||||
@ -247,6 +247,7 @@ TARGET_CONFIGURE_OPTS = \
|
||||
CPP="$(TARGET_CPP)" \
|
||||
CXX="$(TARGET_CXX)" \
|
||||
FC="$(TARGET_FC)" \
|
||||
F77="$(TARGET_FC)" \
|
||||
RANLIB="$(TARGET_RANLIB)" \
|
||||
READELF="$(TARGET_READELF)" \
|
||||
STRIP="$(TARGET_STRIP)" \
|
||||
@ -270,15 +271,22 @@ TARGET_CONFIGURE_OPTS = \
|
||||
CXXFLAGS="$(TARGET_CXXFLAGS)" \
|
||||
LDFLAGS="$(TARGET_LDFLAGS)" \
|
||||
FCFLAGS="$(TARGET_FCFLAGS)" \
|
||||
FFLAGS="$(TARGET_FCFLAGS)" \
|
||||
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
|
||||
STAGING_DIR="$(STAGING_DIR)" \
|
||||
INTLTOOL_PERL=$(PERL)
|
||||
|
||||
TARGET_MAKE_ENV = PATH=$(BR_PATH)
|
||||
|
||||
HOST_MAKE_ENV = \
|
||||
PATH=$(BR_PATH) \
|
||||
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
|
||||
PKG_CONFIG_SYSROOT_DIR="/" \
|
||||
PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
|
||||
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
|
||||
PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig:$(HOST_DIR)/usr/share/pkgconfig"
|
||||
|
||||
HOST_CONFIGURE_OPTS = \
|
||||
PATH=$(BR_PATH) \
|
||||
$(HOST_MAKE_ENV) \
|
||||
AR="$(HOSTAR)" \
|
||||
AS="$(HOSTAS)" \
|
||||
LD="$(HOSTLD)" \
|
||||
@ -293,19 +301,8 @@ HOST_CONFIGURE_OPTS = \
|
||||
CFLAGS="$(HOST_CFLAGS)" \
|
||||
CXXFLAGS="$(HOST_CXXFLAGS)" \
|
||||
LDFLAGS="$(HOST_LDFLAGS)" \
|
||||
PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
|
||||
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
|
||||
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
|
||||
PKG_CONFIG_SYSROOT_DIR="/" \
|
||||
PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig:$(HOST_DIR)/usr/share/pkgconfig" \
|
||||
INTLTOOL_PERL=$(PERL)
|
||||
|
||||
HOST_MAKE_ENV = \
|
||||
PATH=$(BR_PATH) \
|
||||
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
|
||||
PKG_CONFIG_SYSROOT_DIR="/" \
|
||||
PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig"
|
||||
|
||||
# This is extra environment we can not export ourselves (eg. because some
|
||||
# packages use that variable internally, eg. uboot), so we have to
|
||||
# explicitly pass it to user-supplied external hooks (eg. post-build,
|
||||
@ -313,8 +310,7 @@ HOST_MAKE_ENV = \
|
||||
EXTRA_ENV = \
|
||||
PATH=$(BR_PATH) \
|
||||
BR2_DL_DIR=$(BR2_DL_DIR) \
|
||||
BUILD_DIR=$(BUILD_DIR) \
|
||||
BR2_EXTERNAL=$(BR2_EXTERNAL)
|
||||
BUILD_DIR=$(BUILD_DIR)
|
||||
|
||||
################################################################################
|
||||
# settings we need to pass to configure
|
||||
@ -378,6 +374,7 @@ ifeq ($(BR2_STATIC_LIBS),y)
|
||||
SHARED_STATIC_LIBS_OPTS = --enable-static --disable-shared
|
||||
TARGET_CFLAGS += -static
|
||||
TARGET_CXXFLAGS += -static
|
||||
TARGET_FCFLAGS += -static
|
||||
TARGET_LDFLAGS += -static
|
||||
else ifeq ($(BR2_SHARED_LIBS),y)
|
||||
SHARED_STATIC_LIBS_OPTS = --disable-static --enable-shared
|
||||
@ -400,3 +397,4 @@ include package/pkg-generic.mk
|
||||
include package/pkg-kconfig.mk
|
||||
include package/pkg-rebar.mk
|
||||
include package/pkg-kernel-module.mk
|
||||
include package/pkg-waf.mk
|
||||
|
292
package/acl/0002-add-__acl_-prefixes-to-internal-symbols.patch
Normal file
292
package/acl/0002-add-__acl_-prefixes-to-internal-symbols.patch
Normal file
@ -0,0 +1,292 @@
|
||||
From debbe4f7b591b3f35d0ed65c17fa81b196b2eb2d Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Tue, 12 Aug 2014 08:37:25 -0400
|
||||
Subject: [PATCH] add __acl_ prefixes to internal symbols
|
||||
|
||||
When static linking libacl, people sometimes run into symbol collisions
|
||||
because their own code defines symbols like "quote". So for acl internal
|
||||
symbols, use an __acl_ prefix.
|
||||
|
||||
[Rahul Bedarkar: backported from upstream
|
||||
http://git.savannah.gnu.org/cgit/acl.git/commit/?id=a2c4d71c2e84419a49db503ed59de4d3d1dca7dd ]
|
||||
Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
|
||||
---
|
||||
exports | 12 ++----------
|
||||
getfacl/getfacl.c | 4 ++--
|
||||
include/misc.h | 8 ++++----
|
||||
libacl/__acl_to_any_text.c | 4 ++--
|
||||
libacl/acl_from_text.c | 4 ++--
|
||||
libmisc/high_water_alloc.c | 2 +-
|
||||
libmisc/next_line.c | 6 +++---
|
||||
libmisc/quote.c | 4 ++--
|
||||
libmisc/unquote.c | 2 +-
|
||||
setfacl/parse.c | 10 +++++-----
|
||||
setfacl/setfacl.c | 4 ++--
|
||||
11 files changed, 26 insertions(+), 34 deletions(-)
|
||||
|
||||
diff --git a/exports b/exports
|
||||
index 7d8e69e..bf15d84 100644
|
||||
--- a/exports
|
||||
+++ b/exports
|
||||
@@ -59,22 +59,14 @@ ACL_1.0 {
|
||||
acl_to_any_text;
|
||||
|
||||
local:
|
||||
- # Library internal stuff
|
||||
+ # Library internal stuff
|
||||
__new_var_obj_p;
|
||||
__new_obj_p_here;
|
||||
__free_obj_p;
|
||||
__check_obj_p;
|
||||
__ext2int_and_check;
|
||||
- __acl_reorder_entry_obj_p;
|
||||
- __acl_reorder_obj_p;
|
||||
- __acl_init_obj;
|
||||
- __acl_create_entry_obj;
|
||||
- __acl_free_acl_obj;
|
||||
- __acl_to_any_text;
|
||||
+ __acl_*;
|
||||
__apply_mask_to_mode;
|
||||
-
|
||||
- quote;
|
||||
- unquote;
|
||||
};
|
||||
|
||||
ACL_1.1 {
|
||||
diff --git a/getfacl/getfacl.c b/getfacl/getfacl.c
|
||||
index f8eaf25..af9e225 100644
|
||||
--- a/getfacl/getfacl.c
|
||||
+++ b/getfacl/getfacl.c
|
||||
@@ -90,7 +90,7 @@ int opt_numeric; /* don't convert id's to symbolic names */
|
||||
|
||||
static const char *xquote(const char *str, const char *quote_chars)
|
||||
{
|
||||
- const char *q = quote(str, quote_chars);
|
||||
+ const char *q = __acl_quote(str, quote_chars);
|
||||
if (q == NULL) {
|
||||
fprintf(stderr, "%s: %s\n", progname, strerror(errno));
|
||||
exit(1);
|
||||
@@ -718,7 +718,7 @@ int main(int argc, char *argv[])
|
||||
do {
|
||||
if (optind == argc ||
|
||||
strcmp(argv[optind], "-") == 0) {
|
||||
- while ((line = next_line(stdin)) != NULL) {
|
||||
+ while ((line = __acl_next_line(stdin)) != NULL) {
|
||||
if (*line == '\0')
|
||||
continue;
|
||||
|
||||
diff --git a/include/misc.h b/include/misc.h
|
||||
index 0c5fdcc..c25accf 100644
|
||||
--- a/include/misc.h
|
||||
+++ b/include/misc.h
|
||||
@@ -15,9 +15,9 @@
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
-extern int high_water_alloc(void **buf, size_t *bufsize, size_t newsize);
|
||||
+extern int __acl_high_water_alloc(void **buf, size_t *bufsize, size_t newsize);
|
||||
|
||||
-extern const char *quote(const char *str, const char *quote_chars);
|
||||
-extern char *unquote(char *str);
|
||||
+extern const char *__acl_quote(const char *str, const char *quote_chars);
|
||||
+extern char *__acl_unquote(char *str);
|
||||
|
||||
-extern char *next_line(FILE *file);
|
||||
+extern char *__acl_next_line(FILE *file);
|
||||
diff --git a/libacl/__acl_to_any_text.c b/libacl/__acl_to_any_text.c
|
||||
index a4f9c34..19f1ccc 100644
|
||||
--- a/libacl/__acl_to_any_text.c
|
||||
+++ b/libacl/__acl_to_any_text.c
|
||||
@@ -159,7 +159,7 @@ acl_entry_to_any_str(const acl_entry_t entry_d, char *text_p, ssize_t size,
|
||||
if (options & TEXT_NUMERIC_IDS)
|
||||
str = NULL;
|
||||
else
|
||||
- str = quote(user_name(
|
||||
+ str = __acl_quote(user_name(
|
||||
entry_obj_p->eid.qid), ":, \t\n\r");
|
||||
if (str != NULL) {
|
||||
strncpy(text_p, str, size);
|
||||
@@ -182,7 +182,7 @@ acl_entry_to_any_str(const acl_entry_t entry_d, char *text_p, ssize_t size,
|
||||
if (options & TEXT_NUMERIC_IDS)
|
||||
str = NULL;
|
||||
else
|
||||
- str = quote(group_name(
|
||||
+ str = __acl_quote(group_name(
|
||||
entry_obj_p->eid.qid), ":, \t\n\r");
|
||||
if (str != NULL) {
|
||||
strncpy(text_p, str, size);
|
||||
diff --git a/libacl/acl_from_text.c b/libacl/acl_from_text.c
|
||||
index 1e05322..f6165be 100644
|
||||
--- a/libacl/acl_from_text.c
|
||||
+++ b/libacl/acl_from_text.c
|
||||
@@ -206,7 +206,7 @@ parse_acl_entry(const char **text_p, acl_t *acl_p)
|
||||
str = get_token(text_p);
|
||||
if (str) {
|
||||
entry_obj.etag = ACL_USER;
|
||||
- error = get_uid(unquote(str),
|
||||
+ error = get_uid(__acl_unquote(str),
|
||||
&entry_obj.eid.qid);
|
||||
free(str);
|
||||
if (error) {
|
||||
@@ -225,7 +225,7 @@ parse_acl_entry(const char **text_p, acl_t *acl_p)
|
||||
str = get_token(text_p);
|
||||
if (str) {
|
||||
entry_obj.etag = ACL_GROUP;
|
||||
- error = get_gid(unquote(str),
|
||||
+ error = get_gid(__acl_unquote(str),
|
||||
&entry_obj.eid.qid);
|
||||
free(str);
|
||||
if (error) {
|
||||
diff --git a/libmisc/high_water_alloc.c b/libmisc/high_water_alloc.c
|
||||
index c127dc1..951f4bb 100644
|
||||
--- a/libmisc/high_water_alloc.c
|
||||
+++ b/libmisc/high_water_alloc.c
|
||||
@@ -21,7 +21,7 @@
|
||||
#include <stdlib.h>
|
||||
#include "misc.h"
|
||||
|
||||
-int high_water_alloc(void **buf, size_t *bufsize, size_t newsize)
|
||||
+int __acl_high_water_alloc(void **buf, size_t *bufsize, size_t newsize)
|
||||
{
|
||||
#define CHUNK_SIZE 256
|
||||
/*
|
||||
diff --git a/libmisc/next_line.c b/libmisc/next_line.c
|
||||
index 0566d7a..126a364 100644
|
||||
--- a/libmisc/next_line.c
|
||||
+++ b/libmisc/next_line.c
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
#define LINE_SIZE getpagesize()
|
||||
|
||||
-char *next_line(FILE *file)
|
||||
+char *__acl_next_line(FILE *file)
|
||||
{
|
||||
static char *line;
|
||||
static size_t line_size;
|
||||
@@ -31,7 +31,7 @@ char *next_line(FILE *file)
|
||||
int eol = 0;
|
||||
|
||||
if (!line) {
|
||||
- if (high_water_alloc((void **)&line, &line_size, LINE_SIZE))
|
||||
+ if (__acl_high_water_alloc((void **)&line, &line_size, LINE_SIZE))
|
||||
return NULL;
|
||||
}
|
||||
c = line;
|
||||
@@ -47,7 +47,7 @@ char *next_line(FILE *file)
|
||||
if (feof(file))
|
||||
break;
|
||||
if (!eol) {
|
||||
- if (high_water_alloc((void **)&line, &line_size,
|
||||
+ if (__acl_high_water_alloc((void **)&line, &line_size,
|
||||
2 * line_size))
|
||||
return NULL;
|
||||
c = strrchr(line, '\0');
|
||||
diff --git a/libmisc/quote.c b/libmisc/quote.c
|
||||
index bf8f9eb..a28800c 100644
|
||||
--- a/libmisc/quote.c
|
||||
+++ b/libmisc/quote.c
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <string.h>
|
||||
#include "misc.h"
|
||||
|
||||
-const char *quote(const char *str, const char *quote_chars)
|
||||
+const char *__acl_quote(const char *str, const char *quote_chars)
|
||||
{
|
||||
static char *quoted_str;
|
||||
static size_t quoted_str_len;
|
||||
@@ -40,7 +40,7 @@ const char *quote(const char *str, const char *quote_chars)
|
||||
if (nonpr == 0)
|
||||
return str;
|
||||
|
||||
- if (high_water_alloc((void **)"ed_str, "ed_str_len,
|
||||
+ if (__acl_high_water_alloc((void **)"ed_str, "ed_str_len,
|
||||
(s - (unsigned char *)str) + nonpr * 3 + 1))
|
||||
return NULL;
|
||||
for (s = (unsigned char *)str, q = quoted_str; *s != '\0'; s++) {
|
||||
diff --git a/libmisc/unquote.c b/libmisc/unquote.c
|
||||
index bffebf9..4f4ce7c 100644
|
||||
--- a/libmisc/unquote.c
|
||||
+++ b/libmisc/unquote.c
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <ctype.h>
|
||||
#include "misc.h"
|
||||
|
||||
-char *unquote(char *str)
|
||||
+char *__acl_unquote(char *str)
|
||||
{
|
||||
unsigned char *s, *t;
|
||||
|
||||
diff --git a/setfacl/parse.c b/setfacl/parse.c
|
||||
index e7e6add..7433459 100644
|
||||
--- a/setfacl/parse.c
|
||||
+++ b/setfacl/parse.c
|
||||
@@ -226,7 +226,7 @@ user_entry:
|
||||
str = get_token(text_p);
|
||||
if (str) {
|
||||
cmd->c_tag = ACL_USER;
|
||||
- error = get_uid(unquote(str), &cmd->c_id);
|
||||
+ error = get_uid(__acl_unquote(str), &cmd->c_id);
|
||||
free(str);
|
||||
if (error) {
|
||||
*text_p = backup;
|
||||
@@ -245,7 +245,7 @@ user_entry:
|
||||
str = get_token(text_p);
|
||||
if (str) {
|
||||
cmd->c_tag = ACL_GROUP;
|
||||
- error = get_gid(unquote(str), &cmd->c_id);
|
||||
+ error = get_gid(__acl_unquote(str), &cmd->c_id);
|
||||
free(str);
|
||||
if (error) {
|
||||
*text_p = backup;
|
||||
@@ -466,7 +466,7 @@ read_acl_comments(
|
||||
if (strncmp(cp, "file:", 5) == 0) {
|
||||
cp += 5;
|
||||
SKIP_WS(cp);
|
||||
- cp = unquote(cp);
|
||||
+ cp = __acl_unquote(cp);
|
||||
|
||||
if (path_p) {
|
||||
if (*path_p)
|
||||
@@ -483,7 +483,7 @@ read_acl_comments(
|
||||
if (uid_p) {
|
||||
if (*uid_p != ACL_UNDEFINED_ID)
|
||||
goto fail;
|
||||
- if (get_uid(unquote(cp), uid_p) != 0)
|
||||
+ if (get_uid(__acl_unquote(cp), uid_p) != 0)
|
||||
continue;
|
||||
}
|
||||
} else if (strncmp(cp, "group:", 6) == 0) {
|
||||
@@ -493,7 +493,7 @@ read_acl_comments(
|
||||
if (gid_p) {
|
||||
if (*gid_p != ACL_UNDEFINED_ID)
|
||||
goto fail;
|
||||
- if (get_gid(unquote(cp), gid_p) != 0)
|
||||
+ if (get_gid(__acl_unquote(cp), gid_p) != 0)
|
||||
continue;
|
||||
}
|
||||
} else if (strncmp(cp, "flags:", 6) == 0) {
|
||||
diff --git a/setfacl/setfacl.c b/setfacl/setfacl.c
|
||||
index 81062a6..fb2d172 100644
|
||||
--- a/setfacl/setfacl.c
|
||||
+++ b/setfacl/setfacl.c
|
||||
@@ -92,7 +92,7 @@ int promote_warning;
|
||||
|
||||
static const char *xquote(const char *str, const char *quote_chars)
|
||||
{
|
||||
- const char *q = quote(str, quote_chars);
|
||||
+ const char *q = __acl_quote(str, quote_chars);
|
||||
if (q == NULL) {
|
||||
fprintf(stderr, "%s: %s\n", progname, strerror(errno));
|
||||
exit(1);
|
||||
@@ -311,7 +311,7 @@ int next_file(const char *arg, seq_t seq)
|
||||
args.seq = seq;
|
||||
|
||||
if (strcmp(arg, "-") == 0) {
|
||||
- while ((line = next_line(stdin)))
|
||||
+ while ((line = __acl_next_line(stdin)))
|
||||
errors = walk_tree(line, walk_flags, 0, do_set, &args);
|
||||
if (!feof(stdin)) {
|
||||
fprintf(stderr, _("%s: Standard input: %s\n"),
|
||||
--
|
||||
2.6.2
|
||||
|
62
package/acpica/0001-build-do-not-use-Werror.patch
Normal file
62
package/acpica/0001-build-do-not-use-Werror.patch
Normal file
@ -0,0 +1,62 @@
|
||||
From 9382ae2431d2962c430e7149302c8690f5bc159c Mon Sep 17 00:00:00 2001
|
||||
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Date: Sun, 10 Jul 2016 15:06:15 +0200
|
||||
Subject: [PATCH] build: do not use -Werror
|
||||
|
||||
Warnings come and go with various compiler versions, so using -Werror is
|
||||
prone to cause build failures with various compiler versions, especially
|
||||
newer versions that introduce new warnings.
|
||||
|
||||
Remove use of -Werror.
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
---
|
||||
generate/unix/Makefile.config | 1 -
|
||||
generate/unix/iasl/Makefile | 12 ++++++------
|
||||
2 files changed, 6 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/generate/unix/Makefile.config b/generate/unix/Makefile.config
|
||||
index da0f61d..1476e27 100644
|
||||
--- a/generate/unix/Makefile.config
|
||||
+++ b/generate/unix/Makefile.config
|
||||
@@ -185,7 +185,6 @@ CWARNINGFLAGS = \
|
||||
-Wall\
|
||||
-Wbad-function-cast\
|
||||
-Wdeclaration-after-statement\
|
||||
- -Werror\
|
||||
-Wformat=2\
|
||||
-Wmissing-declarations\
|
||||
-Wmissing-prototypes\
|
||||
diff --git a/generate/unix/iasl/Makefile b/generate/unix/iasl/Makefile
|
||||
index a3759cc..c2dc8f0 100644
|
||||
--- a/generate/unix/iasl/Makefile
|
||||
+++ b/generate/unix/iasl/Makefile
|
||||
@@ -320,19 +320,19 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prparser.y.h : $(ASL_COMPILER)/prparse
|
||||
# by the utilities above and they are not necessarily ANSI C, etc.
|
||||
#
|
||||
$(OBJDIR)/aslcompilerlex.o : $(OBJDIR)/aslcompilerlex.c
|
||||
- $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
|
||||
+ $(CC) -c $(CFLAGS) -Wall -o$@ $<
|
||||
|
||||
$(OBJDIR)/aslcompilerparse.o : $(OBJDIR)/aslcompilerparse.c
|
||||
- $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
|
||||
+ $(CC) -c $(CFLAGS) -Wall -o$@ $<
|
||||
|
||||
$(OBJDIR)/dtparserlex.o : $(OBJDIR)/dtparserlex.c
|
||||
- $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
|
||||
+ $(CC) -c $(CFLAGS) -Wall -o$@ $<
|
||||
|
||||
$(OBJDIR)/dtparserparse.o : $(OBJDIR)/dtparserparse.c
|
||||
- $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
|
||||
+ $(CC) -c $(CFLAGS) -Wall -o$@ $<
|
||||
|
||||
$(OBJDIR)/prparserlex.o : $(OBJDIR)/prparserlex.c
|
||||
- $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
|
||||
+ $(CC) -c $(CFLAGS) -Wall -o$@ $<
|
||||
|
||||
$(OBJDIR)/prparserparse.o : $(OBJDIR)/prparserparse.c
|
||||
- $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
|
||||
+ $(CC) -c $(CFLAGS) -Wall -o$@ $<
|
||||
--
|
||||
2.7.4
|
||||
|
13
package/acpica/Config.in
Normal file
13
package/acpica/Config.in
Normal file
@ -0,0 +1,13 @@
|
||||
config BR2_PACKAGE_ACPICA
|
||||
bool "acpica"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
help
|
||||
The ACPI Component Architecture (ACPICA) project provides an
|
||||
operating system (OS)-independent reference implementation
|
||||
of the Advanced Configuration and Power Interface
|
||||
Specification (ACPI).
|
||||
|
||||
https://www.acpica.org
|
||||
|
||||
comment "acpica needs a toolchain w/ threads"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
3
package/acpica/acpica.hash
Normal file
3
package/acpica/acpica.hash
Normal file
@ -0,0 +1,3 @@
|
||||
# locally computed hash
|
||||
sha256 dfb33db5599bd48134dbd6e50c8804099be0cf1c35d98975a6cb84dabca78b67 acpica-unix2-20161117.tar.gz
|
||||
|
26
package/acpica/acpica.mk
Normal file
26
package/acpica/acpica.mk
Normal file
@ -0,0 +1,26 @@
|
||||
################################################################################
|
||||
#
|
||||
# acpica
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ACPICA_VERSION = 20161117
|
||||
ACPICA_SOURCE = acpica-unix2-$(ACPICA_VERSION).tar.gz
|
||||
ACPICA_SITE = https://acpica.org/sites/acpica/files
|
||||
ACPICA_LICENSE = BSD-3c or GPLv2
|
||||
ACPICA_LICENSE_FILES = source/include/acpi.h
|
||||
ACPICA_DEPENDENCIES = host-bison host-flex
|
||||
|
||||
define ACPICA_BUILD_CMDS
|
||||
$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
|
||||
HARDWARE_NAME=$(BR2_ARCH) HOST=_LINUX CC="$(TARGET_CC)" \
|
||||
all
|
||||
endef
|
||||
|
||||
define ACPICA_INSTALL_TARGET_CMDS
|
||||
$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
|
||||
HARDWARE_NAME=$(BR2_ARCH) DESTDIR="$(TARGET_DIR)" \
|
||||
INSTALLFLAGS=-m755 install
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
@ -1,3 +1,3 @@
|
||||
# From https://sourceforge.net/projects/acpid2/files/
|
||||
md5 e41bdf628e122edb4342fca432ea7db9 acpid-2.0.27.tar.xz
|
||||
sha1 aabf129499f99b3c14e7a9f5b5ec717b0913e9c8 acpid-2.0.27.tar.xz
|
||||
md5 0432407b5ff75ae8e08afb43052fde2b acpid-2.0.28.tar.xz
|
||||
sha1 a5cb34d53eb6965293c436db23dc81550273975b acpid-2.0.28.tar.xz
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ACPID_VERSION = 2.0.27
|
||||
ACPID_VERSION = 2.0.28
|
||||
ACPID_SOURCE = acpid-$(ACPID_VERSION).tar.xz
|
||||
ACPID_SITE = http://downloads.sourceforge.net/project/acpid2
|
||||
ACPID_LICENSE = GPLv2+
|
||||
|
16
package/acpitool/Config.in
Normal file
16
package/acpitool/Config.in
Normal file
@ -0,0 +1,16 @@
|
||||
config BR2_PACKAGE_ACPITOOL
|
||||
bool "acpitool"
|
||||
depends on !BR2_bfin
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
help
|
||||
A small, convenient command-line ACPI client with a lot of
|
||||
features for Linux
|
||||
|
||||
http://acpitool.sourceforge.net
|
||||
|
||||
comment "acpitool needs a toolchain w/ threads, C++, dynamic library"
|
||||
depends on !BR2_bfin
|
||||
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \
|
||||
|| !BR2_INSTALL_LIBSTDCPP
|
2
package/acpitool/acpitool.hash
Normal file
2
package/acpitool/acpitool.hash
Normal file
@ -0,0 +1,2 @@
|
||||
# locally computed hash
|
||||
sha256 004fb6cd43102918b6302cf537a2db7ceadda04aef2e0906ddf230f820dad34f acpitool-0.5.1.tar.bz2
|
13
package/acpitool/acpitool.mk
Normal file
13
package/acpitool/acpitool.mk
Normal file
@ -0,0 +1,13 @@
|
||||
################################################################################
|
||||
#
|
||||
# acpitool
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ACPITOOL_VERSION = 0.5.1
|
||||
ACPITOOL_SOURCE = acpitool-$(ACPITOOL_VERSION).tar.bz2
|
||||
ACPITOOL_SITE = http://downloads.sourceforge.net/sourceforge/acpitool
|
||||
ACPITOOL_LICENSE = GPLv2+
|
||||
ACPITOOL_LICENSE_FILES = COPYING
|
||||
|
||||
$(eval $(autotools-package))
|
@ -1,2 +1,2 @@
|
||||
# From http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/3.20/adwaita-icon-theme-3.20.sha256sum
|
||||
sha256 7a0a887349f340dd644032f89d81264b694c4b006bd51af1c2c368d431e7ae35 adwaita-icon-theme-3.20.tar.xz
|
||||
# From http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/3.22/adwaita-icon-theme-3.22.0.sha256sum
|
||||
sha256 c18bf6e26087d9819a962c77288b291efab25d0419b73d909dd771716a45dcb7 adwaita-icon-theme-3.22.0.tar.xz
|
||||
|
@ -4,9 +4,11 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ADWAITA_ICON_THEME_VERSION = 3.20
|
||||
ADWAITA_ICON_THEME_SITE = http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/$(ADWAITA_ICON_THEME_VERSION)
|
||||
ADWAITA_ICON_THEME_VERSION_MAJOR = 3.22
|
||||
ADWAITA_ICON_THEME_VERSION = $(ADWAITA_ICON_THEME_VERSION_MAJOR).0
|
||||
ADWAITA_ICON_THEME_SITE = http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/$(ADWAITA_ICON_THEME_VERSION_MAJOR)
|
||||
ADWAITA_ICON_THEME_SOURCE = adwaita-icon-theme-$(ADWAITA_ICON_THEME_VERSION).tar.xz
|
||||
ADWAITA_ICON_THEME_INSTALL_STAGING = YES
|
||||
ADWAITA_ICON_THEME_LICENSE = LGPLv3 or CC-BY-SA-3.0
|
||||
ADWAITA_ICON_THEME_LICENSE_FILES = COPYING COPYING_LGPL COPYING_CCBYSA3
|
||||
ADWAITA_ICON_THEME_DEPENDENCIES = host-intltool host-libgtk3
|
||||
|
@ -1,2 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 260190beea911190a839e711f610ec3454a9b13985d35479775b7e26ad4c845e aespipe-v2.4c.tar.bz2
|
||||
sha256 c5ce656e0ade49b93e1163ec7b35450721d5743d8d804ad3a9e39add0389e50f aespipe-v2.4d.tar.bz2
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AESPIPE_VERSION = 2.4c
|
||||
AESPIPE_VERSION = 2.4d
|
||||
AESPIPE_SOURCE = aespipe-v$(AESPIPE_VERSION).tar.bz2
|
||||
AESPIPE_SITE = http://loop-aes.sourceforge.net/aespipe
|
||||
AESPIPE_LICENSE = GPL
|
||||
|
@ -1,2 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 d473b98d5f08e572b474c375c11ff1c4c5323824eb721c3979b6c5258b72949d agent++-4.0.4.tar.gz
|
||||
sha256 6775fa2a038801edddedc148d7846427ddc4d438e3bb33362d9eec6074918a88 agent++-4.0.7.tar.gz
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AGENTPP_VERSION = 4.0.4
|
||||
AGENTPP_VERSION = 4.0.7
|
||||
AGENTPP_SOURCE = agent++-$(AGENTPP_VERSION).tar.gz
|
||||
AGENTPP_SITE = http://www.agentpp.com/download
|
||||
AGENTPP_LICENSE = Apache-2.0
|
||||
|
@ -1,53 +0,0 @@
|
||||
From da6e87670ad4639371da056f9e36201a9236dfa2 Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@openwide.fr>
|
||||
Date: Wed, 29 Jul 2015 19:38:46 +0200
|
||||
Subject: [PATCH] fix musl build
|
||||
|
||||
aircrack-ng doesn't build with a musl toolchain due to
|
||||
cdefs.h internal glibc header being used in internal
|
||||
ethernet.h [1].
|
||||
|
||||
[1] http://wiki.musl-libc.org/wiki/FAQ
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
|
||||
---
|
||||
src/include/ethernet.h | 20 +++++++++++---------
|
||||
1 file changed, 11 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/src/include/ethernet.h b/src/include/ethernet.h
|
||||
index 72d5e81..e9d9236 100644
|
||||
--- a/src/include/ethernet.h
|
||||
+++ b/src/include/ethernet.h
|
||||
@@ -389,18 +389,20 @@ void ether_vlan_mtap(struct bpf_if *, struct mbuf *,
|
||||
|
||||
#else /* _KERNEL */
|
||||
|
||||
-#include <sys/cdefs.h>
|
||||
-
|
||||
/*
|
||||
* Ethernet address conversion/parsing routines.
|
||||
*/
|
||||
-__BEGIN_DECLS
|
||||
-struct ether_addr *ether_aton(const char *);
|
||||
-int ether_hostton(const char *, struct ether_addr *);
|
||||
-int ether_line(const char *, struct ether_addr *, char *);
|
||||
-char *ether_ntoa(const struct ether_addr *);
|
||||
-int ether_ntohost(char *, const struct ether_addr *);
|
||||
-__END_DECLS
|
||||
+#ifdef __cplusplus
|
||||
+extern "C" {
|
||||
+#endif
|
||||
+ struct ether_addr *ether_aton(const char *);
|
||||
+ int ether_hostton(const char *, struct ether_addr *);
|
||||
+ int ether_line(const char *, struct ether_addr *, char *);
|
||||
+ char *ether_ntoa(const struct ether_addr *);
|
||||
+ int ether_ntohost(char *, const struct ether_addr *);
|
||||
+#ifdef __cplusplus
|
||||
+}
|
||||
+#endif
|
||||
|
||||
#endif /* !_KERNEL */
|
||||
|
||||
--
|
||||
2.4.3
|
||||
|
51
package/alljoyn-base/Config.in
Normal file
51
package/alljoyn-base/Config.in
Normal file
@ -0,0 +1,51 @@
|
||||
config BR2_PACKAGE_ALLJOYN_BASE
|
||||
bool "alljoyn-base"
|
||||
depends on BR2_USE_MMU # alljoyn
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_USE_WCHAR # alljoyn
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # alljoyn
|
||||
select BR2_PACKAGE_ALLJOYN
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
select BR2_PACKAGE_ALLJOYN_BASE_CONTROLPANEL if \
|
||||
!BR2_PACKAGE_ALLJOYN_BASE_NOTIFICATION && \
|
||||
!BR2_PACKAGE_ALLJOYN_BASE_ONBOARDING
|
||||
help
|
||||
|
||||
AllJoyn Base Services are common services used by many
|
||||
devices, providing a set of interfaces for different devices
|
||||
to interact and interoperate with one another.
|
||||
|
||||
https://allseenalliance.org
|
||||
|
||||
if BR2_PACKAGE_ALLJOYN_BASE
|
||||
|
||||
config BR2_PACKAGE_ALLJOYN_BASE_CONTROLPANEL
|
||||
bool "controlpanel"
|
||||
help
|
||||
Enable AllJoyn Control Panel base service which allows
|
||||
devices to advertise a virtual control panel to be
|
||||
controlled remotely.
|
||||
|
||||
config BR2_PACKAGE_ALLJOYN_BASE_NOTIFICATION
|
||||
bool "notification"
|
||||
help
|
||||
Enable AllJoyn Notification base service which allows
|
||||
text-based notifications to be sent and received by devices
|
||||
on the AllJoyn network. Also supports audio and images via
|
||||
URLs.
|
||||
|
||||
config BR2_PACKAGE_ALLJOYN_BASE_ONBOARDING
|
||||
bool "onboarding"
|
||||
help
|
||||
Enable AllJoyn Onboarding base service which provides a
|
||||
consistent way to bring a new device onto the Wi-Fi network.
|
||||
|
||||
endif # BR2_PACKAGE_ALLJOYN_BASE
|
||||
|
||||
comment "alljoyn-base needs a toolchain w/ C++, threads, wchar, dynamic library"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
!BR2_USE_WCHAR || BR2_STATIC_LIBS
|
2
package/alljoyn-base/alljoyn-base.hash
Normal file
2
package/alljoyn-base/alljoyn-base.hash
Normal file
@ -0,0 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 742f724b3a06c8fc4039591dba24871755728221ca5dc4afb78ebd9a7e3beb44 alljoyn-base-16.04.00.tar.gz
|
91
package/alljoyn-base/alljoyn-base.mk
Normal file
91
package/alljoyn-base/alljoyn-base.mk
Normal file
@ -0,0 +1,91 @@
|
||||
################################################################################
|
||||
#
|
||||
# alljoyn-base
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ALLJOYN_BASE_REV = 16.04
|
||||
ALLJOYN_BASE_VERSION = $(ALLJOYN_BASE_REV).00
|
||||
ALLJOYN_BASE_SITE = \
|
||||
https://mirrors.kernel.org/allseenalliance/alljoyn/$(ALLJOYN_BASE_REV)
|
||||
# See https://allseenalliance.org/alliance/ip-policy
|
||||
ALLJOYN_BASE_LICENSE = ISC
|
||||
|
||||
ALLJOYN_BASE_DEPENDENCIES = host-scons alljoyn openssl
|
||||
ALLJOYN_BASE_INSTALL_STAGING = YES
|
||||
|
||||
ALLJOYN_BASE_CRYPTO = openssl
|
||||
|
||||
# AllJoyn can be compiled in debug or release mode. By default,
|
||||
# AllJoyn is built in debug mode.
|
||||
ALLJOYN_BASE_VARIANT = release
|
||||
|
||||
ALLJOYN_BASE_BINDINGS = c,cpp
|
||||
|
||||
# By setting openwrt for OS and CPU, AllJoyn cross-compilation can be finely
|
||||
# tuned through TARGET_xxx options. All TARGET_xxx variables must be defined
|
||||
# otherwise compilation will fail.
|
||||
# CROSS_COMPILE option should not be used as it works only for linux/ARM.
|
||||
ALLJOYN_BASE_OS = openwrt
|
||||
ALLJOYN_BASE_CPU = openwrt
|
||||
|
||||
# AllJoyn install everything in this relative path
|
||||
ALLJOYN_BASE_DISTDIR = \
|
||||
build/$(ALLJOYN_OS)/$(ALLJOYN_CPU)/$(ALLJOYN_VARIANT)/dist
|
||||
|
||||
ALLJOYN_BASE_SCONS_OPTS = \
|
||||
-j$(PARALLEL_JOBS) \
|
||||
V=1 \
|
||||
OS=$(ALLJOYN_BASE_OS) \
|
||||
CPU=$(ALLJOYN_BASE_CPU) \
|
||||
VARIANT=$(ALLJOYN_BASE_VARIANT) \
|
||||
BR=off \
|
||||
CRYPTO=$(ALLJOYN_BASE_CRYPTO) \
|
||||
BINDINGS=$(ALLJOYN_BASE_BINDINGS) \
|
||||
ALLJOYN_DISTDIR="$(STAGING_DIR)"\
|
||||
TARGET_CFLAGS="$(TARGET_CFLAGS)" \
|
||||
TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \
|
||||
TARGET_LINKFLAGS="$(TARGET_LINKFLAGS)" \
|
||||
TARGET_CC="$(TARGET_CC)" \
|
||||
TARGET_CXX="$(TARGET_CXX)" \
|
||||
TARGET_LD="$(TARGET_LD)" \
|
||||
TARGET_LINK="$(TARGET_CXX)" \
|
||||
TARGET_AR="$(TARGET_AR)" \
|
||||
TARGET_RANLIB="$(TARGET_RANLIB)" \
|
||||
TARGET_PATH="$(BR_PATH)"
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ALLJOYN_BASE_CONTROLPANEL), y)
|
||||
ALLJOYN_BASE_TARGETS += controlpanel
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ALLJOYN_BASE_NOTIFICATION), y)
|
||||
ALLJOYN_BASE_TARGETS += notification
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ALLJOYN_BASE_ONBOARDING), y)
|
||||
ALLJOYN_BASE_TARGETS += onboarding
|
||||
endif
|
||||
|
||||
define ALLJOYN_BASE_BUILD_CMDS
|
||||
$(foreach target,$(ALLJOYN_BASE_TARGETS),\
|
||||
cd $(@D)/$(target); $(SCONS) $(ALLJOYN_BASE_SCONS_OPTS)
|
||||
)
|
||||
endef
|
||||
|
||||
define ALLJOYN_BASE_INSTALL_STAGING_CMDS
|
||||
$(foreach target,$(ALLJOYN_BASE_TARGETS),\
|
||||
cp -a $(@D)/$(target)/$(ALLJOYN_BASE_DISTDIR)/*/lib/lib* \
|
||||
$(STAGING_DIR)/usr/lib/
|
||||
cp -a $(@D)/$(target)/$(ALLJOYN_BASE_DISTDIR)/*/inc/* \
|
||||
$(STAGING_DIR)/usr/include/
|
||||
)
|
||||
endef
|
||||
|
||||
define ALLJOYN_BASE_INSTALL_TARGET_CMDS
|
||||
$(foreach target,$(ALLJOYN_BASE_TARGETS),\
|
||||
cp -a $(@D)/$(target)/$(ALLJOYN_BASE_DISTDIR)/*/lib/lib* \
|
||||
$(TARGET_DIR)/usr/lib/
|
||||
)
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
18
package/alljoyn-tcl-base/Config.in
Normal file
18
package/alljoyn-tcl-base/Config.in
Normal file
@ -0,0 +1,18 @@
|
||||
config BR2_PACKAGE_ALLJOYN_TCL_BASE
|
||||
bool "alljoyn-tcl-base"
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # alljoyn-tcl
|
||||
select BR2_PACKAGE_ALLJOYN_TCL
|
||||
help
|
||||
AllJoyn Base Services are common services used by many
|
||||
devices, providing a set of interfaces for different devices
|
||||
to interact and interoperate with one another.
|
||||
|
||||
Thin Client Library is designed to bring the benefits of the
|
||||
AllJoyn distributed programming environment to embedded
|
||||
systems.
|
||||
|
||||
https://allseenalliance.org
|
||||
|
||||
comment "alljoyn-tcl-base needs a toolchain w/ threads and dynamic library"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
2
package/alljoyn-tcl-base/alljoyn-tcl-base.hash
Normal file
2
package/alljoyn-tcl-base/alljoyn-tcl-base.hash
Normal file
@ -0,0 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 741f7a71929ccd6a66bf75d2b03affc62411e229b70bb89399be9b1b2ce40629 alljoyn-base_tcl-16.04.00.tar.gz
|
45
package/alljoyn-tcl-base/alljoyn-tcl-base.mk
Normal file
45
package/alljoyn-tcl-base/alljoyn-tcl-base.mk
Normal file
@ -0,0 +1,45 @@
|
||||
################################################################################
|
||||
#
|
||||
# alljoyn-tcl-base
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ALLJOYN_TCL_BASE_REV = 16.04
|
||||
ALLJOYN_TCL_BASE_VERSION = $(ALLJOYN_TCL_BASE_REV).00
|
||||
ALLJOYN_TCL_BASE_SOURCE = alljoyn-base_tcl-$(ALLJOYN_TCL_BASE_VERSION).tar.gz
|
||||
ALLJOYN_TCL_BASE_SITE = \
|
||||
https://mirrors.kernel.org/allseenalliance/alljoyn/$(ALLJOYN_TCL_BASE_REV)
|
||||
# See https://allseenalliance.org/alliance/ip-policy
|
||||
ALLJOYN_TCL_BASE_LICENSE = ISC
|
||||
|
||||
ALLJOYN_TCL_BASE_DEPENDENCIES = host-scons alljoyn-tcl
|
||||
ALLJOYN_TCL_BASE_INSTALL_STAGING = YES
|
||||
|
||||
# AllJoyn Base Thin Core can be compiled in debug or release mode. By default,
|
||||
# AllJoyn Base Thin Core is built in debug mode.
|
||||
ALLJOYN_TCL_BASE_VARIANT = release
|
||||
|
||||
ALLJOYN_TCL_BASE_SCONS_OPTS = \
|
||||
-j$(PARALLEL_JOBS) \
|
||||
V=1 \
|
||||
VARIANT=$(ALLJOYN_TCL_BASE_VARIANT) \
|
||||
CC="$(TARGET_CC)" \
|
||||
CXX="$(TARGET_CXX)" \
|
||||
AJTCL_DIST=$(STAGING_DIR) \
|
||||
WS=off
|
||||
|
||||
define ALLJOYN_TCL_BASE_BUILD_CMDS
|
||||
cd $(@D); $(SCONS) $(ALLJOYN_TCL_BASE_SCONS_OPTS)
|
||||
endef
|
||||
|
||||
define ALLJOYN_TCL_BASE_INSTALL_STAGING_CMDS
|
||||
cp -a $(@D)/dist/lib/lib* $(STAGING_DIR)/usr/lib/
|
||||
cp -a $(@D)/dist/include/* $(STAGING_DIR)/usr/include/
|
||||
endef
|
||||
|
||||
# Only install AllJoyn Base Thin Core dynamic libraries into target directory
|
||||
define ALLJOYN_TCL_BASE_INSTALL_TARGET_CMDS
|
||||
cp -a $(@D)/dist/lib/lib*.so* $(TARGET_DIR)/usr/lib/
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
20
package/alljoyn-tcl/Config.in
Normal file
20
package/alljoyn-tcl/Config.in
Normal file
@ -0,0 +1,20 @@
|
||||
config BR2_PACKAGE_ALLJOYN_TCL
|
||||
bool "alljoyn-tcl"
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
help
|
||||
The AllJoyn framework defines a common way for devices and
|
||||
apps to communicate with one another regardless of brands,
|
||||
categories, transports, and OSes. Developers write
|
||||
applications that discover nearby devices, and communicate
|
||||
with each other directly and through the cloud, unleashing
|
||||
new possibilities in the Internet of Things.
|
||||
|
||||
AllJoyn Thin Core Library (AJTCL) is designed to bring the
|
||||
benefits of the AllJoyn distributed programming environment
|
||||
to embedded systems.
|
||||
|
||||
https://allseenalliance.org
|
||||
|
||||
comment "alljoyn-tcl needs a toolchain w/ threads and dynamic library"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
2
package/alljoyn-tcl/alljoyn-tcl.hash
Normal file
2
package/alljoyn-tcl/alljoyn-tcl.hash
Normal file
@ -0,0 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 da13614a9db79067937b744a87328fed84d99ba62e3de19b0ddc4a83e4b2447e ajtcl-16.04.00a-src.tar.gz
|
43
package/alljoyn-tcl/alljoyn-tcl.mk
Normal file
43
package/alljoyn-tcl/alljoyn-tcl.mk
Normal file
@ -0,0 +1,43 @@
|
||||
################################################################################
|
||||
#
|
||||
# alljoyn-tcl
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ALLJOYN_TCL_REV = 16.04
|
||||
ALLJOYN_TCL_VERSION = $(ALLJOYN_TCL_REV).00a
|
||||
ALLJOYN_TCL_SOURCE = ajtcl-$(ALLJOYN_TCL_VERSION)-src.tar.gz
|
||||
ALLJOYN_TCL_SITE = \
|
||||
https://mirrors.kernel.org/allseenalliance/alljoyn/$(ALLJOYN_TCL_REV)
|
||||
# See https://allseenalliance.org/alliance/ip-policy
|
||||
ALLJOYN_TCL_LICENSE = ISC
|
||||
|
||||
ALLJOYN_TCL_DEPENDENCIES = host-scons
|
||||
ALLJOYN_TCL_INSTALL_STAGING = YES
|
||||
|
||||
# AllJoyn Thin Core can be compiled in debug or release mode. By default,
|
||||
# AllJoyn Thin Core is built in debug mode.
|
||||
ALLJOYN_TCL_VARIANT = release
|
||||
|
||||
ALLJOYN_TCL_SCONS_OPTS = \
|
||||
-j$(PARALLEL_JOBS) \
|
||||
V=1 \
|
||||
VARIANT=$(ALLJOYN_TCL_VARIANT) \
|
||||
CC="$(TARGET_CC)" \
|
||||
CXX="$(TARGET_CXX)"
|
||||
|
||||
define ALLJOYN_TCL_BUILD_CMDS
|
||||
cd $(@D); $(SCONS) $(ALLJOYN_TCL_SCONS_OPTS)
|
||||
endef
|
||||
|
||||
define ALLJOYN_TCL_INSTALL_STAGING_CMDS
|
||||
cp -a $(@D)/dist/lib/lib* $(STAGING_DIR)/usr/lib/
|
||||
cp -a $(@D)/dist/include/* $(STAGING_DIR)/usr/include/
|
||||
endef
|
||||
|
||||
# Only install AllJoyn Thin Core dynamic libraries into target directory
|
||||
define ALLJOYN_TCL_INSTALL_TARGET_CMDS
|
||||
cp -a $(@D)/dist/lib/lib*.so* $(TARGET_DIR)/usr/lib/
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
@ -0,0 +1,56 @@
|
||||
From b8e35cf95184ff18bcf923f900439f56c93609db Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@gmail.com>
|
||||
Date: Sat, 16 Jul 2016 15:23:41 +0200
|
||||
Subject: [PATCH] UARTStreamLinux: fix build on sparc
|
||||
|
||||
Some of the serial port highest speed are not defined on SPARC, so
|
||||
alljoyn should not use them, so we add a patch to fix that.
|
||||
|
||||
From:
|
||||
https://git.buildroot.org/buildroot/commit/?id=c5e96d8935016456bea342db170ae6a139a8470f
|
||||
|
||||
Fixes:
|
||||
http://autobuild.buildroot.net/results/e5b/e5b30b5e0d86b44b97410d434b771e1fb7b18de0
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
common/os/posix/UARTStreamLinux.cc | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/common/os/posix/UARTStreamLinux.cc b/common/os/posix/UARTStreamLinux.cc
|
||||
index c193b70..ae81d9d 100644
|
||||
--- a/common/os/posix/UARTStreamLinux.cc
|
||||
+++ b/common/os/posix/UARTStreamLinux.cc
|
||||
@@ -111,21 +111,29 @@ QStatus UART(const qcc::String& devName, uint32_t baud, uint8_t databits, const
|
||||
speed = B2000000;
|
||||
break;
|
||||
|
||||
+#ifdef B2500000
|
||||
case 2500000:
|
||||
speed = B2500000;
|
||||
break;
|
||||
+#endif
|
||||
|
||||
+#ifdef B3000000
|
||||
case 3000000:
|
||||
speed = B3000000;
|
||||
break;
|
||||
+#endif
|
||||
|
||||
+#ifdef B3500000
|
||||
case 3500000:
|
||||
speed = B3500000;
|
||||
break;
|
||||
+#endif
|
||||
|
||||
+#ifdef B4000000
|
||||
case 4000000:
|
||||
speed = B4000000;
|
||||
break;
|
||||
+#endif
|
||||
|
||||
default:
|
||||
QCC_LogError(ER_BAD_ARG_2, ("Invalid baud %d", baud));
|
||||
--
|
||||
2.5.5
|
||||
|
25
package/alljoyn/Config.in
Normal file
25
package/alljoyn/Config.in
Normal file
@ -0,0 +1,25 @@
|
||||
config BR2_PACKAGE_ALLJOYN
|
||||
bool "alljoyn"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_USE_WCHAR
|
||||
select BR2_PACKAGE_LIBCAP
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
help
|
||||
The AllJoyn framework defines a common way for devices and
|
||||
apps to communicate with one another regardless of brands,
|
||||
categories, transports, and OSes. Developers write
|
||||
applications that discover nearby devices, and communicate
|
||||
with each other directly and through the cloud, unleashing
|
||||
new possibilities in the Internet of Things.
|
||||
|
||||
https://allseenalliance.org
|
||||
|
||||
comment "alljoyn needs a toolchain w/ C++, threads, wchar and dynamic library"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
!BR2_USE_WCHAR || BR2_STATIC_LIBS
|
2
package/alljoyn/alljoyn.hash
Normal file
2
package/alljoyn/alljoyn.hash
Normal file
@ -0,0 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 fc437d96cf1213f18048240b5d12a374b31894d21830a0a6ccf562ffa13425d5 alljoyn-16.04.00a-src.tar.gz
|
69
package/alljoyn/alljoyn.mk
Normal file
69
package/alljoyn/alljoyn.mk
Normal file
@ -0,0 +1,69 @@
|
||||
################################################################################
|
||||
#
|
||||
# alljoyn
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ALLJOYN_REV = 16.04
|
||||
ALLJOYN_VERSION = $(ALLJOYN_REV).00a
|
||||
ALLJOYN_SOURCE = alljoyn-$(ALLJOYN_VERSION)-src.tar.gz
|
||||
ALLJOYN_SITE = https://mirrors.kernel.org/allseenalliance/alljoyn/$(ALLJOYN_REV)
|
||||
# See https://allseenalliance.org/alliance/ip-policy
|
||||
ALLJOYN_LICENSE = ISC
|
||||
|
||||
ALLJOYN_DEPENDENCIES = host-scons libcap openssl
|
||||
ALLJOYN_INSTALL_STAGING = YES
|
||||
|
||||
ALLJOYN_CRYPTO = openssl
|
||||
|
||||
# AllJoyn can be compiled in debug or release mode. By default, AllJoyn is built
|
||||
# in debug mode.
|
||||
ALLJOYN_VARIANT = release
|
||||
|
||||
ALLJOYN_BINDINGS = c,cpp
|
||||
|
||||
# By setting openwrt for OS and CPU, AllJoyn cross-compilation can be finely
|
||||
# tuned through TARGET_xxx options. All TARGET_xxx variables must be defined
|
||||
# otherwise compilation will fail.
|
||||
# CROSS_COMPILE option should not be used as it works only for linux/ARM.
|
||||
ALLJOYN_OS = openwrt
|
||||
ALLJOYN_CPU = openwrt
|
||||
|
||||
# AllJoyn installs everything in this relative path
|
||||
ALLJOYN_DISTDIR = build/$(ALLJOYN_OS)/$(ALLJOYN_CPU)/$(ALLJOYN_VARIANT)/dist/
|
||||
|
||||
ALLJOYN_SCONS_OPTS = \
|
||||
-j$(PARALLEL_JOBS) \
|
||||
V=1 \
|
||||
OS=$(ALLJOYN_OS) \
|
||||
CPU=$(ALLJOYN_CPU) \
|
||||
VARIANT=$(ALLJOYN_VARIANT) \
|
||||
BR=off \
|
||||
CRYPTO=$(ALLJOYN_CRYPTO) \
|
||||
BINDINGS=$(ALLJOYN_BINDINGS) \
|
||||
TARGET_CFLAGS="$(TARGET_CFLAGS)" \
|
||||
TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \
|
||||
TARGET_LINKFLAGS="$(TARGET_LINKFLAGS)" \
|
||||
TARGET_CC="$(TARGET_CC)" \
|
||||
TARGET_CXX="$(TARGET_CXX)" \
|
||||
TARGET_LD="$(TARGET_LD)" \
|
||||
TARGET_LINK="$(TARGET_CXX)" \
|
||||
TARGET_AR="$(TARGET_AR)" \
|
||||
TARGET_RANLIB="$(TARGET_RANLIB)" \
|
||||
TARGET_PATH="$(BR_PATH)"
|
||||
|
||||
define ALLJOYN_BUILD_CMDS
|
||||
cd $(@D); $(SCONS) $(ALLJOYN_SCONS_OPTS)
|
||||
endef
|
||||
|
||||
define ALLJOYN_INSTALL_STAGING_CMDS
|
||||
cp -a $(@D)/$(ALLJOYN_DISTDIR)/*/lib/lib* $(STAGING_DIR)/usr/lib/
|
||||
cp -a $(@D)/$(ALLJOYN_DISTDIR)/*/inc/* $(STAGING_DIR)/usr/include/
|
||||
endef
|
||||
|
||||
# Only install alljoyn dynamic libraries into target directory
|
||||
define ALLJOYN_INSTALL_TARGET_CMDS
|
||||
cp -a $(@D)/$(ALLJOYN_DISTDIR)/*/lib/lib*.so* $(TARGET_DIR)/usr/lib/
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
@ -36,10 +36,11 @@ diff --git a/modules/mixer/simple/sbasedl.c b/modules/mixer/simple/sbasedl.c
|
||||
#include <fcntl.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <math.h>
|
||||
+#ifdef HAVE_LIBDL
|
||||
+#include "config.h"
|
||||
+#ifdef HAVE_DLFCN
|
||||
#include <dlfcn.h>
|
||||
+#endif
|
||||
#include "config.h"
|
||||
-#include "config.h"
|
||||
#include "asoundlib.h"
|
||||
#include "mixer_abst.h"
|
||||
diff --git a/src/mixer/simple_abst.c b/src/mixer/simple_abst.c
|
||||
@ -49,9 +50,10 @@ diff --git a/src/mixer/simple_abst.c b/src/mixer/simple_abst.c
|
||||
#include <fcntl.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <math.h>
|
||||
+#ifdef HAVE_LIBDL
|
||||
+#include "config.h"
|
||||
+#ifdef HAVE_DLFCN
|
||||
#include <dlfcn.h>
|
||||
+#endif
|
||||
#include "config.h"
|
||||
-#include "config.h"
|
||||
#include "asoundlib.h"
|
||||
#include "mixer_simple.h"
|
||||
|
67
package/alsa-lib/0005-remove-powerpc64-workaround.patch
Normal file
67
package/alsa-lib/0005-remove-powerpc64-workaround.patch
Normal file
@ -0,0 +1,67 @@
|
||||
Linking currently fails on powerpc64 and powerpc64le when configured
|
||||
with --without-versioned, as follows:
|
||||
../src/.libs/libasound.so: undefined reference to `.__snd_pcm_hw_params_set_format_first'
|
||||
(And many similar messages.)
|
||||
|
||||
This appears to be due to a very old (2003) workaround for powerpc64,
|
||||
(introduced by commit 06221f86) in include/alsa-symbols.h which alters
|
||||
symbol names. While it was probably necessary at the time, it does not
|
||||
appear to be necessary now and removing it fixes the build.
|
||||
|
||||
Signed-off-by: Sam Bobroff <sam.bobroff@au1.ibm.com>
|
||||
---
|
||||
include/alsa-symbols.h | 25 ++++---------------------
|
||||
1 file changed, 4 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/include/alsa-symbols.h b/include/alsa-symbols.h
|
||||
index 51cb982..0cb0b9f 100644
|
||||
--- a/include/alsa-symbols.h
|
||||
+++ b/include/alsa-symbols.h
|
||||
@@ -29,19 +29,10 @@
|
||||
#define INTERNAL_CONCAT2_2(Pre, Post) Pre##Post
|
||||
#define INTERNAL(Name) INTERNAL_CONCAT2_2(__, Name)
|
||||
|
||||
-#ifdef __powerpc64__
|
||||
-# define symbol_version(real, name, version) \
|
||||
- __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version); \
|
||||
- __asm__ (".symver ." ASM_NAME(#real) ",." ASM_NAME(#name) "@" #version)
|
||||
-# define default_symbol_version(real, name, version) \
|
||||
- __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version); \
|
||||
- __asm__ (".symver ." ASM_NAME(#real) ",." ASM_NAME(#name) "@@" #version)
|
||||
-#else
|
||||
-# define symbol_version(real, name, version) \
|
||||
- __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version)
|
||||
-# define default_symbol_version(real, name, version) \
|
||||
- __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version)
|
||||
-#endif
|
||||
+#define symbol_version(real, name, version) \
|
||||
+__asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version)
|
||||
+#define default_symbol_version(real, name, version) \
|
||||
+__asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version)
|
||||
|
||||
#ifdef USE_VERSIONED_SYMBOLS
|
||||
#define use_symbol_version(real, name, version) \
|
||||
@@ -50,13 +41,6 @@
|
||||
default_symbol_version(real, name, version)
|
||||
#else
|
||||
#define use_symbol_version(real, name, version) /* nothing */
|
||||
-#ifdef __powerpc64__
|
||||
-#define use_default_symbol_version(real, name, version) \
|
||||
- __asm__ (".weak " ASM_NAME(#name)); \
|
||||
- __asm__ (".weak ." ASM_NAME(#name)); \
|
||||
- __asm__ (".set " ASM_NAME(#name) "," ASM_NAME(#real)); \
|
||||
- __asm__ (".set ." ASM_NAME(#name) ",." ASM_NAME(#real))
|
||||
-#else
|
||||
#if defined(__alpha__) || defined(__mips__)
|
||||
#define use_default_symbol_version(real, name, version) \
|
||||
__asm__ (".weak " ASM_NAME(#name)); \
|
||||
@@ -67,6 +51,5 @@
|
||||
__asm__ (".set " ASM_NAME(#name) "," ASM_NAME(#real))
|
||||
#endif
|
||||
#endif
|
||||
-#endif
|
||||
|
||||
#endif /* __ALSA_SYMBOLS_H */
|
||||
--
|
||||
2.10.0.297.gf6727b0
|
||||
|
30
package/alsa-lib/0006-ucm-parser-needs-limits.h.patch
Normal file
30
package/alsa-lib/0006-ucm-parser-needs-limits.h.patch
Normal file
@ -0,0 +1,30 @@
|
||||
From 13a796b4bd00defa9f9297fd23d508b430682aed Mon Sep 17 00:00:00 2001
|
||||
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
Date: Wed, 21 Dec 2016 19:41:26 -0300
|
||||
Subject: [PATCH] ucm: parser needs limits.h
|
||||
|
||||
It's using PATH_MAX which is defined there, otherwise the build fails on
|
||||
musl libc.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
---
|
||||
Patch status: sent to alsa-devel ML.
|
||||
|
||||
src/ucm/parser.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/ucm/parser.c b/src/ucm/parser.c
|
||||
index c98373a..f520abc 100644
|
||||
--- a/src/ucm/parser.c
|
||||
+++ b/src/ucm/parser.c
|
||||
@@ -32,6 +32,7 @@
|
||||
|
||||
#include "ucm_local.h"
|
||||
#include <dirent.h>
|
||||
+#include <limits.h>
|
||||
|
||||
/** The name of the environment variable containing the UCM directory */
|
||||
#define ALSA_CONFIG_UCM_VAR "ALSA_CONFIG_UCM"
|
||||
--
|
||||
2.10.2
|
||||
|
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 8ac76c3144ed2ed49da7622ab65ac5415205913ccbedde877972383cbc234269 alsa-lib-1.1.1.tar.bz2
|
||||
sha256 71282502184c592c1a008e256c22ed0ba5728ca65e05273ceb480c70f515969c alsa-lib-1.1.3.tar.bz2
|
||||
|
@ -4,11 +4,11 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ALSA_LIB_VERSION = 1.1.1
|
||||
ALSA_LIB_VERSION = 1.1.3
|
||||
ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
|
||||
ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib
|
||||
ALSA_LIB_LICENSE = LGPLv2.1+
|
||||
ALSA_LIB_LICENSE_FILES = COPYING
|
||||
ALSA_LIB_LICENSE = LGPLv2.1+ (library), GPLv2+ (aserver)
|
||||
ALSA_LIB_LICENSE_FILES = COPYING aserver/COPYING
|
||||
ALSA_LIB_INSTALL_STAGING = YES
|
||||
ALSA_LIB_CFLAGS = $(TARGET_CFLAGS)
|
||||
ALSA_LIB_AUTORECONF = YES
|
||||
@ -62,10 +62,6 @@ else
|
||||
ALSA_LIB_CONF_OPTS += --disable-python
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_SOFT_FLOAT),y)
|
||||
ALSA_LIB_CONF_OPTS += --with-softfloat
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_bfin),y)
|
||||
# blackfin external toolchains don't have versionsort. Fake it using alphasort
|
||||
# instead
|
||||
|
@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 89757c9abaf420831b088fce354d492acc170bd02bb50eb7392c175f594b8041 alsa-utils-1.1.1.tar.bz2
|
||||
sha256 127217a54eea0f9a49700a2f239a2d4f5384aa094d68df04a8eb80132eb6167c alsa-utils-1.1.3.tar.bz2
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ALSA_UTILS_VERSION = 1.1.1
|
||||
ALSA_UTILS_VERSION = 1.1.3
|
||||
ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2
|
||||
ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils
|
||||
ALSA_UTILS_LICENSE = GPLv2
|
||||
@ -23,6 +23,7 @@ ALSA_UTILS_CONF_ENV = \
|
||||
|
||||
ALSA_UTILS_CONF_OPTS = \
|
||||
--disable-xmlto \
|
||||
--disable-rst2man \
|
||||
--with-curses=$(if $(BR2_PACKAGE_NCURSES_WCHAR),ncursesw,ncurses)
|
||||
|
||||
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
|
||||
|
2
package/am335x-pru-package/am335x-pru-package.hash
Normal file
2
package/am335x-pru-package/am335x-pru-package.hash
Normal file
@ -0,0 +1,2 @@
|
||||
# Locally computed
|
||||
sha256 2a902f825ccc1885c5dccd83e1ccee104aa30e601c9964a24f49459f76f674b9 am335x-pru-package-5f374ad57cc195f28bf5e585c3d446aba6ee7096.tar.gz
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AM335X_PRU_PACKAGE_VERSION = 506e074859891a2b350eb4f5fcb451c4961410ea
|
||||
AM335X_PRU_PACKAGE_VERSION = 5f374ad57cc195f28bf5e585c3d446aba6ee7096
|
||||
AM335X_PRU_PACKAGE_SITE = $(call github,beagleboard,am335x_pru_package,$(AM335X_PRU_PACKAGE_VERSION))
|
||||
AM335X_PRU_PACKAGE_LICENSE = BSD-3c
|
||||
AM335X_PRU_PACKAGE_LICENSE_FILES = pru_sw/utils/LICENCE.txt
|
||||
@ -19,19 +19,19 @@ AM335X_MAKE_TARGET = release $(if $(BR2_STATIC_LIBS),,sorelease)
|
||||
endif
|
||||
|
||||
define AM335X_PRU_PACKAGE_BUILD_CMDS
|
||||
$(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" \
|
||||
$(TARGET_MAKE_ENV) $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" \
|
||||
-C $(@D)/pru_sw/app_loader/interface $(AM335X_MAKE_TARGET)
|
||||
endef
|
||||
|
||||
# 'install' installs whatever was built, and our patch removes the dependency
|
||||
# on the release build, so we can use it to install whatever we built above.
|
||||
define AM335X_PRU_PACKAGE_INSTALL_STAGING_CMDS
|
||||
$(MAKE1) DESTDIR="$(STAGING_DIR)" PREFIX="/usr" \
|
||||
$(TARGET_MAKE_ENV) $(MAKE1) DESTDIR="$(STAGING_DIR)" PREFIX="/usr" \
|
||||
-C $(@D)/pru_sw/app_loader/interface install
|
||||
endef
|
||||
|
||||
define AM335X_PRU_PACKAGE_INSTALL_TARGET_CMDS
|
||||
$(MAKE1) DESTDIR="$(TARGET_DIR)" PREFIX="/usr" \
|
||||
$(TARGET_MAKE_ENV) $(MAKE1) DESTDIR="$(TARGET_DIR)" PREFIX="/usr" \
|
||||
-C $(@D)/pru_sw/app_loader/interface install
|
||||
endef
|
||||
|
||||
|
@ -1,6 +1,7 @@
|
||||
config BR2_PACKAGE_AM33X_CM3
|
||||
bool "am33x-cm3"
|
||||
depends on BR2_arm # only relevant for TI am335x
|
||||
depends on BR2_BINFMT_ELF # assumes the compiler builds ELF file
|
||||
help
|
||||
Cortex-M3 binary blob for suspend-resume on am335x
|
||||
|
||||
|
@ -14,7 +14,7 @@ AM33X_CM3_LICENSE_FILES = License.txt
|
||||
# The build command below will use the standard cross-compiler (normally
|
||||
# build for Cortex-A8, to build the FW for the Cortex-M3.
|
||||
define AM33X_CM3_BUILD_CMDS
|
||||
$(MAKE) CC="$(TARGET_CC)" CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) all
|
||||
$(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) all
|
||||
endef
|
||||
|
||||
# Not all of the firmware files are used
|
||||
|
45
package/amd-catalyst/0001-Add-support-for-Linux-4.0.patch
Normal file
45
package/amd-catalyst/0001-Add-support-for-Linux-4.0.patch
Normal file
@ -0,0 +1,45 @@
|
||||
From c35482bc0cc56b40263b74c3e58e42be867fd9f2 Mon Sep 17 00:00:00 2001
|
||||
From: Alberto Milone <alberto.milone@canonical.com>
|
||||
Date: Thu, 17 Sep 2015 15:41:46 +0200
|
||||
Subject: [PATCH] Add support for Linux 4.0
|
||||
|
||||
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
|
||||
---
|
||||
common/lib/modules/fglrx/build_mod/firegl_public.c | 5 +++++
|
||||
common/lib/modules/fglrx/build_mod/kcl_str.c | 4 ++++
|
||||
2 files changed, 9 insertions(+)
|
||||
|
||||
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
index 677565d..6017e89 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
@@ -285,6 +285,11 @@ MODULE_DEVICE_TABLE(pci, fglrx_pci_table);
|
||||
|
||||
MODULE_INFO(supported, "external");
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
|
||||
+#define read_cr4() __read_cr4()
|
||||
+#define write_cr4(cr4) __write_cr4(cr4)
|
||||
+#endif
|
||||
+
|
||||
/* globals constants */
|
||||
const char* KCL_SYSINFO_OsVersionString = UTS_RELEASE;
|
||||
const unsigned int KCL_SYSINFO_PageSize = PAGE_SIZE;
|
||||
diff --git a/common/lib/modules/fglrx/build_mod/kcl_str.c b/common/lib/modules/fglrx/build_mod/kcl_str.c
|
||||
index 2d89eb0..bacdb69 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/kcl_str.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/kcl_str.c
|
||||
@@ -42,6 +42,10 @@
|
||||
#include "kcl_type.h"
|
||||
#include "kcl_str.h"
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
|
||||
+#define strnicmp strncasecmp
|
||||
+#endif
|
||||
+
|
||||
/** \brief Fill memory with a constant byte
|
||||
* \param s Pointer to memory
|
||||
* \param c Initializing value
|
||||
--
|
||||
2.8.1
|
||||
|
31
package/amd-catalyst/0002-Add-support-for-Linux-4.1.patch
Normal file
31
package/amd-catalyst/0002-Add-support-for-Linux-4.1.patch
Normal file
@ -0,0 +1,31 @@
|
||||
From e9c8ccb4c8c842042542b792c51f9a7ec6c85e06 Mon Sep 17 00:00:00 2001
|
||||
From: Alberto Milone <alberto.milone@canonical.com>
|
||||
Date: Thu, 17 Sep 2015 15:44:59 +0200
|
||||
Subject: [PATCH] Add support for Linux 4.1
|
||||
|
||||
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
|
||||
---
|
||||
common/lib/modules/fglrx/build_mod/firegl_public.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
index 6017e89..94778f1 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
@@ -3508,10 +3508,12 @@ int ATI_API_CALL KCL_InstallInterruptHandler(
|
||||
KCL_PUB_InterruptHandlerWrap,
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
|
||||
((useMSI) ? (SA_INTERRUPT) : (SA_SHIRQ)),
|
||||
-#else
|
||||
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0)
|
||||
//when MSI enabled. keep irq disabled when calling the action handler,
|
||||
//exclude this IRQ from irq balancing (only on one CPU)
|
||||
((useMSI) ? (IRQF_DISABLED) : (IRQF_SHARED)),
|
||||
+#else
|
||||
+ ((useMSI) ? (0x0) : (IRQF_SHARED)),
|
||||
#endif
|
||||
dev_name,
|
||||
context);
|
||||
--
|
||||
2.8.1
|
||||
|
121
package/amd-catalyst/0003-Add-support-for-Linux-4.2.patch
Normal file
121
package/amd-catalyst/0003-Add-support-for-Linux-4.2.patch
Normal file
@ -0,0 +1,121 @@
|
||||
From e2e6c2dac2a0311a022208dd289374b832538329 Mon Sep 17 00:00:00 2001
|
||||
From: Alberto Milone <alberto.milone@canonical.com>
|
||||
Date: Tue, 14 Jul 2015 12:56:37 +0200
|
||||
Subject: [PATCH] Add support for Linux 4.2
|
||||
|
||||
Deal with the FPU code renaming
|
||||
|
||||
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
|
||||
---
|
||||
common/lib/modules/fglrx/build_mod/firegl_public.c | 38 ++++++++++++++++++++++
|
||||
1 file changed, 38 insertions(+)
|
||||
|
||||
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
index 94778f1..749ea51 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
@@ -191,9 +191,17 @@
|
||||
#include <linux/string.h>
|
||||
#include <linux/gfp.h>
|
||||
#include <linux/swap.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
|
||||
#include "asm/i387.h"
|
||||
+#else
|
||||
+#include <asm/fpu/api.h>
|
||||
+#endif
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
|
||||
#include <asm/fpu-internal.h>
|
||||
+#else
|
||||
+#include <asm/fpu/internal.h>
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
#include "firegl_public.h"
|
||||
@@ -1711,6 +1719,9 @@ void ATI_API_CALL KCL_SetCurrentProcessState(KCL_ENUM_ProcessState state)
|
||||
|
||||
#if defined(__i386__)
|
||||
#ifndef __HAVE_ARCH_CMPXCHG
|
||||
+#ifndef __xg
|
||||
+#define __xg(x) ((volatile long *)(x))
|
||||
+#endif
|
||||
static inline
|
||||
unsigned long __fgl_cmpxchg(volatile void *ptr, unsigned long old,
|
||||
unsigned long new, int size)
|
||||
@@ -1747,7 +1758,11 @@ unsigned long ATI_API_CALL kcl__cmpxchg(volatile void *ptr, unsigned long old,
|
||||
unsigned long new, int size)
|
||||
{
|
||||
#ifndef __HAVE_ARCH_CMPXCHG
|
||||
+#if defined(__i386__)
|
||||
return __fgl_cmpxchg(ptr,old,new,size);
|
||||
+#elif defined(__x86_64__)
|
||||
+ return cmpxchg((unsigned long*)ptr,old,new);
|
||||
+#endif
|
||||
#else
|
||||
/* On kernel version 2.6.34 passing a variable or unsupported size
|
||||
* argument to the __cmpxchg macro causes the default-clause of a
|
||||
@@ -6443,21 +6458,36 @@ static int KCL_fpu_save_init(struct task_struct *tsk)
|
||||
struct fpu *fpu = &tsk->thread.fpu;
|
||||
|
||||
if(static_cpu_has(X86_FEATURE_XSAVE)) {
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
|
||||
fpu_xsave(fpu);
|
||||
if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP))
|
||||
+#else
|
||||
+ copy_xregs_to_kernel(&fpu->state.xsave);
|
||||
+ if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP))
|
||||
+#endif
|
||||
return 1;
|
||||
} else if (static_cpu_has(X86_FEATURE_FXSR)) {
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
|
||||
fpu_fxsave(fpu);
|
||||
+#else
|
||||
+ copy_fxregs_to_kernel(fpu);
|
||||
+#endif
|
||||
} else {
|
||||
asm volatile("fnsave %[fx]; fwait"
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
|
||||
: [fx] "=m" (fpu->state->fsave));
|
||||
+#else
|
||||
+ : [fx] "=m" (fpu->state.fsave));
|
||||
+#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
|
||||
if (unlikely(fpu->state->fxsave.swd & X87_FSW_ES)) {
|
||||
asm volatile("fnclex");
|
||||
return 0;
|
||||
}
|
||||
+#endif
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
@@ -6469,8 +6499,12 @@ static int KCL_fpu_save_init(struct task_struct *tsk)
|
||||
void ATI_API_CALL KCL_fpu_begin(void)
|
||||
{
|
||||
#ifdef CONFIG_X86_64
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
|
||||
kernel_fpu_begin();
|
||||
#else
|
||||
+ __kernel_fpu_begin();
|
||||
+#endif
|
||||
+#else
|
||||
#ifdef TS_USEDFPU
|
||||
struct thread_info *cur_thread = current_thread_info();
|
||||
struct task_struct *cur_task = get_current();
|
||||
@@ -6515,7 +6549,11 @@ void ATI_API_CALL KCL_fpu_begin(void)
|
||||
*/
|
||||
void ATI_API_CALL KCL_fpu_end(void)
|
||||
{
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
|
||||
kernel_fpu_end();
|
||||
+#else
|
||||
+ __kernel_fpu_end();
|
||||
+#endif
|
||||
}
|
||||
|
||||
/** Create new directory entry under "/proc/...."
|
||||
--
|
||||
2.8.1
|
||||
|
@ -0,0 +1,33 @@
|
||||
From 7120f00015570a2e4d9b6532731960d509c71cba Mon Sep 17 00:00:00 2001
|
||||
From: Alberto Milone <alberto.milone@canonical.com>
|
||||
Date: Thu, 17 Sep 2015 15:48:30 +0200
|
||||
Subject: [PATCH] Use fpregs_active instead of has_fpu
|
||||
|
||||
This is for Linux 4.2
|
||||
|
||||
Thanks to Tim Gardner for the patch.
|
||||
|
||||
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
|
||||
---
|
||||
common/lib/modules/fglrx/build_mod/firegl_public.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
index 749ea51..4c1f9a5 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
@@ -6528,7 +6528,11 @@ void ATI_API_CALL KCL_fpu_begin(void)
|
||||
/* The thread structure is changed with the commit below for kernel 3.3:
|
||||
* https://github.com/torvalds/linux/commit/7e16838d94b566a17b65231073d179bc04d590c8
|
||||
*/
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)
|
||||
+ if (cur_task->thread.fpu.fpregs_active)
|
||||
+#else
|
||||
if (cur_task->thread.fpu.has_fpu)
|
||||
+#endif
|
||||
#else
|
||||
if (cur_task->thread.has_fpu)
|
||||
#endif
|
||||
--
|
||||
2.8.1
|
||||
|
@ -0,0 +1,79 @@
|
||||
From eb703737be5c91c1a0817351db8ec152c523c85d Mon Sep 17 00:00:00 2001
|
||||
From: Alberto Milone <alberto.milone@canonical.com>
|
||||
Date: Thu, 17 Sep 2015 15:49:46 +0200
|
||||
Subject: [PATCH] Use a local copy of copy_xregs_to_kernel
|
||||
|
||||
This is needed for Linux 4.2.
|
||||
|
||||
Thanks to Tim Gardner for the patch.
|
||||
|
||||
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
|
||||
---
|
||||
common/lib/modules/fglrx/build_mod/firegl_public.c | 44 +++++++++++++++++++++-
|
||||
1 file changed, 43 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
index 4c1f9a5..bb67bba 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
@@ -6443,6 +6443,48 @@ int ATI_API_CALL kcl_sscanf(const char * buf, const char * fmt, ...)
|
||||
return i;
|
||||
}
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)
|
||||
+/*
|
||||
+ * Save processor xstate to xsave area.
|
||||
+ */
|
||||
+static void _copy_xregs_to_kernel(struct xregs_state *xstate)
|
||||
+{
|
||||
+ u64 mask = -1;
|
||||
+ u32 lmask = mask;
|
||||
+ u32 hmask = mask >> 32;
|
||||
+ int err = 0;
|
||||
+
|
||||
+ /*WARN_ON(!alternatives_patched);*/
|
||||
+
|
||||
+ /*
|
||||
+ * If xsaves is enabled, xsaves replaces xsaveopt because
|
||||
+ * it supports compact format and supervisor states in addition to
|
||||
+ * modified optimization in xsaveopt.
|
||||
+ *
|
||||
+ * Otherwise, if xsaveopt is enabled, xsaveopt replaces xsave
|
||||
+ * because xsaveopt supports modified optimization which is not
|
||||
+ * supported by xsave.
|
||||
+ *
|
||||
+ * If none of xsaves and xsaveopt is enabled, use xsave.
|
||||
+ */
|
||||
+ alternative_input_2(
|
||||
+ "1:"XSAVE,
|
||||
+ XSAVEOPT,
|
||||
+ X86_FEATURE_XSAVEOPT,
|
||||
+ XSAVES,
|
||||
+ X86_FEATURE_XSAVES,
|
||||
+ [xstate] "D" (xstate), "a" (lmask), "d" (hmask) :
|
||||
+ "memory");
|
||||
+ asm volatile("2:\n\t"
|
||||
+ xstate_fault(err)
|
||||
+ : "0" (err)
|
||||
+ : "memory");
|
||||
+
|
||||
+ /* We should never fault when copying to a kernel buffer: */
|
||||
+ WARN_ON_FPU(err);
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
/** \brief Generate UUID
|
||||
* \param buf pointer to the generated UUID
|
||||
* \return None
|
||||
@@ -6462,7 +6504,7 @@ static int KCL_fpu_save_init(struct task_struct *tsk)
|
||||
fpu_xsave(fpu);
|
||||
if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP))
|
||||
#else
|
||||
- copy_xregs_to_kernel(&fpu->state.xsave);
|
||||
+ _copy_xregs_to_kernel(&fpu->state.xsave);
|
||||
if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP))
|
||||
#endif
|
||||
return 1;
|
||||
--
|
||||
2.8.1
|
||||
|
78
package/amd-catalyst/0006-Add-support-for-Linux-4.4.patch
Normal file
78
package/amd-catalyst/0006-Add-support-for-Linux-4.4.patch
Normal file
@ -0,0 +1,78 @@
|
||||
From 54b230e26a1889c08507e791ab043f8a4b4ff771 Mon Sep 17 00:00:00 2001
|
||||
From: Romain Perier <romain.perier@free-electrons.com>
|
||||
Date: Thu, 7 Jul 2016 14:40:53 +0200
|
||||
Subject: [PATCH] Add support for Linux 4.4
|
||||
|
||||
It fixes various things like the use of seq_printf because its API
|
||||
changed. It also replaces the call to mtrr_add and mtrr_del by
|
||||
arch_phys_wc_add and arch_phys_wc_del because these symbols are
|
||||
no longer exported for Linux >= 4.3.x.
|
||||
|
||||
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
|
||||
---
|
||||
common/lib/modules/fglrx/build_mod/firegl_public.c | 21 +++++++++++++++++++++
|
||||
1 file changed, 21 insertions(+)
|
||||
|
||||
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
index bb67bba..b4b2d30 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
@@ -636,9 +636,16 @@ static int firegl_major_proc_read(struct seq_file *m, void* data)
|
||||
|
||||
len = snprintf(buf, request, "%d\n", major);
|
||||
#else
|
||||
+
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)
|
||||
+ seq_printf(m, "%d\n", major);
|
||||
+ len = 0;
|
||||
+#else
|
||||
len = seq_printf(m, "%d\n", major);
|
||||
#endif
|
||||
|
||||
+#endif
|
||||
+
|
||||
KCL_DEBUG1(FN_FIREGL_PROC, "return len=%i\n",len);
|
||||
|
||||
return len;
|
||||
@@ -3432,7 +3439,11 @@ int ATI_API_CALL KCL_MEM_MTRR_Support(void)
|
||||
int ATI_API_CALL KCL_MEM_MTRR_AddRegionWc(unsigned long base, unsigned long size)
|
||||
{
|
||||
#ifdef CONFIG_MTRR
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)
|
||||
+ return arch_phys_wc_add(base, size);
|
||||
+#else
|
||||
return mtrr_add(base, size, MTRR_TYPE_WRCOMB, 1);
|
||||
+#endif
|
||||
#else /* !CONFIG_MTRR */
|
||||
return -EPERM;
|
||||
#endif /* !CONFIG_MTRR */
|
||||
@@ -3441,7 +3452,12 @@ int ATI_API_CALL KCL_MEM_MTRR_AddRegionWc(unsigned long base, unsigned long size
|
||||
int ATI_API_CALL KCL_MEM_MTRR_DeleteRegion(int reg, unsigned long base, unsigned long size)
|
||||
{
|
||||
#ifdef CONFIG_MTRR
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)
|
||||
+ arch_phys_wc_del(reg);
|
||||
+ return 0;
|
||||
+#else
|
||||
return mtrr_del(reg, base, size);
|
||||
+#endif
|
||||
#else /* !CONFIG_MTRR */
|
||||
return -EPERM;
|
||||
#endif /* !CONFIG_MTRR */
|
||||
@@ -6505,8 +6521,13 @@ static int KCL_fpu_save_init(struct task_struct *tsk)
|
||||
if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP))
|
||||
#else
|
||||
_copy_xregs_to_kernel(&fpu->state.xsave);
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)
|
||||
+ if (!(fpu->state.xsave.header.xfeatures & XFEATURE_MASK_FP))
|
||||
+#else
|
||||
if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP))
|
||||
#endif
|
||||
+
|
||||
+#endif
|
||||
return 1;
|
||||
} else if (static_cpu_has(X86_FEATURE_FXSR)) {
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
|
||||
--
|
||||
2.8.1
|
||||
|
54
package/amd-catalyst/0007-remove-gpl-symbols.patch
Normal file
54
package/amd-catalyst/0007-remove-gpl-symbols.patch
Normal file
@ -0,0 +1,54 @@
|
||||
Author: Manuel Rüger <mrueg@gentoo.org>
|
||||
Date: Sat, 2 Jan 2016 17:24:30 +0100
|
||||
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/x11-drivers/ati-drivers/files?id=179aa11ed2f1bd79cf1b190263c3a7a07279fc50
|
||||
|
||||
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
|
||||
---
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-18 23:57:02.000000000 -0400
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-18 23:57:11.000000000 -0400
|
||||
@@ -136,7 +136,6 @@
|
||||
#include <asm/mman.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/processor.h>
|
||||
-#include <asm/tlbflush.h> // for flush_tlb_page
|
||||
#include <asm/cpufeature.h>
|
||||
#ifdef CONFIG_MTRR
|
||||
#include <asm/mtrr.h>
|
||||
@@ -251,6 +250,26 @@
|
||||
#define WRITE_CR4(x) write_cr4(x)
|
||||
#endif
|
||||
|
||||
+#define __flush_tlb_one(addr) asm volatile("invlpg (%0)" ::"r" (addr) : "memory")
|
||||
+#define __flush_tlb() native_write_cr3(native_read_cr3())
|
||||
+
|
||||
+static inline void __flush_tlb_all(void)
|
||||
+{
|
||||
+ if (cpu_has_pge)
|
||||
+ {
|
||||
+ unsigned long flags, cr4;
|
||||
+ raw_local_irq_save(flags);
|
||||
+ cr4 = native_read_cr4();
|
||||
+ native_write_cr4(cr4 & ~X86_CR4_PGE);
|
||||
+ native_write_cr4(cr4);
|
||||
+ raw_local_irq_restore(flags);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ __flush_tlb();
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
// ============================================================
|
||||
/* globals */
|
||||
|
||||
--- a/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2015-09-19 00:43:35.000000000 -0400
|
||||
+++ b/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2015-09-19 00:43:48.000000000 -0400
|
||||
@@ -868,7 +868,7 @@ void ATI_API_CALL KCL_ACPI_No_Hotplug(vo
|
||||
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
|
||||
if(pdev)
|
||||
{
|
||||
-#if (UTS_UBUNTU_RELEASE_ABI < 0 && LINUX_VERSION_CODE < KERNEL_VERSION(4,1,3)) || (UTS_UBUNTU_RELEASE_ABI >= 0 && UTS_UBUNTU_RELEASE_ABI < 26 && LINUX_VERSION_CODE <= KERNEL_VERSION(3,19,8))
|
||||
+#if 0 && (UTS_UBUNTU_RELEASE_ABI < 0 && LINUX_VERSION_CODE < KERNEL_VERSION(4,1,3)) || (UTS_UBUNTU_RELEASE_ABI >= 0 && UTS_UBUNTU_RELEASE_ABI < 26 && LINUX_VERSION_CODE <= KERNEL_VERSION(3,19,8))
|
||||
pci_ignore_hotplug(pdev);
|
||||
#else
|
||||
pdev->ignore_hotplug = 1;
|
4
package/amd-catalyst/20-fglrx.conf
Normal file
4
package/amd-catalyst/20-fglrx.conf
Normal file
@ -0,0 +1,4 @@
|
||||
Section "Device"
|
||||
Identifier "AMD Radeon GPU"
|
||||
Driver "fglrx"
|
||||
EndSection
|
81
package/amd-catalyst/Config.in
Normal file
81
package/amd-catalyst/Config.in
Normal file
@ -0,0 +1,81 @@
|
||||
comment "amd-catalyst needs a glibc toolchain"
|
||||
depends on BR2_i386 || BR2_x86_64
|
||||
depends on !BR2_TOOLCHAIN_USES_GLIBC
|
||||
|
||||
config BR2_PACKAGE_AMD_CATALYST
|
||||
bool "amd-catalyst"
|
||||
depends on BR2_i386 || BR2_x86_64
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC
|
||||
help
|
||||
The binary-only driver blob for AMD cards.
|
||||
This driver supports AMD Radeon HD 5xxx and newer graphics
|
||||
cards.
|
||||
|
||||
http://www.amd.com/
|
||||
|
||||
if BR2_PACKAGE_AMD_CATALYST
|
||||
|
||||
comment "amd-catalyst X.org drivers needs a modular Xorg server <= 1.17"
|
||||
depends on !BR2_PACKAGE_XORG7 \
|
||||
|| !BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR \
|
||||
|| !BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
|
||||
|
||||
config BR2_PACKAGE_AMD_CATALYST_XORG
|
||||
bool "X.org drivers"
|
||||
default y
|
||||
depends on BR2_PACKAGE_XORG7
|
||||
depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
|
||||
depends on BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
|
||||
select BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX
|
||||
select BR2_PACKAGE_ACPID # runtime
|
||||
select BR2_PACKAGE_XLIB_LIBX11 # runtime
|
||||
select BR2_PACKAGE_XLIB_LIBXEXT # runtime
|
||||
select BR2_PACKAGE_XLIB_LIBXCOMPOSITE # runtime
|
||||
# This package does not have standard GL headers
|
||||
select BR2_PACKAGE_MESA3D_HEADERS
|
||||
select BR2_PACKAGE_HAS_LIBGL
|
||||
|
||||
if BR2_PACKAGE_AMD_CATALYST_XORG
|
||||
|
||||
config BR2_PACKAGE_PROVIDES_LIBGL
|
||||
default "amd-catalyst"
|
||||
|
||||
config BR2_PACKAGE_AMD_CATALYST_CMDLINE_TOOLS
|
||||
bool "command-line configuration tools"
|
||||
help
|
||||
Build and install the AMD command line tools.
|
||||
|
||||
comment "Catalyst Control Center needs Qt4 with X11 and PNG support"
|
||||
depends on !BR2_PACKAGE_QT || !BR2_PACKAGE_QT_X11 \
|
||||
|| BR2_PACKAGE_QT_NOPNG
|
||||
|
||||
config BR2_PACKAGE_AMD_CATALYST_CCCLE
|
||||
bool "Catalyst Control Center"
|
||||
depends on BR2_PACKAGE_QT
|
||||
depends on BR2_PACKAGE_QT_X11
|
||||
depends on !BR2_PACKAGE_QT_NOPNG
|
||||
select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps-ng
|
||||
select BR2_PACKAGE_PROCPS_NG # runtime
|
||||
select BR2_PACKAGE_QT_ACCESSIBILITY
|
||||
help
|
||||
Installs the Catalyst Control Center, a Qt graphical tool to
|
||||
control AMD graphics accelerators.
|
||||
|
||||
endif
|
||||
|
||||
comment "amd-catalyst kernel module needs a kernel to be built"
|
||||
depends on !BR2_LINUX_KERNEL
|
||||
|
||||
config BR2_PACKAGE_AMD_CATALYST_MODULE
|
||||
bool "fglrx kernel module"
|
||||
depends on BR2_LINUX_KERNEL
|
||||
help
|
||||
Builds and install the fglrx kernel module
|
||||
|
||||
config BR2_PACKAGE_AMD_CATALYST_OPENCL
|
||||
bool "OpenCL support"
|
||||
help
|
||||
Installs the OpenCL binary blobs and the ICD profile
|
||||
for GPGPU computing.
|
||||
|
||||
endif # BR2_PACKAGE_AMD_CATALYST
|
2
package/amd-catalyst/amd-catalyst.hash
Normal file
2
package/amd-catalyst/amd-catalyst.hash
Normal file
@ -0,0 +1,2 @@
|
||||
# Locally computed
|
||||
sha256 bf3e6e7d5c51db3d075410a3f116f865b82823debc1d66698d187249feec6a91 amd-catalyst-15.9-linux-installer-15.201.1151-x86.x86_64.zip
|
174
package/amd-catalyst/amd-catalyst.mk
Normal file
174
package/amd-catalyst/amd-catalyst.mk
Normal file
@ -0,0 +1,174 @@
|
||||
################################################################################
|
||||
#
|
||||
# amd-catalyst
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AMD_CATALYST_VERSION = 15.9
|
||||
AMD_CATALYST_VERBOSE_VER = 15.201.1151
|
||||
AMD_CATALYST_SITE = http://www2.ati.com/drivers/linux
|
||||
AMD_CATALYST_DL_OPTS = --referer='http://support.amd.com'
|
||||
AMD_CATALYST_SOURCE = amd-catalyst-$(AMD_CATALYST_VERSION)-linux-installer-$(AMD_CATALYST_VERBOSE_VER)-x86.x86_64.zip
|
||||
AMD_CATALYST_LICENSE = AMD Software License
|
||||
AMD_CATALYST_LICENSE_FILES = LICENSE.TXT
|
||||
AMD_CATALYST_INSTALL_STAGING = YES
|
||||
AMD_CATALYST_SUFFIX = $(if $(BR2_x86_64),_64)
|
||||
AMD_CATALYST_ARCH_DIR = $(@D)/arch/x86$(AMD_CATALYST_SUFFIX)
|
||||
AMD_CATALYST_LIB_SUFFIX = $(if $(BR2_x86_64),64)
|
||||
|
||||
|
||||
define AMD_CATALYST_EXTRACT_CMDS
|
||||
unzip -q $(DL_DIR)/$(AMD_CATALYST_SOURCE) -d $(@D)
|
||||
$(SHELL) $(@D)/AMD-Catalyst-$(AMD_CATALYST_VERSION)-Linux-installer-$(AMD_CATALYST_VERBOSE_VER)-x86.x86_64.run --extract $(@D)
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_PACKAGE_AMD_CATALYST_MODULE),y)
|
||||
AMD_CATALYST_MODULE_SUBDIRS = common/lib/modules/fglrx/build_mod/2.6.x
|
||||
AMD_CATALYST_MODULE_MAKE_OPTS = \
|
||||
CFLAGS_MODULE="-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
|
||||
|
||||
define AMD_CATALYST_PREPARE_MODULE
|
||||
# The Makefile expects to have source in the folder 2.6.x
|
||||
cp $(@D)/common/lib/modules/fglrx/build_mod/*.{c,h} \
|
||||
$(@D)/common/lib/modules/fglrx/build_mod/2.6.x
|
||||
# This static lib is required during the link
|
||||
cp $(@D)/arch/x86$(AMD_CATALYST_SUFFIX)/lib/modules/fglrx/build_mod/libfglrx_ip.a \
|
||||
$(@D)/common/lib/modules/fglrx/build_mod/2.6.x
|
||||
endef
|
||||
|
||||
AMD_CATALYST_POST_PATCH_HOOKS += AMD_CATALYST_PREPARE_MODULE
|
||||
|
||||
$(eval $(kernel-module))
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_AMD_CATALYST_OPENCL),y)
|
||||
|
||||
AMD_CATALYST_OCL_SUFFIX = $(if $(BR2_x86_64),64,32)
|
||||
AMD_CATALYST_OPENCL_FILES = \
|
||||
libOpenCL.so.1 \
|
||||
libaticalcl.so \
|
||||
libamdocl$(AMD_CATALYST_OCL_SUFFIX).so \
|
||||
libamdocl12cl$(AMD_CATALYST_OCL_SUFFIX).so
|
||||
|
||||
define AMD_CATALYST_INSTALL_OPENCL
|
||||
$(foreach f,$(AMD_CATALYST_OPENCL_FILES), \
|
||||
$(INSTALL) -D -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/lib$(AMD_CATALYST_LIB_SUFFIX)/$(f) $(TARGET_DIR)/usr/lib/$(f)
|
||||
)
|
||||
ln -sf libOpenCL.so.1 \
|
||||
$(TARGET_DIR)/usr/lib/libOpenCL.so
|
||||
$(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/bin/clinfo \
|
||||
$(TARGET_DIR)/usr/bin/clinfo
|
||||
$(INSTALL) -D -m 0644 $(AMD_CATALYST_ARCH_DIR)/etc/OpenCL/vendors/amdocl$(AMD_CATALYST_OCL_SUFFIX).icd \
|
||||
$(TARGET_DIR)/etc/OpenCL/vendors/amdocl$(AMD_CATALYST_OCL_SUFFIX).icd
|
||||
endef
|
||||
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_AMD_CATALYST_XORG), y)
|
||||
|
||||
# GL headers are needed by any package that wants to use libgl, so they need to
|
||||
# be installed before any user of it. The only way to do so is to have this
|
||||
# package depends on mesa3d-headers.
|
||||
AMD_CATALYST_DEPENDENCIES += mesa3d-headers
|
||||
AMD_CATALYST_PROVIDES = libgl
|
||||
AMD_CATALYST_X11R6_LIB = $(@D)/xpic$(if $(BR2_x86_64),_64a)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX)
|
||||
|
||||
define AMD_CATALYST_INSTALL_GL_LIBS
|
||||
$(INSTALL) -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX)/fglrx/fglrx-libGL.so.1.2 \
|
||||
$(1)/usr/lib
|
||||
ln -sf fglrx-libGL.so.1.2 $(1)/usr/lib/libGL.so.1.2
|
||||
ln -sf fglrx-libGL.so.1.2 $(1)/usr/lib/libGL.so.1
|
||||
ln -sf fglrx-libGL.so.1.2 $(1)/usr/lib/libGL.so
|
||||
endef
|
||||
|
||||
define AMD_CATALYST_INSTALL_STAGING_XORG
|
||||
$(call AMD_CATALYST_INSTALL_GL_LIBS,$(STAGING_DIR))
|
||||
$(INSTALL) -D -m 0644 package/amd-catalyst/gl.pc \
|
||||
$(STAGING_DIR)/usr/lib/pkgconfig/gl.pc
|
||||
endef
|
||||
|
||||
AMD_CATALYST_XORG_DRIVERS_FILES = modules/amdxmm.so \
|
||||
modules/drivers/fglrx_drv.so \
|
||||
modules/linux/libfglrxdrm.so
|
||||
|
||||
define AMD_CATALYST_INSTALL_XORG
|
||||
# Xorg drivers
|
||||
$(foreach f,$(AMD_CATALYST_XORG_DRIVERS_FILES), \
|
||||
$(INSTALL) -D -m 0755 $(AMD_CATALYST_X11R6_LIB)/$(f) \
|
||||
$(TARGET_DIR)/usr/lib/xorg/$(f)
|
||||
)
|
||||
|
||||
# Xorg is not able to detect the driver automatically
|
||||
$(INSTALL) -D -m 0644 package/amd-catalyst/20-fglrx.conf \
|
||||
$(TARGET_DIR)/etc/X11/xorg.conf.d/20-fglrx.conf
|
||||
|
||||
|
||||
# Common files: containing binary profiles about GPUs,
|
||||
# required by the fglrx_drv xorg driver
|
||||
$(INSTALL) -d $(TARGET_DIR)/etc/ati
|
||||
$(INSTALL) -m 0644 $(@D)/common/etc/ati/* $(TARGET_DIR)/etc/ati/
|
||||
|
||||
# DRI and GLX xorg modules: by default DRI is activated,
|
||||
# these modules are required by the fglrx_drv.so xorg driver
|
||||
$(INSTALL) -D -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX)/modules/dri/fglrx_dri.so \
|
||||
$(TARGET_DIR)/usr/lib/dri/fglrx_dri.so
|
||||
$(INSTALL) -D -m 0644 $(AMD_CATALYST_X11R6_LIB)/modules/extensions/fglrx/fglrx-libglx.so \
|
||||
$(TARGET_DIR)/usr/lib/xorg/modules/extensions/libglx.so
|
||||
$(INSTALL) -D -m 0644 $(AMD_CATALYST_X11R6_LIB)/modules/glesx.so \
|
||||
$(TARGET_DIR)/usr/lib/xorg/modules/glesx.so
|
||||
|
||||
# Userspace GL libraries, also runtime dependency of most of the cmdline
|
||||
# tools
|
||||
$(INSTALL) -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX)/*.so \
|
||||
$(TARGET_DIR)/usr/lib/
|
||||
$(call AMD_CATALYST_INSTALL_GL_LIBS,$(TARGET_DIR))
|
||||
|
||||
# Runtime dependency required by libfglrxdrm.so
|
||||
$(INSTALL) -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/lib$(AMD_CATALYST_LIB_SUFFIX)/libatiuki.so.1.0 \
|
||||
$(TARGET_DIR)/usr/lib/
|
||||
ln -sf libatiuki.so.1.0 \
|
||||
$(TARGET_DIR)/usr/lib/libatiuki.so.1
|
||||
endef
|
||||
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_AMD_CATALYST_CMDLINE_TOOLS), y)
|
||||
AMD_CATALYST_CMDLINE_TOOLS_FILES = \
|
||||
atiode \
|
||||
atiodcli \
|
||||
fgl_glxgears \
|
||||
aticonfig \
|
||||
amd-console-helper \
|
||||
fglrxinfo
|
||||
|
||||
define AMD_CATALYST_INSTALL_CMDLINE_TOOLS
|
||||
$(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/sbin/atieventsd \
|
||||
$(TARGET_DIR)/usr/sbin
|
||||
$(foreach f,$(AMD_CATALYST_CMDLINE_TOOLS_FILES), \
|
||||
$(INSTALL) -D -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/bin/$(f) \
|
||||
$(TARGET_DIR)/usr/bin/$(f)
|
||||
)
|
||||
endef
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_AMD_CATALYST_CCCLE), y)
|
||||
define AMD_CATALYST_INSTALL_CCCLE
|
||||
$(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/bin/amdcccle \
|
||||
$(TARGET_DIR)/usr/bin/amdcccle
|
||||
$(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/sbin/amdnotifyui \
|
||||
$(TARGET_DIR)/usr/sbin/amdnotifyui
|
||||
endef
|
||||
endif
|
||||
|
||||
define AMD_CATALYST_INSTALL_STAGING_CMDS
|
||||
$(call AMD_CATALYST_INSTALL_STAGING_XORG)
|
||||
endef
|
||||
|
||||
define AMD_CATALYST_INSTALL_TARGET_CMDS
|
||||
$(call AMD_CATALYST_INSTALL_XORG)
|
||||
$(call AMD_CATALYST_INSTALL_CMDLINE_TOOLS)
|
||||
$(call AMD_CATALYST_INSTALL_CCCLE)
|
||||
$(call AMD_CATALYST_INSTALL_OPENCL)
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
12
package/amd-catalyst/gl.pc
Normal file
12
package/amd-catalyst/gl.pc
Normal file
@ -0,0 +1,12 @@
|
||||
prefix=/usr
|
||||
exec_prefix=${prefix}
|
||||
libdir=${exec_prefix}/lib
|
||||
includedir=${prefix}/include
|
||||
|
||||
Name: gl
|
||||
Description: AMD Catalyst OpenGL library
|
||||
Version: 15.9
|
||||
Libs: -L${libdir} -lGL -lm -lXext -lX11 -ldl
|
||||
Cflags: -I${includedir}
|
||||
glx_tls: no
|
||||
|
@ -1,9 +1,6 @@
|
||||
[PATCH] Fix build issue with musl
|
||||
|
||||
cdefs.h header doesn't exist in musl toolchains:
|
||||
http://wiki.musl-libc.org/wiki/FAQ
|
||||
|
||||
Also arpa/nameser.h doesn't use the same macro name to avoid several
|
||||
arpa/nameser.h doesn't use the same macro name to avoid several
|
||||
inclusions.
|
||||
|
||||
Finally had an issue with framebuffer_service.c since it was missing the
|
||||
@ -26,7 +23,7 @@ diff --git a/core/adbd/arpa_nameser.h b/core/adbd/arpa_nameser.h
|
||||
index 438dc04..b2a28d6 100644
|
||||
--- a/core/adbd/arpa_nameser.h
|
||||
+++ b/core/adbd/arpa_nameser.h
|
||||
@@ -52,11 +52,12 @@
|
||||
@@ -52,6 +52,8 @@
|
||||
|
||||
#ifndef _ARPA_NAMESER_H_
|
||||
#define _ARPA_NAMESER_H_
|
||||
@ -35,51 +32,12 @@ index 438dc04..b2a28d6 100644
|
||||
|
||||
#define BIND_4_COMPAT
|
||||
|
||||
#include <sys/types.h>
|
||||
-#include <sys/cdefs.h>
|
||||
|
||||
/*
|
||||
* Revision information. This is the release date in YYYYMMDD format.
|
||||
@@ -505,7 +506,9 @@ typedef enum __ns_cert_types {
|
||||
#define ns_makecanon __ns_makecanon
|
||||
#define ns_samename __ns_samename
|
||||
|
||||
-__BEGIN_DECLS
|
||||
+#ifdef __cplusplus
|
||||
+extern "C" {
|
||||
+#endif
|
||||
int ns_msg_getflag(ns_msg, int);
|
||||
uint16_t ns_get16(const u_char *);
|
||||
uint32_t ns_get32(const u_char *);
|
||||
@@ -560,7 +563,9 @@ int ns_samedomain(const char *, const char *);
|
||||
int ns_subdomain(const char *, const char *);
|
||||
int ns_makecanon(const char *, char *, size_t);
|
||||
int ns_samename(const char *, const char *);
|
||||
-__END_DECLS
|
||||
+#ifdef __cplusplus
|
||||
+}
|
||||
+#endif
|
||||
|
||||
#ifdef BIND_4_COMPAT
|
||||
#include "arpa_nameser_compat.h"
|
||||
@@ -574,4 +579,5 @@ __END_DECLS
|
||||
#define XLOG(...) do {} while (0)
|
||||
#endif
|
||||
|
||||
+#endif /* !_ARPA_NAMESER_H */
|
||||
#endif /* !_ARPA_NAMESER_H_ */
|
||||
diff --git a/core/adbd/base64.c b/core/adbd/base64.c
|
||||
index 7270703..73725f5 100644
|
||||
--- a/core/adbd/base64.c
|
||||
+++ b/core/adbd/base64.c
|
||||
@@ -42,7 +42,6 @@
|
||||
* IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
|
||||
*/
|
||||
|
||||
-#include <sys/cdefs.h>
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
__RCSID("$NetBSD: base64.c,v 1.8 2002/11/11 01:15:17 thorpej Exp $");
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
diff --git a/core/adbd/framebuffer_service.c b/core/adbd/framebuffer_service.c
|
||||
index 20c08d2..48e0241 100644
|
||||
--- a/core/adbd/framebuffer_service.c
|
||||
@ -92,140 +50,5 @@ index 20c08d2..48e0241 100644
|
||||
#include <linux/fb.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/mman.h>
|
||||
diff --git a/core/adbd/qemu_pipe.h b/core/adbd/qemu_pipe.h
|
||||
index 1a67022..572a242 100644
|
||||
--- a/core/adbd/qemu_pipe.h
|
||||
+++ b/core/adbd/qemu_pipe.h
|
||||
@@ -16,7 +16,6 @@
|
||||
#ifndef ANDROID_INCLUDE_HARDWARE_QEMU_PIPE_H
|
||||
#define ANDROID_INCLUDE_HARDWARE_QEMU_PIPE_H
|
||||
|
||||
-#include <sys/cdefs.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/mman.h>
|
||||
diff --git a/core/include/cutils/android_reboot.h b/core/include/cutils/android_reboot.h
|
||||
index 0c79be7..2ebe1cf 100644
|
||||
--- a/core/include/cutils/android_reboot.h
|
||||
+++ b/core/include/cutils/android_reboot.h
|
||||
@@ -17,7 +17,9 @@
|
||||
#ifndef __CUTILS_ANDROID_REBOOT_H__
|
||||
#define __CUTILS_ANDROID_REBOOT_H__
|
||||
|
||||
-__BEGIN_DECLS
|
||||
+#ifdef __cplusplus
|
||||
+extern "C" {
|
||||
+#endif
|
||||
|
||||
/* Commands */
|
||||
#define ANDROID_RB_RESTART 0xDEAD0001
|
||||
@@ -30,6 +32,8 @@ __BEGIN_DECLS
|
||||
|
||||
int android_reboot(int cmd, int flags, char *arg);
|
||||
|
||||
-__END_DECLS
|
||||
+#ifdef __cplusplus
|
||||
+}
|
||||
+#endif
|
||||
|
||||
#endif /* __CUTILS_ANDROID_REBOOT_H__ */
|
||||
diff --git a/core/include/cutils/bitops.h b/core/include/cutils/bitops.h
|
||||
index 1b3b762..a7c8cab 100644
|
||||
--- a/core/include/cutils/bitops.h
|
||||
+++ b/core/include/cutils/bitops.h
|
||||
@@ -17,9 +17,9 @@
|
||||
#ifndef __CUTILS_BITOPS_H
|
||||
#define __CUTILS_BITOPS_H
|
||||
|
||||
-#include <sys/cdefs.h>
|
||||
-
|
||||
-__BEGIN_DECLS
|
||||
+#ifdef __cplusplus
|
||||
+extern "C" {
|
||||
+#endif
|
||||
|
||||
static inline int popcount(unsigned int x)
|
||||
{
|
||||
@@ -36,6 +36,8 @@ static inline int popcountll(unsigned long long x)
|
||||
return __builtin_popcountll(x);
|
||||
}
|
||||
|
||||
-__END_DECLS
|
||||
+#ifdef __cplusplus
|
||||
+}
|
||||
+#endif
|
||||
|
||||
#endif /* __CUTILS_BITOPS_H */
|
||||
diff --git a/core/include/cutils/partition_utils.h b/core/include/cutils/partition_utils.h
|
||||
index 597df92..0da9d5b 100644
|
||||
--- a/core/include/cutils/partition_utils.h
|
||||
+++ b/core/include/cutils/partition_utils.h
|
||||
@@ -17,11 +17,15 @@
|
||||
#ifndef __CUTILS_PARTITION_WIPED_H__
|
||||
#define __CUTILS_PARTITION_WIPED_H__
|
||||
|
||||
-__BEGIN_DECLS
|
||||
+#ifdef __cplusplus
|
||||
+extern "C" {
|
||||
+#endif
|
||||
|
||||
int partition_wiped(char *source);
|
||||
void erase_footer(const char *dev_path, long long size);
|
||||
|
||||
-__END_DECLS
|
||||
+#ifdef __cplusplus
|
||||
+}
|
||||
+#endif
|
||||
|
||||
#endif /* __CUTILS_PARTITION_WIPED_H__ */
|
||||
diff --git a/extras/ext4_utils/sha1.c b/extras/ext4_utils/sha1.c
|
||||
index 463ec38..e2e29cf 100644
|
||||
--- a/extras/ext4_utils/sha1.c
|
||||
+++ b/extras/ext4_utils/sha1.c
|
||||
@@ -17,9 +17,6 @@
|
||||
|
||||
#define SHA1HANDSOFF /* Copies data before messing with it. */
|
||||
|
||||
-#ifndef USE_MINGW
|
||||
-#include <sys/cdefs.h>
|
||||
-#endif
|
||||
#include <sys/types.h>
|
||||
#include <assert.h>
|
||||
#include <string.h>
|
||||
diff --git a/extras/ext4_utils/sha1.h b/extras/ext4_utils/sha1.h
|
||||
index 9a8f7e3..fe3217e 100644
|
||||
--- a/extras/ext4_utils/sha1.h
|
||||
+++ b/extras/ext4_utils/sha1.h
|
||||
@@ -17,11 +17,6 @@ typedef unsigned char u_char;
|
||||
typedef unsigned int uint32_t;
|
||||
typedef unsigned int u_int32_t;
|
||||
typedef unsigned int u_int;
|
||||
-
|
||||
-#define __BEGIN_DECLS
|
||||
-#define __END_DECLS
|
||||
-#else
|
||||
-#include <sys/cdefs.h>
|
||||
#endif
|
||||
|
||||
#define SHA1_DIGEST_LENGTH 20
|
||||
@@ -33,11 +28,15 @@ typedef struct {
|
||||
u_char buffer[64];
|
||||
} SHA1_CTX;
|
||||
|
||||
-__BEGIN_DECLS
|
||||
+#ifdef __cplusplus
|
||||
+extern "C" {
|
||||
+#endif
|
||||
void SHA1Transform(uint32_t[5], const u_char[64]);
|
||||
void SHA1Init(SHA1_CTX *);
|
||||
void SHA1Update(SHA1_CTX *, const u_char *, u_int);
|
||||
void SHA1Final(u_char[SHA1_DIGEST_LENGTH], SHA1_CTX *);
|
||||
-__END_DECLS
|
||||
+#ifdef __cplusplus
|
||||
+}
|
||||
+#endif
|
||||
|
||||
#endif /* _SYS_SHA1_H_ */
|
||||
--
|
||||
2.6.1
|
||||
|
||||
|
41
package/android-tools/0007-include-cdefs-h-when-needed.patch
Normal file
41
package/android-tools/0007-include-cdefs-h-when-needed.patch
Normal file
@ -0,0 +1,41 @@
|
||||
Include cdefs.h wherever it is needed
|
||||
|
||||
cdefs.h is included from within a lot of glibc headers, so it almost
|
||||
invariably and automagically gets pulled in with glibc.
|
||||
|
||||
However, this might not be the case with other C libraries. musl does
|
||||
not provide cdefs.h so it does not include it from its own headers
|
||||
(cdefs.h must be provided separately).
|
||||
|
||||
So we must include it when we are going to use macros it provides.
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
---
|
||||
core/adbd/services.c | 1 +
|
||||
core/libcutils/android_reboot.c | 1 +
|
||||
2 files changed, 2 insertions(+), 0 deletion(-)
|
||||
|
||||
diff --git a/core/adbd/services.c b/core/adbd/services.c
|
||||
index 20c08d2..48e0241 100644
|
||||
--- a/core/adbd/services.c
|
||||
+++ b/core/adbd/services.c
|
||||
@@ -20,6 +20,7 @@
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <pwd.h>
|
||||
+#include <sys/cdefs.h>
|
||||
|
||||
#include "sysdeps.h"
|
||||
|
||||
diff --git a/core/libcutils/android_reboot.c b/core/libcutils/android_reboot.c
|
||||
index 20c08d2..48e0241 100644
|
||||
--- a/core/libcutils/android_reboot.c
|
||||
+++ b/core/libcutils/android_reboot.c
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <string.h>
|
||||
#include <linux/reboot.h>
|
||||
#include <sys/syscall.h>
|
||||
+#include <sys/cdefs.h>
|
||||
|
||||
#include <cutils/android_reboot.h>
|
||||
|
@ -17,21 +17,43 @@ config BR2_PACKAGE_ANDROID_TOOLS
|
||||
|
||||
if BR2_PACKAGE_ANDROID_TOOLS
|
||||
|
||||
# We need kernel headers that support the __SANE_USERSPACE_TYPES__
|
||||
# mechanism for 64 bits architectures, so that u64 gets defined as
|
||||
# "unsigned long long" and not "unsigned long". We know that >= 3.16
|
||||
# is needed for MIPS64 (kernel commit
|
||||
# f4b3aa7cd9d32407670e67238c5ee752bb98f481) and >= 3.10 is needed for
|
||||
# PowerPC64 (kernel commit
|
||||
# 2c9c6ce0199a4d252e20c531cfdc9d24e39235c0). Without this, the build
|
||||
# fails with a bad redefinition of u64 (the android-tools fastboot
|
||||
# code defines it as "unsigned long long").
|
||||
config BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT_GOOD_KERNEL_HEADERS
|
||||
bool
|
||||
default y if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 && (BR2_powerpc64 || BR2_powerpc64le)
|
||||
default y if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16 && (BR2_mips64 || BR2_mips64el)
|
||||
default y if !BR2_powerpc64 && !BR2_powerpc64le && !BR2_mips64 && !BR2_mips64el
|
||||
|
||||
config BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT
|
||||
bool "fastboot"
|
||||
select BR2_PACKAGE_LIBSELINUX
|
||||
select BR2_PACKAGE_ZLIB
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libselinux
|
||||
depends on !BR2_STATIC_LIBS # libselinux
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC # libselinux
|
||||
depends on !BR2_arc # libselinux
|
||||
depends on BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT_GOOD_KERNEL_HEADERS
|
||||
help
|
||||
This option will build and install the fastboot utility for
|
||||
the target, which can be used to reflash other target devices
|
||||
implementing the fastboot protocol.
|
||||
|
||||
comment "fastboot needs a toolchain w/ threads, dynamic library"
|
||||
comment "fastboot needs a glibc toolchain w/ threads, dynamic library"
|
||||
depends on !BR2_arc
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
|
||||
!BR2_TOOLCHAIN_USES_GLIBC
|
||||
|
||||
comment "fastboot needs headers >= 3.10 (PowerPC64), headers >= 3.16 (MIPS64)"
|
||||
depends on !BR2_arc
|
||||
depends on !BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT_GOOD_KERNEL_HEADERS
|
||||
|
||||
config BR2_PACKAGE_ANDROID_TOOLS_ADB
|
||||
bool "adb"
|
||||
|
7
package/angular-websocket/Config.in
Normal file
7
package/angular-websocket/Config.in
Normal file
@ -0,0 +1,7 @@
|
||||
config BR2_PACKAGE_ANGULAR_WEBSOCKET
|
||||
bool "angular-websocket"
|
||||
help
|
||||
An AngularJS WebSocket service for connecting client
|
||||
applications to servers.
|
||||
|
||||
https://github.com/AngularClass/angular-websocket
|
2
package/angular-websocket/angular-websocket.hash
Normal file
2
package/angular-websocket/angular-websocket.hash
Normal file
@ -0,0 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 69d752896bc17c08750a2fda24b5eb3c6d653afc6f406dd90a6b7c920b22a14a angular-websocket-v2.0.0.tar.gz
|
18
package/angular-websocket/angular-websocket.mk
Normal file
18
package/angular-websocket/angular-websocket.mk
Normal file
@ -0,0 +1,18 @@
|
||||
################################################################################
|
||||
#
|
||||
# angular-websocket
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ANGULAR_WEBSOCKET_VERSION = v2.0.0
|
||||
ANGULAR_WEBSOCKET_SITE = $(call github,AngularClass,angular-websocket,$(ANGULAR_WEBSOCKET_VERSION))
|
||||
ANGULAR_WEBSOCKET_LICENSE = MIT
|
||||
ANGULAR_WEBSOCKET_LICENSE_FILES = LICENSE
|
||||
|
||||
# install .min.js as .js
|
||||
define ANGULAR_WEBSOCKET_INSTALL_TARGET_CMDS
|
||||
$(INSTALL) -m 0644 -D $(@D)/dist/angular-websocket.min.js \
|
||||
$(TARGET_DIR)/var/www/angular-websocket.js
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
@ -1,79 +1,6 @@
|
||||
menuconfig BR2_PACKAGE_ANGULARJS
|
||||
config BR2_PACKAGE_ANGULARJS
|
||||
bool "angularjs"
|
||||
help
|
||||
AngularJS web application framework.
|
||||
|
||||
http://angularjs.org
|
||||
|
||||
if BR2_PACKAGE_ANGULARJS
|
||||
|
||||
config BR2_ANGULARJS_MODULES
|
||||
bool "angularjs modules"
|
||||
help
|
||||
Select which modules to install. If disabled, all modules
|
||||
will be installed.
|
||||
|
||||
if BR2_ANGULARJS_MODULES
|
||||
|
||||
config BR2_ANGULARJS_MODULE_ANIMATE
|
||||
bool "animate"
|
||||
help
|
||||
The ngAnimate module provides support for CSS-based animations
|
||||
(keyframes and transitions) as well as JavaScript-based animations
|
||||
via callback hooks. Animations are not enabled by default, however,
|
||||
by including ngAnimate then the animation hooks are enabled for an
|
||||
Angular app.
|
||||
|
||||
config BR2_ANGULARJS_MODULE_ARIA
|
||||
bool "aria"
|
||||
help
|
||||
The ngAria module provides support for common ARIA attributes that
|
||||
convey state or semantic information about the application for users
|
||||
of assistive technologies, such as screen readers.
|
||||
|
||||
config BR2_ANGULARJS_MODULE_COOKIES
|
||||
bool "cookies"
|
||||
help
|
||||
The ngCookies module provides a convenient wrapper for reading and
|
||||
writing browser cookies.
|
||||
|
||||
config BR2_ANGULARJS_MODULE_MESSAGE_FORMAT
|
||||
bool "message-format"
|
||||
help
|
||||
The ngMessageFormat module is used recognize MessageFormat extensions
|
||||
in interpolation expressions.
|
||||
|
||||
config BR2_ANGULARJS_MODULE_MESSAGES
|
||||
bool "messages"
|
||||
help
|
||||
The ngMessages module provides enhanced support for displaying
|
||||
messages within templates (typically within forms or when rendering
|
||||
message objects that return key/value data).
|
||||
|
||||
config BR2_ANGULARJS_MODULE_RESOURCE
|
||||
bool "resource"
|
||||
help
|
||||
The ngResource module provides interaction support with RESTful
|
||||
services via the $resource service.
|
||||
|
||||
config BR2_ANGULARJS_MODULE_ROUTE
|
||||
bool "route"
|
||||
help
|
||||
The ngRoute module provides routing and deeplinking services and
|
||||
directives for angular apps.
|
||||
|
||||
config BR2_ANGULARJS_MODULE_SANITIZE
|
||||
bool "sanitize"
|
||||
help
|
||||
The ngSanitize module provides functionality to sanitize HTML.
|
||||
|
||||
config BR2_ANGULARJS_MODULE_TOUCH
|
||||
bool "touch"
|
||||
help
|
||||
The ngTouch module provides touch events and other helpers for
|
||||
touch-enabled devices. The implementation is based on jQuery Mobile
|
||||
touch event handling (jquerymobile.com).
|
||||
|
||||
endif
|
||||
|
||||
endif
|
||||
|
@ -17,23 +17,11 @@ define ANGULARJS_EXTRACT_CMDS
|
||||
rmdir $(@D)/angular-$(ANGULARJS_VERSION)
|
||||
endef
|
||||
|
||||
ANGULARJS_FILES = angular
|
||||
|
||||
ANGULARJS_MODULES = animate aria cookies message-format messages resource \
|
||||
route sanitize touch
|
||||
|
||||
ifeq ($(BR2_ANGULARJS_MODULES),y)
|
||||
ANGULARJS_FILES += $(foreach mod,$(ANGULARJS_MODULES),\
|
||||
$(if $(BR2_ANGULARJS_MODULE_$(call UPPERCASE,$(mod))),\
|
||||
angular-$(mod)))
|
||||
else
|
||||
ANGULARJS_FILES += $(foreach mod,$(ANGULARJS_MODULES),angular-$(mod))
|
||||
endif
|
||||
|
||||
# install .min.js as .js
|
||||
define ANGULARJS_INSTALL_TARGET_CMDS
|
||||
$(foreach f,$(ANGULARJS_FILES),\
|
||||
$(INSTALL) -m 0644 -D $(@D)/$(f).min.js \
|
||||
$(TARGET_DIR)/var/www/$(f).js$(sep))
|
||||
$(foreach f,$(notdir $(wildcard $(@D)/*.min.js)),
|
||||
$(INSTALL) -m 0644 -D $(@D)/$(f) \
|
||||
$(TARGET_DIR)/var/www/$(f:.min.js=.js)$(sep))
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
@ -14,6 +14,34 @@ config BR2_PACKAGE_APACHE
|
||||
|
||||
http://httpd.apache.org
|
||||
|
||||
if BR2_PACKAGE_APACHE
|
||||
|
||||
choice
|
||||
prompt "Multi-Processing Module (MPM)"
|
||||
default BR2_PACKAGE_APACHE_MPM_WORKER
|
||||
help
|
||||
Select the Multi-Processing Module (MPM).
|
||||
|
||||
config BR2_PACKAGE_APACHE_MPM_EVENT
|
||||
bool "event"
|
||||
help
|
||||
A variant of the worker MPM with the goal of consuming threads
|
||||
only for connections with active processing
|
||||
|
||||
config BR2_PACKAGE_APACHE_MPM_PREFORK
|
||||
bool "prefork"
|
||||
help
|
||||
Implements a non-threaded, pre-forking web server
|
||||
|
||||
config BR2_PACKAGE_APACHE_MPM_WORKER
|
||||
bool "worker"
|
||||
help
|
||||
Implements a hybrid multi-threaded multi-process web server
|
||||
|
||||
endchoice
|
||||
|
||||
endif
|
||||
|
||||
comment "apache needs a toolchain w/ dynamic library, threads"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
@ -1,2 +1,2 @@
|
||||
# From http://www.apache.org/dist/httpd/httpd-2.4.20.tar.bz2.sha1
|
||||
sha1 cefe8ea4a3f81c7a08e36c80ebbd792c67ab361b httpd-2.4.20.tar.bz2
|
||||
# From http://www.apache.org/dist/httpd/httpd-2.4.23.tar.bz2.sha1
|
||||
sha1 bd6d138c31c109297da2346c6e7b93b9283993d2 httpd-2.4.25.tar.bz2
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
APACHE_VERSION = 2.4.20
|
||||
APACHE_VERSION = 2.4.25
|
||||
APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2
|
||||
APACHE_SITE = http://archive.apache.org/dist/httpd
|
||||
APACHE_LICENSE = Apache-2.0
|
||||
@ -20,6 +20,14 @@ APACHE_CONF_ENV= \
|
||||
ap_cv_void_ptr_lt_long=no \
|
||||
PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config
|
||||
|
||||
ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT),y)
|
||||
APACHE_MPM = event
|
||||
else ifeq ($(BR2_PACKAGE_APACHE_MPM_PREFORK),y)
|
||||
APACHE_MPM = prefork
|
||||
else ifeq ($(BR2_PACKAGE_APACHE_MPM_WORKER),y)
|
||||
APACHE_MPM = worker
|
||||
endif
|
||||
|
||||
APACHE_CONF_OPTS = \
|
||||
--sysconfdir=/etc/apache2 \
|
||||
--with-apr=$(STAGING_DIR)/usr \
|
||||
@ -31,7 +39,7 @@ APACHE_CONF_OPTS = \
|
||||
--enable-mime-magic \
|
||||
--without-suexec-bin \
|
||||
--enable-mods-shared=all \
|
||||
--with-mpm=worker \
|
||||
--with-mpm=$(APACHE_MPM) \
|
||||
--disable-lua \
|
||||
--disable-luajit
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user