diff options
Diffstat (limited to 'packages')
57 files changed, 2545 insertions, 288 deletions
diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb index ed14234d21..875f6c554b 100644 --- a/packages/altboot/altboot_0.0.0.bb +++ b/packages/altboot/altboot_0.0.0.bb @@ -20,14 +20,14 @@ RDEPENDS_${PN} = "${PN}-conf" ###################################################################################### -PR = "r48" +PR = "r49" ###################################################################################### PACKAGES = "${PN}-conf ${PN}-doc ${PN}" -PACKAGE_ARCH_${PN} = all -PACKAGE_ARCH_${PN}-doc = all +PACKAGE_ARCH_${PN} = "all" +PACKAGE_ARCH_${PN}-doc = "all" PACKAGE_ARCH_${PN}-conf = "${MACHINE}" SRC_URI = "file://altboot-menu \ diff --git a/packages/altboot/altboot_1.0.8.bb b/packages/altboot/altboot_1.0.8.bb index 58b6a9052a..4c214796d7 100644 --- a/packages/altboot/altboot_1.0.8.bb +++ b/packages/altboot/altboot_1.0.8.bb @@ -22,14 +22,14 @@ RDEPENDS_${PN}-conf = "${PN}" ###################################################################################### -PR = "r0" +PR = "r1" ###################################################################################### PACKAGES = "${PN}-conf ${PN}-doc ${PN}" -PACKAGE_ARCH_${PN} = all -PACKAGE_ARCH_${PN}-doc = all +PACKAGE_ARCH_${PN} = "all" +PACKAGE_ARCH_${PN}-doc = "all" PACKAGE_ARCH_${PN}-conf = "${MACHINE}" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}" diff --git a/packages/altboot/altboot_1.1.0-wip.bb b/packages/altboot/altboot_1.1.0-wip.bb index 84acba9f32..df9ac5abfb 100644 --- a/packages/altboot/altboot_1.1.0-wip.bb +++ b/packages/altboot/altboot_1.1.0-wip.bb @@ -24,14 +24,14 @@ RDEPENDS_${PN}-conf = "${PN}" ###################################################################################### WIP_DATE = "20061108" -PR = "${WIP_DATE}-r0" +PR = "${WIP_DATE}-r1" ###################################################################################### PACKAGES = "${PN}-conf ${PN}-doc ${PN}" -PACKAGE_ARCH_${PN} = all -PACKAGE_ARCH_${PN}-doc = all +PACKAGE_ARCH_${PN} = "all" +PACKAGE_ARCH_${PN}-doc = "all" PACKAGE_ARCH_${PN}-conf = "${MACHINE}" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}" diff --git a/packages/angstrom/angstrom-bootmanager-image.bb b/packages/angstrom/angstrom-bootmanager-image.bb index 8c2fd9cc09..9a0bf12a08 100644 --- a/packages/angstrom/angstrom-bootmanager-image.bb +++ b/packages/angstrom/angstrom-bootmanager-image.bb @@ -1,5 +1,5 @@ #Angstrom bootmanager image -LICENSE = MIT +LICENSE = "MIT" PR = "r0" DEPENDS = "task-angstrom" diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb index eb01bd53ec..838ad249c0 100644 --- a/packages/angstrom/angstrom-bootstrap-image.bb +++ b/packages/angstrom/angstrom-bootstrap-image.bb @@ -1,5 +1,5 @@ #Angstrom bootstrap image -LICENSE = MIT +LICENSE = "MIT" PR = "r2" DEPENDS = "task-base" diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-gpe-image.bb index ab632f91a9..c0678431b2 100644 --- a/packages/angstrom/angstrom-gpe-image.bb +++ b/packages/angstrom/angstrom-gpe-image.bb @@ -1,5 +1,5 @@ #Angstrom GPE image -LICENSE = MIT +LICENSE = "MIT" PR = "r4" PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" diff --git a/packages/angstrom/angstrom-version.bb b/packages/angstrom/angstrom-version.bb index 763fbf22dc..e6545117b8 100644 --- a/packages/angstrom/angstrom-version.bb +++ b/packages/angstrom/angstrom-version.bb @@ -1,4 +1,4 @@ -PV = ${DISTRO_VERSION} +PV = "${DISTRO_VERSION}" PACKAGES = "${PN}" diff --git a/packages/apex/apex_1.4.5.bb b/packages/apex/apex_1.4.7.bb index 35d772aa0b..0a7d5520fc 100644 --- a/packages/apex/apex_1.4.5.bb +++ b/packages/apex/apex_1.4.7.bb @@ -23,18 +23,19 @@ CMDLINE="console=ttyS0,115200 rootfstype=jffs2 root=/dev/mtdblock4 rw init=/linu # defconfig to .config do_configure() { rm -f ${S}/.config - echo "CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"" >>'${S}/.config' if test '${ARCH_BYTE_SEX}' = be then - echo 'CONFIG_USER_BIGENDIAN=y' >>'${S}/.config' - echo 'CONFIG_BIGENDIAN=y' >>'${S}/.config' + sed -e 's/.*CONFIG_USER_BIGENDIAN.*/CONFIG_USER_BIGENDIAN=y/' \ + -e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \ + -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"|' \ + ${WORKDIR}/defconfig > ${S}/.config else - echo 'CONFIG_USER_LITTLEENDIAN=y' >>'${S}/.config' - echo 'CONFIG_LITTLEENDIAN=y' >>'${S}/.config' + sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \ + -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \ + -e 's/.*CONFIG_ENV_REGION_KERNEL_SWAP.*/CONFIG_ENV_REGION_KERNEL_SWAP=y/' \ + -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"|' \ + ${WORKDIR}/defconfig > ${S}/.config fi - sed -e '/CONFIG_USER_BIGENDIAN/d' -e '/CONFIG_USER_LITTLEENDIAN/d' \ - -e '/CONFIG_ENV_DEFAULT_CMDLINE/d' \ - ${S}/src/mach-ixp42x/debian-nslu2-arm_config >>${S}/.config oe_runmake oldconfig } diff --git a/packages/apex/nslu2/defconfig b/packages/apex/nslu2/defconfig index 113c69a68e..2d2784457a 100644 --- a/packages/apex/nslu2/defconfig +++ b/packages/apex/nslu2/defconfig @@ -48,7 +48,7 @@ CONFIG_MACH_NSLU2=y # CONFIG_MACH_AVILA2347 is not set # CONFIG_USER_DEFAULTENDIAN is not set # CONFIG_USER_BIGENDIAN is not set -CONFIG_USER_LITTLEENDIAN=y +# CONFIG_USER_LITTLEENDIAN is not set # # Platform Setup @@ -89,8 +89,7 @@ CONFIG_CMD_XRECEIVE=y # # CONFIG_DRIVER_FAT is not set # CONFIG_DRIVER_EXT2 is not set -CONFIG_DRIVER_JFFS2=y -CONFIG_DRIVER_JFFS2_BLOCKDEVICE="nor:0x180000+0x660000" +# CONFIG_DRIVER_JFFS2 is not set CONFIG_DRIVER_FIS=y CONFIG_DRIVER_FIS_BLOCKDEVICE="nor:0x7e0000+4k" CONFIG_DRIVER_NOR_CFI=y @@ -102,21 +101,25 @@ CONFIG_USES_PATHNAME_PARSER=y # Environment # CONFIG_ENV=y +# CONFIG_NO_BOOTSTRAP is not set CONFIG_NOR_BOOT=y # CONFIG_NAND_BOOT is not set +# CONFIG_COMPANION_EVT1_BOOT is not set +# CONFIG_COMPANION_EVT2_BOOT is not set CONFIG_AUTOBOOT=y CONFIG_AUTOBOOT_DELAY=10 CONFIG_ENV_MUTABLE=y CONFIG_ENV_LINK=y CONFIG_ENV_REGION="nor:0x7fc000+15k" +CONFIG_ENV_CHECK_LEN=1024 CONFIG_ENV_STARTUP_KERNEL_COPY=y CONFIG_ENV_REGION_KERNEL="fis://kernel" -CONFIG_ENV_REGION_KERNEL_SWAP=y +# CONFIG_ENV_REGION_KERNEL_SWAP is not set # CONFIG_ENV_STARTUP_RAMDISK_COPY is not set CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y CONFIG_ENV_DEFAULT_CMDLINE="console=ttyS0,115200 rootfstype=jffs2 root=/dev/mtdblock4 rw init=/linuxrc noirqdebug" # CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set CONFIG_USES_NOR_BOOTFLASH=y -CONFIG_LITTLEENDIAN=y +# CONFIG_LITTLEENDIAN is not set CONFIG_CLEAR_STACKS=y CONFIG_ALIASES=y diff --git a/packages/busybox/slingbox-1.2.2/df_rootfs.patch b/packages/busybox/slingbox-1.2.2/df_rootfs.patch new file mode 100644 index 0000000000..fa7e61af15 --- /dev/null +++ b/packages/busybox/slingbox-1.2.2/df_rootfs.patch @@ -0,0 +1,34 @@ +--- busybox-1.2.2/coreutils/df.c.orig 2006-11-11 13:25:00.000000000 -0600 ++++ busybox-1.2.2/coreutils/df.c 2006-11-11 13:23:15.000000000 -0600 +@@ -47,6 +47,7 @@ + struct statfs s; + static const char hdr_1k[] = "1k-blocks"; /* default display is kilobytes */ + const char *disp_units_hdr = hdr_1k; ++ int root_done = 0; + + #ifdef CONFIG_FEATURE_HUMAN_READABLE + bb_opt_complementally = "h-km:k-hm:m-hk"; +@@ -112,16 +113,19 @@ + ) / (blocks_used + s.f_bavail); + } + +- if (strcmp(device, "rootfs") == 0) { +- continue; +- } else if (strcmp(device, "/dev/root") == 0) { ++ if (strcmp(device, "/dev/root") == 0 || strcmp(device, "rootfs") == 0) { + /* Adjusts device to be the real root device, + * or leaves device alone if it can't find it */ +- if ((device = find_block_device("/")) == NULL) { ++ if ((device = find_block_device(mount_point)) == NULL) { + goto SET_ERROR; + } + } + ++ if (strcmp(mount_point, "/") == 0) { ++ if (root_done) continue; ++ root_done = 1; ++ } ++ + #ifdef CONFIG_FEATURE_HUMAN_READABLE + bb_printf("%-20s %9s ", device, + make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr)); diff --git a/packages/busybox/slingbox_1.00.bb b/packages/busybox/slingbox_1.00.bb index 8e11a09e6c..2d2d88317c 100644 --- a/packages/busybox/slingbox_1.00.bb +++ b/packages/busybox/slingbox_1.00.bb @@ -4,7 +4,8 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r9" +PR = "r10" +COMPATIBLE_MACHINE = "nslu2" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://defconfig \ @@ -13,12 +14,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ S = "${WORKDIR}/busybox-${PV}" -python () { - # Don't build slingbox unless we're targeting an nslu2 - if bb.data.getVar("MACHINE", d, 1) != "nslu2": - raise bb.parse.SkipPackage("switchbox only builds for the Linksys NSLU2") -} - export EXTRA_CFLAGS = "${CFLAGS}" EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}" diff --git a/packages/busybox/slingbox_1.1.3.bb b/packages/busybox/slingbox_1.1.3.bb index 8cd85ce540..2a86748f28 100644 --- a/packages/busybox/slingbox_1.1.3.bb +++ b/packages/busybox/slingbox_1.1.3.bb @@ -4,7 +4,8 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r2" +PR = "r3" +COMPATIBLE_MACHINE = "nslu2" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://defconfig \ @@ -15,12 +16,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ S = "${WORKDIR}/busybox-${PV}" -python () { - # Don't build slingbox unless we're targeting an nslu2 - if bb.data.getVar("MACHINE", d, 1) != "nslu2": - raise bb.parse.SkipPackage("slingbox only builds for the Linksys NSLU2") -} - export EXTRA_CFLAGS = "${CFLAGS}" EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}" diff --git a/packages/busybox/slingbox_1.2.2.bb b/packages/busybox/slingbox_1.2.2.bb index 2468680ba1..523e2199f5 100644 --- a/packages/busybox/slingbox_1.2.2.bb +++ b/packages/busybox/slingbox_1.2.2.bb @@ -4,24 +4,20 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r2" +PR = "r4" +COMPATIBLE_MACHINE = "nslu2" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://defconfig \ file://wget-long-options.patch;patch=1 \ file://lazy_umount.patch;patch=1 \ + file://df_rootfs.patch;patch=1 \ file://slingbox_name.patch;patch=1 \ file://halt.patch;patch=1" \ file://slingbox.patch;patch=1" S = "${WORKDIR}/busybox-${PV}" -python () { - # Don't build slingbox unless we're targeting an nslu2 - if bb.data.getVar("MACHINE", d, 1) != "nslu2": - raise bb.parse.SkipPackage("slingbox only builds for the Linksys NSLU2") -} - export EXTRA_CFLAGS = "${CFLAGS}" EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}" diff --git a/packages/eds/eds-dbus_svn.bb b/packages/eds/eds-dbus_svn.bb index d5f32eb7dd..e56b41e595 100644 --- a/packages/eds/eds-dbus_svn.bb +++ b/packages/eds/eds-dbus_svn.bb @@ -18,7 +18,7 @@ S = "${WORKDIR}/trunk" inherit autotools pkgconfig # -ldb needs this on some platforms -export LDFLAGS += "-lpthread" +LDFLAGS += "-lpthread" EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy --without-soup --with-libdb=${STAGING_DIR}/${HOST_SYS} --disable-smime --disable-nss --disable-nntp --disable-gtk-doc" diff --git a/packages/faad2/faad2-2.0/faad2-gcc-fix.patch b/packages/faad2/faad2-2.0/faad2-gcc-fix.patch new file mode 100644 index 0000000000..943b89a53f --- /dev/null +++ b/packages/faad2/faad2-2.0/faad2-gcc-fix.patch @@ -0,0 +1,11 @@ +--- /tmp/mp4ff.c 2006-11-11 21:25:07.000000000 +0100 ++++ faad2/common/mp4ff/mp4ff.c 2006-11-11 21:25:20.348554000 +0100 +@@ -87,7 +87,7 @@ + if (ff) free(ff);
+ }
+
+-static void mp4ff_track_add(mp4ff_t *f)
++void mp4ff_track_add(mp4ff_t *f)
+ {
+ f->total_tracks++;
+
diff --git a/packages/faad2/faad2_2.0.bb b/packages/faad2/faad2_2.0.bb index 18df582a4e..a856a1e45f 100644 --- a/packages/faad2/faad2_2.0.bb +++ b/packages/faad2/faad2_2.0.bb @@ -4,12 +4,13 @@ SECTION = "libs" LICENSE = "LGPL" PRIORITY = "optional" DEPENDS = "" -PR="r1" +PR="r2" inherit autotools SRC_URI = "${SOURCEFORGE_MIRROR}/faac/${PN}-${PV}.zip \ - file://Makefile.am" + file://faad2-gcc-fix.patch;patch=1 \ + file://Makefile.am" S="${WORKDIR}/${PN}" @@ -17,7 +18,7 @@ do_configure_prepend() { mv ${WORKDIR}/Makefile.am ${S}/ } -PACKAGES = "${PN} libfaad libfaad-dev libmp4ff libmp4ff-dev" +PACKAGES =+ "libfaad libfaad-dev libmp4ff libmp4ff-dev" FILES_${PN} = "${bindir}/faad" diff --git a/packages/fuse/gmailfs_0.6.bb b/packages/fuse/gmailfs_0.6.bb deleted file mode 100644 index 8c659441b3..0000000000 --- a/packages/fuse/gmailfs_0.6.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "GmailFS provides a mountable Linux filesystem which uses your Gmail account as its storage medium." -HOMEPAGE = "http://richard.jones.name/google-hacks/gmail-filesystem/gmail-filesystem.html" -LICENSE = "GPL" - -DEPENDS = "fuse libgmail python-fuse" -RDEPENDS = "fuse libgmail python-fuse python-unixadmin python-lang python-textutils python-core" - -SRC_URI = "http://richard.jones.name/google-hacks/gmail-filesystem/gmailfs-0.6.tar.gz" - - -do_install() { -install -d ${D}${datadir}/gmailfs -install -d ${D}${bindir} -install -d ${D}${sysconfdir} - -install -m 755 ${S}/gmailfs.py ${D}${datadir}/gmailfs/ -install -m 755 ${S}/mount.gmailfs ${D}${bindir} -install -m 644 ${S}/*.conf ${D}${sysconfdir} - -} - diff --git a/packages/gnome/gnome-doc-utils_0.7.1.bb b/packages/gnome/gnome-doc-utils_0.7.1.bb index 66d34f09be..69353ee88e 100644 --- a/packages/gnome/gnome-doc-utils_0.7.1.bb +++ b/packages/gnome/gnome-doc-utils_0.7.1.bb @@ -7,6 +7,4 @@ FILES_${PN} += "${datadir}/xml*" do_stage() { autotools_stage_all - } - - +} diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb index 7073105e24..9ef1e6ee88 100644 --- a/packages/images/slugos-image.bb +++ b/packages/images/slugos-image.bb @@ -6,11 +6,14 @@ DESCRIPTION = "Generic SlugOS image" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r36" +PR = "r37" + +COMPATIBLE_MACHINE = "nslu2" # SLUGOS_IMAGENAME defines the name of the image to be build, if it # is not set this package will be skipped! IMAGE_BASENAME = "${SLUGOS_IMAGENAME}" +IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DISTRO_VERSION}" IMAGE_FSTYPES = "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad --${SLUGOS_IMAGESEX} --eraseblock=0x20000 -D ${SLUGOS_DEVICE_TABLE}" IMAGE_LINGUAS = "" @@ -113,26 +116,29 @@ python () { # LinkSys have made "EraseAll" available, however, (this does overwrite RedBoot) # it is a bad idea to produce flash images without a valid RedBoot - that allows # an innocent user upgrade attempt to instantly brick the NSLU2. -PACK_IMAGE += "${@['', 'nslu2_pack_image;'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'yes']}" -PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'yes']}" +PACK_IMAGE += "${@['', 'nslu2_pack_image;'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'nslu2']}" +PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware apex ixp4xx-npe'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'nslu2']}" NSLU2_SLUGIMAGE_ARGS ?= "" nslu2_pack_image() { - if test '${SLUGOS_FLASH_IMAGE}' = yes + if test '${SLUGOS_FLASH_IMAGE}' = nslu2 then install -d ${DEPLOY_DIR_IMAGE}/slug install -m 0644 ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \ ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ ${DEPLOY_DIR_IMAGE}/slug/ + install -m 0644 ${STAGING_LOADER_DIR}/apex.bin ${DEPLOY_DIR_IMAGE}/slug/ install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-nslu2${ARCH_BYTE_SEX} \ ${DEPLOY_DIR_IMAGE}/slug/vmlinuz install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ ${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2 + install -m 0644 ${STAGING_FIRMWARE_DIR}/NPE-B ${DEPLOY_DIR_IMAGE}/slug/ cd ${DEPLOY_DIR_IMAGE}/slug - slugimage -p -b RedBoot -s SysConf -r Ramdisk:1,Flashdisk:flashdisk.jffs2 -t \ - Trailer -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flashdisk.img \ + slugimage -p -b RedBoot -s SysConf -L apex.bin -k vmlinuz \ + -r Flashdisk:flashdisk.jffs2 -m NPE-B -t Trailer \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flashdisk.img \ ${NSLU2_SLUGIMAGE_ARGS} rm -rf ${DEPLOY_DIR_IMAGE}/slug fi diff --git a/packages/images/slugos-imagename.bb b/packages/images/slugos-imagename.bb index 01cca8a0c3..61629d44af 100644 --- a/packages/images/slugos-imagename.bb +++ b/packages/images/slugos-imagename.bb @@ -9,6 +9,7 @@ PACKAGES = "" INHIBIT_DEFAULT_DEPS = "1" SLUGOS_IMAGENAME ?= "slugos" +COMPATIBLE_MACHINE = "nslu2" do_fetch() { } diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb index d585414f1f..3fa3607e83 100644 --- a/packages/images/unslung-image.bb +++ b/packages/images/unslung-image.bb @@ -1,7 +1,9 @@ LICENSE = MIT -PR = "r23" +PR = "r25" +COMPATIBLE_MACHINE = "nslu2" IMAGE_BASENAME = "unslung" +IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DISTRO_VERSION}" IMAGE_LINGUAS = "" USE_DEVFS = "1" @@ -118,10 +120,3 @@ unslung_clean_image () { # #### End of Hack! } - -python () { - # Don't build unslung images unless we're targeting an nslu2 - mach = bb.data.getVar("MACHINE", d, 1) - if mach != 'nslu2': - raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2") -} diff --git a/packages/initscripts/initscripts-1.0/checkroot.sh b/packages/initscripts/initscripts-1.0/checkroot.sh index e84e000f53..df3035371b 100755 --- a/packages/initscripts/initscripts-1.0/checkroot.sh +++ b/packages/initscripts/initscripts-1.0/checkroot.sh @@ -150,6 +150,12 @@ else # if test "$?" -gt 1 then + + # Since this script is run very early in the boot-process, it should be safe to assume that the + # output is printed to VT1. However, some distributions use a bootsplash to hide the "ugly" boot + # messages and having the bootsplash "hang" due to a waiting fsck prompt is less than ideal + chvt 1 + # Surprise! Re-directing from a HERE document (as in # "cat << EOF") won't work, because the root is read-only. echo diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 3c937856ae..73c02e5ec5 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -5,7 +5,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r80" +PR = "r81" SRC_URI = "file://halt \ file://ramdisk \ diff --git a/packages/ipatience/.mtn2git_empty b/packages/ipatience/.mtn2 |