Commit aaf77a4a authored by Alessandro Rubini's avatar Alessandro Rubini

build: script fixes for new file placement

parent fea7addf
......@@ -25,7 +25,7 @@ unzip -q ${WRS_DOWNLOAD_DIR}/$zipname || wrs_die "unzip $zipname"
wrs_echo "Patching AT91Boot"
patch -t -p2 -d $dirname < \
$WRS_BASE_DIR/patches/at91boot/AT91Bootstrap1.11-patch-wr \
"$WRS_BASE_DIR/../patches/at91boot/AT91Bootstrap1.11-patch-wr" \
|| wrs_die "patching at91boot"
wrs_echo "Building AT91Boot"; # stupid makefiles, I must force CROSS_COMPILE
......
......@@ -25,7 +25,7 @@ tar xjf ${WRS_DOWNLOAD_DIR}/$zipname || wrs_die "untar $zipname"
# copy the config and replace "-j" level. First remove it in case it's left in
cd $dirname
CFG=$WRS_BASE_DIR/patches/buildroot/buildroot-config-wrswitch
CFG="$WRS_BASE_DIR/../patches/buildroot/buildroot-config-wrswitch"
if [ "x$WRS_BUILDROOT_CONFIG" != "x" ]; then
if [ -f $WRS_BUILDROOT_CONFIG ]; then
CFG=$WRS_BUILDROOT_CONFIG
......
......@@ -25,13 +25,13 @@ tar xjf ${WRS_DOWNLOAD_DIR}/$zipname || wrs_die "untar $zipname"
# apply patches
cd $dirname
for n in ${WRS_BASE_DIR}/patches/kernel/v2.6.35/00*; do
for n in ${WRS_BASE_DIR}/../patches/kernel/v2.6.35/00*; do
patch -p1 < $n || wrs_die "patch kernel"
done
# copy the config and replace "-j" level. First remove it in case it's left in
CFG=$WRS_BASE_DIR/patches/kernel/v2.6.35/linux-config-wrswitch
CFG="$WRS_BASE_DIR/../patches/kernel/v2.6.35/linux-config-wrswitch"
if [ "x$WRS_KERNEL_CONFIG" != "x" ]; then
if [ -f $WRS_KERNEL_CONFIG ]; then
CFG=$WRS_KERNEL_CONFIG
......
......@@ -25,7 +25,7 @@ tar xjf ${WRS_DOWNLOAD_DIR}/$zipname || wrs_die "untar $zipname"
wrs_echo "Patching U-Boot"
patch -t -p2 -d $dirname < \
$WRS_BASE_DIR/patches/u-boot/u-boot-1.3.4-wr-patch \
"$WRS_BASE_DIR/../patches/u-boot/u-boot-1.3.4-wr-patch" \
|| wrs_die "patching u-boot"
wrs_echo "Building U-Boot"
......
......@@ -71,16 +71,16 @@ failed_step=false; # this is set to "true" but the wrs_build_step function
# Now build the stuff one step at a time, only if not already done.
# done-marker script name
wrs_build_step 00-buildroot wrs_build_buildroot
wrs_build_step 00-buildroot wrs_build_buildroot
wrs_default_compiler
wrs_build_step 01-at91boot wrs_build_at91boot
wrs_build_step 02-u-boot wrs_build_u-boot
wrs_build_step 03-kernel wrs_build_kernel
#wrs_build_step 04-filesystem wrs_build_buildroot-fs
#wrs_build_step 05-wrs-tools wrs_build_tools
#wrs_build_step 06-wrs-addon wrs_build_addon
#wrs_build_step 07-wrap-rootfs wrs_build_finalrootfs
#wrs_build_step 08-host-tftpd wrs_build_tftpd
wrs_build_step 01-at91boot wrs_build_at91boot
wrs_build_step 02-u-boot wrs_build_u-boot
wrs_build_step 03-kernel wrs_build_kernel
#wrs_build_step 04-modules wrs_build_modules
#wrs_build_step 05-wrs-tools wrs_build_tools
#wrs_build_step 06-wrs-addon wrs_build_addon
#wrs_build_step 07-wrap-rootfs wrs_build_finalrootfs
#wrs_build_step 08-host-tftpd wrs_build_tftpd
if $failed_step; then
wrs_die "One or more build steps failed"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment