| 1 |
Author: agaffney |
| 2 |
Date: 2008-05-10 01:16:38 +0000 (Sat, 10 May 2008) |
| 3 |
New Revision: 676 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/gen_compile.sh |
| 8 |
Log: |
| 9 |
Store pre-oldconfig busybox .config for use in bincache comparison |
| 10 |
|
| 11 |
Modified: trunk/ChangeLog |
| 12 |
=================================================================== |
| 13 |
--- trunk/ChangeLog 2008-05-09 22:15:46 UTC (rev 675) |
| 14 |
+++ trunk/ChangeLog 2008-05-10 01:16:38 UTC (rev 676) |
| 15 |
@@ -2,6 +2,9 @@ |
| 16 |
# Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 17 |
# $Header: $ |
| 18 |
|
| 19 |
+ 10 May 2008; Andrew Gaffney <agaffney@g.o> gen_compile.sh: |
| 20 |
+ Store pre-oldconfig busybox .config for use in bincache comparison |
| 21 |
+ |
| 22 |
09 May 2008; Andrew Gaffney <agaffney@g.o> generic/initrd.defaults, |
| 23 |
generic/initrd.scripts, generic/linuxrc: |
| 24 |
Add nomodules kernel commandline parameter to disable loading of modules |
| 25 |
|
| 26 |
Modified: trunk/gen_compile.sh |
| 27 |
=================================================================== |
| 28 |
--- trunk/gen_compile.sh 2008-05-09 22:15:46 UTC (rev 675) |
| 29 |
+++ trunk/gen_compile.sh 2008-05-10 01:16:38 UTC (rev 676) |
| 30 |
@@ -360,27 +360,12 @@ |
| 31 |
gen_die "Could not find busybox source tarball: ${BUSYBOX_SRCTAR}!" |
| 32 |
[ -f "${BUSYBOX_CONFIG}" ] || |
| 33 |
gen_die "Cound not find busybox config file: ${BUSYBOX_CONFIG}!" |
| 34 |
- cd "${TEMP}" |
| 35 |
- rm -rf "${BUSYBOX_DIR}" > /dev/null |
| 36 |
- /bin/tar -jxpf ${BUSYBOX_SRCTAR} || |
| 37 |
- gen_die 'Could not extract busybox source tarball!' |
| 38 |
- [ -d "${BUSYBOX_DIR}" ] || |
| 39 |
- gen_die 'Busybox directory ${BUSYBOX_DIR} is invalid!' |
| 40 |
- cp "${BUSYBOX_CONFIG}" "${BUSYBOX_DIR}/.config" |
| 41 |
-# sed -i ${BUSYBOX_DIR}/.config -e 's/#\? \?CONFIG_FEATURE_INSTALLER[ =].*/CONFIG_FEATURE_INSTALLER=y/g' |
| 42 |
- cd "${BUSYBOX_DIR}" |
| 43 |
-# patch -p1 < "${GK_SHARE}/pkg/busybox-1.1.3+gentoo-mdadm.patch" |
| 44 |
-# patch -p1 < "${GK_SHARE}/pkg/busybox-1.1.3+gentoo-mdadm2.patch" |
| 45 |
-# patch -p1 < "${GK_SHARE}/pkg/busybox-1.1.3+gentoo-mdadm3.patch" |
| 46 |
- apply_patches busybox ${BUSYBOX_VER} |
| 47 |
- print_info 1 'busybox: >> Configuring...' |
| 48 |
- yes '' 2>/dev/null | compile_generic oldconfig utils |
| 49 |
|
| 50 |
# Delete cache if stored config's MD5 does not match one to be used |
| 51 |
- if [ -f "${BUSYBOX_BINCACHE}" -a -f "${BUSYBOX_CONFIG}" ] |
| 52 |
+ if [ -f "${BUSYBOX_BINCACHE}" ] |
| 53 |
then |
| 54 |
- oldconfig_md5=$(tar -xjf "${BUSYBOX_BINCACHE}" -O .config | md5sum) |
| 55 |
- newconfig_md5=$(md5sum < .config) |
| 56 |
+ oldconfig_md5=$(tar -xjf "${BUSYBOX_BINCACHE}" -O .config.gk_orig 2>/dev/null | md5sum) |
| 57 |
+ newconfig_md5=$(md5sum < "${BUSYBOX_CONFIG}") |
| 58 |
if [ "${oldconfig_md5}" != "${newconfig_md5}" ] |
| 59 |
then |
| 60 |
print_info 1 "busybox: >> Removing stale cache..." |
| 61 |
@@ -392,6 +377,19 @@ |
| 62 |
|
| 63 |
if [ ! -f "${BUSYBOX_BINCACHE}" ] |
| 64 |
then |
| 65 |
+ cd "${TEMP}" |
| 66 |
+ rm -rf "${BUSYBOX_DIR}" > /dev/null |
| 67 |
+ /bin/tar -jxpf ${BUSYBOX_SRCTAR} || |
| 68 |
+ gen_die 'Could not extract busybox source tarball!' |
| 69 |
+ [ -d "${BUSYBOX_DIR}" ] || |
| 70 |
+ gen_die 'Busybox directory ${BUSYBOX_DIR} is invalid!' |
| 71 |
+ cp "${BUSYBOX_CONFIG}" "${BUSYBOX_DIR}/.config" |
| 72 |
+ cp "${BUSYBOX_CONFIG}" "${BUSYBOX_DIR}/.config.gk_orig" |
| 73 |
+ cd "${BUSYBOX_DIR}" |
| 74 |
+ apply_patches busybox ${BUSYBOX_VER} |
| 75 |
+ print_info 1 'busybox: >> Configuring...' |
| 76 |
+ yes '' 2>/dev/null | compile_generic oldconfig utils |
| 77 |
+ |
| 78 |
print_info 1 'busybox: >> Compiling...' |
| 79 |
compile_generic all utils |
| 80 |
print_info 1 'busybox: >> Copying to cache...' |
| 81 |
@@ -399,12 +397,12 @@ |
| 82 |
gen_die 'Busybox executable does not exist!' |
| 83 |
strip "${TEMP}/${BUSYBOX_DIR}/busybox" || |
| 84 |
gen_die 'Could not strip busybox binary!' |
| 85 |
- tar -cj -C "${TEMP}/${BUSYBOX_DIR}" -f "${BUSYBOX_BINCACHE}" busybox .config || |
| 86 |
+ tar -cj -C "${TEMP}/${BUSYBOX_DIR}" -f "${BUSYBOX_BINCACHE}" busybox .config .config.gk_orig || |
| 87 |
gen_die 'Could not create the busybox bincache!' |
| 88 |
- fi |
| 89 |
|
| 90 |
- cd "${TEMP}" |
| 91 |
- rm -rf "${BUSYBOX_DIR}" > /dev/null |
| 92 |
+ cd "${TEMP}" |
| 93 |
+ rm -rf "${BUSYBOX_DIR}" > /dev/null |
| 94 |
+ fi |
| 95 |
} |
| 96 |
|
| 97 |
compile_lvm() { |
| 98 |
|
| 99 |
-- |
| 100 |
gentoo-commits@l.g.o mailing list |
Archives