diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
| commit | 2b38e5af3eb58c27cc646fed11ac1a24805fa05d (patch) | |
| tree | 780bd8869c0ed798d8c0abce17869a29cc01fb01 /package | |
| parent | 2a2320b4292d4e370cc95aea61525ebd7dc11337 (diff) | |
| parent | 34592482701199604242848b80c39bd07b6c7716 (diff) | |
resolve merge conflict
Diffstat (limited to 'package')
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rw-r--r-- | package/libgcc/Makefile | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index f20b650c3..db08b8860 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -23,8 +23,6 @@ INSTALL_STYLE:= manual do-install: $(CP) ./src/* $(IDIR_BASE_FILES) - # allow this to fail, as there might be no target-specific files to copy - -$(CP) $(TOPDIR)/target/$(ADK_TARGET_ARCH)/files/* $(IDIR_BASE_FILES) ifeq (${ADK_TARGET_ROOTFS_NFSROOT},y) @echo "#" > $(IDIR_BASE_FILES)/etc/network/interfaces endif diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile index b02464e9a..55f9e5b90 100644 --- a/package/libgcc/Makefile +++ b/package/libgcc/Makefile @@ -7,8 +7,7 @@ include ${TOPDIR}/toolchain/gcc/Makefile.inc PKG_NAME:= libgcc PKG_DESCR:= GCC library PKG_SECTION:= libs - -PKG_DFLT_LIBGCC:= y +PKG_DFLT_LIBGCC:= y if !ADK_TOOLCHAIN_ONLY NO_DISTFILES:= 1 |