Changeset 21326


Ignore:
Timestamp:
2010-05-03T02:17:57+02:00 (7 years ago)
Author:
nico
Message:

[backfire] merge r21243

Location:
branches/backfire/target/linux/x86/image
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/backfire/target/linux/x86/image/gen_image_olpc.sh

    r18279 r21326  
    11#!/usr/bin/env bash 
    2 # Copyright (C) 2006 - 2007 OpenWrt.org 
     2# Copyright (C) 2006-2010 OpenWrt.org 
    33set -x  
    44[ $# == 5 ] || { 
     
    3333[ -n "$PADDING" ] && dd if=/dev/zero of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc count="$ROOTFSSIZE" 
    3434dd if="$ROOTFSIMAGE" of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc 
    35 #rm -f "$OUTPUT.kernel" 
     35rm -f "$OUTPUT.kernel" 
  • branches/backfire/target/linux/x86/image/gen_image_x86.sh

    r18279 r21326  
    11#!/usr/bin/env bash 
    2 # Copyright (C) 2006 OpenWrt.org 
     2# Copyright (C) 2006-2010 OpenWrt.org 
    33set -x  
    44[ $# == 5 ] || { 
     
    3636genext2fs -d "$KERNELDIR" -b "$BLOCKS" "$OUTPUT.kernel" 
    3737dd if="$OUTPUT.kernel" of="$OUTPUT" bs=512 seek="$KERNELOFFSET" conv=notrunc 
    38 #rm -f "$OUTPUT.kernel" 
     38rm -f "$OUTPUT.kernel" 
    3939 
    4040which chpax >/dev/null && chpax -zp $(which grub) 
Note: See TracChangeset for help on using the changeset viewer.