Browse Source

Split swupdate-image with a common part

This is in preparation to add further images.

Signed-off-by: Stefano Babic <sbabic@denx.de>
Stefano Babic 7 years ago
parent
commit
0037316bf3
2 changed files with 36 additions and 35 deletions
  1. 1 35
      recipes-extended/images/swupdate-image.bb
  2. 35 0
      recipes-extended/images/swupdate-image.inc

+ 1 - 35
recipes-extended/images/swupdate-image.bb

@@ -1,42 +1,8 @@
 SUMMARY = "Root filesystem for swupdate as rescue system"
 DESCRIPTION = "Root FS to start swupdate in rescue mode	\
 		"
-
-IMAGE_INSTALL = "base-files \
-		base-passwd \
-		busybox \
-		mtd-utils \
-		mtd-utils-ubifs \
-		libconfig \
-		swupdate \
-		swupdate-www \
-                ${@bb.utils.contains('SWUPDATE_INIT', 'tiny', 'initscripts-swupdate', 'initscripts sysvinit', d)} \
-		util-linux-sfdisk \
-		 "
-
-USE_DEVFS = "1"
-
-# This variable is triggered to check if sysvinit must be overwritten by a single rcS
-export SYSVINIT = "no"
-
 LICENSE = "MIT"
 
-IMAGE_FSTYPES = "ext4.gz.u-boot"
+require swupdate-image.inc
 
 IMAGE_ROOTFS_SIZE = "8192"
-
-inherit image
-
-IMAGE_LINGUAS = " "
-
-fix_inittab_swupdate () {
-	sed -e 's/1\:2345.*/1\:2345:respawn:\/bin\/sh/' \
-		"${IMAGE_ROOTFS}${sysconfdir}/inittab" | \
-		sed -e 's/^z6/#&/' | \
-		 sed -e 's/.*getty.*//' \
-		> "${IMAGE_ROOTFS}${sysconfdir}/inittab.swupdate"
-	rm ${IMAGE_ROOTFS}${sysconfdir}/inittab
-	mv ${IMAGE_ROOTFS}${sysconfdir}/inittab.swupdate ${IMAGE_ROOTFS}${sysconfdir}/inittab
-}
-
-ROOTFS_POSTPROCESS_COMMAND += "${@bb.utils.contains('SWUPDATE_INIT', 'tiny', 'fix_inittab_swupdate', '',  d)}"

+ 35 - 0
recipes-extended/images/swupdate-image.inc

@@ -0,0 +1,35 @@
+
+USE_DEVFS = "1"
+
+# This variable is triggered to check if sysvinit must be overwritten by a single rcS
+export SYSVINIT = "no"
+
+IMAGE_INSTALL = "base-files \
+		base-passwd \
+		busybox \
+		mtd-utils \
+		mtd-utils-ubifs \
+		libconfig \
+		swupdate \
+		swupdate-www \
+                ${@bb.utils.contains('SWUPDATE_INIT', 'tiny', 'initscripts-swupdate', 'initscripts sysvinit', d)} \
+		util-linux-sfdisk \
+		 "
+
+IMAGE_FSTYPES = "ext4.gz.u-boot"
+
+inherit image
+
+IMAGE_LINGUAS = " "
+
+fix_inittab_swupdate () {
+	sed -e 's/1\:2345.*/1\:2345:respawn:\/bin\/sh/' \
+		"${IMAGE_ROOTFS}${sysconfdir}/inittab" | \
+		sed -e 's/^z6/#&/' | \
+		 sed -e 's/.*getty.*//' \
+		> "${IMAGE_ROOTFS}${sysconfdir}/inittab.swupdate"
+	rm ${IMAGE_ROOTFS}${sysconfdir}/inittab
+	mv ${IMAGE_ROOTFS}${sysconfdir}/inittab.swupdate ${IMAGE_ROOTFS}${sysconfdir}/inittab
+}
+
+ROOTFS_POSTPROCESS_COMMAND += "${@bb.utils.contains('SWUPDATE_INIT', 'tiny', 'fix_inittab_swupdate', '',  d)}"