diff options
Diffstat (limited to 'packages/images')
| -rw-r--r-- | packages/images/essential-machine-image.bb | 2 | ||||
| -rw-r--r-- | packages/images/nylon-image-base.bb | 4 | ||||
| -rw-r--r-- | packages/images/nylon-image-mini.bb | 4 | ||||
| -rw-r--r-- | packages/images/nylon-image-standard.bb | 2 | ||||
| -rw-r--r-- | packages/images/openprotium-image.bb | 2 | ||||
| -rw-r--r-- | packages/images/opie-image.bb | 12 | ||||
| -rw-r--r-- | packages/images/unslung-image.bb | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/packages/images/essential-machine-image.bb b/packages/images/essential-machine-image.bb index 04f74aacf5..38a8d6c237 100644 --- a/packages/images/essential-machine-image.bb +++ b/packages/images/essential-machine-image.bb @@ -28,7 +28,7 @@ MACHINE_TASKS_akita = "task-essential-to-boot \ task-essential-usbhost task-essential-usbclient \ task-essential-sound task-essential-irda \ task-essential-sd" - + ###################################################################################### export IMAGE_BASENAME = "essential-image" diff --git a/packages/images/nylon-image-base.bb b/packages/images/nylon-image-base.bb index c87e669532..267233445c 100644 --- a/packages/images/nylon-image-base.bb +++ b/packages/images/nylon-image-base.bb @@ -1,4 +1,4 @@ -inherit image_ipk +inherit image_ipk inherit nylon-image LICENSE = "MIT" @@ -21,7 +21,7 @@ RDEPENDS_append_mtx-2 = " modutils modutils-initscripts modutils-depmod modutils ## kernel 2.6 ## RDEPENDS_append_mtx-3 = " module-init-tools udev" -export IPKG_INSTALL = "${RDEPENDS}" +export IPKG_INSTALL = "${RDEPENDS}" IMAGE_LINGUAS = "" diff --git a/packages/images/nylon-image-mini.bb b/packages/images/nylon-image-mini.bb index e3ac80720d..b1f55917a6 100644 --- a/packages/images/nylon-image-mini.bb +++ b/packages/images/nylon-image-mini.bb @@ -1,5 +1,5 @@ export IMAGE_BASENAME = "nylon-mini" - + NYLON_BASE = "base-files base-passwd busybox \ dropbear \ miniinit \ @@ -11,7 +11,7 @@ NYLON_BASE = "base-files base-passwd busybox \ RDEPENDS = "kernel \ ${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}" -export IPKG_INSTALL = "${RDEPENDS}" +export IPKG_INSTALL = "${RDEPENDS}" IMAGE_LINGUAS = "" diff --git a/packages/images/nylon-image-standard.bb b/packages/images/nylon-image-standard.bb index 4bd7b2b99e..29e29cd1eb 100644 --- a/packages/images/nylon-image-standard.bb +++ b/packages/images/nylon-image-standard.bb @@ -23,6 +23,6 @@ NYLON_STANDARD = "\ DEPENDS += "hostap-modules ntp \ ${NYLON_STANDARD}" - + RDEPENDS += "hostap-modules-pci ntpdate nano elvis-tiny \ ${NYLON_STANDARD}" diff --git a/packages/images/openprotium-image.bb b/packages/images/openprotium-image.bb index 5efb401386..55477096d8 100644 --- a/packages/images/openprotium-image.bb +++ b/packages/images/openprotium-image.bb @@ -18,7 +18,7 @@ USE_DEVFS = "1" # dev entries!) SLUGOS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}" -# IMAGE_PREPROCESS_COMMAND is run before making the image. +# IMAGE_PREPROCESS_COMMAND is run before making the image. # We use this to do a few things: # . remove the uImage, which is in a separate part of the flash already. # . adjust the default run level (sysvinit is 5 by default, we like 3) diff --git a/packages/images/opie-image.bb b/packages/images/opie-image.bb index e22200abc5..172e4111aa 100644 --- a/packages/images/opie-image.bb +++ b/packages/images/opie-image.bb @@ -30,11 +30,11 @@ merge_feeds() { echo "[${IMAGE_ROOTFS}/etc/ipkg.conf] is missing!" exit 1 fi - + # comment out existing feed-sources inserted by ipkg-collateral cat ${IMAGE_ROOTFS}/etc/ipkg.conf | sed "s/^src\ /#src\ /" > ${IMAGE_ROOTFS}/etc/ipkg.conf_ rm ${IMAGE_ROOTFS}/etc/ipkg.conf && mv ${IMAGE_ROOTFS}/etc/ipkg.conf_ ${IMAGE_ROOTFS}/etc/ipkg.conf - + # extract, then delete destinations cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf.dest cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep -v "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf_ @@ -46,19 +46,19 @@ merge_feeds() { # strip leading and trailing spaces/tabs, then split into name and uri line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`" feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`" - feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`" + feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`" # insert new feed-sources echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg.conf done - + # remove temporary files and rebuild ipkg.conf echo "" >> ${IMAGE_ROOTFS}/etc/ipkg.conf cat ${IMAGE_ROOTFS}/etc/ipkg.conf.dest >> ${IMAGE_ROOTFS}/etc/ipkg.conf rm ${IMAGE_ROOTFS}/etc/ipkg.conf.dest - + # remove -feed.conf files which are no longer needed - cd ${IMAGE_ROOTFS}/etc/ipkg/ && rm -- *-feed.conf + cd ${IMAGE_ROOTFS}/etc/ipkg/ && rm -- *-feed.conf fi } diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb index ce946e7677..58f61b10d5 100644 --- a/packages/images/unslung-image.bb +++ b/packages/images/unslung-image.bb @@ -27,7 +27,7 @@ IPKG_INSTALL = "kernel update-modules unslung-rootfs \ ${UNSLUNG_EXTRA_INSTALL}" IMAGE_PREPROCESS_COMMAND += "unslung_clean_image; " - + inherit image_ipk # Note that anything in this function must be repeatable without having to rebuild the rootfs |