summaryrefslogtreecommitdiffstats
path: root/remote/rootfs
diff options
context:
space:
mode:
authorJonathan Bauer2013-04-24 17:17:19 +0200
committerJonathan Bauer2013-04-24 17:17:19 +0200
commit5633488d5a50c58e7ad05fc186cef95af338506b (patch)
tree7aaffefc7cdae07a601dbc0ad8c040fdff883b54 /remote/rootfs
parentcompile kernel on the reference system with our config requirements (diff)
parentdelete plymouth/data/etc/systemd... (diff)
downloadtm-scripts-5633488d5a50c58e7ad05fc186cef95af338506b.tar.gz
tm-scripts-5633488d5a50c58e7ad05fc186cef95af338506b.tar.xz
tm-scripts-5633488d5a50c58e7ad05fc186cef95af338506b.zip
merge?
Diffstat (limited to 'remote/rootfs')
-rw-r--r--remote/rootfs/rootfs-stage32/rootfs-stage32.build6
-rw-r--r--remote/rootfs/rootfs-stage32/rootfs-stage32.conf2
-rw-r--r--remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper4
3 files changed, 8 insertions, 4 deletions
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
index e7c1d5f3..164a3464 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
@@ -4,6 +4,12 @@ fetch_source() {
}
build() {
+ if [ ! -z "$REQUIRED_PACKAGES" ]; then
+ COPYLIST="list_dpkg_output"
+ [ -e "${COPYLIST}" ] && rm "${COPYLIST}"
+ list_packet_files >> "${COPYLIST}"
+ tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}"
+ fi
FILELIST="list_binaries_and_files"
[ -e "${FILELIST}" ] && rm "${FILELIST}"
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
index d2c1e5a9..d421cf1b 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
@@ -49,8 +49,6 @@ REQUIRED_FILES=" /etc/environment
/etc/localtime
/etc/login.defs
/etc/securetty
- /etc/default/locale
- /etc/default/aufs
/etc/protocols
/etc/services
/etc/networks
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
index ec489fd1..a8a8c1b3 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
@@ -1,4 +1,6 @@
+pinfo "If aufs install fails, run zypper addrepo http://jftp.inai.de/openSUSE_12.3/ j.eng-i586"
REQUIRED_DEPENDENCIES="nfs-client aufs squashfs"
+REQUIRED_PACKAGES="timezone"
REQUIRED_BINARIES=" bash
agetty
cat
@@ -47,8 +49,6 @@ REQUIRED_FILES=" /etc/environment
/etc/login.defs
/etc/nsswitch.conf
/etc/securetty
- /etc/default/locale
- /etc/default/aufs
/etc/protocols
/etc/services
/etc/networks