[Galaxy S I9000 Android Development] RlndVt:
roland@rolandvet-MacBookPro:~/semaphore/samsung-kernel-aries$ git pull
remote: Counting objects: 15, done.
remote: Compressing objects: 100% (1/1), done.
remote: Total 8 (delta 7), reused 8 (delta 7)
Unpacking objects: 100% (8/8), done.
From git://github.com/stratosk/samsung-kernel-aries
43af959..2897174 jellybean -> origin/jellybean
Updating 43af959..2897174
error: Your local changes to the following files would be overwritten by merge:
arch/arm/configs/semaphore_galaxys_defconfig
Please, commit your changes or stash them before you can merge.
Aborting

I only changed the config file for the galaxys, must I revert that?

EDIT:

Reverted the change, git pull worked nicely, but the building still fails.

roland@rolandvet-MacBookPro:~/semaphore/samsung-kernel-aries$ git pull
Updating 43af959..2897174
Fast-forward
arch/arm/configs/semaphore_captivate_defconfig | 2 +-
arch/arm/configs/semaphore_galaxys_defconfig | 2 +-
arch/arm/configs/semaphore_vibrant_defconfig | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
roland@rolandvet-MacBookPro:~/semaphore/samsung-kernel-aries$ ./sbuild.sh

Making semaphore_galaxys_defconfig
#
# configuration written to .config
#
LOCALVERSION=-Semaphore_JB_2.5.0
CROSS_COMPILE=../toolchain/arm-linux-gnueabihf-
ARCH=arm
INIT_DIR=../ics-ramdisk/jb_combo/
MODULES_DIR=../ics-ramdisk/jb_combo/files/modules
KERNEL_DIR=/home/roland/semaphore/samsung-kernel-aries
OUTPUT_DIR=../output/
CWM_DIR=../ics-ramdisk/cwm/
scripts/kconfig/conf --silentoldconfig Kconfig
CHK include/linux/version.h
CHK include/generated/utsrelease.h
CC scripts/mod/empty.o
as: unrecognized option '-EL'
make[2]: *** [scripts/mod/empty.o] Error 1
make[1]: *** [scripts/mod] Error 2
make: *** [scripts] Error 2
make: *** Waiting for unfinished jobs....
rm: cannot remove `../ics-ramdisk/jb_combo/files/modules/*': No such file or directory
CHK include/linux/version.h
CHK include/generated/utsrelease.h
CC scripts/mod/empty.o
make[1]: `include/generated/mach-types.h' is up to date.
CC kernel/bounds.s
as: unrecognized option '-EL'
make[2]: *** [scripts/mod/empty.o] Error 1
make[1]: *** [scripts/mod] Error 2
make: *** [scripts] Error 2
make: *** Waiting for unfinished jobs....
GEN include/generated/bounds.h
CC arch/arm/kernel/asm-offsets.s
GEN include/generated/asm-offsets.h
CALL scripts/checksyscalls.sh
tar: zImage: Cannot stat: No such file or directory
tar: Exiting with failure status due to previous errors
Moving to ../output/galaxys/
cp: cannot stat `arch/arm/boot/zImage': No such file or directory
adding: bml_over_mtd (deflated 37%)
adding: bml_over_mtd.sh (deflated 59%)
adding: boot.img (deflated 0%)
adding: erase_image (deflated 32%)
adding: flash_image (deflated 35%)
adding: META-INF/ (stored 0%)
adding: META-INF/CERT.RSA (deflated 33%)
adding: META-INF/CERT.SF (deflated 61%)
adding: META-INF/com/ (stored 0%)
adding: META-INF/com/android/ (stored 0%)
adding: META-INF/com/android/metadata (deflated 5%)
adding: META-INF/com/google/ (stored 0%)
adding: META-INF/com/google/android/ (stored 0%)
adding: META-INF/com/google/android/update-binary (deflated 34%)
adding: META-INF/com/google/android/updater-script (deflated 69%)
adding: META-INF/MANIFEST.MF (deflated 61%)

Build completed in 0 minute(s) and 5 seconds.

Edit2:

"rm: cannot remove `../ics-ramdisk/jb_combo/files/modules/*': No such file or directory"

Only fails because the folder is empty.

What does:

"as: unrecognized option '-EL'"

refer to?