diff options
| -rw-r--r-- | conf/distro/openslug-native-packages.conf | 7 | ||||
| -rw-r--r-- | conf/distro/openslug-native.conf | 6 | ||||
| -rw-r--r-- | packages/meta/openslug-native-packages.bb | 16 | ||||
| -rw-r--r-- | packages/meta/openslug-packages.bb | 60 | ||||
| -rw-r--r-- | packages/meta/ucslugc-packages.bb | 131 | ||||
| -rw-r--r-- | packages/samba/samba_3.0.14a.bb | 4 |
6 files changed, 180 insertions, 44 deletions
diff --git a/conf/distro/openslug-native-packages.conf b/conf/distro/openslug-native-packages.conf new file mode 100644 index 0000000000..d4fedda6e2 --- /dev/null +++ b/conf/distro/openslug-native-packages.conf @@ -0,0 +1,7 @@ +# automatically generated by bitbake freeze +BBFILES := "\ +${PKGDIR}/packages/vlan/*.bb \ +${PKGDIR}/packages/gzip/*.bb \ +${PKGDIR}/packages/meta/*.bb \ +${OPENSLUG_EXTRA_BBFILES}" +# I don't know of any packages we currently need to compile nativly, so this is something to test with diff --git a/conf/distro/openslug-native.conf b/conf/distro/openslug-native.conf index f946afe216..a366aa7688 100644 --- a/conf/distro/openslug-native.conf +++ b/conf/distro/openslug-native.conf @@ -9,9 +9,3 @@ ASSUME_PROVIDED = "libtool-cross libtool-native automake-native autoconf-native # Our build host is armeb, not armv5eb that the kernel reports BUILD_ARCH = armeb -# I don't know of any packages we currently need to compile nativly, so here are two examples -BBFILES = "\ -${PKGDIR}/packages/vlan/*.bb \ -${PKGDIR}/packages/gzip/*.bb \ -${OPENSLUG_EXTRA_BBFILES}" - diff --git a/packages/meta/openslug-native-packages.bb b/packages/meta/openslug-native-packages.bb new file mode 100644 index 0000000000..d856bbfe87 --- /dev/null +++ b/packages/meta/openslug-native-packages.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Packages that are to be compiled nativly for the OpenSlug firmware" +LICENSE = MIT +PR = "r1" + +INHIBIT_DEFAULT_DEPS = "1" +ALLOW_EMPTY = 1 +PACKAGES = "${PN}" + +OPENSLUG_NATIVE_PACKAGES = "\ + " + +BROKEN_PACKAGES = "\ + " + +DEPENDS = '${OPENSLUG_NATIVE_PACKAGES} \ + package-index' diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 7e248bc60e..1e53d342d2 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -34,24 +34,20 @@ OPENSLUG_DEVELOPMENT = "\ openssh \ patch \ pciutils \ + perl \ pkgconfig \ quilt \ sed \ strace \ - util-linux \ - " - -# These packages only build on TARGET_OS=linux, not -# TARGET_OS=linux-uclibc -OPENSLUG_DEVELOPMENT_append_linux = "\ - perl \ tar \ + util-linux \ " OPENSLUG_PACKAGES = "\ atftp \ bash \ + bind \ bluez-utils-nodbus \ bridge-utils \ bwmon \ @@ -60,6 +56,7 @@ OPENSLUG_PACKAGES = "\ cron \ cvs\ cyrus-imapd \ + db4 \ dnsmasq \ expat \ ftpd-topfield \ @@ -67,61 +64,52 @@ OPENSLUG_PACKAGES = "\ gphoto2 \ gtk-doc \ less \ + libpam \ libusb \ libxml2 \ + man man-pages \ + mgetty \ miau \ microcom \ + mpd \ mt-daapd \ mutt \ mysql \ nail \ nano \ ncftp \ + nfs-utils \ + ntp \ obexftp openobex openobex-apps ircp \ + openldap \ + openntpd \ openssh \ openvpn \ pcre \ + php \ + postfix \ ppp \ procps \ + psmisc \ puppy \ pwc \ + python \ + reiserfsprogs reiser4progs \ rsync \ + samba \ + sane-backends \ + screen \ setpwc \ + strace \ + streamripper \ sudo \ sysfsutils \ thttpd \ - db4 \ - openldap \ - openntpd \ - ntp \ - reiserfsprogs reiser4progs \ - python \ - samba \ - sane-backends \ - strace \ thttpd \ + timezones \ + unionfs-modules unionfs-utils \ vlan \ wget \ - unionfs-modules unionfs-utils \ - " - -# These packages only build on TARGET_OS=linux, not -# TARGET_OS=linux-uclibc (Note that for several this -# is because of use of single precision FP interfaces -# such as sinf.) -OPENSLUG_PACKAGES_append_linux = "\ - bind \ - man man-pages \ - mgetty \ - mpd \ - nfs-utils \ - libpam \ - php \ - postfix \ - psmisc \ - screen \ - streamripper \ - timezones \ xinetd \ yp-tools ypbind ypserv \ " diff --git a/packages/meta/ucslugc-packages.bb b/packages/meta/ucslugc-packages.bb new file mode 100644 index 0000000000..afd029bc30 --- /dev/null +++ b/packages/meta/ucslugc-packages.bb @@ -0,0 +1,131 @@ +# Meta package containing all the packages which build for UcSlugC +# +# All packages in here must build with the ucslugc.conf distro, they +# do not necessarily work. +DESCRIPTION = "Packages that are compatible with the UcSlugC firmware" +LICENSE = MIT +PR = "r0" + +INHIBIT_DEFAULT_DEPS = "1" +ALLOW_EMPTY = 1 +PACKAGES = "${PN}" + +# The list of packages to build for the ucslugc DISTRO. +# KEEP IN ALPHABETICAL ORDER +UCSLUGC_PACKAGES = "\ + atftp \ + autoconf \ + automake \ + bash \ + bash \ + binutils \ + bison \ + bluez-utils-nodbus \ + bridge-utils \ + bwmon \ + bzip2 \ + ccxstream \ + coreutils \ + coreutils \ + cron \ + cvs \ + cvs\ + cyrus-imapd \ + db4 \ + diffutils \ + dnsmasq \ + expat \ + findutils \ + flex \ + ftpd-topfield \ + gawk \ + gcc \ + gdb \ + glib-2.0 \ + gnu-config \ + gphoto2 \ + grep \ + gtk-doc \ + gzip \ + ipkg-utils \ + less \ + libtool \ + libusb \ + libxml2 \ + lsof \ + m4 \ + make \ + miau \ + microcom \ + monotone-4 monotone-5 \ + mt-daapd \ + mutt \ + mysql \ + nail \ + nano \ + ncftp \ + ncurses \ + ntp \ + obexftp openobex openobex-apps ircp \ + openldap \ + openntpd \ + openssh \ + openssh \ + openvpn \ + patch \ + pciutils \ + pcre \ + pkgconfig \ + ppp \ + procps \ + puppy \ + pwc \ + python \ + quilt \ + reiserfsprogs reiser4progs \ + rsync \ + samba \ + sane-backends \ + sed \ + setpwc \ + strace \ + strace \ + sudo \ + sysfsutils \ + thttpd \ + thttpd \ + unionfs-modules unionfs-utils \ + util-linux \ + vlan \ + wget \ + " + +# These packages only build on TARGET_OS=linux, but not TARGET_OS=linux-uclibc. +# KEEP IN ALPHABETICAL ORDER +UCSLUGC_BROKEN_PACKAGES = "\ + bind \ + libpam \ + man man-pages \ + mgetty \ + mpd \ + perl \ + php \ + postfix \ + psmisc \ + screen \ + streamripper \ + tar \ + timezones \ + xinetd \ + " + +# These packages will never build because uclibc lacks (and always will lack) +# appropriate support. This define is for documentation of this fact! +UCSLUGC_UNSUPPORTABLE_PACKAGES = "\ + nfs-utils \ + yp-tools ypbind ypserv \ + " + +# The package-index at the end causes regeneration of the Packages.gz and +# other control files. +DEPENDS = "openslug-image ${UCSLUGC_PACKAGES} package-index" diff --git a/packages/samba/samba_3.0.14a.bb b/packages/samba/samba_3.0.14a.bb index 3c660ed5c1..c008fe27f5 100644 --- a/packages/samba/samba_3.0.14a.bb +++ b/packages/samba/samba_3.0.14a.bb @@ -1,4 +1,4 @@ -PR = "r11" +PR = "r12" SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ file://configure.patch;patch=1 \ @@ -17,7 +17,7 @@ INITSCRIPT_NAME = "samba" # level, later levels put the shutdown later too - see the links # in rc6.d, the shutdown must precede network shutdown). INITSCRIPT_PARAMS = "defaults" -#CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf" +CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf" # The file system settings --foodir=dirfoo and overridden unconditionally # in the samba config by --with-foodir=dirfoo - even if the --with is not |