pastebin - collaborative debugging tool
eckelmann.kpaste.net RSS


Kconfig choice and ptxdist collection
Posted by Anonymous on Fri 1st Mar 2019 07:14
raw | new post
modification of post by Anonymous (view diff)

  1. From 4fea7ee2d00b0da5da82a9bc3627ff4466330225 Mon Sep 17 00:00:00 2001
  2. From: Gavin Schenk <g.schenk@eckelmann.de>
  3. Date: Thu, 28 Feb 2019 14:51:46 +0000
  4. Subject: [PATCH] ptx/basicsys: Copy different fstab to firmware and usb image
  5.  
  6. There is a requirement, that the USB stick image must not mount the
  7. second data drive of prodos3.
  8.  
  9. If the system boots from the firmware image it must mount the second
  10. data drive of prodos3.
  11.  
  12. Signed-off-by: Gavin Schenk <g.schenk@eckelmann.de>
  13. ---
  14.  
  15. Hallo,
  16.  
  17. bei dem Projekt prodos3 werden 2 Images erzeugt. eines ist die Firmware für die Platte, ein Zweites ist ein USBStick für Maintenance. Gelöst über collections.
  18.  
  19. Die Anforderung ist, dass in einem image die Datenplatte gemounted werden muss, und im anderen Image die Datenplatte nicht gemounted werden darf. Diese Partition wird über /etc/fstab eingehängt. Ich brauche also zwei unterschiedliche fstab.
  20.  
  21. Ich habe das verucht mit diesem Patch hinzubekommen, es klappt leider nicht.
  22.  
  23. Geht das eleganter?
  24. Warum kann ich in meiner Lösung die choice nicht in den collections sehen?
  25.  
  26.  
  27.  ptxdist/configs/ptxconfig_bb12qa6                  |  4 +++-
  28.  .../bb11qa6-basicsys/etc/fstab_full}               |  0
  29.  ptxdist/local_src/bb11qa6-basicsys/etc/fstab_slim  | 19 ++++++++++++++++++
  30.  ptxdist/rules/bb11qa6-basicsys.in                  | 23 +++++++++++++++++++++-
  31.  ptxdist/rules/bb11qa6-basicsys.make                |  7 +++++++
  32.  5 files changed, 51 insertions(+), 2 deletions(-)
  33.  rename ptxdist/{projectroot/etc/fstab => local_src/bb11qa6-basicsys/etc/fstab_full} (100%)
  34.  create mode 100644 ptxdist/local_src/bb11qa6-basicsys/etc/fstab_slim
  35.  
  36. diff --git a/ptxdist/configs/ptxconfig_bb12qa6 b/ptxdist/configs/ptxconfig_bb12qa6
  37. index d7673f0bd..7c9975481 100755
  38. --- a/ptxdist/configs/ptxconfig_bb12qa6
  39. +++ b/ptxdist/configs/ptxconfig_bb12qa6
  40. @@ -13,6 +13,8 @@ PTXCONF_ALTERA_CONTROL=y
  41.  PTXCONF_BACKUP_ETC=m
  42.  PTXCONF_BB11QA6_ATA2DISK_INIT=m
  43.  PTXCONF_BB11QA6_BASICSYS=y
  44. +# PTXCONF_BB11QA6_BASICSYS_FSTAB_FULL is not set
  45. +# PTXCONF_BB11QA6_BASICSYS_FSTAB_SLIM is not set
  46.  PTXCONF_BB11QA6_EUPDATE_GUI=y
  47.  # PTXCONF_BB11QA6_EUPDATE_GUI_TRUNK is not set
  48.  PTXCONF_BB11QA6_FPGA_UPDATE=m
  49. @@ -419,7 +421,7 @@ PTXCONF_ROOTFS_PASSWD=y
  50.  PTXCONF_ROOTFS_SHADOW=y
  51.  PTXCONF_ROOTFS_GROUP=y
  52.  # PTXCONF_ROOTFS_GSHADOW is not set
  53. -PTXCONF_ROOTFS_FSTAB=y
  54. +# PTXCONF_ROOTFS_FSTAB is not set
  55.  # PTXCONF_ROOTFS_MTAB_FILE is not set
  56.  # PTXCONF_ROOTFS_MTAB_LINK_MOUNTS is not set
  57.  PTXCONF_ROOTFS_MTAB_LINK_SELF_MOUNTS=y
  58. diff --git a/ptxdist/projectroot/etc/fstab b/ptxdist/local_src/bb11qa6-basicsys/etc/fstab_full
  59. similarity index 100%
  60. rename from ptxdist/projectroot/etc/fstab
  61. rename to ptxdist/local_src/bb11qa6-basicsys/etc/fstab_full
  62. diff --git a/ptxdist/local_src/bb11qa6-basicsys/etc/fstab_slim b/ptxdist/local_src/bb11qa6-basicsys/etc/fstab_slim
  63. new file mode 100644
  64. index 000000000..6a563209e
  65. --- /dev/null
  66. +++ b/ptxdist/local_src/bb11qa6-basicsys/etc/fstab_slim
  67. @@ -0,0 +1,19 @@
  68. +#
  69. +# /etc/fstab
  70. +#
  71. +
  72. +# special filesystems
  73. +proc   /proc                   proc    nosuid,nodev,noexec                     0 0
  74. +devpts /dev/pts                devpts  nosuid,noexec,mode=620,gid=112          0 0
  75. +sysfs  /sys                    sysfs   nosuid,nodev,noexec                     0 0
  76. +
  77. +# ramdisks
  78. +tmpfs  /tmp                    tmpfs   nosuid,nodev,mode=1777,size=50%         0 0
  79. +tmpfs  /run                    tmpfs   nosuid,nodev,strictatime,mode=0755      0 0
  80. +tmpfs  /var/log                tmpfs   nosuid,nodev,noexec,mode=0755,size=10%  0 0
  81. +tmpfs  /var/lock               tmpfs   nosuid,nodev,noexec,mode=0755,size=1M   0 0
  82. +tmpfs  /var/tmp                tmpfs   nosuid,nodev,mode=1777,size=20%         0 0
  83. +
  84. +none   /media                  tmpfs   defaults,mode=0755                      0 0
  85. +none   /var/lib                tmpfs   defaults,mode=0755                      0 0
  86. +
  87. diff --git a/ptxdist/rules/bb11qa6-basicsys.in b/ptxdist/rules/bb11qa6-basicsys.in
  88. index 27a106511..f990c8f82 100644
  89. --- a/ptxdist/rules/bb11qa6-basicsys.in
  90. +++ b/ptxdist/rules/bb11qa6-basicsys.in
  91. @@ -1,8 +1,29 @@
  92.  ## SECTION=project_specific
  93.  
  94.  config BB11QA6_BASICSYS
  95. -       bool
  96. +       tristate
  97.         prompt "bb11qa6-basicsys"
  98.         help
  99.           Basic systemconfiguration for the platform BB11QA6
  100.  
  101. +if BB11QA6_BASICSYS
  102. +
  103. +choice
  104. +       tristate
  105. +       prompt "install full or slim fstab"
  106. +
  107. +       config BB11QA6_BASICSYS_FSTAB_FULL
  108. +               bool
  109. +               prompt "bb11qa6-basicsys full fstab"
  110. +               help
  111. +                 Use full fstab with data drive
  112. +
  113. +       config BB11QA6_BASICSYS_FSTAB_SLIM
  114. +               bool
  115. +               prompt "bb11qa6-basicsys slim fstab"
  116. +               help
  117. +                 Use slim fstab without data drive
  118. +
  119. +endchoice
  120. +
  121. +endif
  122. diff --git a/ptxdist/rules/bb11qa6-basicsys.make b/ptxdist/rules/bb11qa6-basicsys.make
  123. index c46a4fb43..40a7fabc8 100644
  124. --- a/ptxdist/rules/bb11qa6-basicsys.make
  125. +++ b/ptxdist/rules/bb11qa6-basicsys.make
  126. @@ -76,6 +76,13 @@ $(STATEDIR)/bb11qa6-basicsys.targetinstall:
  127.         @$(call install_fixup,bb11qa6-basicsys,AUTHOR,"G. Schenk (EAG) <g.schenk@eckelmann.de>")
  128.         @$(call install_fixup,bb11qa6-basicsys,DESCRIPTION,missing)
  129.  
  130. +ifdef PTXCONF_BB11QA6_BASICSYS_FSTAB_FULL
  131. +       @$(call install_copy, bb11qa6-basicsys, 0, 0, 0644, $(BB11QA6_BASICSYS_DIR)/etc/fstab_full, /etc/fstab)
  132. +endif
  133. +
  134. +ifdef PTXCONF_BB11QA6_BASICSYS_FSTAB_SLIM
  135. +       @$(call install_copy, bb11qa6-basicsys, 0, 0, 0644, $(BB11QA6_BASICSYS_DIR)/etc/fstab_slim, /etc/fstab)
  136. +endif
  137.  
  138.         #tmpdir.d
  139.         $(call install_copy, bb11qa6-basicsys, 0, 0, 0640, $(BB11QA6_BASICSYS_DIR)/usr/lib/tmpfiles.d/sshd.conf, /usr/lib/tmpfiles.d/sshd.conf)
  140. --
  141. 2.11.0

Submit a correction or amendment below (click here to make a fresh posting)
After submitting an amendment, you'll be able to view the differences between the old and new posts easily.

Syntax highlighting:

To highlight particular lines, prefix each line with {%HIGHLIGHT}





All content is user-submitted.
The administrators of this site (kpaste.net) are not responsible for their content.
Abuse reports should be emailed to us at