Révision d4a5c43c
Ajouté par Ermal il y a presque 10 ans
builder_scripts/builder_common.sh | ||
---|---|---|
203 | 203 |
mkdir -p $KERNEL_DESTDIR/boot/kernel |
204 | 204 |
mkdir -p $KERNEL_DESTDIR/boot/defaults |
205 | 205 |
|
206 |
# Copy pfSense kernel configuration files over to $SRCDIR/sys/$TARGET/conf |
|
207 |
cp $BUILDER_TOOLS/builder_scripts/conf/kernel/$KERNCONF $KERNELCONF |
|
208 |
if [ ! -f "$KERNELCONF" ]; then |
|
209 |
echo ">>> ERROR: Could not find $KERNELCONF" |
|
210 |
print_error_pfS |
|
211 |
fi |
|
212 |
echo "" >> $KERNELCONF |
|
213 |
|
|
214 |
|
|
215 | 206 |
if [ "$TARGET_ARCH" = "" ]; then |
216 | 207 |
TARGET_ARCH=$TARGET |
217 | 208 |
fi |
... | ... | |
274 | 265 |
LOGFILE="${BUILDER_LOGS}/kernel.${KERNCONF}.${TARGET}.log" |
275 | 266 |
echo ">>> Building $BUILD_KERNEL kernel." | tee -a ${LOGFILE} |
276 | 267 |
|
268 |
# Copy pfSense kernel configuration files over to $SRCDIR/sys/$TARGET/conf |
|
269 |
cp $BUILDER_TOOLS/builder_scripts/conf/kernel/$KERNCONF $KERNELCONF |
|
270 |
if [ ! -f "$KERNELCONF" ]; then |
|
271 |
echo ">>> ERROR: Could not find $KERNELCONF" |
|
272 |
print_error_pfS |
|
273 |
fi |
|
274 |
echo "" >> $KERNELCONF |
|
275 |
|
|
277 | 276 |
# Use kernel INSTALL_NAME if it exists |
278 |
KERNEL_INSTALL_NAME=$(echo ${KERNELCONF} | /usr/bin/sed -e '/INSTALL_NAME/!d; s/^.*INSTALL_NAME[[:blank:]]*//' \
|
|
277 |
KERNEL_INSTALL_NAME=$(cat $BUILDER_TOOLS/builder_scripts/conf/kernel/$KERNCONF | /usr/bin/sed -e '/INSTALL_NAME/!d; s/^.*INSTALL_NAME[[:blank:]]*//' \
|
|
279 | 278 |
| /usr/bin/head -n 1) |
280 | 279 |
|
281 | 280 |
if [ -z "${KERNEL_INSTALL_NAME}" ]; then |
... | ... | |
323 | 322 |
fi |
324 | 323 |
|
325 | 324 |
# Use kernel INSTALL_NAME if it exists |
326 |
KERNEL_INSTALL_NAME=$(echo ${1} | /usr/bin/sed -e '/INSTALL_NAME/!d; s/^.*INSTALL_NAME[[:blank:]]*//' \ |
|
327 |
| /usr/bin/head -n 1) |
|
325 |
if [ -f $BUILDER_TOOLS/builder_scripts/conf/kernel/${1} ]; then |
|
326 |
KERNEL_INSTALL_NAME=$(echo $BUILDER_TOOLS/builder_scripts/conf/kernel/${1} \ |
|
327 |
| /usr/bin/sed -e '/INSTALL_NAME/!d; s/^.*INSTALL_NAME[[:blank:]]*//' \ |
|
328 |
| /usr/bin/head -n 1) |
|
329 |
fi |
|
328 | 330 |
|
329 | 331 |
if [ -z "${KERNEL_INSTALL_NAME}" ]; then |
330 | 332 |
export KERNEL_NAME=$(echo ${1} | sed -e 's/pfSense_//; s/\.[0-9].*$//') |
Formats disponibles : Unified diff
Restore functionality of KERNEL_INSTALL_NAME with other kernel configs. The install name is supposed to be put inside the kernel config. Reported-by: Warren