head	1.4;
access;
symbols
	rel-8-1-2-sv:1.4
	import-20070116:1.1.1.13
	import-20061124:1.1.1.12
	rel-6-2-2-sv:1.1.1.11
	rel-6-2-1-sv:1.1.1.11
	import-20060615:1.1.1.11
	import-20060530:1.1.1.10
	import-20060516:1.1.1.9
	import-20060421:1.1.1.8
	import-20060406:1.1.1.7
	import-29mar06:1.1.1.6
	import-14mar06:1.1.1.5
	import-13mar06:1.1.1.5
	fixed-post-import-14feb06:1.1.1.4
	import-14feb06:1.1.1.4
	fixed-post-import-6feb06:1.1.1.3
	import-6feb06:1.1.1.3
	import-6sep05:1.1.1.2
	start:1.1.1.1
	freescale:1.1.1;
locks; strict;
comment	@# @;


1.4
date	2007.11.07.14.15.08;	author seh;	state dead;
branches;
next	1.3;
commitid	EGTWia6z4yxOmEEs;

1.3
date	2007.01.17.11.19.50;	author seh;	state Exp;
branches;
next	1.2;

1.2
date	2007.01.15.11.18.10;	author seh;	state Exp;
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	2005.09.06.10.07.58;	author seh;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2006.02.06.14.19.58;	author seh;	state Exp;
branches;
next	1.1.1.4;

1.1.1.4
date	2006.02.14.09.52.37;	author seh;	state Exp;
branches;
next	1.1.1.5;

1.1.1.5
date	2006.03.13.17.44.07;	author seh;	state Exp;
branches;
next	1.1.1.6;

1.1.1.6
date	2006.03.29.14.43.11;	author seh;	state Exp;
branches;
next	1.1.1.7;

1.1.1.7
date	2006.04.06.14.36.26;	author seh;	state Exp;
branches;
next	1.1.1.8;

1.1.1.8
date	2006.04.21.10.02.31;	author seh;	state Exp;
branches;
next	1.1.1.9;

1.1.1.9
date	2006.05.16.14.20.53;	author seh;	state Exp;
branches;
next	1.1.1.10;

1.1.1.10
date	2006.05.30.14.08.28;	author seh;	state Exp;
branches;
next	1.1.1.11;

1.1.1.11
date	2006.06.15.09.35.17;	author seh;	state Exp;
branches;
next	1.1.1.12;

1.1.1.12
date	2006.11.27.11.19.18;	author seh;	state Exp;
branches;
next	1.1.1.13;

1.1.1.13
date	2007.01.17.10.48.13;	author seh;	state Exp;
branches;
next	;


desc
@@


1.4
log
@import-20071105 conflig resolution commit
@
text
@PKG_FAKE_PROVIDES   =   fake-provides
PKG_MKSPOOFLINKS    =   mkspooflinks
PKG_U_BOOT          =   u-boot
PKG_COLILO          =   colilo
PKG_KERNEL          =   kernel
PKG_DEV             =   dev
PKG_SKELL           =   skell
PKG_LIBC            =   base_libs
PKG_BINUTILS        =   binutils
PKG_GCC             =   gcc
PKG_BLOB            =   blob
PKG_BUSYBOX         =   busybox
PKG_TINYLOGIN       =   tinylogin
PKG_NTPCLIENT       =   ntpclient
PKG_MODUTILS        =   modutils
PKG_MODULE_INIT_TOOLS = module-init-tools
PKG_LIBTERMCAP      =   libtermcap
PKG_BASH            =   bash
PKG_SASH            =   sash
PKG_COREUTILS       =   coreutils
PKG_SEQ             =   seq
PKG_ZLIB            =   zlib
PKG_LFS_UTILS       =   lfs-utils
PKG_FINDUTILS       =   findutils
PKG_GAWK            =   gawk
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_AUTOCONF        =   autoconf
PKG_AUTOMAKE        =   automake
PKG_FILE            =   file
PKG_LIBTOOL         =   libtool
PKG_GMP             =   gmp
PKG_BZIP2           =   bzip2
PKG_DIFFUTILS       =   diffutils
PKG_DOSFSTOOLS      =   dosfstools
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_DEVFSD          =   devfsd
PKG_SYSVINIT        =   sysvinit
PKG_TAR             =   tar
PKG_UTIL_LINUX      =   util-linux
PKG_DB1             =   db1
PKG_HDPARM          =   hdparm
PKG_POPT            =   popt
PKG_LIBELF          =   libelf
PKG_LIBUSB          =   libusb
PKG_USBUTILS        =   usbutils
PKG_ETHTOOL         =   ethtool
PKG_PCIUTILS        =   pciutils
PKG_IRATTACH        =   irattach
PKG_WIRELESS_TOOLS  =   wireless-tools
PKG_OPROFILE        =   oprofile
PKG_LIBPCAP         =   libpcap
PKG_TCPDUMP         =   tcpdump
PKG_IPERF           =   iperf
PKG_NETPERF         =   netperf
PKG_IPROUTE         =   iproute
PKG_BOA             =   boa
PKG_TCP_WRAPPERS    =   tcp_wrappers
PKG_PORTMAP         =   portmap
PKG_RNG_TOOLS       =   rng-tools
PKG_DROPBEAR        =   dropbear
PKG_OPENSSL         =   openssl
PKG_OPENSSH         =   openssh
PKG_IPSEC_TOOLS     =   ipsec-tools
PKG_IPSECADM        =   ipsecadm
PKG_IPTABLES        =   iptables
PKG_OPENSWAN        =   openswan
PKG_TIME            =   time
PKG_CAN4LINUX       =   can4linux
PKG_I2C_TOOLS       =   i2c-tools
PKG_WATCHDOG        =   watchdog
PKG_DSPI            =   dspi
PKG_HOTPLUG         =   hotplug
PKG_WHICH           =   which
PKG_FAKEROOT        =   fakeroot
PKG_GDB             =   gdb
PKG_GDB_BDM         =   m68k-gdb-bdm
PKG_STRACE          =   strace
PKG_WGET            =   wget
PKG_UCLINUX_CKSUM   =   uclinux-cksum
PKG_VSFTPD          =   vsftpd
PKG_VSC7385_FIRMWARE_MPC8313ERDB  =  vsc7385-firmware-mpc8313erdb
PKG_HELLOWORLD      =   helloworld
PKG_HELLOWORLD_MOD  =   hello_mod
PKG_GENEXT2FS       =   genext2fs
PKG_GENROMFS        =   genromfs
PKG_U_BOOT_TOOLS    =   u-boot-tools
PKG_MTD_UTILS       =   mtd-utils
PKG_RPM             =   rpm
PKG_RSYNC           =   rsync
PKG_LTP             =   ltp
PKG_LMBENCH         =   lmbench
PKG_APPTRK          =   apptrk
PKG_PPP             =   ppp
PKG_APPTRK_PPCBIN   =   apptrk-ppcbin
PKG_APPTRK_M54X5    =   apptrk-m54x5
PKG_DAEMONIZER      =   daemonizer
PKG_UNZIP           =   unzip
PKG_PIDENTD         =   pidentd
PKG_EXPAT           =   expat
PKG_FREETYPE        =   freetype
PKG_FONTCONFIG      =   fontconfig
PKG_LIBPNG          =   libpng
PKG_XFREE86         =   XFree86
PKG_PYTHON          =   python
PKG_PKGCONFIG       =   pkgconfig
PKG_GLIB2           =   glib2
PKG_ATK             =   atk
PKG_PANGO           =   pango
PKG_ALSA_LIB        =   alsa-lib
PKG_LIBJPEG         =   libjpeg
PKG_LIBTIFF         =   libtiff
PKG_GTK2            =   gtk2
PKG_SWIG            =   swig
PKG_MICROWINDOWS    =	microwindows
PKG_QTOPIA          =   qtopia
PKG_DIRECTFB        =   DirectFB
PKG_DIRECTFB_EXAMPLES =   DirectFB-examples
PKG_LIBXML2         =   libxml2
PKG_HTTPD           =   httpd
PKG_MYSQL           =   mysql
PKG_PHP             =   php
PKG_KRB5            =   krb5
PKG_SUBVERSION      =   subversion
PKG_INTLTOOL        =   intltool
PKG_LIBIDL          =   libidl
PKG_ORBIT2          =   ORBit2
PKG_GCONF           =   GConf
PKG_XML_PARSER_PM   =   xml-parser-pm
PKG_LIBBONOBO       =   libbonobo
PKG_GNOME_MIME_DATA =   gnome-mime-data
PKG_SHARED_MIME_INFO = shared-mime-info
PKG_GNOME_VFS       = gnome-vfs
PKG_LIBGNOME        = libgnome
PKG_LIBGLADE        = libglade
PKG_LIBART_LGPL     = libart_lgpl
PKG_LIBGNOMECANVAS  = libgnomecanvas
PKG_GNOME_KEYRING   = gnome-keyring
PKG_LIBBONOBOUI     = libbonoboui
PKG_LIBGNOMEUI      = libgnomeui
PKG_READLINE        = readline
PKG_LIBSIGCPP       = libsigc++
PKG_GLIBMM          = glibmm
PKG_GTKMM           = gtkmm
PKG_LIBGNOMEMM      = libgnomemm
PKG_LIBGNOMECANVASMM = libgnomecanvasmm
PKG_LIBGLADEMM      = libglademm
PKG_GNOME_VFSMM     = gnome-vfsmm
PKG_GCONFMM         = gconfmm
PKG_LIBGNOMEUIMM    = libgnomeuimm
PKG_BOOST           = boost
PKG_HICOLOR_ICON_THEME = hicolor-icon-theme
PKG_LIBXSLT         = libxslt
PKG_GLADE2          = glade2
PKG_PYGTK2          = pygtk2
PKG_PEXPECT         = pexpect
PKG_PYSERIAL        = pyserial
PKG_PCMCIA_CS       = pcmcia-cs
PKG_LINUX_ATM       = linux-atm
PKG_LIBID3TAG       = libid3tag
PKG_LIBMAD          = libmad
PKG_MADPLAY         = madplay
PKG_PCRE            = pcre
PKG_LRZSZ           = lrzsz
PKG_UDEV            = udev
PKG_YAFFS_UTILS     = yaffs-utils
PKG_SAMBA           = samba
PKG_NAS_CONFIG      = NAS-config
PKG_MDADM           = mdadm
PKG_CLAMAV          = clamav
PKG_BONNIE_PLUS_PLUS = bonnie++
PKG_ALSA_UTILS      = alsa-utils
PKG_DHCP            = dhcp
PKG_BIND            = bind
PKG_TVOUT_TEST_MX31 = tvout-test-mx31
PKG_DTC             = dtc
PKG_BRIDGE_UTILS    = bridge-utils
PKG_CPIO            = cpio
PKG_CRACKLIB        = cracklib
PKG_CRAMFS          = cramfs
PKG_HESIOD          = hesiod
PKG_IPUTILS         = iputils
PKG_SCHEDUTILS      = schedutils
PKG_SETSERIAL       = setserial
PKG_MXC_MISC        = mxc-misc
PKG_PTPD            = ptpd
PKG_DEVMEM2         = devmem2
PKG_DISTCC          = distcc
PKG_HARDWARETEST_IMX = hardwaretest-imx
PKG_TIMEZONE        = timezone
PKG_MPC8555AMC_DSPUTILS = mpc8555amc-dsputils
PKG_SCREEN          = screen
PKG_LINUX_WLAN      = linux-wlan

# leave these as the last 2 packages in the build order
PKG_MERGE           =   merge
PKG_SYSCONFIG       =   sysconfig
@


1.3
log
@fixups from import-20070116
@
text
@@


1.2
log
@add hello_mod.spec modules example
@
text
@d11 1
d106 1
d217 1
@


1.1
log
@Initial revision
@
text
@d18 1
d20 1
d42 1
d45 1
d60 1
d78 2
d83 2
d86 1
a86 1
PKG_DROPBEAR        =   dropbear
d89 2
d94 2
a104 2
PKG_EXPAT           =   expat
PKG_FREETYPE        =   freetype
d106 1
d108 1
d116 1
d118 100
a218 2
PKG_MERGE           =   merge

@


1.1.1.1
log
@LTIB external initial import
@
text
@@


1.1.1.2
log
@Import from fsl 6sep05
@
text
@a39 1
PKG_GMP             =   gmp
a75 1
PKG_RNG_TOOLS       =   rng-tools
a79 1
PKG_OPENSWAN        =   openswan
a102 1
PKG_PPP             =   ppp
@


1.1.1.3
log
@Import from fsl 6feb06
@
text
@a17 1
PKG_SASH            =   sash
a73 1
PKG_NETPERF         =   netperf
a81 1
PKG_IPTABLES        =   iptables
a85 2
PKG_WATCHDOG        =   watchdog
PKG_DSPI            =   dspi
d95 2
a107 66
PKG_APPTRK_M54X5    =   apptrk-m54x5
PKG_DAEMONIZER      =   daemonizer
PKG_UNZIP           =   unzip
PKG_PIDENTD         =   pidentd
PKG_TMAKE           =   tmake
PKG_EXPAT           =   expat
PKG_FREETYPE        =   freetype
PKG_FONTCONFIG      =   fontconfig
PKG_LIBPNG          =   libpng
PKG_XFREE86         =   XFree86
PKG_PYTHON          =   python
PKG_PKGCONFIG       =   pkgconfig
PKG_GLIB2           =   glib2
PKG_ATK             =   atk
PKG_PANGO           =   pango
PKG_LIBJPEG         =   libjpeg
PKG_LIBTIFF         =   libtiff
PKG_GTK2            =   gtk2
PKG_SWIG            =   swig
PKG_MICROWINDOWS    =	microwindows
PKG_QTEMBEDDED      =   qt-embedded 
PKG_QTOPIA          =   qtopia 
PKG_LIBXML2         =   libxml2
PKG_HTTPD           =   httpd
PKG_MYSQL           =   mysql
PKG_PHP             =   php
PKG_KRB5            =   krb5
PKG_SUBVERSION      =   subversion
PKG_INTLTOOL        =   intltool
PKG_LIBIDL          =   libidl
PKG_ORBIT2          =   ORBit2
PKG_GCONF           =   GConf
PKG_XML_PARSER_PM   =   xml-parser-pm
PKG_LIBBONOBO       =   libbonobo
PKG_GNOME_MIME_DATA =   gnome-mime-data
PKG_SHARED_MIME_INFO = shared-mime-info
PKG_GNOME_VFS       = gnome-vfs
PKG_LIBGNOME        = libgnome
PKG_LIBGLADE        = libglade
PKG_LIBART_LGPL     = libart_lgpl
PKG_LIBGNOMECANVAS  = libgnomecanvas
PKG_GNOME_KEYRING   = gnome-keyring
PKG_LIBBONOBOUI     = libbonoboui
PKG_LIBGNOMEUI      = libgnomeui
PKG_READLINE        = readline
PKG_LIBSIGCPP       = libsigc++
PKG_GLIBMM          = glibmm
PKG_GTKMM           = gtkmm
PKG_LIBGNOMEMM      = libgnomemm
PKG_LIBGNOMECANVASMM = libgnomecanvasmm
PKG_LIBGLADEMM      = libglademm
PKG_GNOME_VFSMM     = gnome-vfsmm
PKG_GCONFMM         = gconfmm
PKG_LIBGNOMEUIMM    = libgnomeuimm
PKG_BOOST           = boost
PKG_HICOLOR_ICON_THEME = hicolor-icon-theme
PKG_LIBXSLT         = libxslt
PKG_GLADE2          = glade2
PKG_PYGTK2          = pygtk2
PKG_PEXPECT         = pexpect
PKG_PYSERIAL        = pyserial
PKG_LIBID3TAG       = libid3tag
PKG_LIBMAD          = libmad
PKG_MADPLAY         = madplay

# leave these as the last 2 packages in the build order
d110 1
@


1.1.1.4
log
@Import from fsl 14feb06
@
text
@a75 1
PKG_IPROUTE         =   iproute
@


1.1.1.5
log
@Import from fsl 13mar06
@
text
@a57 1
PKG_DEVFSD          =   devfsd
a172 1
PKG_LINUX_ATM       = linux-atm
a175 5
PKG_SAMBA           =   samba
PKG_NAS_CONFIG      =   NAS-config
PKG_MDADM           =   mdadm
PKG_CLAMAV          =   clamav
PKG_BONNIE_PLUS_PLUS        =   bonnie++
@


1.1.1.6
log
@Import from fsl 29mar06
@
text
@a43 1
PKG_DOSFSTOOLS      =   dosfstools
a82 1
PKG_OPENSSH         =   openssh
a177 2
PKG_PCRE            = pcre
PKG_LRZSZ           = lrzsz
@


1.1.1.7
log
@Import from fsl 20060406
@
text
@a19 1
PKG_SEQ             =   seq
a136 2
PKG_DIRECTFB        =   DirectFB
PKG_DIRECTFB_EXAMPLES =   DirectFB-examples
d182 5
a186 5
PKG_SAMBA           = samba
PKG_NAS_CONFIG      = NAS-config
PKG_MDADM           = mdadm
PKG_CLAMAV          = clamav
PKG_BONNIE_PLUS_PLUS = bonnie++
@


1.1.1.8
log
@Import from fsl 20060421
@
text
@a106 1
PKG_GENROMFS        =   genromfs
a130 1
PKG_ALSA_LIB        =   alsa-lib
d136 2
a137 2
PKG_QTEMBEDDED      =   qt-embedded-mxc
PKG_QTOPIA          =   qtopia-mxc
a189 3
PKG_ALSA_UTILS      = alsa-utils
PKG_DHCP            =   dhcp
PKG_BIND            =   bind
d192 1
a193 1
PKG_SYSCONFIG       =   sysconfig
@


1.1.1.9
log
@Import from fsl 20060516
@
text
@a180 1
PKG_PCMCIA_CS       = pcmcia-cs
a186 2
PKG_UDEV            = udev
PKG_YAFFS_UTILS     = yaffs-utils
a191 1
PKG_MBX_SRC         = mbx-src 
@


1.1.1.10
log
@Import from fsl 20060530
@
text
@a198 2
PKG_MXC_MISC        = mxc-misc
PKG_TVOUT_TEST_MX31 = tvout-test-mx31
@


1.1.1.11
log
@Import from fsl 20060615
@
text
@a83 1
PKG_DROPBEAR        =   dropbear
d86 1
@


1.1.1.12
log
@Import from fsl 20061124
@
text
@d121 1
d138 2
a139 1
PKG_QTOPIA          =   qtopia
d195 1
d197 3
a199 2
PKG_DHCP            = dhcp
PKG_BIND            = bind
a200 17
PKG_DTC             = dtc
PKG_BRIDGE_UTILS    = bridge-utils
PKG_CPIO            = cpio
PKG_CRACKLIB        = cracklib
PKG_CRAMFS          = cramfs
PKG_HESIOD          = hesiod
PKG_IPUTILS         = iputils
PKG_SCHEDUTILS      = schedutils
PKG_SETSERIAL       = setserial
PKG_MXC_MISC        = mxc-misc
PKG_PTPD            = ptpd
PKG_DEVMEM2         = devmem2
PKG_DISTCC          = distcc
PKG_HARDWARETEST_IMX = hardwaretest-imx
PKG_TIMEZONE        = timezone
PKG_MPC8555AMC_DSPUTILS = mpc8555amc-dsputils
PKG_SCREEN          = screen
@


1.1.1.13
log
@Import from fsl 20070116
@
text
@a10 1
PKG_BLOB            =   blob
a104 1
PKG_VSC7385_FIRMWARE_MPC8313ERDB  =  vsc7385-firmware-mpc8313erdb
a105 1
PKG_HELLOWORLD_MOD  =   hello_mod
a213 1
PKG_LINUX_WLAN      = linux-wlan
@


