Skip to content

Commit 3e2317a

Browse files
jkloetzkejkloetzke
authored
Merge pull request #112 from rhubert/perl+fixes
Perl+fixes
2 parents ad7ec4b + 6403f3c commit 3e2317a

File tree

15 files changed

+171
-52
lines changed

15 files changed

+171
-52
lines changed

‎classes/linux.yaml‎

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ checkoutSCM:
8383
dir: kmod-script
8484

8585
buildVars: [LINUX_ARCH, ARCH, CROSS_COMPILE, CC]
86-
buildTools: [m4, bison, flex, target-toolchain, host-toolchain]
86+
buildTools: [m4, bison, flex, target-toolchain, host-toolchain, perl]
8787
buildSetup: |
8888
# make sure we find our kmod-dist script in the package step
8989
ln -sf $1/kmod-script .
@@ -92,28 +92,32 @@ buildSetup: |
9292
#
9393
# $1: linux kernel source directory
9494
# $2: defconfig (optional)
95+
# - if omitted, use the kernel defconfig
9596
# - if this is an actual file, use it as the config
96-
# - if this is not a file, check if a defconfig for the target arch by
97-
# that name exists and if yes, use that one
97+
# - if this is not a file, treat it as a defconfig of the target arch
9898
linuxConfig()
9999
{
100-
DEF_CFG=${2:-$1/arch/${LINUX_ARCH}/configs/defconfig}
101-
if [[ -f "$1/arch/${LINUX_ARCH}/configs/${DEF_CFG}" ]] ; then
102-
DEF_CFG=$1/arch/${LINUX_ARCH}/configs/${DEF_CFG}
103-
fi
104-
# check if the defconfig file exists
105-
if [[ ! -f "$DEF_CFG" ]]; then
106-
>&2 echo "Don't know how to use '$DEF_CFG' as linux kernel config!"
107-
false
108-
fi
109-
# check if the source file is newer than .config
110-
if [[ -f .config && .config -nt $DEF_CFG ]]; then
111-
return 0
100+
if [[ ${2+set} ]] ; then
101+
local DEF_CFG
102+
if [[ -f "$2" ]] ; then
103+
DEF_CFG="$2"
104+
else
105+
DEF_CFG="$1/arch/${LINUX_ARCH}/configs/$2"
106+
fi
107+
108+
if [[ ! -f "$DEF_CFG" ]]; then
109+
>&2 echo "Specified kernel defconfig '$DEF_CFG' does not exist!"
110+
false
111+
fi
112+
113+
# check if the source file is newer than .config
114+
if [[ ! -f .config || .config -ot $DEF_CFG ]]; then
115+
cp -u "$DEF_CFG" .config
116+
makeSequential -C "$1" O="$PWD" olddefconfig
117+
fi
118+
elif [[ ! -f .config ]] ; then
119+
makeSequential -C "$1" O="$PWD" defconfig
112120
fi
113-
# redo the .config file
114-
cp -u "$DEF_CFG" .config
115-
makeSequential -C $1 O=$PWD \
116-
olddefconfig
117121
}
118122
119123
# Build the actual target linux image and all configured modules

‎recipes/bsp/uboot.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ multiPackage:
1616
- if: "${UBOOT_CUSTOM_CONFIG:-}"
1717
name: "${UBOOT_CUSTOM_CONFIG_PKG:-uboot-custom-cfg}"
1818

19+
buildToolsWeak: [perl]
1920
buildVars: [UBOOT_CONFIG, UBOOT_TARGETS, UBOOT_CUSTOM_CONFIG, UBOOT_CUSTOM_CONFIG_PKG]
2021
buildScript: |
2122
# Use plain "defconfig" if we have no specific target. Otherwise check if

‎recipes/core/busybox.yaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,15 @@ buildScript: |
3535
elif [[ ${BUSYBOX_CONFIG:+true} ]] ; then
3636
CFG="$1/configs/${BUSYBOX_CONFIG}"
3737
else
38-
CFG="defconfig"
38+
if [ ! -e .config ]; then
39+
make -C $1 O=$PWD defconfig
40+
fi
41+
CFG=".config"
3942
fi
4043
4144
# check if the defconfig exists
4245
if [[ ! -f "$CFG" ]]; then
43-
>&2 echo "Don't know how to use '$CFG' as busybox config!"
46+
>&2 echo "Specified busybox defconfig '$CFG' does not exist!"
4447
false
4548
fi
4649

‎recipes/devel/intltool.yaml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1-
inherit: [autotools]
1+
inherit: [autotools, perl5]
22

33
metaEnvironment:
44
PKG_VERSION: "0.50.2"
55

6+
depends:
7+
- perl::xml-parser-dev
8+
- use: []
9+
depends:
10+
- perl::xml-parser-tgt
11+
612
checkoutSCM:
713
scm: url
814
url: http://launchpad.net/intltool/trunk/${PKG_VERSION}/+download/intltool-${PKG_VERSION}.tar.gz
@@ -14,3 +20,5 @@ buildScript: |
1420
1521
packageScript: |
1622
autotoolsPackageTgt
23+
24+
provideDeps: ['*-tgt']

‎recipes/devel/squashfs-tools.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ depends:
1616

1717
checkoutSCM:
1818
scm: url
19-
url: ${GITHUB_MIRROR}/plougher/squashfs-tools/archive/${PKG_VERSION}.tar.gz
19+
url: ${GITHUB_MIRROR}/plougher/squashfs-tools/releases/download/${PKG_VERSION}/squashfs-tools-${PKG_VERSION}.tar.gz
2020
digestSHA256: "94201754b36121a9f022a190c75f718441df15402df32c2b520ca331a107511c"
2121
stripComponents: 1
2222

‎recipes/kernel/linux.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@ buildScript: |
2626
export KCONFIG_NOTIMESTAMP=1
2727
export KBUILD_BUILD_TIMESTAMP='Mon Dec 28 22:49:40 CET 2015'
2828
29-
# Use plain "defconfig" if we have no specific target. Otherwise check if
30-
# defconfig has changed.
29+
LCFG=( "$1/linux" )
30+
31+
# Use plain "defconfig" if we have no specific target. Otherwise, pick up
32+
# the requested config.
3133
if [[ ${LINUX_CUSTOM_CONFIG:+true} ]] ; then
3234
PKG="${LINUX_CUSTOM_CONFIG_PKG:-kernel::linux-custom-config}"
33-
LCFG="${BOB_DEP_PATHS[$PKG]}/$LINUX_CUSTOM_CONFIG"
35+
LCFG+=( "${BOB_DEP_PATHS[$PKG]}/$LINUX_CUSTOM_CONFIG" )
3436
elif [[ ${LINUX_CONFIG:+true} ]] ; then
35-
LCFG="${LINUX_CONFIG}"
36-
else
37-
LCFG="defconfig"
37+
LCFG+=( "${LINUX_CONFIG}" )
3838
fi
3939
40-
linuxConfig $1/linux $LCFG
40+
linuxConfig "${LCFG[@]}"
4141
4242
multiPackage:
4343
"":

‎recipes/libs/botan.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ depends:
1313

1414
checkoutSCM:
1515
scm: url
16-
url: https://botan.randombit.net/releases/Botan-${PKG_VERSION}.tar.xz
17-
digestSHA256: fc0620463461caaea8e60f06711d7e437a3ad1eebd6de4ac29c14bbd901ccd1b
16+
url: ${GITHUB_MIRROR}/randombit/botan/archive/refs/tags/${PKG_VERSION}.tar.gz
17+
digestSHA256: 8d2a072c7cdca6cadd16f89bb966fce1b3ec77cb4614bf1d87dec1337a3d2330
1818
stripComponents: 1
1919

20+
checkoutDeterministic: True
2021
checkoutScript: |
2122
patchApplySeries $<@botan/*@>
2223

‎recipes/libs/libseccomp.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ checkoutSCM:
1010
digestSHA1: c0349aca443ec0807528d088a3f2e2e0d5d1b17b
1111
stripComponents: 1
1212

13+
depends:
14+
- name: devel::gperf
15+
use: [tools]
16+
tools:
17+
target-toolchain: host-compat-toolchain
18+
19+
buildTools: [gperf]
1320
buildScript: |
1421
autotoolsBuild $1
1522

‎recipes/libs/libxcrypt.yaml‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎recipes/net/ifupdown.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ checkoutSCM:
1111
stripComponents: 1
1212

1313
buildVars: [CC]
14+
buildTools: [perl]
1415
buildScript: |
1516
mkdir -p build
1617
cp -a $1/* build/
18+
sed -i 's#/usr/bin/perl#/usr/bin/env -S perl#' build/defn2*.pl
1719
1820
# fake this
1921
mkdir -p bin

0 commit comments

Comments
 (0)