Ignore:
Timestamp:
2010-01-15T18:30:25Z (14 years ago)
Author:
Pavel Rimsky <pavel@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
eeb643d
Parents:
387416b (diff), 563d6077 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merged latest trunk changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • boot/arch/sparc64/loader/Makefile.common

    r387416b r99de22b  
    3535DEPEND = Makefile.depend
    3636DEPEND_PREV = $(DEPEND).prev
     37JOB = image.job
    3738OUTPUT = image.boot
    3839
     
    4546RD_SRVS_GENERIC = \
    4647        $(USPACEDIR)/srv/fs/fat/fat \
    47         $(USPACEDIR)/srv/cir/fhc/fhc \
    48         $(USPACEDIR)/srv/cir/obio/obio
     48        $(USPACEDIR)/srv/hw/cir/fhc/fhc \
     49        $(USPACEDIR)/srv/hw/cir/obio/obio
    4950
    5051RD_APPS_GENERIC = \
Note: See TracChangeset for help on using the changeset viewer.