Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lipck
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
osak
lipck
Commits
d6f1e2d7
Commit
d6f1e2d7
authored
10 years ago
by
Christopher Spinrath
Browse files
Options
Downloads
Patches
Plain Diff
Renamed remaining bash scripts to their corr. Makefile target
parent
4b1343aa
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile
+3
-3
3 additions, 3 deletions
Makefile
scripts/repo_packages.sh
+0
-0
0 additions, 0 deletions
scripts/repo_packages.sh
scripts/rootfs_remaster.sh
+0
-0
0 additions, 0 deletions
scripts/rootfs_remaster.sh
with
3 additions
and
3 deletions
Makefile
+
3
−
3
View file @
d6f1e2d7
...
...
@@ -182,7 +182,7 @@ $(call gentargets,$(STATE_DIR)/rootfs_remastered) : $(call archdir,%)$(STATE_DIR
-s
lxc.mount.entry
=
"
$(
APT_CACHE_DIR
)
$(
call archdir,
$*
)$(
ROOTFS
)
/var/cache/apt/ none defaults,bind 0 0"
\
-s
lxc.mount.entry
=
"none
$(
call archdir,
$*
)$(
ROOTFS
)
/tmp tmpfs defaults 0 0"
\
-s
lxc.mount.entry
=
"none
$(
call archdir,
$*
)$(
ROOTFS
)
/run tmpfs defaults 0 0"
\
--
/bin/bash
-l
/remaster/remaster.proxy.sh /remaster/scripts/remaster
_rootfs
.sh
--
/bin/bash
-l
/remaster/remaster.proxy.sh /remaster/scripts/r
ootfs_r
emaster.sh
$(
MAKE
)
ARCH
=
$*
rootfs_finalize
#apply patches
...
...
@@ -376,7 +376,7 @@ image : image_content
repo_packages
:
$(REPO_ARCHIVE_DIR)/Packages.$(call altarch
,
$(ARCH))
$(REPO_ARCHIVE_DIR)/Packages.$(call altarch,$(PRIMARY_ARCH)) $(REPO_ARCHIVE_DIR)/Packages.$(call altarch,$(SECONDARY_ARCH))
:
$(REPO_ARCHIVE_DIR)/Packages.% : $(call archdir
,
$*)$(STATE_DIR)/rootfs_remastered | $(IMAGE_DIR)
$(
MAKE
)
ARCH
=
$(
call to_arch,
$*
)
rootfs_prepare
mkdir
"
$(
call archdir,
$*
)$(
ROOTFS
)
/cdrom"
mkdir
-p
"
$(
call archdir,
$*
)$(
ROOTFS
)
/cdrom"
mkdir
-p
"
$(
call archdir,
$*
)$(
LXC_DIR
)
"
lxc-execute
--name
"lipck_remaster_
$*
"
-P
"
$(
call archdir,
$*
)$(
LXC_DIR
)
"
-f
"
$(
CURDIR
)
/config/lxc_common.conf"
\
-s
lxc.arch
=
"
$(
call to_arch,
$*
)
"
-s
lxc.rootfs
=
"
$(
call archdir,
$*
)$(
ROOTFS
)
"
\
...
...
@@ -385,7 +385,7 @@ $(REPO_ARCHIVE_DIR)/Packages.$(call altarch,$(PRIMARY_ARCH)) $(REPO_ARCHIVE_DIR)
-s
lxc.mount.entry
=
"none
$(
call archdir,
$(
ARCH
))$(
ROOTFS
)
/run tmpfs defaults 0 0"
\
-s
lxc.mount.entry
=
"
$(
IMAGE_DIR
)
$(
call archdir,
$*
)$(
ROOTFS
)
/cdrom none defaults,bind 0 0"
\
--
/bin/bash
-l
/remaster/remaster.proxy.sh
\
/remaster/scripts/
fill_offline_repo
.sh
"
$*
"
"/cdrom"
/remaster/scripts/
repo_packages
.sh
"
$*
"
"/cdrom"
rmdir
"
$(
call archdir,
$*
)$(
ROOTFS
)
/cdrom"
$(
MAKE
)
ARCH
=
$(
call to_arch,
$*
)
rootfs_finalize
...
...
This diff is collapsed.
Click to expand it.
scripts/
fill_offline_repo
.sh
→
scripts/
repo_packages
.sh
+
0
−
0
View file @
d6f1e2d7
File moved
This diff is collapsed.
Click to expand it.
scripts/remaster
_rootfs
.sh
→
scripts/r
ootfs_r
emaster.sh
+
0
−
0
View file @
d6f1e2d7
File moved
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment