head	1.2;
access;
symbols
	rel-8-1-2-sv:1.2
	rel-6-2-2-sv:1.1.1.2
	rel-6-2-1-sv:1.1.1.2
	import-20060615:1.1.1.2
	import-20060530:1.1.1.2
	import-20060516:1.1.1.2
	import-20060421:1.1.1.2
	import-20060406:1.1.1.2
	import-29mar06:1.1.1.2
	import-14mar06:1.1.1.1
	import-13mar06:1.1.1.1
	fixed-post-import-14feb06:1.1.1.1
	import-14feb06:1.1.1.1
	fixed-post-import-6feb06:1.1.1.1
	import-6feb06:1.1.1.1
	import-6sep05:1.1.1.1
	start:1.1.1.1
	freescale:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2006.11.27.11.42.55;	author seh;	state dead;
branches;
next	1.1;

1.1
date	2005.08.23.08.54.19;	author seh;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2005.08.23.08.54.19;	author seh;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	2006.03.29.14.43.10;	author seh;	state Exp;
branches;
next	;


desc
@@


1.2
log
@fix conflicts from fsl import-20061124
@
text
@PKG_FAKE_PROVIDES   =   fake-provides
PKG_MKSPOOFLINKS    =   mkspooflinks
PKG_KERNEL          =   kernel
PKG_SKELL           =   skell
PKG_LIBC            =   base_libs
PKG_BUSYBOX         =   busybox
PKG_TINYLOGIN       =   tinylogin
PKG_MODUTILS        =   modutils
PKG_BASH            =   bash
PKG_COREUTILS       =   coreutils
PKG_ZLIB            =   zlib
PKG_LFS_UTILS       =   lfs-utils
PKG_FINDUTILS       =   findutils
PKG_GAWK            =   gawk
PKG_LIBTERMCAP      =   libtermcap
PKG_NCURSES         =   ncurses
PKG_PERL            =   perl
PKG_VIM             =   vim
PKG_M4              =   m4
PKG_BISON           =   bison
PKG_LESS            =   less
PKG_GROFF           =   groff
PKG_SED             =   sed
PKG_FLEX            =   flex
PKG_GETTEXT         =   gettext
PKG_NET_TOOLS       =   net-tools
PKG_INETUTILS       =   inetutils
PKG_texinfo         =   texinfo
PKG_autoconfg       =   autoconfg
PKG_automake        =   automake
PKG_FILE            =   file
PKG_LIBTOOL         =   libtool
PKG_BZIP2           =   bzip2
PKG_DIFFUTILS       =   diffutils
PKG_ED              =   ed
PKG_KBD             =   kbd
PKG_E2FSPROGS       =   e2fsprogs
PKG_GREP            =   grep
PKG_GRUB            =   grub
PKG_MAN             =   man
PKG_MAKE            =   make
PKG_BUILDROOT_LKC   =   buildroot-config
PKG_LKC             =   lkc
PKG_PATCH           =   patch
PKG_PROCINFO        =   procinfo
PKG_PROCPS          =   procps
PKG_PSMISC          =   psmisc
PKG_SYSKLOGD        =   sysklogd
PKG_SYSVINIT        =   sysvinit
PKG_TAR             =   tar
PKG_UTIL_LINUX      =   util-linux
PKG_DB1             =   db1
PKG_WHICH           =   which
PKG_FAKEROOT        =   fakeroot
PKG_GDB             =   gdb
PKG_WGET            =   wget
PKG_EXPAT           =   expat
PKG_FREETYPE        =   freetype
PKG_HELLOWORLD      =   helloworld
PKG_MERGE           =   merge

@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@LTIB external initial import
@
text
@@


1.1.1.2
log
@Import from fsl 29mar06
@
text
@d1 5
d7 1
d9 53
@


